[gnome-user-docs] Several typo fixes, grammar improvements & other cleanup, merged from Ubuntu
- From: Jeremy Bicha <jbicha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs] Several typo fixes, grammar improvements & other cleanup, merged from Ubuntu
- Date: Wed, 21 Mar 2012 05:01:43 +0000 (UTC)
commit 64b60a940fe5cc4dceae241201e8d2fe2297e0a7
Author: Jeremy Bicha <jbicha ubuntu com>
Date: Wed Mar 21 00:58:22 2012 -0400
Several typo fixes, grammar improvements & other cleanup, merged from Ubuntu
gnome-help/C/bluetooth-problem-connecting.page | 3 +--
gnome-help/C/files-rename.page | 2 +-
gnome-help/C/look-background.page | 2 +-
gnome-help/C/look-display-fuzzy.page | 2 +-
gnome-help/C/mouse-problem-notmoving.page | 2 +-
gnome-help/C/music-cantplay-drm.page | 2 +-
gnome-help/C/net-install-flash.page | 1 -
gnome-help/C/net-macaddress.page | 2 +-
gnome-help/C/net-manual.page | 4 ++--
gnome-help/C/net-proxy.page | 2 +-
gnome-help/C/net-slow.page | 8 ++++----
gnome-help/C/net-tethering.page.stub | 2 +-
gnome-help/C/net-vpn-connect.page | 2 +-
gnome-help/C/power-batteryestimate.page | 2 +-
gnome-help/C/power-hibernate.page | 8 ++++----
gnome-help/C/power-othercountry.page | 4 ++--
gnome-help/C/power-suspendfail.page | 4 ++--
gnome-help/C/session-screenlocks.page | 7 +++----
18 files changed, 28 insertions(+), 31 deletions(-)
---
diff --git a/gnome-help/C/bluetooth-problem-connecting.page b/gnome-help/C/bluetooth-problem-connecting.page
index 7ff1e22..4b5e62a 100644
--- a/gnome-help/C/bluetooth-problem-connecting.page
+++ b/gnome-help/C/bluetooth-problem-connecting.page
@@ -40,8 +40,7 @@ such as a phone or headset.</p>
<item>
<title>Adapter not switched on</title>
<p>Make sure that your Bluetooth adapter is switched on. Click the Bluetooth
- icon on the top bar and check that it's not disabled. See
- <link xref="bluetooth-turn-on-off"/>.</p>
+ icon on the top bar and check that it's not <link xref="bluetooth-turn-on-off">disabled</link>.</p>
</item>
<item>
<title>Device Bluetooth connection switched off</title>
diff --git a/gnome-help/C/files-rename.page b/gnome-help/C/files-rename.page
index 91e69e9..4d85158 100644
--- a/gnome-help/C/files-rename.page
+++ b/gnome-help/C/files-rename.page
@@ -44,7 +44,7 @@
<note style="tip">
<p>If you renamed the wrong file, or named your file improperly, you can
- undo the rename. To revert the action choose immediatly <guiseq><gui>Edit
+ undo the rename. To revert the action, immediately click <guiseq><gui>Edit
</gui><gui> Undo</gui> </guiseq> to restore the former name.</p>
</note>
diff --git a/gnome-help/C/look-background.page b/gnome-help/C/look-background.page
index 455a34c..896dbce 100644
--- a/gnome-help/C/look-background.page
+++ b/gnome-help/C/look-background.page
@@ -55,7 +55,7 @@ it to a simple color or gradient.</p>
store photos there.</p></item>
<item><p>Select <gui>Colors & Gradients</gui> to just
use a flat color or a linear gradient. Color selector buttons will appear
- in the bottom-right corner.</p></item>
+ in the bottom right corner.</p></item>
</list>
<p>You can also browse for any picture on your computer by clicking
diff --git a/gnome-help/C/look-display-fuzzy.page b/gnome-help/C/look-display-fuzzy.page
index 5d381a1..340f01b 100644
--- a/gnome-help/C/look-display-fuzzy.page
+++ b/gnome-help/C/look-display-fuzzy.page
@@ -41,7 +41,7 @@
<p>You can set it so that the two displays have different resolutions, but you won't be able to display the same thing on both screens simultaneously. In effect, you will have two independent screens connected at the same time. You can move windows from one screen to another, but you can't show the same window on both screens at once.</p>
- <p>To set-up the displays so that they each have their own resolution:</p>
+ <p>To set up the displays so that they each have their own resolution:</p>
<steps>
<item>
diff --git a/gnome-help/C/mouse-problem-notmoving.page b/gnome-help/C/mouse-problem-notmoving.page
index 20b4e96..84d7e02 100644
--- a/gnome-help/C/mouse-problem-notmoving.page
+++ b/gnome-help/C/mouse-problem-notmoving.page
@@ -109,7 +109,7 @@
<item><p>Make sure the mouse is turned on. There is often a switch on the
bottom of the mouse to turn the mouse off completely, so you can move it
from place to place without it constantly waking up.</p></item>
- <item><p>If you are using a Bluetooth, make sure you have actually paired the
+ <item><p>If you are using a Bluetooth mouse, make sure you have actually paired the
mouse with your computer. See <link xref="bluetooth-connect-device"/>.</p></item>
<item>
<p>
diff --git a/gnome-help/C/music-cantplay-drm.page b/gnome-help/C/music-cantplay-drm.page
index 19cf02c..8753b41 100644
--- a/gnome-help/C/music-cantplay-drm.page
+++ b/gnome-help/C/music-cantplay-drm.page
@@ -20,7 +20,7 @@
<p>This could be because the music is in a format that is not recognized by your computer. To be able to play a song you need to have support for the right audio formats installed - for example, if you want to play MP3 files, you need MP3 support installed. If you don't have support for a given audio format, you should see a message telling you so when you try to play a song. The message should also provide instructions for how to install support for that format so that you can play it.</p>
-<p>If you do have support installed for the song's audio format but still can't play it, the song might be <em>copy protected</em> (also known as being <em>DRM restricted</em>). DRM is a way of restricting who can play a song and on what devices they can play it. The company that sold the song to you is in control of this, not you. If a music file has DRM restrictions, you will probably not be able to play it - you generally need special software from the vendor to play DRM restricted files, but few of these are supported on Linux.</p>
+<p>If you do have support installed for the song's audio format but still can't play it, the song might be <em>copy protected</em> (also known as being <em>DRM restricted</em>). DRM is a way of restricting who can play a song and on what devices they can play it. The company that sold the song to you is in control of this, not you. If a music file has DRM restrictions, you will probably not be able to play it - you generally need special software from the vendor to play DRM restricted files, but this software is often not supported on Linux.</p>
<p>You can learn more about DRM from the <link href="http://www.eff.org/issues/drm";>Electronic Frontier Foundation</link>.</p>
diff --git a/gnome-help/C/net-install-flash.page b/gnome-help/C/net-install-flash.page
index 0134901..b1a285e 100644
--- a/gnome-help/C/net-install-flash.page
+++ b/gnome-help/C/net-install-flash.page
@@ -59,7 +59,6 @@
<list style="compact">
<item><p>LightSpark</p></item>
<item><p>Gnash</p></item>
- <item><p>SWFdec (no longer being updated)</p></item>
</list>
</section>
diff --git a/gnome-help/C/net-macaddress.page b/gnome-help/C/net-macaddress.page
index 66d7916..77eec0d 100644
--- a/gnome-help/C/net-macaddress.page
+++ b/gnome-help/C/net-macaddress.page
@@ -32,6 +32,6 @@
<item><p>Your MAC address will be displayed as the <gui>Hardware Address</gui>.</p></item>
</steps>
- <p>In practice, you may need to <link xref="net-editcon">modify or "spoof" a MAC address</link>. For example, some internet service providers may require that a specific MAC address be used to access their service. If the network card stops working, and you need swap a new card in, the service won't work anymore. In such cases, you would need to spoof the MAC address.</p>
+ <p>In practice, you may need to <link xref="net-editcon">modify or "spoof" a MAC address</link>. For example, some internet service providers may require that a specific MAC address be used to access their service. If the network card stops working, and you need to swap a new card in, the service won't work anymore. In such cases, you would need to spoof the MAC address.</p>
</page>
diff --git a/gnome-help/C/net-manual.page b/gnome-help/C/net-manual.page
index 4a9647e..defbe3b 100644
--- a/gnome-help/C/net-manual.page
+++ b/gnome-help/C/net-manual.page
@@ -27,7 +27,7 @@
</item>
<item>
- <p>Select the network connection that you want to setup manually and click <gui>Configure</gui>. For example, if you plug in to the network with a cable, look at <gui>Wired</gui>.</p>
+ <p>Select the network connection that you want to set up manually and click <gui>Configure</gui>. For example, if you plug in to the network with a cable, look at <gui>Wired</gui>.</p>
<p>Make sure that your wireless card is turned on or a network cable is plugged in. Otherwise, you won't be able to click <gui>Configure</gui>.</p>
</item>
@@ -45,7 +45,7 @@
</item>
<item>
- <p>Click <gui>Save</gui>. If you are not connected to the network, click the network icon on the top bar and connect. Test the network settings by trying to visit a website or looking at shared files on the network, for example.</p>
+ <p>Click <gui>Save</gui>. If you are not connected to the network, click the network icon on the top bar and connect. Test the network settings by trying to visit a website or look at shared files on the network, for example.</p>
</item>
</steps>
diff --git a/gnome-help/C/net-proxy.page b/gnome-help/C/net-proxy.page
index 6389e62..6fb2a1c 100644
--- a/gnome-help/C/net-proxy.page
+++ b/gnome-help/C/net-proxy.page
@@ -28,7 +28,7 @@
from your web browser to fetches the web pages and their elements, and following
a policy will decide to pass them you back. They are commonly used in businesses
and at public wireless hotspots to control what websites you can look at,
- prevent you from accessing the internet without logging-in, or to do security
+ prevent you from accessing the internet without logging in, or to do security
checks on websites.</p>
</section>
diff --git a/gnome-help/C/net-slow.page b/gnome-help/C/net-slow.page
index 610c3e9..56e31cd 100644
--- a/gnome-help/C/net-slow.page
+++ b/gnome-help/C/net-slow.page
@@ -17,9 +17,9 @@
<title>The internet seems slow</title>
-<p>If you are using the internet and it seems slow, there are a number of things could be causing the slow down.</p>
+<p>If you are using the internet and it seems slow, there are a number of things that could be causing the slow down.</p>
-<p>A couple of quick fixes to try are closing your web browser and then re-opening it, and disconnecting from the internet and then reconnecting again. (Doing this resets a lot of things that might be causing the internet to run slowly.)</p>
+<p>Try closing your web browser and then re-opening it, and disconnecting from the internet and then reconnecting again. (Doing this resets a lot of things that might be causing the internet to run slowly.)</p>
<list>
<item>
@@ -39,12 +39,12 @@
<item>
<p><em style="strong">Low wireless connection signal</em></p>
- <p>If you're connected to the internet by wireless (wifi), check the network icon on the top bar to see if you have good wireless signal. If not, the internet may seem slow because you don't have a very strong signal.</p>
+ <p>If you're connected to the internet by wireless (wifi), check the network icon on the top bar to see if you have good wireless signal. If not, the internet may be slow because you don't have a very strong signal.</p>
</item>
<item>
<p><em style="strong">Using a slower mobile internet connection</em></p>
- <p>If you have a mobile internet connection and notice that it is going slowly, you may have moved into an area where signal reception is poor. When this happens, the internet connection will automatically switch from a fast "mobile broadband" connection like 3G to a more reliable, but slower, connection like GPRS.</p>
+ <p>If you have a mobile internet connection and notice that it is slow, you may have moved into an area where signal reception is poor. When this happens, the internet connection will automatically switch from a fast "mobile broadband" connection like 3G to a more reliable, but slower, connection like GPRS.</p>
</item>
<item>
diff --git a/gnome-help/C/net-tethering.page.stub b/gnome-help/C/net-tethering.page.stub
index 46dee1a..33d4680 100644
--- a/gnome-help/C/net-tethering.page.stub
+++ b/gnome-help/C/net-tethering.page.stub
@@ -2,7 +2,7 @@
type="topic" style="task"
id="net-tethering">
<info>
- <link type="guide" xref="net#wireless"/>
+ <link type="guide" xref="net-wireless"/>
<revision pkgversion="3.0" date="2011-03-20" status="stub"/>
<credit type="author">
diff --git a/gnome-help/C/net-vpn-connect.page b/gnome-help/C/net-vpn-connect.page
index 1a58ac3..3a79a31 100644
--- a/gnome-help/C/net-vpn-connect.page
+++ b/gnome-help/C/net-vpn-connect.page
@@ -12,7 +12,7 @@
<email>gnome-doc-list gnome org</email>
</credit>
- <desc>VPNs allow you to connect to a local network over the internet. Learn how to set-up a VPN connection.</desc>
+ <desc>VPNs allow you to connect to a local network over the internet. Learn how to set up a VPN connection.</desc>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
</info>
diff --git a/gnome-help/C/power-batteryestimate.page b/gnome-help/C/power-batteryestimate.page
index 4068e24..3a8b762 100644
--- a/gnome-help/C/power-batteryestimate.page
+++ b/gnome-help/C/power-batteryestimate.page
@@ -43,7 +43,7 @@ changes from moment to moment, and is difficult to predict.</p>
faster the emptier they get. Without precise knowledge of how the battery
discharges, only a rough estimate of remaining battery life can be made.</p>
-<p>As the battery discharges, the power manager will figure-out its discharge
+<p>As the battery discharges, the power manager will figure out its discharge
properties and will learn how to make better estimates of battery life. They
will never be completely accurate, though.</p>
diff --git a/gnome-help/C/power-hibernate.page b/gnome-help/C/power-hibernate.page
index 19ccbe9..213755b 100644
--- a/gnome-help/C/power-hibernate.page
+++ b/gnome-help/C/power-hibernate.page
@@ -25,16 +25,16 @@
<p>When the computer <em>hibernates</em>, all of your applications and
documents are stored and the computer completely switches off so it does not
use any power, but the applications and documents will still be open when you
-switch on the computer again. You cannot hibernate the computer yourself, but you can set <gui>Hybernate</gui> as the default action for when your computer battery is critically low:</p>
+switch on the computer again. You cannot hibernate the computer yourself, but you can set <gui>Hibernate</gui> as the default action for when your computer battery is critically low:</p>
<steps>
<item>
- <p>Click your name on the top bar and select <gui>System Settings</gui></p>
+ <p>Click your name on the top bar and select <gui>System Settings</gui>.</p>
</item>
<item>
- <p>Open <gui>Network</gui> and select the <gui>Power</gui> tab</p>
+ <p>Open <gui>Power</gui>.</p>
</item>
<item>
- <p>Change the <gui>When power is critically low</gui> option to <gui>Hibernate</gui></p>
+ <p>Change the <gui>When power is critically low</gui> option to <gui>Hibernate</gui>.</p>
</item>
</steps>
diff --git a/gnome-help/C/power-othercountry.page b/gnome-help/C/power-othercountry.page
index 6bfe245..6b0a63d 100644
--- a/gnome-help/C/power-othercountry.page
+++ b/gnome-help/C/power-othercountry.page
@@ -23,11 +23,11 @@
<p>Different countries use power supplies at different voltages (usually 110V
or 220-240V) and AC frequencies (usually 50 Hz or 60 Hz). Your computer should
-work with a different power supply in a different country as long as you have
+work with a power supply in a different country as long as you have
an appropriate power adapter. You may also need to flip a switch.</p>
<p>If you have a laptop, all you should need to do is get the right plug for
-your power adapter. Many laptops come packaged with more than one plug for
+your power adapter. Some laptops come packaged with more than one plug for
their adapter, so you may already have the right one. If not, plugging your
existing one into a standard travel adapter will suffice.</p>
diff --git a/gnome-help/C/power-suspendfail.page b/gnome-help/C/power-suspendfail.page
index 41191a5..bc3adce 100644
--- a/gnome-help/C/power-suspendfail.page
+++ b/gnome-help/C/power-suspendfail.page
@@ -37,8 +37,8 @@ hardware.</p>
once).</p>
<p>If this still does not help, make sure that your computer's monitor is
switched on and try pressing a key on the keyboard again.</p>
- <p>As a last resort, turn off the computer by holding-in the power button for
- 4-10 seconds, although you will lose any unsaved work by doing this. You
+ <p>As a last resort, turn off the computer by holding in the power button for
+ 5-10 seconds, although you will lose any unsaved work by doing this. You
should then be able to turn on the computer again.</p>
<p>If this happens every time you suspend your computer, the suspend
feature may not work with your hardware.</p>
diff --git a/gnome-help/C/session-screenlocks.page b/gnome-help/C/session-screenlocks.page
index 2843c68..b7be342 100644
--- a/gnome-help/C/session-screenlocks.page
+++ b/gnome-help/C/session-screenlocks.page
@@ -5,11 +5,10 @@
<info>
<link type="guide" xref="prefs-display"/>
<link type="guide" xref="hardware-problems-graphics"/>
- <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+ <revision pkgversion="3.4.0" date="2012-03-18" status="review"/>
<desc>Change how long to wait before locking the screen in the
- <gui>Screen</gui> settings.</desc>
- <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+ <gui>Brightness and Lock</gui> settings.</desc>
<credit type="author">
<name>GNOME Documentation Project</name>
<email>gnome-doc-list gnome org</email>
@@ -30,7 +29,7 @@
<steps>
<item><p>Click your name on the top bar and select <gui>System Settings</gui>.</p></item>
- <item><p>Open <gui>Screen</gui>.</p></item>
+ <item><p>Click <gui>Brightness and Lock</gui>.</p></item>
<item><p>Change the value in the <gui>Lock screen after</gui> drop-down list.</p></item>
</steps>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
