diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index dd189a10..5824837e 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -54,8 +54,8 @@
     <item>
       <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>
+      <key>Alt Gr</key>, <key>Ctrl</key>, <key>Shift</key>, <key>Super</key>,
+      number and letter keys.</p>
       <note>
         <p>Mnemonic key combinations, such as <keyseq><key>Alt</key>
         <key>F</key></keyseq> will not work.</p>
@@ -123,11 +123,11 @@
       <tbody>
         <tr>
           <td><p>Copy</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>C</key></keyseq></p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq></p></td>
         </tr>
         <tr>
           <td><p>Paste</p></td>
-          <td><p><keyseq><key>Ctrl</key><key>Shift</key><key>V</key></keyseq></p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq></p></td>
         </tr>
       </tbody>
     </table>
@@ -167,6 +167,40 @@
     </table>
   </section>
 
+  <section id="find-shortcuts">
+    <title><gui style="menu">Find</gui> shortcuts</title>
+
+    <p>The default shortcuts for options under <gui style="menu">Find</gui>
+    menu are:</p>
+
+    <table rules="rows" frame="top bottom" ui:expanded="false">
+      <thead>
+        <tr>
+          <td><p>Action</p></td>
+          <td><p>Keyboard Shortcut</p></td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><p>Find</p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>F</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Find Next</p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Find Previous</p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Clear Highlight</p></td>
+          <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq></p></td>
+        </tr>
+      </tbody>
+    </table>
+  </section>
+
   <section id="tab-shortcuts">
     <title>Tab shortcuts</title>
 
@@ -240,28 +274,6 @@
     </table>
   </section>
 
-  <section id="help-shortcuts">
-    <title>Help shortcuts</title>
-
-    <p>The default shortcuts for accessing items in the
-    <gui style="menu">Help</gui> menu are:</p>
-
-    <table rules="rows" frame="top bottom" ui:expanded="false">
-      <thead>
-        <tr>
-          <td><p>Action</p></td>
-          <td><p>Keyboard Shortcut</p></td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td><p>Contents</p></td>
-          <td><p><key>F1</key></p></td>
-        </tr>
-      </tbody>
-    </table>
-  </section>
-
   <section id="other-shortcuts">
     <title>Other</title>
 
@@ -283,6 +295,22 @@
           <td><p>Scroll down by one line</p></td>
           <td><p><keyseq><key>Shift</key><key>Ctrl</key><key>Down</key></keyseq></p></td>
         </tr>
+        <tr>
+          <td><p>Scroll up by one page</p></td>
+          <td><p><keyseq><key>Shift</key><key>Page Up</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Scroll down by one page</p></td>
+          <td><p><keyseq><key>Shift</key><key>Page Down</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Scroll to the top</p></td>
+          <td><p><keyseq><key>Shift</key><key>Home</key></keyseq></p></td>
+        </tr>
+        <tr>
+          <td><p>Scroll to the bottom</p></td>
+          <td><p><keyseq><key>Shift</key><key>End</key></keyseq></p></td>
+        </tr>
       </tbody>
     </table>
   </section>
@@ -341,29 +369,28 @@
           <td><p><keyseq><key>Alt</key><key>F</key></keyseq></p></td> 
         </tr>
         <tr>
-          <td><p>Delete from the cursor to the beginning of the line.</p></td>
+          <td><p>Delete from the cursor to the beginning of the line</p></td>
           <td><p><keyseq><key>Ctrl</key><key>u</key></keyseq></p></td> 
         </tr>
         <tr>
-          <td><p>Delete from the cursor to the end of the line.</p></td>
+          <td><p>Delete from the cursor to the end of the line</p></td>
           <td><p><keyseq><key>Ctrl</key><key>K</key></keyseq></p></td> 
         </tr>
         <tr>
-          <td><p>Delete from the cursor to the start of the word.</p></td>
+          <td><p>Delete from the cursor to the start of the word</p></td>
           <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Delete previous word</p></td>
-          <td><p><keyseq><key>Esc</key><key>Del</key></keyseq> or
-          <keyseq><key>Esc</key><key>Backspace</key></keyseq></p></td>
+          <td><p><keyseq><key>Alt</key><key>Backspace</key></keyseq></p></td>
         </tr>
         <tr>
