[gnome-terminal] Fix various errors pointed by Gabor Kelemen

From: Baptiste Mille-Mathias <baptistem src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-terminal] Fix various errors pointed by Gabor Kelemen
Date: Mon, 11 Nov 2013 21:53:41 +0000 (UTC)
commit 3b6a43008a7a6e0c9aa2351acb9fb74eea6201f2
Author: Baptiste Mille-Mathias <baptiste millemathias gmail com>
Date:   Mon Nov 11 22:48:29 2013 +0100

    Fix various errors pointed by Gabor Kelemen
    
    Fixed errors and inconsistencies reported in bug 711164.

 help/C/adv-keyboard-shortcuts.page |   15 +++++++--------
 help/C/app-fonts.page              |   12 +++++-------
 help/C/app-terminal-sizes.page     |    5 ++---
 help/C/app-zoom.page               |    4 ++--
 help/C/gs-tabs.page                |   19 ++++++++++---------
 help/C/legal.xml                   |    2 +-
 help/C/overview.page               |   17 +++++++++--------
 help/C/pref-bell.page              |    5 ++---
 help/C/pref-custom-command.page    |    2 +-
 help/C/pref-custom-exit.page       |    8 ++++----
 help/C/pref-keyboard-access.page   |    5 ++---
 help/C/pref-menubar.page           |    5 ++---
 help/C/pref-profiles.page          |   16 +++++++++-------
 help/C/pref-scrolling.page         |    8 ++++----
 help/C/txt-copy-paste.page         |    8 ++++----
 help/C/txt-links.page              |    2 +-
 16 files changed, 65 insertions(+), 68 deletions(-)
---
diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index acdbe92..5a0bdcb 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -52,14 +52,13 @@
       to edit it.</p>
     </item>
     <item>
-      <p>Press your desired shortcut key combination, exactly as you would use
-      it. The keys that you can use include <key>Alt</key>, <key>Alt Gr</key>,
-      <key>Ctrl</key>, <key>Shift</key>, number and letter keys.</p>
+      <p>Press your desired shortcut key combination as you would enter it to
+      use it. The keys that you can use include <key>Alt</key>,
+      <key>Alt Gr</key>, <key>Ctrl</key>, <key>Shift</key>, number and letter
+      keys.</p>
       <note>
-       <p>Mnemonic key combinations, such as <keyseq><key>Alt</key>
-       <key>F</key></keyseq> will not work. If you accidentally set one of
-       these key combinations as a shortcut, you can change it to something
-       else, or disable it.</p>
+        <p>Mnemonic key combinations, such as <keyseq><key>Alt</key>
+        <key>F</key></keyseq> will not work.</p>
       </note>
     </item>
     <item>
@@ -234,7 +233,7 @@
           <td><p><keyseq><key>Alt</key><key>9</key></keyseq></p></td>
         </tr>
         <tr>
-          <td><p>Switch to Tab 0</p></td>
+          <td><p>Switch to Tab 10</p></td>
           <td><p><keyseq><key>Alt</key><key>0</key></keyseq></p></td>
         </tr>
       </tbody>
diff --git a/help/C/app-fonts.page b/help/C/app-fonts.page
index 5d5bffd..2844eca 100644
--- a/help/C/app-fonts.page
+++ b/help/C/app-fonts.page
@@ -42,9 +42,8 @@
 
   <steps>
     <item>
-      <p>Go to <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select <gui style="checkbox">Use the system fixed width font</gui>.</p>
@@ -98,9 +97,8 @@
 
   <steps>
     <item>
-      <p>Go to <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq></p>
+      <p>Go to <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select <gui style="checkbox">Allow bold text</gui>.</p>
@@ -109,7 +107,7 @@
 
   <note style="important">
     <p><gui style="checkbox">Allow bold text</gui> is a shell specific feature.
-    If you are using a shell other than Bash, then the described behaviour may
+    If you are using a shell other than Bash, then the described behavior may
     not be similar.</p>
   </note>
 
diff --git a/help/C/app-terminal-sizes.page b/help/C/app-terminal-sizes.page
index f79e645..bb34861 100644
--- a/help/C/app-terminal-sizes.page
+++ b/help/C/app-terminal-sizes.page
@@ -76,9 +76,8 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
    </item>
    <item>
     <p>Check <gui>Use custom default terminal size</gui>.</p>
diff --git a/help/C/app-zoom.page b/help/C/app-zoom.page
index a8e7d4a..779dfff 100644
--- a/help/C/app-zoom.page
+++ b/help/C/app-zoom.page
@@ -12,7 +12,7 @@
       <years>2013</years>
     </credit>
     <credit type="copyright editor">
