[seahorse/wip/userdocs: 109/229] help: Reorder index so that passwords are first

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 23d66774bec23a585494e2a808294fd8d5881a7b
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Wed Aug 14 18:22:59 2013 +0100

    help: Reorder index so that passwords are first

 help/C/index.page |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/help/C/index.page b/help/C/index.page
index 5599029..037f972 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -2,14 +2,12 @@
       xmlns:its="http://www.w3.org/2005/11/its";
       type="guide" style="2column task"
       id="index">
+
   <info>
     <title type="link">Passwords and Keys</title>
     <title type="text">Passwords and Keys</title>
-
     <revision version="0.1" date="2011-06-17" status="draft"/>
-    <revision pkgversion="3.9" version="0.1" date="2013-07-18" status="review"/>
-
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <revision pkgversion="3.9" date="2013-08-14" status="review"/>
 
     <credit type="author copyright">
       <name>Jim Campbell</name>
@@ -21,35 +19,38 @@
       <email its:translate="no">aruna evam gmail com</email>
       <years>2013</years>
     </credit>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Passwords and Keys</desc>
   </info>
 
   <title>
+<<<<<<< HEAD
     <media its:translate="no" type="image" mime="image/png" src="media/seahorse.png">
     </media>
+=======
+    <media its:translate="no" type="image" mime="image/png" src="figures/seahorse.png" />
+>>>>>>> 48fb969... help: Reorder index so that passwords are first
     Passwords and Keys
   </title>
 
+  <section id="passwords" style="2column">
+    <title>Stored passwords and password keyrings</title>
+  </section>
+
   <section id="pgp-keys" style="2column">
     <title>PGP keys</title>
-
   </section>
 
   <section id="ssh-keys" style="2column">
     <title>SSH Keys</title>
-
-  </section>
-
-  <section id="passwords" style="2column">
-    <title>Stored passwords and password keyrings</title>
-
   </section>
 
   <!--
   TODO: This section will be updated after the certificates UI is revised
   <section id="certificates" style="2column">
     <title>Certificates</title>
-
   </section>
   -->