Style fixes. I've stopped removing 1.3 references.

This will need to be done later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86337 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 104 insertions, 86 deletions

diff --git a/docs/manual/mod/mod_expires.html b/docs/manual/mod/mod_expires.html
index 141a969598..7e62e25af3 100644
--- a/docs/manual/mod/mod_expires.html
+++ b/docs/manual/mod/mod_expires.html
@@ -14,11 +14,27 @@
   <!--#include virtual="header.html" -->
   <H1 ALIGN="CENTER">Module mod_expires</H1>
   <P>
-  This module is contained in the <CODE>mod_expires.c</CODE> file, and
-  is <STRONG>not</STRONG> compiled in by default.  It provides for the
-  generation of <CODE>Expires</CODE> headers according to user-specified
-  criteria.
+  This module provides for the generation of <CODE>Expires</CODE> HTTP
+  headers according to user-specified criteria.
   </P>
+
+<P><A
+HREF="module-dict.html#Status"
+REL="Help"
+><STRONG>Status:</STRONG></A> Extension
+<BR>
+<A
+HREF="module-dict.html#SourceFile"
+REL="Help"
+><STRONG>Source File:</STRONG></A> mod_expires.c
+<BR>
+<A
+HREF="module-dict.html#ModuleIdentifier"
+REL="Help"
+><STRONG>Module Identifier:</STRONG></A> expires_module
+</P>
+
+
   <H2>Summary</H2>
   <P>
   This module controls the setting of the <CODE>Expires</CODE> HTTP
@@ -34,9 +50,10 @@
   &quot;expired&quot; and invalid, and a new copy must be obtained from
   the source.
   </P>
+
   <H2>Directives</H2>
   <P>
-  <MENU>
+  <ul>
    <LI><A
         HREF="#expiresactive"
        >ExpiresActive</A>
@@ -49,7 +66,89 @@
         HREF="#expiresdefault"
        >ExpiresDefault</A>
    </LI>
+  </ul>
+
+  <H2>
+   <A NAME="AltSyn">Alternate Interval Syntax</A>
+  </H2>
+  <P>
+  The 
+  <A
+   HREF="#expiresdefault"
+  ><SAMP>ExpiresDefault</SAMP></A>
+  and
+  <A
+   HREF="#expiresbytype"
+  ><SAMP>ExpiresByType</SAMP></A>
+  directives can also be defined in a more readable syntax of the form:
+  </P>
+  <DL>
+   <DD><CODE>ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt; &lt;type&gt;}*"
+    <BR>
+    ExpiresByType type/encoding "&lt;base&gt; [plus]
+      {&lt;num&gt; &lt;type&gt;}*"</CODE>
+   </DD>
+  </DL>
+  <P>
+  where &lt;base&gt; is one of:
+  </P>
+  <MENU>
+   <LI><SAMP>access</SAMP>  
+   </LI>
+   <LI><SAMP>now</SAMP> (equivalent to '<SAMP>access</SAMP>')
+   </LI>
+   <LI><SAMP>modification</SAMP>
+   </LI>
+  </MENU>
+  <P>
+  The '<SAMP>plus</SAMP>' keyword is optional.  &lt;num&gt; should be an
+  integer value [acceptable to <SAMP>atoi()</SAMP>], and &lt;type&gt;
+  is one of:
+  </P>
+  <MENU>
+   <LI><SAMP>years</SAMP>
+   </LI>
+   <LI><SAMP>months</SAMP>
+   </LI>
+   <LI><SAMP>weeks</SAMP>
+   </LI>
+   <LI><SAMP>days</SAMP>
+   </LI>
+   <LI><SAMP>hours</SAMP>
+   </LI>
+   <LI><SAMP>minutes</SAMP>
+   </LI>
+   <LI><SAMP>seconds</SAMP>
+   </LI>
   </MENU>