-          <td><p>Pastes text from the clipboard.</p></td>
+          <td><p>Paste text from the clipboard</p></td>
           <td><p><keyseq><key>Ctrl</key><key>Y</key></keyseq></p></td> 
         </tr>
         <tr>
           <td><p>Clear the screen leaving the current line at the top of the
-          screen.</p></td>
+          screen</p></td>
           <td><p><keyseq><key>Ctrl</key><key>L</key></keyseq></p></td> 
         </tr>
         <tr>
diff --git a/help/C/app-colors.page b/help/C/app-colors.page
index 6e57fdf4..a044a1c4 100644
--- a/help/C/app-colors.page
+++ b/help/C/app-colors.page
@@ -59,9 +59,9 @@
 
     <p>You can choose one of the built-in color schemes: <gui>Black on light
     yellow</gui>, <gui>Black on white</gui>, <gui>Gray on black</gui>,
-    <gui>Green on black</gui>, <gui>White on black</gui>, <gui>Solarized
-    light</gui>, <gui>Solarized dark</gui>. To set any of the built-in
-    schemes:</p>
+    <gui>Green on black</gui>, <gui>White on black</gui>, <gui>Tango
+    light</gui>, <gui>Tango dark</gui>. <gui>Solarized light</gui>,
+    <gui>Solarized dark</gui>. To set any of the built-in schemes:</p>
 
     <steps>
       <item>
@@ -101,15 +101,12 @@
         <gui>Built-in schemes</gui> drop-down list.</p>
       </item>
       <item>
-        <p>Click on the color sample next to the component you would like to
-        change.</p>
+        <p>Click on the color you would like to change.</p>
       </item>
       <item>
         <p>Choose your desired color from the color sample and click
         <gui style="button">Select</gui>.</p>
-        <p>If you wish to select a color from the color picker, click on
-        <gui style="button">+</gui>. You can chose the desired color in the
-	following ways:</p>
+        <p>You can chose the desired color in the following ways:</p>
         <list>
           <item>
             <p>Input the hexadecimal color code in the input box.</p>
@@ -129,6 +126,19 @@
       built-in scheme menu will change to <gui>Custom</gui>.</p>
     </note>
 
+    <note style="tip">
+      <p>Traditionally terminal emulators offered a 16 color paltte, this is
+      what you can alter here. <app>Terminal</app> supports an extended set of
+      256 colors, but the additional 240 colors cannot be edited here.</p>
+
+      <p><app>Terminal</app> even offers direct access to over 16 million
+      colors, this is called “true color” mode.</p>
+
+      <p>If the changes you make to the palette do not seem to have an effect,
+      presumably the contents you see consist of such extended palette colors
+      or true colors, rather than the 16 base colors.</p>
+    </note>
+
   </section>
 
 </page>
diff --git a/help/C/app-cursor.page b/help/C/app-cursor.page
index e0906921..50b8519d 100644
--- a/help/C/app-cursor.page
+++ b/help/C/app-cursor.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="task"
       id="app-cursor">
 
@@ -25,7 +26,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Select different cursor style</desc>
+    <desc>Select different cursor style.</desc>
 
   </info>
 
@@ -45,24 +46,20 @@
       <gui>Cursor shape</gui>. You can choose from the following options:</p>
       <terms>
         <item>
-          <title>|</title>
-          <p><gui>I-Beam</gui></p>
+          <title its:translate="no">█</title>
+          <p><gui>Block</gui></p>
         </item>
         <item>
-          <title>⎕</title>
-          <p><gui>Block</gui></p>
+          <title its:translate="no">▏</title>
+          <p><gui>I-Beam</gui></p>
         </item>
         <item>
-          <title>_</title>
+          <title its:translate="no">▁</title>
           <p><gui>Underline</gui></p>
         </item>
       </terms>
       <p>Upon selection of the cursor, your choice is saved automatically.</p>
     </item>
-    <item>
-      <p>To return to <app>Terminal</app>, click <gui
-      style="button">Close</gui>.</p>
-    </item>
-    </steps>
+  </steps>
 
 </page>