-      <name>Ekaterina Gerasimomva</name>
+      <name>Ekaterina Gerasimova</name>
       <email>kittykat3756 gmail com</email>
       <years>2013</years>
     </credit>
@@ -56,7 +56,7 @@
     <item>
       <p>Select <guiseq><gui style="View">View</gui> <gui
       style="menuitem">Normal Size</gui></guiseq> or press
-      <keyseq><key>Control</key><key>0</key></keyseq>.</p>
+      <keyseq><key>Ctrl</key><key>0</key></keyseq>.</p>
     </item>
   </steps>
 
diff --git a/help/C/gs-tabs.page b/help/C/gs-tabs.page
index d7fc207..a3ddf51 100644
--- a/help/C/gs-tabs.page
+++ b/help/C/gs-tabs.page
@@ -31,8 +31,8 @@
   <title>Manage tabs</title>
 
   <p>The tab bar appears at the top a <app>Terminal</app> window that has
-  multiple tabs open in what looks like a row of buttons, which you can click
-  to change between tabs. You can open multiple tabs to manage your work in
+  multiple tabs open (it looks like a row of buttons). Click on a tab to switch 
+  to the corresponding tab. You can open multiple tabs to manage your work in
   <app>Terminal</app>. This will allow you to multi-task with activities such
   as running programs, browsing directories and editing text files in a single
   <app>Terminal</app> window.</p>
@@ -65,13 +65,14 @@
         <gui style="menuitem">Set Title…</gui></guiseq>.</p>
       </item>
       <item>
-        <p>Enter the <gui>Title</gui> that you wish to use, enter the
-        desired name for the tab. This will overwrite any titles that would be
-        set by terminal commands.</p>
+        <p>Enter the desired <gui>Title</gui> that you wish to use for the tab.
+        This will overwrite any titles that would be set by terminal commands.
+        </p>
         <note>
-          <p>It is not possible to unset a title once it has been set for a
-          tab. To see the title, you need to allow terminal command titles to
-          be shown in the <gui style="menuitem">Profile Preferences</gui>.</p>
+          <p>It is not possible to set back the automatically set title once it
+          has been set for a tab. To see the title, you need to allow terminal
+          command titles to be shown in the <gui style="menuitem">Profile 
+          Preferences</gui>.</p>
         </note>
       </item>
       <item>
@@ -107,7 +108,7 @@
         <p>Click and hold the left mouse button on the tab.</p>
       </item>
       <item>
-        <p>Drag the tab to the desired position amongst the other tabs.</p>
+        <p>Drag the tab to the desired position among the other tabs.</p>
       </item>
       <item>
         <p>Release the mouse button.</p>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 4f27802..14bbfc9 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,6 +1,6 @@
 <license xmlns="http://projectmallard.org/1.0/";>
 
-  <p>This work is licenced under a
+  <p>This work is licensed under a
   <link href="http://creativecommons.org/licenses/by-sa/3.0/";>Creative Commons
   Attribution-Share Alike 3.0 Unported License</link> and a
   <link href="http://www.gnu.org/licenses/";>GNU General Public License version
diff --git a/help/C/overview.page b/help/C/overview.page
index a9f0859..eba744b 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -61,11 +61,10 @@
     </item>
     <item>
       <title>Shell</title>
-      <p>A <app>shell</app> is a program that provides an interface to invoke or
+      <p>A <em>shell</em> is a program that provides an interface to invoke or
       "launch" commands or another program inside a terminal. It also allows you
       to view and browse the contents of directories. Popular shells are
-      <app>Bash</app>, <app>rsh</app>, <app>tsh</app>, <app>fish</app> and so
-      on.</p>
+      <app>bash</app>, <app>zsh</app>, <app>csh</app>.</p>
     </item>
     <item>
       <title>Escape Sequences</title>
@@ -82,17 +81,19 @@
       characters used in the command line environment to indicate the readiness
       of the shell to accept commands.</p>
 
-      <p>A prompt usually ends with characters $, %, # or > and include
+      <p>A prompt usually ends with characters <sys>$</sys>, <sys>%</sys>,
+      <sys>#</sys> or <sys>&gt;</sys> and include
       information about path of present working directory. On Unix based
-      systems, it is common for the prompt to end in a $ or % character
-      depending on the user role such as $ for user and # for superuser (also
-      called root).</p>
+      systems, it is common for the prompt to end in a <sys>$</sys> or 
+      <sys>%</sys> character depending on the user role such as <sys>$</sys>
+      for user and <sys>#</sys> for superuser (also called <sys>root</sys>).
+      </p>
     </item>
     <item>
       <title>Command</title>
       <p>An input entered in the prompt to be executed is called a
       <em>command</em>. It is a combination of the program name along with any
