GNOME.org
 

Two more patches for gnome-user-docs

Here's two more patches for the GNOME user guide.

Jeremy

From 9df34c91c32d935cb385bce9788690329c4219f6 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha ubuntu com>
Date: Sat, 27 Aug 2011 02:18:48 -0400
Subject: [PATCH] Several minor edits to hardware pages

---
 gnome-help/C/bluetooth-connect-device.page       |    2 +-
 gnome-help/C/bluetooth-problem-connecting.page   |    5 +++++
 gnome-help/C/color-assignprofiles.page           |    2 +-
 gnome-help/C/disk-capacity.page                  |    2 +-
 gnome-help/C/disk-format.page                    |    6 ++++--
 gnome-help/C/disk-partitions.page                |    4 ++--
 gnome-help/C/hardware-cardreader.page            |    2 +-
 gnome-help/C/hardware-problems-crashes.page.stub |    1 +
 gnome-help/C/power-lowpower.page                 |    2 +-
 gnome-help/C/printing-2sided.page                |    4 +++-
 gnome-help/C/printing-inklevel.page              |    5 +----
 gnome-help/C/printing-setup.page                 |    1 -
 12 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/gnome-help/C/bluetooth-connect-device.page b/gnome-help/C/bluetooth-connect-device.page
index 0520746..cd1338e 100644
--- a/gnome-help/C/bluetooth-connect-device.page
+++ b/gnome-help/C/bluetooth-connect-device.page
@@ -28,7 +28,7 @@
       <p><link xref="bluetooth-turn-on-off">Turn on</link> your computer's Bluetooth device.</p>
     </item>
     <item>
-      <p>Select the Bluetooth icon in the top-bar, and select <gui>Setup a New Device...</gui>.</p>
+      <p>Select the Bluetooth icon in the top bar, and select <gui>Setup a New Device...</gui>.</p>
     </item>
     <item>
       <p>Make the other Bluetooth device discoverable or visible, and place it within 10 meters of your computer. Then select <gui>Forward</gui>. Your computer will begin searching for devices.</p>
diff --git a/gnome-help/C/bluetooth-problem-connecting.page b/gnome-help/C/bluetooth-problem-connecting.page
index 1a4b26d..6305dba 100644
--- a/gnome-help/C/bluetooth-problem-connecting.page
+++ b/gnome-help/C/bluetooth-problem-connecting.page
@@ -42,6 +42,11 @@
   <p>Device Bluetooth connection switched off</p>
   <p>Check that Bluetooth is turned on on the device you're trying to connect to. For example, if you're trying to connect to a phone, make sure that it's not in airplane mode.</p>
  </item>
+
+ <item>
+  <p>No Bluetooth adapter in your computer</p>
+  <p>Many computers do not have Bluetooth adapters. You can buy an adapter if you want to use Bluetooth.</p>
+ </item>
 </list>
 
 </page>
diff --git a/gnome-help/C/color-assignprofiles.page b/gnome-help/C/color-assignprofiles.page
index f819c33..720abea 100644
--- a/gnome-help/C/color-assignprofiles.page
+++ b/gnome-help/C/color-assignprofiles.page
@@ -3,7 +3,7 @@
       id="color-assignprofiles">
 
   <info>
-    <link type="guide" xref="hardware#color"/>
+    <link type="guide" xref="color"/>
     <link type="seealso" xref="color-whatisprofile"/>
     <link type="seealso" xref="color-why-calibrate"/>
     <desc>Look in <guiseq><gui>System Settings</gui><gui>Color</gui></guiseq> for the option to change this.</desc>
