[gnome-user-docs/gnome-3-0] Assorted small edits and combining Grubs in user-forgottenpassword
- From: Tiffany Antopolski <antopolski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs/gnome-3-0] Assorted small edits and combining Grubs in user-forgottenpassword
- Date: Tue, 14 Jun 2011 01:48:31 +0000 (UTC)
commit 86e155bc387c53df4bdcb55496b2b7a1ad261407
Author: Michael Hill <mdhillca gmail com>
Date: Tue May 31 12:18:05 2011 -0400
Assorted small edits and combining Grubs in user-forgottenpassword
gnome-help/C/app-evolution-setup.page.stub | 14 ++-
gnome-help/C/figures/evolution-setup.png | Bin 0 -> 30229 bytes
gnome-help/C/files-browse.page | 1 -
gnome-help/C/user-forgottenpassword.page.old | 159 ++++++++++----------------
4 files changed, 74 insertions(+), 100 deletions(-)
---
diff --git a/gnome-help/C/app-evolution-setup.page.stub b/gnome-help/C/app-evolution-setup.page.stub
index b43b0b0..7076a73 100644
--- a/gnome-help/C/app-evolution-setup.page.stub
+++ b/gnome-help/C/app-evolution-setup.page.stub
@@ -16,7 +16,19 @@
<title>Evolution setup</title>
-<p><link href="ghelp:evolution">Evolution</link> is the GNOME groupware application that provides mail, calendaring and addressbook functionality. The first time you launch it from the activities overview or the <app>clock calendar</app>, the <app>Evolution Setup Assistant</app> appears. </p>
+<p><link href="ghelp:evolution">Evolution</link> is the GNOME groupware
+ application that provides mail, calendaring and addressbook functionality. The
+ first time you launch it from the activities overview or the <app>clock
+ calendar</app>, the <app>Evolution Setup Assistant</app> appears.</p>
+
+<media type="image" src="figures/evolution-setup.png"
+ width="500" height="538">
+ <p>Evolution Setup Assistant</p>
+</media>
+
+<p>Armed with your mail account details, you can follow
+ <link href="ghelp:evolution?usage-mainwindow-starting">these instructions</link>
+ to complete your account setup.</p>
</page>
diff --git a/gnome-help/C/figures/evolution-setup.png b/gnome-help/C/figures/evolution-setup.png
new file mode 100644
index 0000000..6a7f0ca
Binary files /dev/null and b/gnome-help/C/figures/evolution-setup.png differ
diff --git a/gnome-help/C/files-browse.page b/gnome-help/C/files-browse.page
index 8bc7ef7..ee7624c 100644
--- a/gnome-help/C/files-browse.page
+++ b/gnome-help/C/files-browse.page
@@ -34,7 +34,6 @@ network shares.</p>
<p>To open the file manager, open <app>Files</app> in the <gui>Activities</gui>
overview. You can also search for files and folders through the overview in the
same way you would <link xref="shell-apps-open">search for applications</link>.
-They will appear under the heading <gui>Places and Devices</gui>.</p>
<p>In the file manager, double-click any folder to view its contents,
and double-click any file to open it with the default application for
diff --git a/gnome-help/C/user-forgottenpassword.page.old b/gnome-help/C/user-forgottenpassword.page.old
index d8180b2..4ed2225 100644
--- a/gnome-help/C/user-forgottenpassword.page.old
+++ b/gnome-help/C/user-forgottenpassword.page.old
@@ -28,12 +28,15 @@ 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.
- If you have forgotten the password to log in to your computer account, you can follow the following steps to reset it.
+ It is important not only to choose <link xref="user-goodpassword">a good
+ and secure password</link>, but also one that you can 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>
- If you have an encrypted home directory, you will not be able to reset a forgotten password.
+ If you have an encrypted home directory, you will not be able to reset a
+ forgotten password.
</p>
</note>
<p>
@@ -42,103 +45,40 @@ integrated in gnome-help then link there.</p>
<links type="section"/>
- <section id="reset-password-grub2"><title>Reset password on Grub2 systems</title>
- <steps>
- <item>
- <p>
- Restart your computer, and hold down the <key>Shift</key> during bootup to get into the grub menu.
- </p>
- <note style="tip">
- <p>
- If you have a dual-boot machine and you choose at boot time which operating system to boot into, the grub menu should appear without the need to hold down the <key>Shift</key> key.
- </p>
- </note>
- <note>
- <p>If you are unable to get into the Grub boot menu, and therefore cannot edit any Linux kernel lines, you can <link xref="user-forgottenpassword#live-cd">use a live CD to reset your user password</link>.
- </p>
- </note>
- </item>
- <item>
- <p>
- Press <key>e</key> to edit the line that begins with the word 'linux'. This line may actually be wrapped onto a second line.
- </p>
- </item>
- <item>
- <p>
- Add <cmd>init = /bin/sh</cmd> to the end of the line.
- </p>
- </item>
- <item>
- <p>
- Press <keyseq><key>Ctrl</key><key> x </key></keyseq> to boot.
- </p>
- </item>
- <item>
- <p>
- At the <cmd>#</cmd> symbol, type:
- </p>
- <p>
- <cmd>mount -o remount, rw /</cmd>
- </p>
- </item>
- <item>
- <p>
- At the next <cmd>#</cmd> symbol type:
- </p>
- <p>
- <cmd>passwd <var>username</var></cmd>, where <var>username</var> is the username of the account you're changing the password for.
- </p>
+ <section id="reset-password-grub2"><title>Reset password on <app>Grub2</app>
+ systems</title>
<note>
- <p>
- Debian systems do not have a <cmd>root</cmd> password. Therefore, on Debian systems you would always be changing the password of a particular username, never root.
+ <p>These steps will work for <app>Grub2</app>. If you are still
+ running the older version of <app>Grub</app>, the procedure is very similar;
+ differences are shown in brackets.
</p>
</note>
- </item>
- <item>
- <p>
- You will be prompted to enter a new UNIX password, and to confirm the new password.
- </p>
- </item>
- <item>
- <p>
- Once the password has been successfully changed:
- </p>
- <p>
- # <cmd>mount -o remount, ro /</cmd>
- </p>
- </item>
- <item>
- <p>
- Then:
- </p>
- <p>
- # <cmd>reboot -f</cmd>
- </p>
- </item>
- </steps>
- <p>
- 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>
<steps>
<item>
<p>
- Restart your computer, and press the <key>Esc</key> during bootup to get into the grub menu.
+ Restart your computer, and hold down <key>Shift</key> during bootup
+ to get into the Grub menu (<app>Grub</app>: press <key>Esc</key> repeatedly).
</p>
<note style="tip">
<p>
- If you have a dual-boot machine and you choose at boot time which operating system to boot into, the grub menu should appear without the need to hold down the <key>Esc</key> key.
+ If you have a dual-boot machine and you choose at boot time which
+ operating system to boot into, the Grub menu should appear without the need to
+ hold down <key>Shift</key> (or press <key>Esc</key>).
</p>
</note>
<note>
- <p>If you are unable to get into the Grub boot menu, and therefore cannot edit any linux kernel lines, you can <link xref="#live-cd">use a live CD</link> to reset your user password.
+ <p>If you are unable to get into the Grub boot menu, and therefore
+ cannot edit any Linux kernel lines, you can
+ <link xref="user-forgottenpassword#live-cd">use a live CD to reset your user
+ password</link>.
</p>
</note>
</item>
<item>
<p>
- Press <key>e</key> to edit the line that begins with the word 'kernel'. This line may actually be wrapped onto a second line.
+ Press <key>e</key> to edit the line that begins with the word 'linux'
+ (<app>Grub</app>: the line begins with the word 'kernel'). This line may
+ actually be wrapped onto a second line.
</p>
</item>
<item>
@@ -148,7 +88,8 @@ integrated in gnome-help then link there.</p>
</item>
<item>
<p>
- Press <key>b</key> to boot.
+ Press <keyseq><key>Ctrl</key><key> x </key></keyseq> to boot.
+ (<app>Grub</app>: Press <key>b</key> to boot.)
</p>
</item>
<item>
@@ -164,17 +105,21 @@ integrated in gnome-help then link there.</p>
At the next <cmd>#</cmd> symbol type:
</p>
<p>
- <cmd>passwd <var>username</var></cmd>, where <var>username</var> is the username of the account you're changing the password for.
+ <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>
- Debian systems do not have a <cmd>root</cmd> password. Therefore, on Debian systems you would always be changing the password of a particular username, never root.
+ Some distributions do not have a <cmd>root</cmd> password. On
+ these systems you would always be changing the password of a particular
+ username, never root.
</p>
</note>
</item>
<item>
<p>
- You will be prompted to enter a new UNIX password, and to confirm the new password.
+ You will be prompted to enter a new UNIX password, and to confirm the
+ new password.
</p>
</item>
<item>
@@ -196,7 +141,11 @@ integrated in gnome-help then link there.</p>
</steps>
<p>
- 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.
+ 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>
@@ -213,7 +162,8 @@ integrated in gnome-help then link there.</p>
</item>
<item>
<p>
- Press <keyseq><key>Alt</key><key>F2</key></keyseq> to get the <gui>Run Application</gui> window.
+ Press <keyseq><key>Alt</key><key>F2</key></keyseq> to get the <gui>Run
+ Application</gui> window.
</p>
</item>
<item>
@@ -223,7 +173,8 @@ integrated in gnome-help then link there.</p>
<note style="tip">
<!-- Translators: do not translate the word "home". -->
<p>
- Within the drive you just mounted, you can check that it is the right drive by clicking <gui> home </gui> and then your username.
+ Within the drive you just mounted, you can check that it is the right
+ drive by clicking <gui> home </gui> and then your username.
</p>
</note>
</item>
@@ -261,7 +212,8 @@ integrated in gnome-help then link there.</p>
<item>
<p>
- Find your username in for which you have forgotten the password. It should look something like this (the characters after the colon will be different):
+ Find your username for which you have forgotten the password. It
+ should look something like this (the characters after the colon will be different):
</p>
<p>
username:$1$2abCd0E or
@@ -272,26 +224,35 @@ integrated in gnome-help then link there.</p>
</item>
<item>
<p>
- Replace the characters after the first colon (and before the second colon if it applies) with the hash for a blank password: U6aMy0wojraho
+ Replace the characters after the first colon (and before the second
+ colon if it applies) with the hash for a blank password: U6aMy0wojraho
</p>
<p>
- Save the file, exit out of everything and reboot your computer without the live CD or USB.
+ Save the file, exit out of everything and reboot your computer without
+ the live CD or USB.
</p>
</item>
<item>
<p>
- When you boot back into your installation, type 'about me' in the <gui>Activities</gui> overview. Open <gui>About Me</gui> and reset your password.
+ When you boot back into your installation, type 'about me' in the
+ <gui>Activities</gui> overview. Open <gui>About Me</gui> and reset your password.
</p>
</item>
<item>
<p>
- For <gui>Current password</gui> do not enter anything, as your current password is blank. Just click <gui>Authenticate</gui> and enter a new password.
+ For <gui>Current password</gui> do not enter anything, as your
+ current password is blank. Just click <gui>Authenticate</gui> and enter a new
+ password.
</p>
</item>
</steps>
<p>
- 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.
+ 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>
@@ -308,7 +269,8 @@ integrated in gnome-help then link there.</p>
Go to your Home folder by typing 'home' in the <gui>Activities</gui> overview.
</p></item>
<item><p>
- Press <keyseq><key>Ctrl</key><key>h</key></keyseq> (or click <guiseq><gui>View</gui><gui>Show Hidden Files</gui></guiseq>.)
+ Press <keyseq><key>Ctrl</key><key>h</key></keyseq> (or click
+ <guiseq><gui>View</gui><gui>Show Hidden Files</gui></guiseq>.)
</p></item>
<item><p>
Double click on the folder .gnome2
@@ -324,7 +286,8 @@ integrated in gnome-help then link there.</p>
</p></item>
</steps>
<p>
-After you restart and log in 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]