-      other additional parameteres passed as flags to alter the execution of the
+      other additional parameters passed as flags to alter the execution of the
       program.</p>
     </item>
   </terms>
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index 5675c75..a556537 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -40,9 +40,8 @@
   <p>To be notified of these events:</p>
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select <gui style="checkbox">Terminal bell</gui></p>
diff --git a/help/C/pref-custom-command.page b/help/C/pref-custom-command.page
index a76f8fd..723f5b2 100644
--- a/help/C/pref-custom-command.page
+++ b/help/C/pref-custom-command.page
@@ -62,7 +62,7 @@
     </item>
   </steps>
 
-  <p>You can also <link xref="pref-custom-exit">set the behaviour</link> of
+  <p>You can also <link xref="pref-custom-exit">set the behavior</link> of
   the terminal once the command finishes executing.</p>
 
   <note style="important">
diff --git a/help/C/pref-custom-exit.page b/help/C/pref-custom-exit.page
index a10cccb..400c846 100644
--- a/help/C/pref-custom-exit.page
+++ b/help/C/pref-custom-exit.page
@@ -26,11 +26,11 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Set the behaviour of <app>Terminal</app> when a custom command or the default shell exits.</desc>
+    <desc>Set the behavior of <app>Terminal</app> when a custom command or the default shell exits.</desc>
 
   </info>
 
-  <title>Set behaviour on command exit</title>
+  <title>Set behavior on command exit</title>
 
   <p>You can set the terminal to exit, restart or remain open when the shell or
   a custom command exits:</p>
@@ -39,7 +39,7 @@
     <item>
       <p>Select <guiseq>
         <gui style="menu">Edit</gui>
-        <gui style="menuitem">Preferences</gui>
+        <gui style="menuitem">Profile Preferences</gui>
         <gui style="tab">Title and Command</gui></guiseq>.</p>
     </item>
     <item>
@@ -62,7 +62,7 @@
 
   <note style="important">
     <p>If you have <link xref="pref-custom-command">set a custom command</link>
-    that is non-interactive, have set the exit behaviour to <gui>Exit the
+    that is non-interactive, have set the exit behavior to <gui>Exit the
     terminal</gui>, and have set the profile to be the default profile,
     <app>Terminal</app> may exit before you can see the output of the
     command.</p>
diff --git a/help/C/pref-keyboard-access.page b/help/C/pref-keyboard-access.page
index 2634fbe..ce8fb76 100644
--- a/help/C/pref-keyboard-access.page
+++ b/help/C/pref-keyboard-access.page
@@ -58,9 +58,8 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-       <gui style="menuitem">Preferences</gui>
-       <gui style="tab">General</gui></guiseq>.</p>
+        <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+        Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
       </item>
       <item>
         <p>Check <gui style="checkbox">Enable mnemonics</gui>.</p>
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index f704edf..2791180 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -57,9 +57,8 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
+      Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
       <p>Select <gui>Show menubar by default in new terminals</gui>.</p>
diff --git a/help/C/pref-profiles.page b/help/C/pref-profiles.page
index d6f647c..2fc1046 100644
--- a/help/C/pref-profiles.page
+++ b/help/C/pref-profiles.page
@@ -116,14 +116,15 @@
         <gui style="tab">General</gui> tab.</p>
       </item>
       <item>
-        <p>Set your preferred behaviour for the
+        <p>Set your preferred behavior for the
         <link xref="pref-custom-exit"><cmd>exit</cmd> command</link>.
         You can also set a
         <link xref="pref-custom-command">custom shell</link> in the
         <gui style="tab">Title and Command</gui> tab.</p>
       </item>
       <item>
-        <p>Set your preferred <link xref="app-colors">theme and colors</link> in the <gui 
style="tab">Colors</gui> tab.</p>
+        <p>Set your preferred <link xref="app-colors">theme and colors</link>
+        in the <gui style="tab">Colors</gui> tab.</p>
       </item>
       <item>
         <p>Set your <link xref="pref-scrolling">scrolling preference</link> in
@@ -154,8 +155,9 @@
       <item>
         <p>Set your desired <link xref="#edit-profile">profile
         preferences</link>. These will be saved automatically. If you do not
-        update the profile name, the new profile will not overwrite the profile
-        that it is based on.</p>
+        update the <gui>Profile name</gui> on the tab <gui style="tab">General
+        </gui>, the new profile will not overwrite the profile that it is based
+        on.</p>
       </item>
     </steps>
 
@@ -175,7 +177,7 @@
         <p>Click <gui style="button">Clone</gui>.</p>
       </item>
       <item>