diff --git a/help/C/app-fonts.page b/help/C/app-fonts.page
index 2844eca5..7bec25ac 100644
--- a/help/C/app-fonts.page
+++ b/help/C/app-fonts.page
@@ -46,7 +46,7 @@
       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>
+      <p>Unselect <gui style="checkbox">Custom font</gui>.</p>
     </item>
   </steps>
 
@@ -64,11 +64,10 @@
       <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Ensure that <gui>Use the system fixed width font</gui> option is
-      unchecked.</p>
+      <p>Select <gui style="checkbox">Custom font</gui>.</p>
     </item>
     <item>
-      <p>Click on the button next to <gui>Font</gui>.</p>
+      <p>Click on the button next to <gui style="checkbox">Custom font</gui>.</p>
     </item>
     <item>
       <p>Type the name of your desired font into the search field or browse the
@@ -89,11 +88,13 @@
 
   </section>
 
-  <section id="bold-fonts">
-  <title>Bold text</title>
+  <section id="cell-spacing">
+  <title>Line spacing and character spacing</title>
 
-  <p><app>Terminal</app> allows your shell to process text such as the prompt,
-  directory names or man page headings to appear in bold style.</p>
+  <p><app>Terminal</app> allows you to pull its characters apart for improved
+  readability. Line spacing and character spacing can be adjusted from 1.0
+  (the regular look) to 2.0 (“double spacing”), including fractional values
+  in between.</p>
 
   <steps>
     <item>
@@ -101,16 +102,15 @@
       Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select <gui style="checkbox">Allow bold text</gui>.</p>
+      <p>To set the horizonal character spacing, adjust the multiplier number
+      in front of <gui>width</gui>.</p>
+    </item>
+    <item>
+      <p>To set the line spacing, adjust the multiplier number in front of
+      <gui>height</gui>.</p>
     </item>
   </steps>
 
-  <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 behavior may
-    not be similar.</p>
-  </note>
-
   </section>
 
 </page>
diff --git a/help/C/app-fullscreen.page b/help/C/app-fullscreen.page
index 6a2fa205..ca2db5c3 100644
--- a/help/C/app-fullscreen.page
+++ b/help/C/app-fullscreen.page
@@ -25,7 +25,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Enable fullscreen mode</desc>
+    <desc>Enable fullscreen mode.</desc>
   </info>
 
   <title>Fullscreen session</title>
diff --git a/help/C/app-terminal-sizes.page b/help/C/app-terminal-sizes.page
index bb348612..1ae26f33 100644
--- a/help/C/app-terminal-sizes.page
+++ b/help/C/app-terminal-sizes.page
@@ -25,7 +25,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Change the <app>Terminal</app> window size</desc>
+    <desc>Change the <app>Terminal</app> window size.</desc>
 
   </info>
 
@@ -67,12 +67,12 @@
     <p>If you have enabled <link xref="pref-keyboard-access"><gui>Menu access
     keys</gui></link>, you can access this menu by pressing
     <keyseq><key>Alt</key><key>T</key></keyseq> and then pressing <key>1</key>
-    to open a <app>Terminal</app> window of size <gui>80×24</gui> and so
+    to switch the <app>Terminal</app> window to size <gui>80×24</gui> and so
     on.</p>
   </note>
 
   <p>If you require custom size <app>Terminal</app> windows, you can also set
-  the window size according to your requirements:</p>
+  the default window size according to your requirements:</p>
 
   <steps>
     <item>
@@ -80,10 +80,7 @@
       Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
    </item>
    <item>
-    <p>Check <gui>Use custom default terminal size</gui>.</p>
-   </item>
-   <item>
-     <p>Set <gui>Default size</gui> by typing the desired number of columns and 
+     <p>Set <gui>Initial terminal size</gui> by typing the desired number of columns and
      rows in the corresponding input boxes. You can also click
      <gui style="button">+</gui> to increase or <gui style="button">-</gui> to
      decrease the size.</p>
