[deployment-guide/comm-rel: 4/23] Further changes and indexing.

[dsilas]

commit 46d749f928978f529f50daef382d2bbacd1de69f
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Fri Jul 16 11:00:09 2010 +0200

    Further changes and indexing.

 en-US/OpenSSH.xml |   61 ++++++++++++++++++++--------------------------------
 1 files changed, 24 insertions(+), 37 deletions(-)
---
diff --git a/en-US/OpenSSH.xml b/en-US/OpenSSH.xml
index 8f6793c..72a2ea9 100644
--- a/en-US/OpenSSH.xml
+++ b/en-US/OpenSSH.xml
@@ -58,7 +58,7 @@
       <title>Main Features</title>
       <indexterm>
         <primary>SSH protocol</primary>
-        <secondary>features of</secondary>
+        <secondary>features</secondary>
       </indexterm>
       <indexterm>
         <primary>OpenSSH</primary>
@@ -182,7 +182,7 @@
         <title>Transport Layer</title>
         <indexterm>
           <primary>SSH protocol</primary>
-          <secondary>layers of</secondary>
+          <secondary>layers</secondary>
           <tertiary>transport layer</tertiary>
         </indexterm>
         <para>
@@ -251,7 +251,7 @@
         <title>Channels</title>
         <indexterm>
           <primary>SSH protocol</primary>
-          <secondary>layers of</secondary>
+          <secondary>layers</secondary>
           <tertiary>channels</tertiary>
         </indexterm>
         <para>
@@ -282,13 +282,14 @@ Password:</screen>
         <primary>SSH protocol</primary>
         <secondary>configuration files</secondary>
       </indexterm>
-      <indexterm>
-        <primary>OpenSSH</primary>
-        <secondary>configuration files for</secondary>
-      </indexterm>
       <para>
         There are two different sets of configuration files: those for client programs (that is, <command>ssh</command>, <command>scp</command>, and <command>sftp</command>), and those for the server (the <command>sshd</command> daemon).
       </para>
+      <indexterm>
+        <primary>SSH protocol</primary>
+        <secondary>configuration files</secondary>
+        <tertiary>system-wide configuration files</tertiary>
+      </indexterm>
       <para>
         System-wide SSH configuration information is stored in the <filename>/etc/ssh/</filename> directory. See <xref linkend="table-ssh-configuration-configs-system" /> for a description of its content.
       </para>
@@ -379,6 +380,11 @@ Password:</screen>
           </tbody>
         </tgroup>
       </table>
+      <indexterm>
+        <primary>SSH protocol</primary>
+        <secondary>configuration files</secondary>
+        <tertiary>user-specific configuration files</tertiary>
+      </indexterm>
       <para>
         User-specific SSH configuration information is stored in the user's home directory within the <filename>~/.ssh/</filename> directory. See <xref linkend="table-ssh-configuration-configs-user" /> for a description of its content.
       </para>
@@ -480,12 +486,17 @@ Password:</screen>
       <indexterm>
         <primary>OpenSSH</primary>
         <secondary>server</secondary>
-        <tertiary>starting and stopping</tertiary>
+        <tertiary>starting</tertiary>
       </indexterm>
       <para>
         To start the <command>sshd</command> daemon, type the following at a shell prompt:
       </para>
       <screen>~]# <command>service sshd start</command></screen>
+      <indexterm>
+        <primary>OpenSSH</primary>
+        <secondary>server</secondary>
+        <tertiary>stopping</tertiary>
+      </indexterm>
       <para>
         To stop the running <command>sshd</command> daemon, use the following command:
       </para>
@@ -514,7 +525,7 @@ It is also possible that the RSA host key has just been changed.</screen>
       <title>Requiring SSH for Remote Connections</title>
       <indexterm>
         <primary>SSH protocol</primary>
-        <secondary>insecure protocols and</secondary>
+        <secondary>insecure protocols</secondary>
       </indexterm>
       <indexterm>
         <primary>SSH protocol</primary>
@@ -535,10 +546,10 @@ It is also possible that the RSA host key has just been changed.</screen>
       </para>
     </section>
     <section id="s2-ssh-configuration-keypairs">
-      <title>Using Key-Based Authentication</title>
+      <title>Using a Key-Based Authentication</title>
       <indexterm>
         <primary>OpenSSH</primary>
-        <secondary>generating key pairs</secondary>
+        <secondary>using key-based authentication</secondary>
       </indexterm>
       <para>
         To improve the system security even further, you can enforce the use the key-based authentication by disabling the standard password authentication. To do so, open the <filename class="directory">/etc/ssh/sshd_config</filename> configuration file in a text editor such as <application>vi</application> or <application>nano</application>, and change the <option>PasswordAuthentication</option> option as follows:
@@ -562,8 +573,8 @@ It is also possible that the RSA host key has just been changed.</screen>
           If you reinstall your system and want to keep previously generated key pair, backup the <filename class="directory">~/.ssh/</filename> directory. After reinstalling, copy it back to your home directory. This process can be done for all users on your system, including root.
         </para>
       </note>
-      <section id="s3-ssh-configuration-keypairs-rsa2">
-        <title>Generating an RSA Key Pair for Version 2</title>
+      <section id="s3-ssh-configuration-keypairs-generating">
+        <title>Generating Key Pairs</title>
         <indexterm>
           <primary>RSA keys</primary>
           <secondary>generating</secondary>
@@ -637,18 +648,6 @@ The key's randomart image is:
             <screen>~]$ <command>chmod 644 ~/.ssh/authorized_keys</command></screen>
           </step>
         </procedure>
-        <para>
-          Refer to <xref linkend="s3-ssh-configuration-keypairs-agent" /> for information on how to set up your system to remember the passphrase.
-        </para>
-        <important>
-          <title>Important: Never Share Your Private Key</title>
-          <para>
-            The private key is for your personal use only, and it is important that you never give it to anyone.
-          </para>
-        </important>
-      </section>
-      <section id="s3-ssh-configuration-keypairs-dsa2">
-        <title>Generating a DSA Key Pair for Version 2</title>
         <indexterm>
           <primary>DSA keys</primary>
           <secondary>generating</secondary>
@@ -722,18 +721,6 @@ The key's randomart image is:
             <screen>~]$ <command>chmod 644 ~/.ssh/authorized_keys</command></screen>
           </step>
         </procedure>
-        <para>
-          Refer to <xref linkend="s3-ssh-configuration-keypairs-agent" /> for information on how to set up your system to remember the passphrase.
-        </para>
-        <important>
-          <title>Important: Never Share Your Private Key</title>
-          <para>
-            The private key is for your personal use only, and it is important that you never give it to anyone.
-          </para>
-        </important>
-      </section>
-      <section id="s3-ssh-configuration-keypairs-rsa1">
-        <title>Generating an RSA Key Pair for Version 1</title>
         <indexterm>
           <primary>RSA Version 1 keys</primary>
           <secondary>generating</secondary>