|
|
@@ -85,16 +85,16 @@ As a member, you issue Git commands from the Atom Editor.
|
|
|
.Non-Members
|
|
|
Update your local copy of the Wiki by issuing a pull request from your forked repository to the Wiki repository prior to pushing your commit to your fork.
|
|
|
|
|
|
-.. Go to your version of the repository on GitHub.
|
|
|
-.. Click the btn:[New Pull Request] button at the top.
|
|
|
+. Go to your version of the repository on GitHub.
|
|
|
+. Click the btn:[New Pull Request] button at the top.
|
|
|
+
|
|
|
NOTE: The Wiki repository will be on the left and your repository will be on the right.
|
|
|
|
|
|
-.. Click the btn:[Base] button on the left and from the drop down list select your forked repository.
|
|
|
-.. Click the "`compare across forks`" link.
|
|
|
-.. Click the btn:[Head Fork] button and from the drop down list select the Wiki repository.
|
|
|
-.. If the repositories are not identical, there will be green button btn:[Create pull request]. Click it to update your repository.
|
|
|
-.. Update your local copy by doing a Pull request in Atom.
|
|
|
+. Click the btn:[Base] button on the left and from the drop down list select your forked repository.
|
|
|
+. Click the "`compare across forks`" link.
|
|
|
+. Click the btn:[Head Fork] button and from the drop down list select the Wiki repository.
|
|
|
+. If the repositories are not identical, there will be green button btn:[Create pull request]. Click it to update your repository.
|
|
|
+. Update your local copy by doing a Pull request in Atom.
|
|
|
|
|
|
IMPORTANT: As a non-member, when there is interaction between the Wiki repository and your fork, you issue commands online. When the interaction is between your forked repository and your local copy, you issue command from Atom.
|
|
|
|
|
|
@@ -107,10 +107,10 @@ As a member, you issue all Git commands from the Atom Editor.
|
|
|
.Non-Members
|
|
|
To submit changes to the Wiki repository after pushing them to your fork:
|
|
|
|
|
|
-.. Go to your version of the Wiki repository on GitHub.
|
|
|
-.. Click the btn:[New Pull Request] button at the top.
|
|
|
-.. Note that the jMonkeyEngine repository will be on the left and your repository will be on the right.
|
|
|
-.. Click the green button btn:[Create pull request]. Give a succinct and informative title, in the comment field give a short explanation of the changes and click the green button btn:[Create pull request] again.
|
|
|
+. Go to your version of the Wiki repository on GitHub.
|
|
|
+. Click the btn:[New Pull Request] button at the top.
|
|
|
+. Note that the jMonkeyEngine repository will be on the left and your repository will be on the right.
|
|
|
+. Click the green button btn:[Create pull request]. Give a succinct and informative title, in the comment field give a short explanation of the changes and click the green button btn:[Create pull request] again.
|
|
|
|
|
|
IMPORTANT: As a non-member, when there is interaction between the Wiki repository and your fork, you issue commands online. When the interaction is between your forked repository and your local copy, you issue command from Atom.
|
|
|
|
|
|
@@ -120,12 +120,12 @@ IMPORTANT: As a non-member, when there is interaction between the Wiki repositor
|
|
|
|
|
|
To make things even easier, you can create your own Wiki template for page creation. You must first have the `*file-templates*` package installed. You can find this package by selecting `menu:File[Settings>Install]` and typing "`template`" into the search box.
|
|
|
|
|
|
-* Once installed, from the `Command Palette` (kbd:[ctrl]+kbd:[shift] +kbd:[P] or `menu:Packages[Command Palette>Toggle]`) enter "`file`" into the search box.
|
|
|
-* Select btn:[File Templates: New Template].
|
|
|
-* For `Template Name`, use `Jme3 Wiki Template`, and when ready select btn:[Create].
|
|
|
-* From the `Command Palette`, enter "`file`" and select btn:[File Templates: Update Template].
|
|
|
-* If this is the first template it will open automatically. If not, then select the `Jme3 Wiki Template` you just created and press the btn:[Edit Template] button.
|
|
|
-* Copy and paste the text below into the head of the document.
|
|
|
+. Once installed, from the `Command Palette` (kbd:[ctrl]+kbd:[shift] +kbd:[P] or `menu:Packages[Command Palette>Toggle]`) enter "`file`" into the search box.
|
|
|
+. Select btn:[File Templates: New Template].
|
|
|
+. For `Template Name`, use `Jme3 Wiki Template`, and when ready select btn:[Create].
|
|
|
+. From the `Command Palette`, enter "`file`" and select btn:[File Templates: Update Template].
|
|
|
+. If this is the first template it will open automatically. If not, then select the `Jme3 Wiki Template` you just created and press the btn:[Edit Template] button.
|
|
|
+. Copy and paste the text below into the head of the document.
|
|
|
+
|
|
|
[source,subs="+macros"]
|
|
|
----
|
|
|
@@ -138,7 +138,7 @@ To make things even easier, you can create your own Wiki template for page creat
|
|
|
:experimental:
|
|
|
ifdef++::++env-github,env-browser[:outfilesuffix: .adoc]
|
|
|
----
|
|
|
-* When done, close the document and when it asks you if you want to save it select btn:[Yes] .
|
|
|
+. When done, close the document and when it asks you if you want to save it select btn:[Yes] .
|
|
|
|
|
|
You can now use your template when creating new Wiki documents by opening the `Command Palette`, entering "`file`" into the search box, and selecting btn:[File Templates: New File].
|
|
|
|
mitm