浏览代码

Reordered some content.

mitm 7 年之前
父节点
当前提交
141502243e
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14 13
      src/docs/asciidoc/wiki/atom_editor.adoc

+ 14 - 13
src/docs/asciidoc/wiki/atom_editor.adoc

@@ -35,6 +35,9 @@ To fork the Wiki repository into your GitHub Account:
 *** *language-asciidoc* +
 *** *language-asciidoc* +
 *** *asciidoc-preview* +
 *** *asciidoc-preview* +
 *** *autocomplete-asciidoc*
 *** *autocomplete-asciidoc*
++
+TIP: You can add more GitHub controls to the editor by adding the package `*git-plus*`.
+
 .  To edit the Wiki you will need to clone the wiki repository.
 .  To edit the Wiki you will need to clone the wiki repository.
 ..  From the `Command Palette` (kbd:[ctrl]+kbd:[shift] +kbd:[P]  or `menu:Packages[Command Palette>Toggle]`), enter "`git`" into the search box.
 ..  From the `Command Palette` (kbd:[ctrl]+kbd:[shift] +kbd:[P]  or `menu:Packages[Command Palette>Toggle]`), enter "`git`" into the search box.
 ..  Select btn:[GitHub: Clone].
 ..  Select btn:[GitHub: Clone].
@@ -43,17 +46,15 @@ To fork the Wiki repository into your GitHub Account:
 IMPORTANT: Use the +++<abbr title="Uniform Resource Locator">URL</abbr>+++ to your repository fork and clone your fork if a non-member.
 IMPORTANT: Use the +++<abbr title="Uniform Resource Locator">URL</abbr>+++ to your repository fork and clone your fork if a non-member.
 
 
 ..  When you're ready, press the btn:[Clone] button.
 ..  When you're ready, press the btn:[Clone] button.
-
++
 The clone will take some time due to the size of the Wiki. Once cloned, a new `Project` tab will open on the left, and the `Git` and `GitHub Preview` tabs will open to the right. If they don't, you can open the Git tab using kbd:[ctrl]+kbd:[shift]+kbd:[9]  and the GitHub Preview tab using kbd:[ctrl]+kbd:[shift]+kbd:[8]. Alternatively, you can navigate the `menu:Packages[GitHub]` menu. You will also notice in the lower right corner, on the `Status Bar`, you now have your GitHub control.
 The clone will take some time due to the size of the Wiki. Once cloned, a new `Project` tab will open on the left, and the `Git` and `GitHub Preview` tabs will open to the right. If they don't, you can open the Git tab using kbd:[ctrl]+kbd:[shift]+kbd:[9]  and the GitHub Preview tab using kbd:[ctrl]+kbd:[shift]+kbd:[8]. Alternatively, you can navigate the `menu:Packages[GitHub]` menu. You will also notice in the lower right corner, on the `Status Bar`, you now have your GitHub control.
 
 
-All Wiki documents live in the `asciidoc` folder, images in the `images` folder, and resources for your documents in the `resources` folder. Select an appropriate folder under each to store your new document, image or resource.
+.  Before you can commit any changes to the Wiki, you must configure at least the user.email and user.name variables for Git. You can do this via Git Bash, or manually, by following these instructions.
 
 
-Before you can commit any changes to the Wiki, you must configure at least the user.email and user.name variables for Git. You can do this via Git Bash, or manually, by following these instructions.
-
-.  Git Bash:  link:https://help.github.com/articles/setting-your-commit-email-address-in-git/[Setting your commit email address in Git]
-.  Manually:
-..  link:https://help.github.com/articles/setting-your-commit-email-address-on-github/[Set your commit email address on GitHub]
-..  Open your `.gitconfig` file (located in USER_HOME) and add:
+..  Git Bash:  link:https://help.github.com/articles/setting-your-commit-email-address-in-git/[Setting your commit email address in Git]
+..  Manually:
+...  link:https://help.github.com/articles/setting-your-commit-email-address-on-github/[Set your commit email address on GitHub]
+...  Open your `.gitconfig` file (located in USER_HOME) and add:
 +
 +
 [source]
 [source]
 ----
 ----
@@ -64,11 +65,11 @@ Before you can commit any changes to the Wiki, you must configure at least the u
 +
 +
 To maintain your privacy, setup your email settings in your GitHub account and use the `users.noreply.github.com` email address.
 To maintain your privacy, setup your email settings in your GitHub account and use the `users.noreply.github.com` email address.
 
 
-Lastly, you will need to create a GitHub token. Follow the directions in the popup to enter the token.
+.  Lastly, you will need to create a GitHub token. Follow the directions in the popup to enter the token.
 
 
-When you edit a Wiki page, the Git tab will show any unstaged changes. When you're done making changes, you stage any or all changes, write your commit message, commit, and then push the changes.
+All Wiki documents live in the `asciidoc` folder, images in the `images` folder, and resources for your documents in the `resources` folder. Select an appropriate folder under each to store your new document, image or resource.
 
 
-You can add more GitHub controls to the editor by adding the package `*git-plus*`.
+When you edit a Wiki page, the Git tab will show any unstaged changes. When you're done making changes, you stage any or all changes, write your commit message, commit, and then push the changes.
 
 
 You can preview your documents by selecting the document and using the keyboard shortcut kbd:[ctrl]+kbd:[shift]+kbd:[A] or by using the File header menu menu:Packages[AsciiDoc Preview>Toggle Preview].
 You can preview your documents by selecting the document and using the keyboard shortcut kbd:[ctrl]+kbd:[shift]+kbd:[A] or by using the File header menu menu:Packages[AsciiDoc Preview>Toggle Preview].
 
 
@@ -86,7 +87,7 @@ As a member, you issue Git commands from the Atom Editor.
 .Non-Members
 .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.
 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.
+..  Go to your version of the repository on GitHub.
 ..  Click the btn:[New Pull Request] button at the top.
 ..  Click the btn:[New Pull Request] button at the top.
 ..  Note that the Wiki repository will be on the left and your repository will be on the right.
 ..  Note that 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 btn:[Base] button on the left and from the drop down list select your forked repository.
@@ -106,7 +107,7 @@ As a member, you issue all Git commands from the Atom Editor.
 .Non-Members
 .Non-Members
 To submit changes to the Wiki repository after pushing them to your fork:
 To submit changes to the Wiki repository after pushing them to your fork:
 
 
-..  Go to your version of the Wiki repository on github.
+..  Go to your version of the Wiki repository on GitHub.
 ..  Click the btn:[New Pull Request] button at the top.
 ..  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.
 ..  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.
 ..  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.