diff --git a/help/C/gs-execute-commands.page b/help/C/gs-execute-commands.page
index 22e56802..5c464c7c 100644
--- a/help/C/gs-execute-commands.page
+++ b/help/C/gs-execute-commands.page
@@ -28,7 +28,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Launch programs or run commands using <app>Terminal</app></desc>
+    <desc>Launch programs or run commands using <app>Terminal</app>.</desc>
   </info>
 
   <title>Execute a command</title>
diff --git a/help/C/gs-tabs.page b/help/C/gs-tabs.page
index ea4ea6b7..283f8476 100644
--- a/help/C/gs-tabs.page
+++ b/help/C/gs-tabs.page
@@ -31,10 +31,6 @@
 
   <title>Use tabs</title>
 
-  <p>Before you can navigate around tabs using the menus, you need to check
-  that they are <link xref="pref-tab-window">enabled in your
-  preferences</link>.</p>
-
   <p>The tab bar is shown at the top a <app>Terminal</app> window that has
   multiple tabs open (it looks like a row of buttons). Click on a tab to switch
   to it. You can open multiple tabs to manage your work in <app>Terminal</app>.
@@ -94,7 +90,7 @@
       <item>
         <p>Select
         <guiseq><gui style="menu">File</gui><gui style="menuitem">Close
-        Terminal</gui></guiseq>.</p>
+        Tab</gui></guiseq>.</p>
       </item>
     </steps>
 
diff --git a/help/C/index.page b/help/C/index.page
index ec335d0f..f40c26bc 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -37,19 +37,19 @@
   </title>
 
   <section id="getting-started" style="2column">
-    <title>Getting started</title>
+    <title>Getting Started</title>
   </section>
 
  <section id="textoutput" style="2column">
-    <title>Working with text</title>
+    <title>Working With Text</title>
   </section>
 
  <section id="appearance" style="2column">
-    <title>Customize appearance</title>
+    <title>Customize Appearance</title>
   </section>
 
   <section id="preferences" style="2column">
-    <title>Customize behavior</title>
+    <title>Customize Behavior</title>
   </section>
 
   <section id="advanced" style="2column">
diff --git a/help/C/overview.page b/help/C/overview.page
index eba744b2..cc5340a5 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -62,9 +62,9 @@
     <item>
       <title>Shell</title>
       <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>zsh</app>, <app>csh</app>.</p>
+      “launch” commands or another program inside a terminal. It also allows you
+      to view and browse the contents of directories. Popular shells include
+      <app>bash</app>, <app>zsh</app>, <app>fish</app>.</p>
     </item>
     <item>
       <title>Escape Sequences</title>
@@ -85,7 +85,7 @@
       <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 <sys>$</sys> or 
-      <sys>%</sys> character depending on the user role such as <sys>$</sys>
+      <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>
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index a5565371..4842354f 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -25,17 +25,14 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Enable audible notification in <app>Terminal</app></desc>
+    <desc>Enable audible notification in <app>Terminal</app>.</desc>
 
   </info>
 
   <title>Set audible bell</title>
 
   <p><app>Terminal</app> can sound an audible bell to indicate events in
-  <app>Terminal</app> windows and tabs. For example, the bell will sound when
-  the <key>Tab</key> is pressed to auto-complete a command, when a command has
-  finished executing, or when a command ends execution with a warning, error or
-  notification.</p>
+  <app>Terminal</app> windows and tabs.</p>
 
   <p>To be notified of these events:</p>
   <steps>
@@ -46,10 +43,6 @@
     <item>
       <p>Select <gui style="checkbox">Terminal bell</gui></p>
     </item>
-    <item>
-      <p>The setting will be saved automatically. Press
-      <gui style="button">Close</gui> to quit the preference dialog.</p>
-    </item>
   </steps>
 
   <note style="tip">
diff --git a/help/C/pref-compatibility.page.stub b/help/C/pref-compatibility.page.stub
index 0e80aa0d..2ff258c6 100644
--- a/help/C/pref-compatibility.page.stub
+++ b/help/C/pref-compatibility.page.stub
@@ -22,7 +22,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Change behaviour of <key>Backspace</key> and <key>Delete</key> keys
-    in <app>Terminal</app></desc>
+    in <app>Terminal</app>.</desc>
   </info>
 
   <title>Key compatibility</title>