-        <p>Set your <link xref="#edit-profile">desired profile
+        <p>Set your desired <link xref="#edit-profile">profile
         preferences</link>. These will be saved automatically. If you do not
         update the profile name, the new profile will not overwrite the profile
         that it is based on.</p>
@@ -197,7 +199,7 @@
       <p>If the default profile is edited, it cannot be restored to its
       original settings! If you have not already created any other
       <app>Terminal</app> profiles and have customized the default profile,
-      <app>Terminal</app> <em>may</em> become unusuable should any settings
+      <app>Terminal</app> <em>may</em> become unusable should any settings
       cause problems. It is recommended that you
       <link xref="#create-profile-from-existing">create a copy of the
       default profile</link> then edit the copy to create a custom profile.</p>
@@ -214,7 +216,7 @@
         <link xref="app-terminal-sizes"><app>Terminal</app> size</link>.</p>
       </item>
       <item>
-        <p>You may also change behaviour of <app>Terminal</app> on
+        <p>You may also change behavior of <app>Terminal</app> on
         <link xref="pref-custom-exit">command exit</link>, set a
         <link xref="pref-login-shell">custom login shell</link> or change
         <link xref="pref-scrolling">scrollbar preferences</link>.</p>
diff --git a/help/C/pref-scrolling.page b/help/C/pref-scrolling.page
index fc9b6af..c01c722 100644
--- a/help/C/pref-scrolling.page
+++ b/help/C/pref-scrolling.page
@@ -20,14 +20,14 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Set scroll output and scrollbar behaviour.</desc>
+    <desc>Set scroll output and scrollbar behavior.</desc>
   </info>
 
   <title>Scrollbar preferences</title>
 
   <p>A scrollbar is a part of the graphical user interface (GUI) which allows
   anything continuous and exceeding the visible screen space such as text to be
-  viewable by the user by scrolling down to the parts hidden from current
+  viewable by the user by scrolling up or down to the parts hidden from current
   view.</p>
 
   <!-- Note to self: check UI. -->
@@ -113,7 +113,7 @@
 
     <steps>
       <item>
-        <p>Go to <guiseq><gui style="menu">Edit</gui>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
         <gui style="menuitem">Profile Preferences</gui>
         <gui style="tab">Scrolling</gui></guiseq>.</p>
       </item>
@@ -133,7 +133,7 @@
 
     <steps>
       <item>
-        <p>Go to <guiseq><gui style="menu">Edit</gui>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
         <gui style="menuitem">Profile Preferences</gui>
         <gui style="tab">Scrolling</gui></guiseq>.</p>
       </item>
diff --git a/help/C/txt-copy-paste.page b/help/C/txt-copy-paste.page
index ef28529..30d9fa6 100644
--- a/help/C/txt-copy-paste.page
+++ b/help/C/txt-copy-paste.page
@@ -32,7 +32,7 @@
   <title>Copy and paste</title>
 
   <p>You can copy and paste text in <app>Terminal</app> in a similar way to
-  other applications. However, the keyboard shorcuts differ.</p>
+  other applications. However, the keyboard shortcuts differ.</p>
 
   <terms>
     <item>
@@ -40,14 +40,14 @@
       <p>Highlight the text portions you wish to copy, then select
       <guiseq><gui style="menu">Edit</gui>
       <gui style="menuitem">Copy</gui></guiseq>. Alternatively, you can press
-      <keyseq><key>Control</key><key>Shift</key><key>C</key></keyseq>.</p>
+      <keyseq><key>Ctrl</key><key>Shift</key><key>C</key></keyseq>.</p>
     </item>
     <item>
       <title><gui>Paste</gui></title>
       <p>Right click in the <app>Terminal</app> and select
-      <guiseq><gui style="menuitem">Paste</gui></guiseq>. Alternatively, you
+      <gui style="menuitem">Paste</gui>. Alternatively, you
       can press
-      <keyseq><key>Control</key><key>Shift</key><key>V</key></keyseq>.</p>
+      <keyseq><key>Ctrl</key><key>Shift</key><key>V</key></keyseq>.</p>
     </item>
   </terms>
 
diff --git a/help/C/txt-links.page b/help/C/txt-links.page
index 85312c0..f048b21 100644
--- a/help/C/txt-links.page
+++ b/help/C/txt-links.page
@@ -82,7 +82,7 @@
         <p>Copy an email address:</p>
         <steps>
           <item>
-            <p>Right click in <app>Terminal</app>.</p>
+            <p>Right click on the email address in <app>Terminal</app>.</p>
           </item>
           <item>
           <p>Select <gui style="menuitem">Copy E-mail Address</gui>.</p>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]