Merge pull request #7 from forcedotcom/jshackell/rearrange

fix: rearrange command xml, rename setup guide, fix rn link

Author: jshackell-sfdc

templates/cli_reference_xml.hbs

@@ -31,9 +31,9 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
         <section>
             <p>For information about installing Salesforce CLI, see the <cite><xref 
                 href="https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_install_cli.htm" 
-                type="new-window:HTML" format="html" scope="external">Salesforce DX Setup Guide</xref></cite>.</p>
+                type="new-window:HTML" format="html" scope="external">Salesforce CLI Setup Guide</xref></cite>.</p>
             <p>For information about Salesforce CLI changes, see the <cite><xref 
-                href="https://developer.salesforce.com/media/salesforce-cli/releasenotes.html" 
+                href="https://github.com/forcedotcom/cli/blob/master/releasenotes/README.md"
                 type="new-window:HTML" format="html" scope="external">Salesforce CLI Release Notes</xref></cite>.</p>
         </section>
     </refbody>

templates/command.hbs

@@ -61,6 +61,22 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
                 format="html" scope="external" type="new-window:HTML">{{trailblazerCommunityName}}</xref> group in the
                 Trailblazer Community.</note>
         </section>{{/if}}
+        {{#if help}}
+        <section>
+            <title><ph>Help for <codeph otherprops="nolang">{{id}}</codeph></ph></title>
+            {{#each help}}
+            {{#isCodeBlock this}}<codeblock otherprops="nolang">{{this}}</codeblock>{{else}}<p>{{this}}</p>{{/isCodeBlock}}
+            {{/each}}
+        </section>
+        {{/if}}
+        {{#if examples}}
+        <section>
+            <title><ph>Examples for <codeph otherprops="nolang">{{id}}</codeph></ph></title>
+            {{#each examples}}
+            {{#isCodeBlock this}}<codeblock otherprops="nolang">{{this}}</codeblock>{{else}}<p>{{this}}</p>{{/isCodeBlock}}
+            {{/each}}
+        </section>
+        {{/if}}
         <section>
             <title><ph>Command Syntax</ph></title>
             <dl>
@@ -90,14 +106,6 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
             </dl>
         </section>
         {{/if}}
-        {{#if help}}
-        <section>
-            <title><ph>Help for <codeph otherprops="nolang">{{id}}</codeph></ph></title>
-            {{#each help}}
-            {{#isCodeBlock this}}<codeblock otherprops="nolang">{{this}}</codeblock>{{else}}<p>{{this}}</p>{{/isCodeBlock}}
-            {{/each}}
-        </section>
-        {{/if}}
         {{#if aliases}}
         <section>
             <title><ph>Aliases for <codeph otherprops="nolang">{{id}}</codeph></ph></title>
@@ -106,13 +114,5 @@ IF YOU WANT TO CHANGE THIS CONTENT, CONTACT juliet.shackell@salesforce.com FOR D
             {{/each}}
         </section>
         {{/if}}
-        {{#if examples}}
-        <section>
-            <title><ph>Examples for <codeph otherprops="nolang">{{id}}</codeph></ph></title>
-            {{#each examples}}
-            {{#isCodeBlock this}}<codeblock otherprops="nolang">{{this}}</codeblock>{{else}}<p>{{this}}</p>{{/isCodeBlock}}
-            {{/each}}
-        </section>
-        {{/if}}
     </refbody>
 </reference>