[gnome-user-docs] g-h/user-*: passwords & pictures; some edits, final



commit 094801b39df5dbbcb8724578f2b1482581118f22
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Apr 4 00:08:01 2011 -0400

    g-h/user-*: passwords & pictures; some edits, final

 gnome-help/C/user-changepassword.page    |   49 ++++++---------------
 gnome-help/C/user-changepicture.page     |   69 +++++++++++------------------
 gnome-help/C/user-forgottenpassword.page |   37 ++++++++++------
 3 files changed, 63 insertions(+), 92 deletions(-)
---
diff --git a/gnome-help/C/user-changepassword.page b/gnome-help/C/user-changepassword.page
index c4e2d5a..57d7363 100644
--- a/gnome-help/C/user-changepassword.page
+++ b/gnome-help/C/user-changepassword.page
@@ -5,9 +5,10 @@
   <info>
     <link type="guide" xref="user-accounts#passwords"/>
     
-    <desc>To do this, click <guiseq><gui>Users and Groups</gui><gui>Users Settings</gui><gui>Passwords</gui><gui>Change</gui></guiseq>.</desc>
+    <desc>Keep your account secure by changing your password often
+    in your account settings.</desc>
     
-    <revision pkgversion="3.0" version="0.1" date="2011-03-25" status="final"/>
+    <revision pkgversion="3.0" date="2011-03-25" status="final"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
@@ -19,59 +20,35 @@
 <title>Change your password</title>
 <p>It is a good idea to change your password from time to time, especially if you think someone else knows what your password is.</p>
    <steps>
-   <item><p>
-     In the <gui>Activities</gui> overview, search for <input>users and groups</input>. Click on it when it comes up.
-   </p></item>
-      <item><p>
-      In the <gui>Users Settings</gui>, select the user whose password you wish to change.
-   </p></item>
-      <item><p>
-      Next to where it says <gui>Password</gui>, click <gui>Change</gui>.
-   </p></item>
+    <item><p>Click your name on the top bar and select <gui>My Account</gui>.</p></item>
+    <item><p>Click the button label next to <gui>Password</gui>. It should look
+    like a series of dots or boxes if you already have a password set.</p></item>
       <item><p>
         Fill in your <gui>Current password</gui>, a <gui>New password</gui>, and <gui>Confirmation password</gui> (which needs to be exactly the same as the <gui>New password</gui>).
    </p></item>
          <item><p>
-      Click <gui>OK</gui>.
+      Click <gui>Change</gui>.
    </p></item>
    </steps>
 
 <p>Make sure you <link xref="user-goodpassword">choose a good password</link>. This will help to keep your user account safe.</p>
 
-  <note style="advanced">
-   <title>Using the command line</title>
-     <p>You can change your password using the command line instead.</p>
-     <steps>
-     <item><p>
-       At the Terminal prompt, run the <cmd>passwd</cmd> command.
-     </p></item>
-
-        <item><p>
-         Enter your current password. The letters won't show up when you type them, but they are being entered. Press <key>Enter</key> when you're done.
-             </p></item>
-
-        <item><p>
-        Enter the desired new password twice. You're done.
-     </p></item>
-     </steps>
-  </note>
-
   <section id="changepass">
     <title>Change the keyring password</title>
 
-  <p>
-    If you change your login password, it may become out of sync with the <em>keyring password</em>. The keyring saves you having to remember lots of different passwords by just requiring one "master" password to access them all. If you change your user password (see above), your keyring password will remain the same as your old password and so the keyring won't be <em>unlocked</em> automatically when you log in.</p>
+  <p>If you change your login password, it may become out of sync with the <em>keyring password</em>.
+  The keyring keeps you from having to remember lots of different passwords by just requiring one
+  <em>master</em> password to access them all. If you change your user password (see above), your keyring password will remain the same as your old password and so the keyring won't be <em>unlocked</em> automatically when you log in.</p>
     
   <p>To change your keyring password (to match your login password):</p>
   <steps>
