More changes for merging

Jeremy Bicha jeremy at bicha.net
Sat Apr 16 08:47:16 UTC 2011


I tried making 3 separate patches this time to see if that makes
reviewing the changes any easier. One adds a "How do I disable the
login sound" page along with other Unity changes to the sound pages.

The other two change the term for the "session indicator" to the
"power icon" which is a lot more understandable to people who just
want to use their computers and not care about what the developers
call all the buttons.

Jeremy
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110416065154-ylgtiii16emhwmi3
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/gnome-user-docs/natty/
# testament_sha1: de1919a44967e77adab92da70bee9d24e96008db
# timestamp: 2011-04-16 02:52:22 -0400
# base_revision_id: jwcampbell at gmail.com-20110415203348-\
#   wa52gt9nu55yeasv
# 
# Begin patch
=== modified file 'gnome-help/C/power-brighter.page'
--- gnome-help/C/power-brighter.page	2011-04-10 06:33:24 +0000
+++ gnome-help/C/power-brighter.page	2011-04-16 06:51:54 +0000
@@ -23,7 +23,7 @@
 
 <p>If you have a laptop or netbook, there are probably some screen brightness controls on the keyboard. They usually have stylized "sun" icons, and are often on or above the function keys (e.g. <key>F4</key>). On some laptops, you must hold-down the Function (<key>Fn</key>) key and then press one of the brightness keys to change the screen brightness. For example, you might press <keyseq><key>Fn</key><key>F4</key></keyseq> to decrease the brightness and <keyseq><key>Fn</key><key>F5</key></keyseq> to increase it.</p>
 
-<p>You can also change the brightness by clicking the <gui>session indicator</gui> at the far top right of the screen, selecting <gui>System Settings</gui> and then opening the <gui>Power Management</gui> preferences.</p>
+<p>You can also change the brightness by clicking the <gui>power icon</gui> at the far top right of the screen and selecting <gui>System Settings</gui>. In the Hardware section, click <gui>Power Management</gui>.</p>
 
 <p>If you have a desktop computer, you should be able to use controls on the monitor to change the brightness of the screen. How you do this depends very much on what monitor you have - some have specific buttons to change brightness, whereas others have buttons which you use to navigate on-screen menus.</p>
 

=== modified file 'gnome-help/C/power-lowpower.page'
--- gnome-help/C/power-lowpower.page	2011-04-10 06:33:24 +0000
+++ gnome-help/C/power-lowpower.page	2011-04-16 06:51:54 +0000
@@ -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 the <gui>session indicator</gui> at the far top right of the screen, selecting <gui>System Settings</gui>, and then opening the <gui>Power</gui> settings. Switch to the <gui>On Battery Power</gui> tab. 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 the <gui>power icon</gui> at the far top right of the screen and selecting <gui>System Settings</gui>. In the Hardware section, click <gui>Power Management</gui>. Switch to the <gui>On Battery Power</gui> tab. 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>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>
 

=== modified file 'gnome-help/C/power-turnoffbutton.page'
--- gnome-help/C/power-turnoffbutton.page	2011-04-10 06:33:24 +0000
+++ gnome-help/C/power-turnoffbutton.page	2011-04-16 06:51:54 +0000
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="hardware#power"/>
-    <desc>Look in <guiseq><gui>System Settings</gui><gui>Power</gui></guiseq> for the option to change this.</desc>
+    <desc>Look in <guiseq><gui>System Settings</gui><gui>Power Management</gui></guiseq> for the option to change this.</desc>
     <revision pkgversion="3.0" date="2011-04-04" status="final"/>
     <revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
     <credit type="author">
@@ -19,6 +19,17 @@
 
 <p>When you press the power button on your computer, a window will pop up asking what you want to do - whether you want to turn off the computer, send it to sleep and so on. You can make it so that one of these options happens automatically when you press the power button, rather than showing this window.</p>
 