diff --git a/help/C/pref-encoding.page b/help/C/pref-encoding.page
index f91f4fb7..9e3b832c 100644
--- a/help/C/pref-encoding.page
+++ b/help/C/pref-encoding.page
@@ -47,8 +47,8 @@
     </item>
   </list>
 
-  <section id="change-default-encoding">
-    <title>Change the default character encoding</title>
+  <section id="change-encoding">
+    <title>Change the character encoding</title>
 
     <steps>
       <item>
@@ -62,32 +62,4 @@
 
   </section>
 
-  <section id="add-encoding-menu-choices">
-    <title>Add more options to the character encoding menu</title>
-
-    <steps>
-      <item>
-        <p>Select <guiseq><gui style="menu">Terminal</gui>
-	<gui style="menuitem">Set Character Encoding</gui>
-	<gui style="menuitem">Add or Remove…</gui></guiseq>.</p>
-      </item>
-      <item>
-        <p>Browse from the available encodings.</p>
-      </item>
-      <item>
-        <p>Select the encodings that you want to be added to the menu.</p>
-      </item>
-      <item>
-	<p>Click <gui style="button">Close</gui> to quit the dialog and return
-	to <app>Terminal</app>.</p>
-      </item>
-    </steps>
-
-    <note>
-      <p>Most modern operating systems now support and use UTF-8 character
-      encoding by default.</p>
-    </note>
-
-  </section>
-
 </page>
diff --git a/help/C/pref-keyboard-access.page b/help/C/pref-keyboard-access.page
index ce8fb76c..517f9721 100644
--- a/help/C/pref-keyboard-access.page
+++ b/help/C/pref-keyboard-access.page
@@ -71,7 +71,7 @@
   <section id="menu-accelerator">
     <title>Menu accelerator key</title>
 
-    <p>This setting brings up the <gui style="menu">File</gui> menu the menu
+    <p>This setting brings up the <gui style="menu">File</gui> menu when the menu
     accelerator key is pressed. This key is usually <key>F10</key> by
     default.</p>
 
diff --git a/help/C/pref-login-shell.page b/help/C/pref-login-shell.page
index 316c1622..c4e27e33 100644
--- a/help/C/pref-login-shell.page
+++ b/help/C/pref-login-shell.page
@@ -31,22 +31,23 @@
 
   <title>Login shells</title>
 
-  <p>Shells in UNIX based systems are classified into two types:</p>
+  <p>Shells in UNIX based systems can be started up in login and non-login
+  modes:</p>
 
   <terms>
     <item>
       <title>Login shell</title>
       <p>A login shell is a shell given to a user upon login into their user
-      account. This login shell is defined at the time of creation of the user
-      account by the super user. It is initiated by using the
-      <cmd>--login</cmd> option with bash. It starts after a successful login
-      using <file>/bin/login</file> and by reading the <file>/etc/passwd</file>
-      file.</p>
+      account. This is initiated by using the <cmd>-l</cmd> or
+      <cmd>--login</cmd> option, or placing a dash as the initial character
+      of the command name, for example invoking <cmd>bash</cmd> as
+      <cmd>-bash</cmd>.</p>
     </item>
     <item>
       <title>Sub shell</title>
       <p>Sub shell, also called a non-login shell is a shell started after
-      the login process without the <cmd>--login</cmd> option.</p>
+      the login process without the <cmd>-l</cmd> or <cmd>--login</cmd>
+      option and without an extra dash before the command name.</p>
     </item>
   </terms>
 
@@ -67,9 +68,8 @@
   <section id="login-shell-howto">
     <title>Start a login shell</title>
 
-    <p>You can allow <app>Terminal</app> to start a login shell. The
-    <cmd>--login</cmd> will be passed to <app>Bash</app> or your
-    <link xref="pref-custom-command">custom shell</link>.</p>
+    <p>You can allow <app>Terminal</app> to start a login shell. Your default
+    shell will be started with a dash character prepended to its name.</p>
 
     <steps>
       <item>
@@ -85,39 +85,8 @@
         <p>Under the <gui>Command</gui> label, select
         <gui style="checkbox">Run command as a login shell</gui>.</p>
       </item>