-  <item><p>
-     Go to the <gui>Activities</gui> overview and open <input>Passwords and Encryption Keys</input>.
-  </p></item>
+  <item><p>Open the <app>Passwords and Encryption Keys</app> application fromn
+  the <gui>Activities</gui> overview.</p></item>
     <item><p>
     In the <gui>Passwords</gui> tab, right-click on <gui>Passwords: login</gui>.  Select <gui>Change Password</gui>.
   </p></item>
     <item><p>
-    Enter your <gui>Old Password</gui>, followed by your current <gui>Password</gui>, and <gui>Confirm</gui> your current password by entering it again.
+    Enter your <gui>Old Password</gui>, followed by your new <gui>Password</gui>, and <gui>Confirm</gui> your new password by entering it again.
   </p></item>
     <item><p>
     Click <gui>OK</gui>.
diff --git a/gnome-help/C/user-changepicture.page b/gnome-help/C/user-changepicture.page
index 7741fb7..6ecf802 100644
--- a/gnome-help/C/user-changepicture.page
+++ b/gnome-help/C/user-changepicture.page
@@ -5,57 +5,40 @@
   <info>
     <link type="guide" xref="user-accounts#manage"/>
     <desc>Add a bit of your personality to your login and user screens.</desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-02-24" status="candidate"/>
+    <revision pkgversion="3.0" version="0.1" date="2011-02-24" status="final"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
     </credit>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Select or change login screen photo</title>
-  <steps>
-   <item>
-   <p>
-      Press <keyseq><key> Alt </key><key> F1 </key></keyseq> to go to the <gui> Activities </gui> overview.
-   </p>
-   </item>
-   <item>
-   <p>
-     Type <input>about me</input> in the <gui> Type to search </gui> textbox. Click on the <gui> About me </gui> icon under Preferences, when it appears.
-   </p>
-   </item>
-   <item>
-   <p>
-   Click on the photo square to the left of the username. 
-   </p>
-   <note>
-   <p>
-   You can select from the many photos available from the /usr/share/pixmaps/faces directory.
-   </p>
-   <p>
-   You can also select a photo from a different folder on your computer by clicking on a folder of choice from the <gui> Places </gui> menu on the left.
-   </p>
-   </note>
-   
-   </item>
+  <title>Change your login screen photo</title>
 
-   <item>
-   <p>
-  Select the photo by clicking on the name of the file and then clicking <gui> Open </gui>.  The photo has been applied.
-   </p>
-   </item>
-   <item>
-   <p>
-   Click <gui> Close </gui>.
-   </p>
-   </item>
-  </steps>
-
-  <comment>
-   <cite date="2010-10-31" href="mailto:gnome-doc-list gnome org">GNOME Documentation Project</cite>
-   <p>Explain how to change the user's account picture, which is displayed on the login screen.</p>
-  </comment>
+  <p>When you log in or switch users, you will see a list of users with
+  their login photos. You can change your photo to a stock image or an
+  image of your own. You can even take a new login photo with your
+  webcam.</p>
 
+  <steps>
+    <item><p>Click your name on the top bar and select <gui>My Account</gui>.</p></item>
+    <item><p>Click the picture next to your name. A drop-down gallery
+    will be shown with some stock login photos. If you like one of
+    them, click it to use it for yourself.</p>
+    <list>
+      <item><p>If you'd rather use a picture you already have on your computer,
+      click <gui>Browse for more pictures</gui>.</p></item>
+      <item><p>If you have a webcam, you can take a new login photo right now
+      by clicking <gui>Take a photo</gui>. Take your picture, then move and
+      resize the square outline to crop out the parts you don't want. If you
+      don't like the picture you took, click <gui>Discard photo</gui> to try
+      again, or <gui>Cancel</gui> to give up.</p></item>
+    </list>
+    </item>
+  </steps>
 </page>
diff --git a/gnome-help/C/user-forgottenpassword.page b/gnome-help/C/user-forgottenpassword.page
index 0a35f76..2112afb 100644
--- a/gnome-help/C/user-forgottenpassword.page
+++ b/gnome-help/C/user-forgottenpassword.page
@@ -4,8 +4,8 @@
 
   <info>
     <link type="guide" xref="user-accounts#passwords"/>