diff --git a/gnome-help/C/disk-capacity.page b/gnome-help/C/disk-capacity.page
index 14c9604..9dba8b2 100644
--- a/gnome-help/C/disk-capacity.page
+++ b/gnome-help/C/disk-capacity.page
@@ -34,7 +34,7 @@
      <item><p>Open the <app>Disk Usage Analyzer</app> application from the <gui>Activities</gui> overview.</p></item>
      <item><p>The <app>Disk Usage Analyzer</app> window will display the <gui>Total file system capacity</gui> and <gui>Total file system usage</gui>.</p><p>(You can click on <gui>View as Rings Chart</gui> to change the display to <gui>View as Treemap Chart</gui>).</p></item> 
     <item><p>Click <gui>Scan Home</gui> if you want to check how much disk space is left inside the Home folder or click <gui>Scan filesystem</gui> icon if you want to check how much disk space is left inside the '/' (Root) folder. In both cases, the location of the files and other options like Usage, Size and Contents will be presented. You can change the order of the details and view the files in order of file size.</p></item>
-    <item><p>Click the <gui>Scan a folder</gui> icon if you want to scan disk space inside specific folder or click <gui>Scan a remote folder</gui> if you want to scan disk space inside remote folder. See more details in <link xref="Disk Usage Analyzer"><app>Disk Usage Analyzer</app></link></p></item>
+    <item><p>Click the <gui>Scan a folder</gui> icon if you want to scan disk space inside specific folder or click <gui>Scan a remote folder</gui> if you want to scan disk space inside remote folder. See more details in <link xref="ghelp:baobab?baobab-usage"><app>Disk Usage Analyzer</app></link></p></item>
     <item><p>Click <gui>Stop </gui> or <gui>Refresh</gui> anytime you need to cancel or update the scanning.</p></item>
   </steps>
 
diff --git a/gnome-help/C/disk-format.page b/gnome-help/C/disk-format.page
index 225ecdb..e4b7b3d 100644
--- a/gnome-help/C/disk-format.page
+++ b/gnome-help/C/disk-format.page
@@ -28,9 +28,11 @@ of the files on the disk and leaves it empty.</p>
  <item><p>Open the <app>Disk Utility</app> application from the <gui>Activities</gui> overview.</p></item>
  <item><p>Select the disk you want to wipe from the <gui>Storage Devices</gui> list.</p>
   <note style="warning"><p>Make sure that you have selected the correct disk! If you choose the wrong disk, all of the files on the other disk will be deleted!</p></note></item>
- <item><p>Click <gui>Format Volume</gui> from <gui>Volumes</gui>. A window pops up from below, so you can choose the <gui>Type</gui> of the disk. If you use the disk on Windows, Mac OS as well as Linux computers, choose <gui>FAT</gui>. If you only use it on Windows, <gui>NTFS</gui> may be a better option. A brief description of the <gui>file system type</gui> will be presented as a label.</p></item>
+ <item><p>In the Volumes section, click <gui>Unmount Volume</gui>. Then click <gui>Format Volume</gui>.</p></item>
+ <item><p>In the window that pops up, choose a file system <gui>Type</gui> for the disk.</p>
+  <p>If you use the disk on Windows and Mac OS computers in addition to Linux computers, choose <gui>FAT</gui>. If you only use it on Windows, <gui>NTFS</gui> may be a better option. A brief description of the <gui>file system type</gui> will be presented as a label.</p></item>
  <item><p>Give the disk a name and click <gui>Format</gui> to begin wiping the disk.</p></item>
- <item><p>Right-click on the disk and choose <gui>Safely Remove Drive</gui> once the formatting has finished. It should now be blank and ready to use again.</p></item>
+ <item><p>Once the formatting has finished, <gui>safely remove</gui> the disk. It should now be blank and ready to use again.</p></item>
 </steps>
 
 <note style="warning">
diff --git a/gnome-help/C/disk-partitions.page b/gnome-help/C/disk-partitions.page
index af454e9..85b7c6d 100644
--- a/gnome-help/C/disk-partitions.page
+++ b/gnome-help/C/disk-partitions.page
@@ -31,11 +31,11 @@
   <p>Open the <gui>Activities</gui> overview and start the <app>Disk Utility</app>.</p>
  </item>
  <item>