-      <item>
-        <p>Click <gui style="button">Close</gui> to quit the dialog and return
-        to <app>Terminal</app>.</p>
-      </item>
-    </steps>
-
-  </section>
-
-  <section id="login-shell-update-records">
-    <title>Update login records</title>
-
-    <p>UNIX based systems maintain files to keep information about user logins
-    and sessions. They are called login records. To allow <app>Terminal</app>
-    to write an entry of your login in these records:</p>
-
-    <steps>
-      <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
-      </item>
-      <item>
-        <p>Under the <gui>Command</gui> label, check
-        <gui style="checkbox">Update login records when command is
-        launched</gui>. Your change will be applied automatically.</p>
-      </item>
     </steps>
 
-    <note style="tip">
-      <p>The command <cmd>last</cmd> followed by a username in your computer
-      shows the login records for a particular user.</p>
-    </note>
-
   </section>
 
 </page>
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index 2791180f..694bd401 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -52,8 +52,8 @@
     </item>
   </steps>
 
-  <p>To enable the menubar by default in all <app>Terminal</app> windows that
-  you open:</p>
+  <p>To enable or disable the menubar by default in all <app>Terminal</app>
+  windows that you open:</p>
 
   <steps>
     <item>
@@ -61,7 +61,7 @@
       Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select <gui>Show menubar by default in new terminals</gui>.</p>
+      <p>Select or deselect <gui>Show menubar by default in new terminals</gui>.</p>
     </item>
   </steps>
 
diff --git a/help/C/pref-profile-encoding.page b/help/C/pref-profile-encoding.page
index 366ebe6c..2f38b8d5 100644
--- a/help/C/pref-profile-encoding.page
+++ b/help/C/pref-profile-encoding.page
@@ -26,7 +26,7 @@
 
   <title>Change profile character encoding</title>
 
-  <p>You should normally be able to use the default, UTF-8, encoding for all of
+  <p>You should normally be able to use the default, UTF-8 encoding for all of
   your terminal needs. If you do find that you regularly need to use a
   different character encoding for a specific task, you can
   <link xref="pref-profiles#new-profile">create a new profile</link> with a
diff --git a/help/C/pref-scrolling.page b/help/C/pref-scrolling.page
index 46fcec88..29e14bab 100644
--- a/help/C/pref-scrolling.page
+++ b/help/C/pref-scrolling.page
@@ -54,7 +54,7 @@
     <title>Scroll on output</title>
 
     <p>You can lock scrolling so that it always shows the newest output while a
-    command executes.</p>
+    command executes and produces output.</p>
 
     <steps>
       <item>
@@ -90,9 +90,8 @@
   <section id="lines">
     <title>Scrollback lines</title>
 
-    <p>You can limit the number of lines of terminal output which are stored in
-    memory. You may want to do this if you rarely restart your terminal so that
-    there is a limit to how much memory the scrollback can use.</p>
+    <p>You can limit the number of lines of terminal output which are
+    remembered.</p>
 
     <steps>
       <item>
@@ -102,7 +101,7 @@
       </item>
       <item>
         <p>Check <gui>Limit scrollback to</gui> and enter a number of lines
-        which is greater than 0 to limit scrollback.</p>
+        to limit scrollback.</p>
       </item>
       <item>
         <p>Optionally, you can click on <gui style="button">+</gui> to
@@ -110,9 +109,38 @@
       </item>
     </steps>
 
+    <p>You can choose to have unlimited scrollback.</p>
+
+    <steps>
+      <item>
+        <p>Select
+        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
+        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Uncheck <gui>Limit scrollback to</gui>.</p>
+      </item>
+    </steps>
+
+    <note style="tip">
+      <p>Scrollback data is stored in compressed and encrypted files on disk,
+      under the system’s default location for temporary files (usually
+      <file>/tmp</file>). These files are unlinked immediately after their
+      creation, and as such, do not show up in the directory listing. The
+      occupied disk space is freed up as soon as the corresponding terminal
+      closes.</p>
+    </note>
+
     <note style="warning">