-<p>Click the <gui>session indicator</gui> at the far top right of the screen, select <gui>System Settings</gui> and click <gui>Power</gui>. Switch to the <gui>General</gui> tab. Change the option labeled <gui>When the power button is pressed</gui>. For example, if you choose <gui>Suspend</gui>, the computer will go to sleep when you press the power button. The default option is <gui>Ask me</gui>.</p>
-
+<steps>
+ <item>
+  <p>Click the <gui>power icon</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+ </item>
+ <item>
+  <p>In the Hardware section, click <gui>Power Management</gui>.</p>
+ </item>
+ <item>
+  <p>Switch to the <gui>General</gui> tab and change the option labeled <gui>When the 
+power button is pressed</gui>. For example, if you choose <gui>Suspend</gui>, the computer 
+will go to sleep when you press the power button. The default option is <gui>Ask me</gui>.</p>
+ </item>
+</steps>
 </page>

=== modified file 'gnome-help/C/power-whydim.page'
--- gnome-help/C/power-whydim.page	2011-04-10 06:33:24 +0000
+++ gnome-help/C/power-whydim.page	2011-04-16 06:51:54 +0000
@@ -28,15 +28,15 @@
 <p>You can stop the screen from dimming itself:</p>
 <steps>
  <item>
-  <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+  <p>Click the <gui>power icon</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
  </item>
  
  <item>
-  <p>Open <gui>Power Management</gui> and switch to the <gui>On Battery Power</gui> tab.</p>
+  <p>In the Hardware section, click <gui>Power Management</gui>.</p>
  </item>
 
  <item>
-  <p>Uncheck <gui>Dim display when idle</gui>.</p>
+  <p>Switch to the <gui>On Battery Power</gui> tab and uncheck <gui>Dim display when idle</gui>.</p>
  </item>
 </steps>
 

# Begin bundle
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
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110416065452-vqg3ywen1ox009bd
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/gnome-user-docs/natty/
# testament_sha1: fc4436dcafd4fea9e06cf6a0c65de61616eea3a1
# timestamp: 2011-04-16 02:55:25 -0400
# base_revision_id: jwcampbell at gmail.com-20110415203348-\
#   wa52gt9nu55yeasv
# 
# Begin patch
=== modified file 'gnome-help/C/net-default-browser.page'
--- gnome-help/C/net-default-browser.page	2011-04-15 18:07:39 +0000
+++ gnome-help/C/net-default-browser.page	2011-04-16 06:54:52 +0000
@@ -21,7 +21,7 @@
 
 <steps>
  <item>
-  <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+  <p>Click the <gui>power button</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
  </item>
  
  <item>

=== modified file 'gnome-help/C/net-default-email.page'
--- gnome-help/C/net-default-email.page	2011-04-15 18:07:39 +0000
+++ gnome-help/C/net-default-email.page	2011-04-16 06:54:52 +0000
@@ -21,7 +21,7 @@
 
 <steps>
  <item>
-  <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+  <p>Click the <gui>power icon</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
  </item>
  
  <item>

=== modified file 'gnome-help/C/power-closelid.page'
--- gnome-help/C/power-closelid.page	2011-04-10 06:33:24 +0000
+++ gnome-help/C/power-closelid.page	2011-04-16 06:54:52 +0000
@@ -30,16 +30,17 @@
 
 <steps>
  <item>
-  <p>Click the <gui>session indicator</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+  <p>Click the <gui>power icon</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p>
+ </item>
+ <item>
+  <p>In the Hardware section, click <gui>Power Management</gui>.</p>
  </item>
  <item>
   <p>To change the setting used when running on AC power, set <gui>When laptop lid is closed</gui> to <gui>blank screen</gui>.</p>
  </item>
  <item>
