[system-administrators-guide] Update the resources section to new style

stephenw stephenw at fedoraproject.org
Mon Dec 1 21:55:23 UTC 2014


commit f7fe3f2860da9b622cba7d678fabac787482be39
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Mon Dec 1 22:54:22 2014 +0100

    Update the resources section to new style

 en-US/The_Apache_HTTP_Server.xml |   93 +++++++++++++++-----------------------
 1 files changed, 37 insertions(+), 56 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index fe684eb..87cc712 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -101,7 +101,7 @@ Some additional configuration files are provided by the <package>httpd</package>
       <term>Default Configuration</term>
       <listitem>
         <para>
-A minimal <filename>httpd.conf</filename> file is now provided by default. Many common configuration settings, such as <literal>Timeout</literal> or <literal>KeepAlive</literal> are no longer explicitly configured in the default configuration; hard-coded settings will be used instead, by default. The hard-coded default settings for all configuration directives are specified in the manual. See <xref linkend="s3-apache-resources-installed" /> for more information.
+A minimal <filename>httpd.conf</filename> file is now provided by default. Many common configuration settings, such as <literal>Timeout</literal> or <literal>KeepAlive</literal> are no longer explicitly configured in the default configuration; hard-coded settings will be used instead, by default. The hard-coded default settings for all configuration directives are specified in the manual. See <xref linkend="bh-The_Apache_HTTP_Server-Installable_Documentation" /> for more information.
 </para>
 </listitem>
 </varlistentry>
@@ -4220,95 +4220,76 @@ SSLCertificateKeyFile /etc/pki/tls/private/<replaceable>hostname</replaceable>.k
     <para>
       To learn more about the Apache HTTP Server, see the following resources.
     </para>
-    <section id="s3-apache-resources-installed">
-      <title>Installed Documentation</title>
+
+    <bridgehead
+      id="bh-The_Apache_HTTP_Server-Installed_Documentation">Installed Documentation</bridgehead>
       <indexterm>
         <primary><application>Apache HTTP Server</application></primary>
         <secondary>additional resources</secondary>
         <tertiary>installed documentation</tertiary>
       </indexterm>
-      <variablelist>
-        <varlistentry>
-          <term><ulink url="http://localhost/manual/" /></term>
+      <itemizedlist>
           <listitem>
             <para>
-              The official documentation for the Apache HTTP Server with the full description of its directives and available modules. Note that in order to access this documentation, you must have the <package>httpd-manual</package> package installed, and the web server must be running.
+              <filename>httpd(8)</filename> — The manual page for the <systemitem class="service">httpd</systemitem> service containing the complete list of its command-line options. 
             </para>
           </listitem>
-        </varlistentry>
-        <varlistentry>
-        <term><filename>/usr/share/doc/httpd/</filename></term>
           <listitem>
             <para>
-              The directory containing a number of example configurations files. 
+              <filename>genkey(1)</filename> — The manual page for <command>genkey</command> utility, provided by the <package>crypto-utils</package> package.
             </para>
           </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <command>man httpd</command>
-          </term>
           <listitem>
             <para>
-              The manual page for the <systemitem class="service">httpd</systemitem> service containing the complete list of its command line options. 
+              <filename>apachectl(8)</filename>  —  The manual page for the Apache HTTP Server Control Interface. 
             </para>
           </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <command>man apachectl</command>
-          </term>
-          <listitem>
-            <para>
-              The manual page for the Apache HTTP Server Control Interface. 
+      </itemizedlist>
+
+        <bridgehead
+      id="bh-The_Apache_HTTP_Server-Installable_Documentation">Installable Documentation</bridgehead>
+      <indexterm>
+             <primary>
+          <application>Apache HTTP Server</application>
+        </primary>
+        <secondary>additional resources</secondary>
+        <tertiary>installable documentation</tertiary>
+      </indexterm>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://localhost/manual/"/> — The official documentation for the Apache HTTP Server with the full description of its directives and available modules. Note that in order to access this documentation, you must have the <package>httpd-manual</package> package installed, and the web server must be running.
             </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>
-            <command>man genkey</command>
-          </term>
-          <listitem>
             <para>
-              The manual page for <command>genkey</command> containing the full documentation on its usage.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </section>
-    <section id="s3-apache-resources-web">
-      <title>Useful Websites</title>
+ Before accessing the documentation, issue the following commands as <systemitem class="username">root</systemitem>:</para>
+        <screen>~]#&#160;<command>yum install httpd-manual</command>
+~]#&#160;<command>apachectl graceful</command></screen>
+      </listitem>
+      </itemizedlist>
+
+      <bridgehead
+      id="bh-The_Apache_HTTP_Server-Online_Documentation">Online Documentation</bridgehead>
       <indexterm>
         <primary><application>Apache HTTP Server</application></primary>
         <secondary>additional resources</secondary>
         <tertiary>useful websites</tertiary>
       </indexterm>
-      <variablelist>
-        <varlistentry>
-          <term><ulink url="http://httpd.apache.org/" /></term>
-          <listitem>
+    <itemizedlist>
+           <listitem>
             <para>
-              The official website for the Apache HTTP Server with documentation on all the directives and default modules.
+              <ulink url="http://httpd.apache.org/"/> — The official website for the Apache HTTP Server with documentation on all the directives and default modules.
             </para>
           </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><ulink url="http://www.modssl.org/" /></term>
           <listitem>
             <para>
-              The official website for the <application>mod_ssl</application> module.
+              ulink url="http://www.modssl.org/" /> — The official website for the <application>mod_ssl</application> module.
             </para>
           </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><ulink url="http://www.openssl.org/" /></term>
           <listitem>
             <para>
-              The OpenSSL home page containing further documentation, frequently asked questions, links to the mailing lists, and other useful resources.
+              <ulink url="http://www.openssl.org/"/> — The OpenSSL home page containing further documentation, frequently asked questions, links to the mailing lists, and other useful resources.
             </para>
           </listitem>
-        </varlistentry>
-      </variablelist>
-    </section>
+      </itemizedlist>
   </section>
 </section>


More information about the docs-commits mailing list