[seahorse/mallard-help: 288/288] Merge branch 'mallard-help'

[Aruna Sankaranarayanan <arunasank src gnome org>]

commit cdcae8e0f5ac1a8095207cb4c41305cc09bee933
Merge: 20932da a27903b
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Tue Aug 20 23:36:54 2013 +0530

    Merge branch 'mallard-help'
    
    Merge mallard-help of ssh://git.gnome.org/git/seahorse into mallard-help
    
    Fixed all merge conflicts.

 help/C/key-servers-add.page                   |    1 +
 help/C/passwords-keyring-update-password.page |   32 ++++++++++++------------
 help/C/passwords-stored-new-create.page       |    1 -
 help/C/ssh-connect-remote.page                |    1 +
 4 files changed, 18 insertions(+), 17 deletions(-)
---
diff --cc help/C/key-servers-add.page
index 2af045c,4035851..816746d
--- a/help/C/key-servers-add.page
+++ b/help/C/key-servers-add.page
@@@ -4,7 -4,7 +4,8 @@@
        id="key-servers-add">
  
    <info>
 +    <link type="guide" xref="about-key-servers"/>
+     <link type="guide" xref="index#pgp-keys"/>
  
      <revision version="0.1" date="2011-10-23" status="stub"/>
      <revision pkgversion="3.9" date="2013-08-18" status="draft"/>
diff --cc help/C/passwords-keyring-update-password.page
index fbcd330,d8096e7..0443676
--- a/help/C/passwords-keyring-update-password.page
+++ b/help/C/passwords-keyring-update-password.page
@@@ -29,22 -29,22 +29,22 @@@
  
    <steps>
      <title>To update the password for your password keyring:</title>
--      <item>
--        <p>Select the password keyring of your choice from the list.</p>
--      </item>
--      <item>
--      <p>Right click on the selected password keyring and select
--      <gui>Change Password</gui>.</p>
--      </item>
--      <item>
--      <p>Type your old password to authenticate yourself and press
--      <gui style="continue">Continue</gui>.</p>
--      </item>
--      <item>
--      <p>In the new dialog, type your new password, retype it to confirm the
--      new password and press the <gui style="button">Continue</gui> button to
--      finish.</p>
--      </item>
++    <item>
++      <p>Select the password keyring of your choice from the list.</p>
++    </item>
++    <item>
++      <p>Right click on the selected password keyring and select
++      <gui>Change Password</gui>.</p>
++    </item>
++    <item>
++      <p>Type your old password to authenticate yourself and press
++      <gui style="continue">Continue</gui>.</p>
++    </item>
++    <item>
++      <p>In the new dialog, type your new password, retype it to confirm the
++      new password and press the <gui style="button">Continue</gui> button to
++      finish.</p>
++    </item>
    </steps>
  
  </page>
diff --cc help/C/passwords-stored-new-create.page
index 533bda1,c476588..917bcda
--- a/help/C/passwords-stored-new-create.page
+++ b/help/C/passwords-stored-new-create.page
@@@ -4,8 -4,8 +4,7 @@@
        id="passwords-stored-new-create">
  
    <info>
 -    <link type="guide" xref="index#passwords"/>
 -    <link type="topic" xref="passwords-keyring-create"/>
 +    <link type="guide" xref="passwords-landing#index"/>
-     <link type="topic" xref="passwords-keyring-create"/>
      <revision pkgversion="3.9" version="0.1" date="2013-07-18" status="draft"/>
  
      <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
diff --cc help/C/ssh-connect-remote.page
index b3f9738,9d5c30a..a614d5e
--- a/help/C/ssh-connect-remote.page
+++ b/help/C/ssh-connect-remote.page
@@@ -2,8 -2,8 +2,9 @@@
        xmlns:its="http://www.w3.org/2005/11/its";
        type="topic" style="task"
        id="ssh-connect-remote">
++
    <info>
 -    <link type="guide" xref="index#ssh-keys"/>
 +    <link type="guide" xref="ssh-landing#index"/>
  
      <revision version="0.1" date="2011-10-23" status="stub"/>