-  <p> In the pane marked <gui>Storage Devices</gui>, you will find hard disks, CD/DVD drives, and other physical devices. Click on the device you want to inspect.</p>
+  <p> In the pane marked <gui>Storage Devices</gui>, you will find hard disks, CD/DVD drives, and other physical devices. Click the device you want to inspect.</p>
  </item>
  <item>
  <p> In the right pane, the area labeled <gui>Volumes</gui> provides a visual breakdown of the volumes and partitions present on the selected device. It also contains a variety of tools used to manage these volumes.</p>
- <p>Take care; it is possible to completely erase the data on your disk with these tools if you try to.</p>
+ <p>Be careful: it is possible to completely erase the data on your disk with these utilities.</p>
 </item>
 </steps>
 
diff --git a/gnome-help/C/hardware-cardreader.page b/gnome-help/C/hardware-cardreader.page
index ffd8166..a342f06 100644
--- a/gnome-help/C/hardware-cardreader.page
+++ b/gnome-help/C/hardware-cardreader.page
@@ -17,7 +17,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Media card reader doesn't work</title>
+<title>Media card reader problems</title>
 
 <p>Many computers contain readers for SD, MMC, SM, MS, CF, and other storage media 
 cards. These should be automatically detected and <link xref="disk-partitions">mounted</link>. Here are some 
diff --git a/gnome-help/C/hardware-problems-crashes.page.stub b/gnome-help/C/hardware-problems-crashes.page.stub
index db1dc8b..1bc16c1 100644
--- a/gnome-help/C/hardware-problems-crashes.page.stub
+++ b/gnome-help/C/hardware-problems-crashes.page.stub
@@ -14,6 +14,7 @@
     <desc>
       Troubleshoot problems with computer crashes.
     </desc>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
 <title>Computer crashing</title>
diff --git a/gnome-help/C/power-lowpower.page b/gnome-help/C/power-lowpower.page
index a891414..377d1e3 100644
--- a/gnome-help/C/power-lowpower.page
+++ b/gnome-help/C/power-lowpower.page
@@ -19,7 +19,7 @@
 
 <p>When the charge level of the battery gets too low, your computer will automatically hibernate (that is, it will save all of your open documents and applications, and then turn off). It does this to make sure that the battery doesn't completely discharge, since this is bad for the battery. If the battery just ran out, the computer wouldn't have time to shut down properly either.</p>
 
-<p>You can change what happens when the battery level gets too low by clicking your name at the top of the screen, selecting <gui>System Settings</gui>, and then opening the <gui>Power</gui> settings. Look at the <gui>When power is critically low</gui> setting. You can choose for the computer to hibernate or shut down; if you choose shut down, your applications and documents <em>will not</em> be saved before the computer turn off.</p>
+<p>You can change what happens when the battery level gets too low by clicking your name at the top of the screen, selecting <gui>System Settings</gui>, and then opening the <gui>Power</gui> settings. Look at the <gui>When power is critically low</gui> setting. You can choose for the computer to hibernate or shut down. If you choose shut down, your applications and documents <em>will not</em> be saved before the computer turns off.</p>
 
 <p>Some computers have problems hibernating, and may not be able to recover the applications and documents you had open when you turn on the computer again. In this case, it is possible that you could lose some of your work if you didn't save it before the computer hibernated. You may be able to <link xref="power-suspendfail">fix problems with hibernation</link> though.</p>
 
diff --git a/gnome-help/C/printing-2sided.page b/gnome-help/C/printing-2sided.page
index bce81a8..02762d1 100644
--- a/gnome-help/C/printing-2sided.page
+++ b/gnome-help/C/printing-2sided.page
@@ -34,7 +34,9 @@
  </item>
  <item>
   <p>