-      <p>Using unlimited scrollback can make your <app>Terminal</app> sluggish
-      during scrolling!</p>
+      <p>Make sure you have sufficient disk space available for these temporary
+      files. If in doubt, monitor disk usage for example with the command
+      <cmd>du /tmp</cmd>.</p>
+    </note>
+
+    <note style="important">
+      <p>A giant scrollback buffer makes resizing the terminal window slower.
+      As a rule of thumb, resizing gets noticeably slow at around 1 million
+      lines.</p>
     </note>
 
   </section>
diff --git a/help/C/pref-tab-window.page b/help/C/pref-tab-window.page
index 3eb942cd..7c542c06 100644
--- a/help/C/pref-tab-window.page
+++ b/help/C/pref-tab-window.page
@@ -27,8 +27,8 @@
 
   <title>Windows and tabs</title>
 
-  <p>You can chose whether to open a new tab or a new <app>Terminal</app>
-  window when you use <gui style="menuitem">Open Terminal</gui>.</p>
+  <p>You can choose whether to open a new tab or a new <app>Terminal</app>
+  window when you use <gui style="menuitem">New Terminal</gui>.</p>
 
   <steps>
     <item>
diff --git a/help/C/prob-reset.page b/help/C/prob-reset.page
index 29f0cf0c..e6c5125d 100644
--- a/help/C/prob-reset.page
+++ b/help/C/prob-reset.page
@@ -24,7 +24,7 @@
     or has lot of strange symbols on it?</desc>
   </info>
 
-  <title>Reset your <app>Terminal</app> output</title>
+  <title>Reset your <app>Terminal</app> state</title>
 
   <p>After viewing a non-text file by mistake, or launching some command, it can
   happen the <app>Terminal</app> screen is unresponsive, has strange letters
@@ -53,7 +53,7 @@
 
     <p>In addition to resetting your <app>Terminal</app>,
     <gui style="menuitem">Reset and Clear</gui> clears the visible
-    <app>Terminal</app> screen space of all terminal output. To
+    <app>Terminal</app> screen space and the scrollback contents. To
     <gui style="menuitem">Reset and Clear</gui> your <app>Terminal</app>:</p>
 
     <steps>
@@ -66,7 +66,7 @@
       </item>
     </steps>
 
-    <note style="tip"><p><gui>Reset and clear</gui> provides the similar
+    <note style="tip"><p><gui>Reset and Clear</gui> provides similar
     functionality than the terminal command <cmd>reset</cmd>.</p></note>
 
   </section>
diff --git a/help/C/txt-copy-paste.page b/help/C/txt-copy-paste.page
index 30d9fa66..9a1b6960 100644
--- a/help/C/txt-copy-paste.page
+++ b/help/C/txt-copy-paste.page
@@ -40,14 +40,20 @@
       <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>Ctrl</key><key>Shift</key><key>C</key></keyseq>.</p>
+      <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p>
+    </item>
+    <item>
+      <title><gui>Copy as HTML</gui></title>
+      <p>Highlight the text portions you wish to copy with color and font
+      attributes, then select <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Copy as HTML</gui></guiseq>.</p>
     </item>
     <item>
       <title><gui>Paste</gui></title>
       <p>Right click in the <app>Terminal</app> and select
       <gui style="menuitem">Paste</gui>. Alternatively, you
       can press
-      <keyseq><key>Ctrl</key><key>Shift</key><key>V</key></keyseq>.</p>
+      <keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq>.</p>
     </item>
   </terms>
 
diff --git a/help/C/txt-links.page b/help/C/txt-links.page
index f048b21d..d08c291d 100644
--- a/help/C/txt-links.page
+++ b/help/C/txt-links.page
@@ -52,7 +52,7 @@
             <p>Right click on the link in <app>Terminal</app>.</p>
           </item>
           <item>
-          <p>Select <gui style="menuitem">Copy Link Address</gui>.</p>
+          <p>Select <gui style="menuitem">Copy Link</gui>.</p>
           </item>
         </steps>
       </item>
@@ -85,7 +85,7 @@
             <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>
+          <p>Select <gui style="menuitem">Copy Mail Address</gui>.</p>
           </item>
         </steps>
       </item>