+  <P>
+  For example, any of the following directives can be used to make
+  documents expire 1 month after being accessed, by default:
+  </P>
+  <DL>
+   <DD><CODE>ExpiresDefault "access plus 1 month"
+    <BR>
+    ExpiresDefault "access plus 4 weeks"
+    <BR>
+    ExpiresDefault "access plus 30 days"</CODE>
+   </DD>
+  </DL>
+  <P>
+  The expiry time can be fine-tuned by adding several '&lt;num&gt;
+  &lt;type&gt;' clauses:
+  </P>
+  <DL>
+   <DD><CODE>ExpiresByType text/html "access plus 1 month 15 days 2 hours"
+    <BR>
+    ExpiresByType image/gif "modification plus 5 hours 3 minutes"</CODE>
+   </DD>
+  </DL>
+  <P>
+  Note that if you use a modification date based setting, the Expires
+  header will <STRONG>not</STRONG> be added to content that does
+  not come from a file on disk.  This is due to the fact that there is
+  no modification time for such content.
+
   <HR>
   <H2><A NAME="expiresactive">
    ExpiresActive directive
@@ -240,87 +339,6 @@
   >alternate syntax</A>
   description as well.
   </P>
-  <HR>
-  <H2>
-   <A NAME="AltSyn">Alternate Interval Syntax</A>
-  </H2>
-  <P>
-  The 
-  <A
-   HREF="#expiresdefault"
-  ><SAMP>ExpiresDefault</SAMP></A>
-  and
-  <A
-   HREF="#expiresbytype"
-  ><SAMP>ExpiresByType</SAMP></A>
-  directives can also be defined in a more readable syntax of the form:
-  </P>
-  <DL>
-   <DD><CODE>ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt; &lt;type&gt;}*"
-    <BR>
-    ExpiresByType type/encoding "&lt;base&gt; [plus]
-      {&lt;num&gt; &lt;type&gt;}*"</CODE>
-   </DD>
-  </DL>
-  <P>
-  where &lt;base&gt; is one of:
-  </P>
-  <MENU>
-   <LI><SAMP>access</SAMP>  
-   </LI>
-   <LI><SAMP>now</SAMP> (equivalent to '<SAMP>access</SAMP>')
-   </LI>
-   <LI><SAMP>modification</SAMP>
-   </LI>
-  </MENU>
-  <P>
-  The '<SAMP>plus</SAMP>' keyword is optional.  &lt;num&gt; should be an
-  integer value [acceptable to <SAMP>atoi()</SAMP>], and &lt;type&gt;
-  is one of:
-  </P>
-  <MENU>
-   <LI><SAMP>years</SAMP>
-   </LI>
-   <LI><SAMP>months</SAMP>
-   </LI>
-   <LI><SAMP>weeks</SAMP>
-   </LI>
-   <LI><SAMP>days</SAMP>
-   </LI>
-   <LI><SAMP>hours</SAMP>
-   </LI>
-   <LI><SAMP>minutes</SAMP>
-   </LI>
-   <LI><SAMP>seconds</SAMP>
-   </LI>
-  </MENU>
-  <P>
-  For example, any of the following directives can be used to make
-  documents expire 1 month after being accessed, by default:
-  </P>
-  <DL>
-   <DD><CODE>ExpiresDefault "access plus 1 month"
-    <BR>
-    ExpiresDefault "access plus 4 weeks"
-    <BR>
-    ExpiresDefault "access plus 30 days"</CODE>
-   </DD>
-  </DL>
-  <P>
-  The expiry time can be fine-tuned by adding several '&lt;num&gt;
-  &lt;type&gt;' clauses:
-  </P>
-  <DL>
-   <DD><CODE>ExpiresByType text/html "access plus 1 month 15 days 2 hours"
-    <BR>
-    ExpiresByType image/gif "modification plus 5 hours 3 minutes"</CODE>
-   </DD>
-  </DL>
-  <P>
-  Note that if you use a modification date based setting, the Expires
-  header will <STRONG>not</STRONG> be added to content that does
-  not come from a file on disk.  This is due to the fact that there is
-  no modification time for such content.
 
   <!--#include virtual="footer.html" -->
  </BODY>