-    <desc><link xref="user-forgottenpassword#live-cd">Using Live CD or USB</link>, <link xref="user-forgottenpassword#reset-password-grub2">Grub</link>, <link xref="user-forgottenpassword#delete-keyring">keyring</link></desc>
-    <revision pkgversion="3.0" version="0.1" date="2011-02-22" status="review"/>
+    <desc>Advanced techniques for resetting your password</desc>
+    <revision pkgversion="3.0" date="2011-02-22" status="final"/>
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
@@ -15,8 +15,17 @@
   </info>
 
   <title>I forgot my password!</title>
+<comment><cite date="2011-04-03">shaunm</cite><p>Marking final for 3.0.
+This could use some work for 3.2. There are some less drastic things.
+Like if there's another admin user on your computer, have them reset
+your password in the user accounts settings.</p>
+<p>Also: merge two grubs instructions (almost equal), use clicky-clicky
+instructions as much as possible, and let's get some real keyring docs
+integrated in gnome-help then link there.</p>
+</comment>
   <p>
-     It is important to not only choose <link xref="user-goodpassword">a good and secure password</link>, but one that you can also remember.  In the event that you have forgotten the password to login to your computer account, you can follow the following steps to reset it.
+     It is important to not only choose <link xref="user-goodpassword">a good and secure password</link>, but one that you can also remember.
+     If you have forgotten the password to log in to your computer account, you can follow the following steps to reset it.
   </p>
   <note style="important">
   <p>
@@ -26,10 +35,8 @@
   <p>
   If you simply want to change your password, see <link xref="user-changepassword"/>.
   </p>
-  <comment>
-   <cite date="2010-10-31" href="mailto:gnome-doc-list gnome org">GNOME Documentation Project</cite>
-   <p>Instruction on what to do if the user forgets his/her password. Mention possible side-effects of changing the password.</p>
-  </comment>
+
+  <links type="section"/>
 
   <section id="reset-password-grub2"><title>Reset password on Grub2 systems</title>
      <steps>
@@ -75,7 +82,7 @@
            At the next <cmd>#</cmd> symbol type:
            </p>
            <p>
-           <cmd>passwd username</cmd>, where username is the username of the password you are changing.
+           <cmd>passwd <var>username</var></cmd>, where <var>username</var> is the username of the account you're changing the password for.
            </p>
            <note>
            <p>
@@ -106,7 +113,7 @@
           </item>
      </steps>
      <p>
-       After you successfully login, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
+       After you successfully log in, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
      </p>
   </section>
     <section id="reset-password-grub1"><title>Reset password on Grub systems</title>
@@ -153,7 +160,7 @@
            At the next <cmd>#</cmd> symbol type:
            </p>
            <p>
-           <cmd>passwd username</cmd>, where username is the username of the password you are changing.
+           <cmd>passwd <var>username</var></cmd>, where <var>username</var> is the username of the account you're changing the password for.
            </p>
            <note>
            <p>
@@ -185,7 +192,7 @@
 
      </steps>
      <p>
-       After you successfully login, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
+       After you successfully log in, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
      </p>
   </section>
     <section id="live-cd"><title>Reset password using a Live CD or USB</title>
@@ -279,7 +286,7 @@
 
      </steps>
      <p>
-       After you successfully login, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
+       After you successfully log in, you will not be able to access your keyring (since you don't remember the old password).  This means that all your saved passwords for wireless networks, jabber accounts, etc. will no longer be accessible.  You will need to <link xref="#delete-keyring">delete the old keyring</link> and start a new one.
      </p>
   </section>
 
@@ -287,6 +294,10 @@
   <section id="delete-keyring">
     <title>Get Rid of the Keyring Manager</title>
 
+    <note style="warning"><p>This will delete all your saved passwords for wireless
+    networks, instant messaging accounts, etc. Only do this if you can't remember
+    the password you used for your keyring.</p></note>
+
   <steps>
    <item><p>
     Go to your Home folder by typing 'home' in the <gui>Activities</gui> overview.
@@ -308,7 +319,7 @@
    </p></item>
  </steps>
 <p>
-After you restart and login you will be asked to enter your wireless networks password.
+After you restart and log in you will be asked to enter your wireless networks password.
 </p>
   </section>
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]