[deployment-guide/comm-rel: 650/727] Minor clean-up.

Tue Oct 19 13:20:20 UTC 2010

commit 1eaf4f717c88264869619ac9305e754b929a1f8c
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Tue Sep 14 14:27:56 2010 +0200

    Minor clean-up.

 en-US/The_Apache_HTTP_Server.xml |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---

diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index 9ccc0e6..32a87ce 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -2620,19 +2620,11 @@ ErrorDocument 404 /404-not_found.html</screen>
           </listitem>
         </varlistentry>
       </variablelist>
-      <!-- TODO: Move the following admonition elsewhere.
-      <note>
-        <title>Note</title>
-        <para>
-          The default SSL virtual host container now resides in the file <filename>/etc/httpd/conf.d/ssl.conf</filename>.
-        </para>
-      </note>
-      -->
     </section>
     <section id="s2-apache-sslconf-common">
       <title>Common <filename>ssl.conf</filename> Directives</title>
       <para>
-        The <firstterm>Secure Sockets Layer</firstterm> (SSL) directives allow you to customize the behavior of the Apache HTTP Secure Server, and in most cases, they are configured appropriately during the installation. Be careful when changing these settings, as incorrect configuration can lead to security vulnurabilities.
+        The <firstterm>Secure Sockets Layer</firstterm> (<acronym>SSL</acronym>) directives allow you to customize the behavior of the Apache HTTP Secure Server, and in most cases, they are configured appropriately during the installation. Be careful when changing these settings, as incorrect configuration can lead to security vulnurabilities.
       </para>
       <para>
         The following directive is commonly used in <filename>/etc/httpd/conf.d/ssl.conf</filename>:
@@ -2731,7 +2723,7 @@ ErrorDocument 404 /404-not_found.html</screen>
     <section id="s2-apache-mpm-common">
       <title>Common Multi-Processing Module Directives</title>
       <para>
-        The <firstterm>Multi-Processing Module</firstterm> (MPM) directives allow you to customize the behavior of a particular MPM specific server-pool. Since its characteristics differ depending on which MPM is used, the directives are embeded in <option>IfModule</option>. By default, the server-pool is defined for both the <systemitem class="resource">prefork</systemitem> and <systemitem class="resource">worker</systemitem> MPMs.
+        The <firstterm>Multi-Processing Module</firstterm> (<acronym>MPM</acronym>) directives allow you to customize the behavior of a particular MPM specific server-pool. Since its characteristics differ depending on which MPM is used, the directives are embeded in <option>IfModule</option>. By default, the server-pool is defined for both the <systemitem class="resource">prefork</systemitem> and <systemitem class="resource">worker</systemitem> MPMs.
       </para>
       <para>
         The following MPM directives are commonly used in <filename>/etc/httpd/conf/httpd.conf</filename>:
@@ -2874,7 +2866,7 @@ ErrorDocument 404 /404-not_found.html</screen>
   <section id="s1-apache-dso">
     <title>Working with Modules</title>
     <para>
-      Being a modular application, the <systemitem class="service">httpd</systemitem> service is distributed along with a number of <firstterm>Dynamic Shared Objects</firstterm> (DSOs), which can be dynamically loaded or unloaded at runtime as necessary. By default, these modules are located in <filename class="directory">/usr/lib/httpd/modules/</filename>.
+      Being a modular application, the <systemitem class="service">httpd</systemitem> service is distributed along with a number of <firstterm>Dynamic Shared Objects</firstterm> (<acronym>DSO</acronym>s), which can be dynamically loaded or unloaded at runtime as necessary. By default, these modules are located in <filename class="directory">/usr/lib/httpd/modules/</filename>.
     </para>
     <section id="s2-apache-dso-loading">
       <title>Loading a Module</title>
@@ -2943,12 +2935,12 @@ ErrorDocument 404 /404-not_found.html</screen>
   <section id="s1-apache-mod_ssl">
     <title>Setting Up an SSL Server</title>
     <para>
-      <firstterm>Secure Sockets Layer</firstterm> (<acronym>SSL</acronym>) is a cryptographic protocol that allows a server and a client to communicate securely. Along with its extended and improved version called <firstterm>Transport Layer Security</firstterm> (<acronym>TLS</acronym>), it ensures both privacy and data integrity. The Apache HTTP Server in combination with <systemitem class="resource">mod_ssl</systemitem>, a module that uses the OpenSSL toolkit to provide the <acronym>SSL</acronym>/<acronym>TLS</acronym> support, is commonly referred to as the <firstterm>SSL server</firstterm>.
+      <firstterm>Secure Sockets Layer</firstterm> (<acronym>SSL</acronym>) is a cryptographic protocol that allows a server and a client to communicate securely. Along with its extended and improved version called <firstterm>Transport Layer Security</firstterm> (<acronym>TLS</acronym>), it ensures both privacy and data integrity. The Apache HTTP Server in combination with <systemitem class="resource">mod_ssl</systemitem>, a module that uses the OpenSSL toolkit to provide the SSL/TLS support, is commonly referred to as the <firstterm>SSL server</firstterm>.
     </para>
     <para>
       Unlike a regular HTTP connection that can be read and possibly modified by anybody who is able to intercept it, the use of <systemitem class="resource">mod_ssl</systemitem> prevents any inspection or modification of the transmitted content. This section provides basic information on how to enable this module in the Apache HTTP Server configuration, and guides you through the process of generating private keys and self-signed certificates.
     </para>
-    <section id="s2-secureserver-overview-certs">
+    <section id="s2-apache-mod_ssl-certificates">
       <title>An Overview of Certificates and Security</title>
       <para>Secure communication depends upon the use of keys (think of them as secret encoder/decoder rings in data format). In conventional or symmetric cryptography, both ends of the transaction have the same key, which they use to decode each other's transmissions. In public or asymmetric cryptography, two keys co-exist: a public key and a private key. A person or an organization keeps their private key a secret and publishes their public key. Data encoded with the public key can only be decoded with the private key; data encoded with the private key can only be decoded with the public key.</para>
 
@@ -3154,7 +3146,7 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
       </para>
       <screen>~]# <command>yum install crypto-utils</command></screen>
       <para>
-        This package provides a set of tools to generate and manage <acronym>SSL</acronym> certificates and private keys, and includes <application>genkey</application>, the Red Hat Keypair Generation utility that will guide you through the key generation process. To run it, use the <command>genkey</command> command followed by the appropriate hostname (for example, <systemitem class="domainname">penguin.example.com</systemitem>):
+        This package provides a set of tools to generate and manage SSL certificates and private keys, and includes <application>genkey</application>, the Red Hat Keypair Generation utility that will guide you through the key generation process. To run it, use the <command>genkey</command> command followed by the appropriate hostname (for example, <systemitem class="domainname">penguin.example.com</systemitem>):
       </para>
       <screen>~]# <command>genkey</command> <replaceable>hostname</replaceable></screen>
       <para>
