[seahorse/wip/userdocs: 31/270] help: updated index to reflect new name.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 17636b954dcd308f4761852b0ebbdde0afa75474
Author: Jim Campbell <jwcampbell gmail com>
Date:   Sun Mar 4 11:02:50 2012 -0600

    help: updated index to reflect new name.
    
    Seahorse->Passwords and Keys

 help/C/index.page |   39 ++-------------------------------------
 1 files changed, 2 insertions(+), 37 deletions(-)
---
diff --git a/help/C/index.page b/help/C/index.page
index 67d8c72..d2d914a 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -15,10 +15,9 @@
       <email>jwcampbell gmail com</email>
     </credit>
 
-    <desc>Seahorse Encryption Key Manager</desc>
+    <desc>Passwords and Keys</desc>
   </info>
 
-<<<<<<< HEAD
   <title>
     <media its:translate="no" type="image" mime="image/png" src="figures/seahorse.png">
     </media>
@@ -45,41 +44,7 @@
   <section id="certificates" style="2column">
     <title>Certificates</title>
 
-=======
-  <title>Seahorse Encryption Key Manager</title>
-
-  <p>Welcome to the <app>Seahorse</app> help guide.</p>
-  
-  <section id="learn-about-keys" style="2column">
-    <title>Learn about keys</title>
-    
-  </section>
-  
-  <section id="create-keys" style="2column">
-    <title>Create keys</title>
-    
-  </section>
-
-  <section id="use-keys" style="2column">
-    <title>Use keys</title>
-    
-  </section>
-
-  <section id="back-up-and-secure-keys" style="2column">
-    <title>Back-up and secure your keys</title>
-    
->>>>>>> e8fb9ab... help: moved pages to help/C/ directory
-  </section>
-
-<<<<<<< HEAD
-  <section id="misc" style="2column">
-    <title>Miscellaneous</title>
-
-=======
-  <section id="revoke-keys" style="2column">
-    <title>Revoke your keys</title>
-    
->>>>>>> e8fb9ab... help: moved pages to help/C/ directory
   </section>
+  -->
 
 </page>