-   Go to the <gui>Page Setup</gui> tab of the Print window and choose an option from the <gui>Two-sided</gui> drop-down list.
+   Go to the <gui>Page Setup</gui> tab of the Print window and choose an option
+   from the <gui>Two-sided</gui> drop-down list. If the option is disabled,
+   two-sided printing is not available for your printer.
   </p>
   <p>
   Printers handle two-sided printing in different ways. It's a good idea to experiment with your printer to see how it works.
diff --git a/gnome-help/C/printing-inklevel.page b/gnome-help/C/printing-inklevel.page
index 166219d..a9ca0b0 100644
--- a/gnome-help/C/printing-inklevel.page
+++ b/gnome-help/C/printing-inklevel.page
@@ -13,10 +13,7 @@
       <name>Anita Reitere</name>
       <email>nitalynx gmail com</email>
     </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
   <title>How can I check my printer's ink/toner levels?</title>
diff --git a/gnome-help/C/printing-setup.page b/gnome-help/C/printing-setup.page
index 45c8966..b9a18a0 100644
--- a/gnome-help/C/printing-setup.page
+++ b/gnome-help/C/printing-setup.page
@@ -66,4 +66,3 @@
 
   <p>After you install the printer, you may wish to <link xref="printing-setup-default-printer">change your default printer</link>.</p>
 </page>
-
-- 
1.7.5.4


From f5d7b4a222f9c8c0cb2fbed4989f975d90949ae8 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha ubuntu com>
Date: Sat, 27 Aug 2011 02:36:01 -0400
Subject: [PATCH] Several minor updates to user* pages

---
 gnome-help/C/user-add.page            |    7 +++----
 gnome-help/C/user-addguest.page       |    5 ++---
 gnome-help/C/user-admin-change.page   |    3 ++-
 gnome-help/C/user-admin-explain.page  |    2 +-
 gnome-help/C/user-changepassword.page |    2 +-
 gnome-help/C/user-delete.page         |    5 ++---
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gnome-help/C/user-add.page b/gnome-help/C/user-add.page
index e3f44d4..6550e02 100644
--- a/gnome-help/C/user-add.page
+++ b/gnome-help/C/user-add.page
@@ -33,9 +33,8 @@
   home folder, documents, and settings.</p>
 
 <steps>
-  <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
-  <item><p>Click <gui>User Accounts</gui>.</p></item>
-  <item><p>Click <gui>Unlock</gui> in the bottom-left corner and type your
+  <item><p>Click your name on the top bar and select <gui>My Account</gui>.</p></item>
+  <item><p>Click <gui>Unlock</gui> in the top right corner and type your
   password to make changes. You must be an administrative user to add user
   accounts.</p></item>
   <item><p>In the list of accounts on the left, click the <gui>+</gui> button
@@ -49,7 +48,7 @@
   like.</p></item>
   <item><p>Click <gui>Create</gui> when you're done.</p></item>
   <item><p>The account is initially disabled until you choose what to do about
-  the user's password. Under <gui>Login Options</gui> click the label <gui>Account disabled</gui> next
+  the user's password. Under <gui>Login Options</gui> click  <gui>Account disabled</gui> next
   to <gui>Password</gui>. Use the <gui>Action</gui> drop-down list to set the
   password now, allow the user to log in without a password, or have the user
   set their password the first time they log in.</p>
diff --git a/gnome-help/C/user-addguest.page b/gnome-help/C/user-addguest.page
index 17c4e60..9e3e312 100644
--- a/gnome-help/C/user-addguest.page
+++ b/gnome-help/C/user-addguest.page
@@ -30,9 +30,8 @@
 <steps>
   <title>Create a guest user account:</title>
 
