[seahorse/mallard-help: 150/335] Passwords-control-access->passwords-keyring-lock

[Aruna Sankaranarayanan <arunasank src gnome org>]

commit 4737db56e1466f6ae17cac5a70fb384259de94bb
Author: Aruna Sankaranarayanan <arunasank src gnome org>
Date:   Tue Aug 20 16:33:18 2013 +0530

    Passwords-control-access->passwords-keyring-lock
    
    Renaming makes the page fit in more easily with the other pages.
    Now there's passwords-keyring-lock.page and passwords-keyring-unlock.page

 ...rol-access.page => passwords-keyring-lock.page} |   33 +++++++------------
 1 files changed, 12 insertions(+), 21 deletions(-)
---
diff --git a/help/C/passwords-control-access.page b/help/C/passwords-keyring-lock.page
similarity index 53%
rename from help/C/passwords-control-access.page
rename to help/C/passwords-keyring-lock.page
index ba466f8..c1540f4 100644
--- a/help/C/passwords-control-access.page
+++ b/help/C/passwords-keyring-lock.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:its="http://www.w3.org/2005/11/its";
       type="topic" style="task"
-      id="passwords-control-access">
+      id="passwords-keyring-lock">
 
   <info>
     <link type="guide" xref="about-keyring"/>
@@ -17,23 +17,22 @@
       <years>2013</years>
     </credit>
 
-    <desc>Lock or password protect your password keyrings.</desc>
+    <desc>Lock and password protect your password keyrings.</desc>
   </info>
 
   <title>Control access to your passwords.</title>
 
-  <p>To control access to your password keyrings, you can:</p>
+  <p>To keep your passwords secure, you can control access to the password
+  keyring which contains them. This can be done by using a password-protected
+  keyring to store the password. When a password-protected keyring is locked,
+  the passwords in it are kept hidden till someone
+  <link xref="passwords-keyring-unlock">unlocks</link> the keyring with the
+  correct password.</p>
 
-  <list>
-    <item>
-      <p>Lock your password keyrings. This keeps your passwords protected till
-      you unlock the keyring.</p>
-    </item>
-    <item>
-      <p>Protect your keyring with a password. This requires you to type the
-      password for the keyring while unlocking it.</p>
-    </item>
-  </list>
+  <note style="tip">
+    <p>You can choose whether or not to protect your keyring with a password
+    while <link xref="passwords-keyring-create">creating</link> it.</p>
+  </note>
 
   <steps>
     <title>To lock your password keyring:</title>
@@ -44,14 +43,6 @@
       <p>Right click on the selected keyring and select <gui>Lock</gui> or
       click the small picture of an opened lock next to the name of the
       password keyring. This will lock the keyring.</p>
-      <note style="info">
-       <p>A locked keyring can be unlocked by right clicking on a selected
-       keyring and selecting <gui>Unlock</gui> or clicking the picture of the
-       closed lock next to the name of the locked keyring. If the keyring has
-       been protected with a password when the keyring was
-       <link xref="passwords-keyring-create">created</link>, you will
-       be prompted to enter the password while unlocking it.</p>
-      </note>
     </item>
   </steps>