@@ -96,7 +96,7 @@
             <p>Right click on the address.</p>
           </item>
           <item>
-            <p>Select <gui style="menuitem">Sent Mail To…</gui>.</p>
+            <p>Select <gui style="menuitem">Send Mail To…</gui>.</p>
           </item>
         </steps>
       </item>
diff --git a/help/C/txt-save-text.page b/help/C/txt-save-text.page
index 5ee90c65..944f650d 100644
--- a/help/C/txt-save-text.page
+++ b/help/C/txt-save-text.page
@@ -39,7 +39,7 @@
       <p>Go to <gui style="menu">File</gui>.</p>
     </item>
     <item>
-      <p>Select <gui style="menuitem">Save Contents</gui>.</p>
+      <p>Select <gui style="menuitem">Save Contents…</gui>.</p>
     </item>
     <item>
       <p>Chose your desired directory and enter a filename.</p>
@@ -50,10 +50,9 @@
   </steps>
 
   <note style="tip">
-    <p>You may optionally input a file extension along with the filename. Valid
-    file extensions are <input>.doc</input> and <input>.txt</input>. This may
-    be useful if you plan to view the file when using another operating
-    system.</p>
+    <p>You may optionally input a file extension along with the filename, for
+    example <input>.txt</input>. This may be useful if you plan to view the
+    file when using another operating system.</p>
   </note>
 
 </page>
diff --git a/help/C/txt-search.page b/help/C/txt-search.page
index bbe2f067..0dea8e2a 100644
--- a/help/C/txt-search.page
+++ b/help/C/txt-search.page
@@ -28,18 +28,19 @@
 
   </info>
 
-  <title>Use <gui style="menuitem">Find</gui></title>
+  <title>Search for text</title>
 
   <p>You can search text in the <app>Terminal</app> output:</p>
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Search</gui>
+      <p>Select <guiseq><gui style="menu">Find</gui>
       <gui style="menuitem">Find…</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Type in the search keyword and press <gui style="button">Find</gui>.
-      To cancel, press <gui style="button">Close</gui>.</p>
+      <p>Type in the search keyword and press <key>Enter</key> to search
+      backwards. Alternatively, click on the arrows according to the desired
+      search direction.</p>
     </item>
   </steps>
 
@@ -56,9 +57,9 @@
       <title><gui style="checkbox">Match entire word only</gui></title>
       <p><app>Terminal</app> will look for the entire keyword and will ignore
       results that partially match your search keyword. For example, if
-      you have searched for "gnome", <app>Terminal</app> will show only
+      you have searched for “cat”, <app>Terminal</app> will show only
       results that match this keyword exactly and omit results such as
-      "gnome-terminal".</p>
+      “bobcat”.</p>
     </item>
     <item>
       <title><gui style="checkbox">Match as regular expression</gui></title>
@@ -66,18 +67,11 @@
       patterns, in your search keywords. <app>Terminal</app> will display
       the results that match these search terms.</p>
     </item>
-    <item>
-      <title><gui style="checkbox">Search backwards</gui></title>
-      <p><app>Terminal</app> will search for the keyword from the latest output
-      and continue the search upwards. This option is recommended when you are
-      looking for a keyword that could have occurred recently, thus enabling
-      you to find the keyword quickly.</p>
-    </item>
     <item>
       <title><gui style="checkbox">Wrap around</gui></title>
       <p><app>Terminal</app> searches from your current location in the
       scrollback to the end of available terminal output and then restarts the
-      search from the top.</p>
+      search.</p>
     </item>
   </terms>
 
diff --git a/help/Makefile.am b/help/Makefile.am
index 181d6c44..86e8f19a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -29,6 +29,7 @@ HELP_FILES = \
 	pref-custom-command.page \
 	pref-encoding.page \
 	pref-keyboard-access.page \
+	pref-login-shell.page \
 	pref-menubar.page \
 	pref-profiles.page \
 	pref-profile-char-width.page \
@@ -40,6 +41,7 @@ HELP_FILES = \
 	prob-reset.page \
 	txt-copy-paste.page \
 	txt-links.page \
+	txt-save-text.page \
 	txt-search.page \
 	txt-select-text.page \
 	$(NULL)