-  <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
-  <item><p>Click <gui>User Accounts</gui>.</p></item>
-  <item><p>Click <gui>Unlock</gui> in the bottom-left corner and type your
+  <item><p>Click your name on the top bar and select <gui>My Account</gui>.</p></item>
+  <item><p>Click <gui>Unlock</gui> in the top right corner and type your
   password to make changes. You must be an administrative user to add user
   accounts.</p></item>
   <item><p>In the list of accounts on the left, click the <gui>+</gui> button
diff --git a/gnome-help/C/user-admin-change.page b/gnome-help/C/user-admin-change.page
index 8b1fd4b..34bd01f 100644
--- a/gnome-help/C/user-admin-change.page
+++ b/gnome-help/C/user-admin-change.page
@@ -45,7 +45,8 @@
 </steps>
 
 <note>
- <p>The first user account on the system is usually the one that has admin privileges. This is the user account that was created when you first installed the system.</p><p> It is unwise to have too many users with <gui>Administrator</gui> privileges on one system.</p>
+ <p>The first user account on the system is usually the one that has admin privileges. This is the user account that was created when you first installed the system.</p>
+<p> It is unwise to have too many users with <gui>Administrator</gui> privileges on one system.</p>
 </note>
 
   <comment>
diff --git a/gnome-help/C/user-admin-explain.page b/gnome-help/C/user-admin-explain.page
index 8ce90db..73facfa 100644
--- a/gnome-help/C/user-admin-explain.page
+++ b/gnome-help/C/user-admin-explain.page
@@ -25,7 +25,7 @@
 
 <p>Sometimes you need to use these applications, so you may be able to temporarily get admin privileges to allow you to make the changes. If an application needs admin privileges, it will ask for your password. For example, if you want to install some new software, the software installer (package manager) will ask for your admin password so it can add the new application to the system. Once it has finished, your admin privileges will be taken away again.</p>
 
-<p>Admin privileges are associated with your user account. Some users are allowed to have admin privileges and some are not. Without admin priveleges you will not be able to install software. Some user accounts (for example, the "root" account) have permanent admin privileges. You shouldn't use admin privileges all of the time, because you might accidentally change an important file and break something.</p>
+<p>Admin privileges are associated with your user account. Some users are allowed to have admin privileges and some are not. Without admin privileges you will not be able to install software. Some user accounts (for example, the "root" account) have permanent admin privileges. You shouldn't use admin privileges all of the time, because you might accidentally change an important file and break something.</p>
 
 <p>In summary, admin privileges allow you to change important parts of your system when you need to, but prevent you from doing it accidentally.</p>
 
diff --git a/gnome-help/C/user-changepassword.page b/gnome-help/C/user-changepassword.page
index 0db3c24..3f83f45 100644
--- a/gnome-help/C/user-changepassword.page
+++ b/gnome-help/C/user-changepassword.page
@@ -62,7 +62,7 @@
   <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. When you next log in, you will be
-  asked to update your keyring password. If you prefer to change the keyring password  (to match your login password) immediately:</p>
+  asked to update your keyring password. If you prefer to change the keyring password (to match your login password) immediately:</p>
     
   <steps>
   <item><p>Open the <app>Passwords and Encryption Keys</app> application from
diff --git a/gnome-help/C/user-delete.page b/gnome-help/C/user-delete.page
index cabfe82..0829634 100644
--- a/gnome-help/C/user-delete.page
+++ b/gnome-help/C/user-delete.page
@@ -29,9 +29,8 @@
   your computer, you can delete that user's account.</p>
 
 <steps>
-  <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
-  <item><p>Click <gui>User Accounts</gui>.</p></item>
-  <item><p>Click <gui>Unlock</gui> in the bottom-left corner and type your
+  <item><p>Click your name on the top bar and select <gui>My Account</gui>.</p></item>
+  <item><p>Click <gui>Unlock</gui> in the top right corner and type your
   password to make changes. You must be an administrative user to delete user
   accounts.</p></item>
   <item><p>Select the user you want to delete and click the <gui>-</gui> button.</p></item>
-- 
1.7.5.4
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]