-  <p>Open <gui>Power Management</gui> and switch to the <gui>On Battery Power</gui> tab.</p>
- </item>
- <item>
-  <p>To change the setting used when running on battery power, set <gui>When laptop lid is closed</gui> to <gui>blank screen</gui>.</p>
+  <p>To change the setting used when running on battery power, switch to the <gui>On Battery Power</gui>
+     tab and set <gui>When laptop lid is closed</gui> to <gui>blank screen</gui>.</p>
  </item>
 </steps>
  <p>There are other settings available besides <gui>blank screen</gui> such as <gui>hibernate</gui> or <gui>shutdown</gui>.</p>

=== modified file 'gnome-help/C/session-language.page'
--- gnome-help/C/session-language.page	2011-04-10 12:49:37 +0000
+++ gnome-help/C/session-language.page	2011-04-16 06:54:52 +0000
@@ -32,12 +32,12 @@
   you have the proper language packs installed on your computer.</p>
 
   <steps>
-    <item><p>Click the session indicator at the top right of the screen and select
+    <item><p>Click the <gui>power icon</gui> at the top right of the screen and select
     <gui>System Settings</gui>. This will open the <app>Control Center</app>.</p></item>
     <item><p>In the <em>System</em> section, click <gui>Language Support</gui>.</p></item>
     <item><p>Select your desired language on the <gui>Language</gui> tab.</p></item>
     <item><p>You have to log out and back in for language changes to take
-    effect. Click the session indicator and select <gui>Log Out</gui>
+    effect. Click the power icon and select <gui>Log Out</gui>
     to log out.</p></item>
   </steps>
 

=== modified file 'gnome-help/C/session-screenlocks.page'
--- gnome-help/C/session-screenlocks.page	2011-04-06 19:22:40 +0000
+++ gnome-help/C/session-screenlocks.page	2011-04-16 06:54:52 +0000
@@ -25,13 +25,13 @@
 <p>To wait for a longer period before automatically locking the screen:</p>
 
   <steps>
-    <item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
-    <item><p>Select <gui>Screen</gui>.</p></item>
-    <item><p>Change the value in the <gui>Lock screen after</gui> drop-down list.</p></item>
+    <item><p>Click the <gui>power icon</gui> at the top right of the screen and select <gui>System Settings</gui>.</p></item>
+    <item><p>In the Personal section, click <gui>Screensaver</gui>.</p></item>
+    <item><p>Change the value in the <gui>Regard computer as idle after</gui> slider.</p></item>
   </steps>
 
 <note style="tip">
- <p>If you don't ever want the screen to lock itself automatically, switch <gui>Lock</gui> off.</p>
+ <p>If you don't ever want the screen to lock itself automatically, uncheck <gui>Lock screen when screensaver is active</gui>.</p>
 </note>
 
 </page>

# Begin bundle
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
cxQFLQf4u5IpwoSDDorhaA==
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jeremy at bicha.net-20110416065938-qka22v8ewqa3yna1
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/gnome-user-docs/natty/
# testament_sha1: c88d1fd9deaacb1e00ed15d9c4de72991823642d
# timestamp: 2011-04-16 03:02:09 -0400
# base_revision_id: jwcampbell at gmail.com-20110415203348-\
#   wa52gt9nu55yeasv
# 
# Begin patch
=== modified file 'gnome-help/C/sound-alert.page'
--- gnome-help/C/sound-alert.page	2011-04-06 19:22:40 +0000
+++ gnome-help/C/sound-alert.page	2011-04-16 06:59:38 +0000
@@ -23,8 +23,7 @@
   alert sounds entirely.</p>
 
   <steps>
-    <item><p>Click your name in the top bar and select <gui>System Settings</gui>.</p></item>
-    <item><p>Click <gui>Sound</gui>.</p></item>
+    <item><p>Click the volume icon on the top bar and click <gui>Sound Preferences</gui>.</p></item>
     <item><p>On the <gui>Sound Effects</gui> tab, select an alert sound. Each sound
     will play when you click on it so you can hear what it sounds like.</p></item>
   </steps>

