Move more pages to the right places

And fix up other minor stylistic issues

system-admin-guide/C/extensions-enable.page

@@ -4,14 +4,14 @@
       id="extensions-enable">
 
   <info>
-    <link type="guide" xref="index#extension" />
-    <revision pkgversion="3.12" date="2014-06-17" status="review"/>
+    <link type="guide" xref="software#extension" />
     <link type="seealso" xref="extensions-lockdown" />
     <link type="seealso" xref="extensions" />
+    <revision pkgversion="3.12" date="2014-06-17" status="review"/>
 
     <credit type="author copyright">
       <name>Petr Kovar</name>
-      <email>pknbe@volny.cz</email>
+      <email its:translate="no">pknbe@volny.cz</email>
       <years>2014</years>
     </credit>
 
@@ -31,8 +31,8 @@
   <steps>
     <title>Setting the org.gnome.shell.enabled-extensions key</title>
     <item>
-      <p>Create a <code>user</code> profile in <file>/etc/dconf/profile/user</file>:
-      </p>
+      <p>Create a <code>user</code> profile in
+      <file>/etc/dconf/profile/user</file>:</p>
       <listing>
         <code>
 user-db:user

system-admin-guide/C/extensions-lockdown.page

@@ -4,14 +4,14 @@
       id="extensions-lockdown">
 
   <info>
-    <link type="guide" xref="index#extension" />
-    <revision pkgversion="3.12" date="2014-06-17" status="review"/>
+    <link type="guide" xref="software#extension" />
     <link type="seealso" xref="extensions-enable" />
     <link type="seealso" xref="extensions" />
+    <revision pkgversion="3.12" date="2014-06-17" status="review"/>
 
     <credit type="author copyright">
       <name>Petr Kovar</name>
-      <email>pknbe@volny.cz</email>
+      <email its:translate="no">pknbe@volny.cz</email>
       <years>2014</years>
     </credit>
 
@@ -23,20 +23,22 @@
   <title>Lock down enabled extensions</title>
   
   <p>In GNOME Shell, you can prevent the user from enabling or disabling
-   extensions by locking down the <code>org.gnome.shell.enabled-extensions</code>
-   and <code>org.gnome.shell.development-tools</code> keys. This allows you to
-   provide a set of extensions that the user has to use.</p>
+  extensions by locking down the
+  <code>org.gnome.shell.enabled-extensions</code> and
+  <code>org.gnome.shell.development-tools</code> keys. This allows you to
+  provide a set of extensions that the user has to use.</p>
    
-  <p>Locking down the <code>org.gnome.shell.development-tools</code> key ensures
-  that the user cannot use GNOME Shell's integrated debugger and inspector tool
-  (<app>Looking Glass</app>) to disable any mandatory extensions.</p>
+  <p>Locking down the <code>org.gnome.shell.development-tools</code> key
+  ensures that the user cannot use GNOME Shell's integrated debugger and
+  inspector tool (<app>Looking Glass</app>) to disable any mandatory
+  extensions.</p>
    
   <steps>
     <title>Lock down the org.gnome.shell.enabled-extensions and
     org.gnome.shell.development-tools keys</title>
     <item>
-      <p>Create a <code>user</code> profile in <file>/etc/dconf/profile/user</file>:
-      </p>
+      <p>Create a <code>user</code> profile in
+      <file>/etc/dconf/profile/user</file>:</p>
       <listing>
         <code>
 user-db:user
@@ -85,7 +87,6 @@ development-tools=false
   in <file>~/.local/share/gnome-shell/extensions</file> or
   <file>/usr/share/gnome-shell/extensions</file> that are not listed in the
   <code>org.gnome.shell.enabled-extensions</code> key will not be loaded by
-  GNOME Shell, thus preventing the user from using them.
-  </p>
+  GNOME Shell, thus preventing the user from using them.</p>
 
 </page>

system-admin-guide/C/extensions.page

@@ -4,14 +4,14 @@
       id="extensions">
 
   <info>
-    <link type="guide" xref="index#extension" />
-    <revision pkgversion="3.9" version="0.1" date="2013-08-07" status="review"/>
+    <link type="guide" xref="software#extension" />
     <link type="seealso" xref="extensions-lockdown" />
     <link type="seealso" xref="extensions-enable" />
+    <revision pkgversion="3.9" date="2013-08-07" status="review"/>
 
     <credit type="author copyright">
       <name>Petr Kovar</name>
-      <email>pknbe@volny.cz</email>
+      <email its:translate="no">pknbe@volny.cz</email>
       <years>2013</years>
     </credit>
 
@@ -30,23 +30,23 @@
   The uuid is also used for the name of the directory where an extension is
   installed. You can either install the extension per-user in
   <file>~/.local/share/gnome-shell/extensions/&lt;uuid&gt;</file>, or
-  machine-wide in <file>/usr/share/gnome-shell/extensions/&lt;uuid&gt;</file>.
-  </p>
+  machine-wide in
+  <file>/usr/share/gnome-shell/extensions/&lt;uuid&gt;</file>.</p>
   
   <p>To view installed extensions, you can use <app>Looking Glass</app>, GNOME
   Shell's integrated debugger and inspector tool.</p>
   
   <steps>
-  	<title>View installed extensions</title>
-  	<item>
-  	  <p>Press <keyseq type="combo"><key>Alt</key><key>F2</key></keyseq>,
-  	  type in <em>lg</em> and press <key>Enter</key> to open
-  	  <app>Looking Glass</app>.</p>
-  	</item>
-  	<item>
-  	  <p>On the top bar of <app>Looking Glass</app>, click
-  	  <gui>Extensions</gui> to open the list of installed extensions.</p>
-  	</item>
+    <title>View installed extensions</title>
+    <item>
+      <p>Press <keyseq type="combo"><key>Alt</key><key>F2</key></keyseq>,
+      type in <em>lg</em> and press <key>Enter</key> to open
+      <app>Looking Glass</app>.</p>
+    </item>
+    <item>
+      <p>On the top bar of <app>Looking Glass</app>, click
+      <gui>Extensions</gui> to open the list of installed extensions.</p>
+    </item>
   </steps>
 
 </page>

system-admin-guide/C/software.page

@@ -15,6 +15,11 @@
   <links style="2column" type="topic"/>
 </section>
 
+<section id="extension">
+  <title>Extensions</title>
+  <links style="2column" type="topic"/>
+</section>
+
 <section id="management">
   <title>Management</title>
   <links style="2column" type="topic"/>