=== modified file 'gnome-help/C/sound-crackle.page'
--- gnome-help/C/sound-crackle.page	2011-04-06 19:22:40 +0000
+++ gnome-help/C/sound-crackle.page	2011-04-16 06:59:38 +0000
@@ -34,7 +34,7 @@
  
  <item>
   <p>Check if the sound drivers aren't very good.</p>
-  <p>Some sound cards don't work very well on Linux because they don't have very good drivers. This problem is more difficult to identify. Try searching for the make and model of your sound card on the internet, plus the search term "Linux", to see if other people are having the same problem.</p>
+  <p>Some sound cards don't work very well on Linux because they don't have very good drivers. This problem is more difficult to identify. Try searching for the make and model of your sound card on the internet, plus the search term "Ubuntu", to see if other people are having the same problem.</p>
   <p>You can use the <cmd>lspci</cmd> command to get more information about your sound card.</p>
  </item>
 </list>

=== added file 'gnome-help/C/sound-disable-login.page'
--- gnome-help/C/sound-disable-login.page	1970-01-01 00:00:00 +0000
+++ gnome-help/C/sound-disable-login.page	2011-04-16 06:59:38 +0000
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="sound-disable-login">
+  <info>
+    <link type="guide" xref="media#sound" group="#last"/>
+    <revision pkgversion="3.0" date="2011-04-04" status="final"/>
+    <revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
+
+    <credit type="author">
+      <name>Ubuntu Documentation Project</name>
+      <email>ubuntu-doc at lists.ubuntu.com</email>
+    </credit>
+
+    <desc>Open System Settings and click Login Screen.</desc>
+  </info>
+
+  <title>How do I disable the login sound?</title>
+
+  <p>When you login to your computer, Ubuntu plays a short audio clip. The current sound was designed by Ubuntu community member Pete Savage. The exotic-sounding theme was inspired by the African origins of the word <em>Ubuntu</em>.</p>
+
+  <steps>
+    <title>To disable the sound from playing when you login:</title>
+    <item><p>Click the <gui>power icon</gui> at the far top right of the screen and select <gui>System Settings</gui>.</p></item>
+    <item><p>In the System section, select <gui>Login Screen</gui>.</p></item>
+    <item><p>Click <gui>Unlock</gui> and enter your password into the popup authentication window.</p></item>
+    <item><p>Uncheck the <gui>Play login sound</gui> option.</p></item>
+  </steps>
+
+  <p>This will disable the login sound for all users on your computer.</p>
+</page>

=== modified file 'gnome-help/C/sound-usemic.page'
--- gnome-help/C/sound-usemic.page	2011-04-06 19:22:40 +0000
+++ gnome-help/C/sound-usemic.page	2011-04-16 06:59:38 +0000
@@ -34,8 +34,7 @@
 
   <steps>
     <title>Select a default audio input device</title>
-    <item><p>Click your name in the top bar and select <gui>System Settings</gui>.</p></item>
-    <item><p>Click <gui>Sound</gui>.</p></item>
+    <item><p>Click the volume icon on the top panel and click <gui>Sound Preferences</gui>.</p></item>
     <item><p>On the <gui>Input</gui> tab, select the device in the list of devices.
     The input level indicator should respond when you speak.</p></item>
   </steps>

=== modified file 'gnome-help/C/sound-usespeakers.page'
--- gnome-help/C/sound-usespeakers.page	2011-04-06 19:22:40 +0000
+++ gnome-help/C/sound-usespeakers.page	2011-04-16 06:59:38 +0000
@@ -43,8 +43,7 @@
 
   <steps>
     <title>Select a default audio input device</title>
-    <item><p>Click your name in the top bar and select <gui>System Settings</gui>.</p></item>
-    <item><p>Click <gui>Sound</gui>.</p></item>
+    <item><p>Click the volume icon on the top panel and click <gui>Sound Preferences</gui>.</p></item>
     <item><p>On the <gui>Output</gui> tab, select the device in the list of devices.</p></item>
   </steps>
 

# Begin bundle
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


More information about the ubuntu-doc mailing list