Backport:

   - r1859106: Axe some outdated compatibility notes
   - r1878824: Add some html syntax highlight to a piece of code. + some missing links
   - r1878825: Fix typo in r1878824

Remove some trainling space to synch with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1883419 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml
index cc6ac8dac98f66cd998b681227c362c378a7e749..fb30f3c4db8d3075c8c5d611e34523dabf7b9593 100644 (file)
--- a/docs/manual/mod/mod_autoindex.xml
+++ b/docs/manual/mod/mod_autoindex.xml
@@ -69,7 +69,7 @@
     same header repeatedly toggles between ascending and descending
     order. These column header links are suppressed with the
     <directive module="mod_autoindex">IndexOptions</directive> directive's
-    <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> 
+    <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
     option.</p>
 
     <p>Note that when the display is sorted by "Size", it's the
@@ -140,44 +140,35 @@
     <p>The simple example below, which can be clipped and saved in
     a header.html file, illustrates these query options. Note that
     the unknown "X" argument, for the submit button, is listed last
-    to assure the arguments are all parsed before mod_autoindex
+    to assure the arguments are all parsed before <module>mod_autoindex</module>
     encounters the X=Go input.</p>
 
-    <example>
-      &lt;form action="" method="get"&gt;<br />
-      <indent>
-        Show me a &lt;select name="F"&gt;<br />
-        <indent>
-          &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
-          &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
-          &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
-        </indent>
-        &lt;/select&gt;<br />
-        Sorted by &lt;select name="C"&gt;<br />
-        <indent>
-          &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
-          &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
-          &lt;option value="S"&gt; Size&lt;/option&gt;<br />
-          &lt;option value="D"&gt; Description&lt;/option&gt;<br />
-        </indent>
-        &lt;/select&gt;<br />
-        &lt;select name="O"&gt;<br />
-        <indent>
-          &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
-          &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
-        </indent>
-        &lt;/select&gt;<br />
-        &lt;select name="V"&gt;<br />
-        <indent>
-          &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
-          &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
-        </indent>
-        &lt;/select&gt;<br />
-        Matching &lt;input type="text" name="P" value="*" /&gt;<br />
-        &lt;input type="submit" name="X" value="Go" /&gt;<br />
-      </indent>
-      &lt;/form&gt;
-    </example>
+    <example><title>Example</title>
+        <highlight language="html">
+&lt;form action="" method="get"&gt;
+    Show me a &lt;select name="F"&gt;
+        &lt;option value="0"&gt; Plain list&lt;/option&gt;
+        &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;
+        &lt;option value="2"&gt; Table list&lt;/option&gt;
+    &lt;/select&gt;
+    Sorted by &lt;select name="C"&gt;
+        &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;
+        &lt;option value="M"&gt; Date Modified&lt;/option&gt;
+        &lt;option value="S"&gt; Size&lt;/option&gt;
+        &lt;option value="D"&gt; Description&lt;/option&gt;
+    &lt;/select&gt;
+    &lt;select name="O"&gt;
+        &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;
+        &lt;option value="D"&gt; Descending&lt;/option&gt;
+    &lt;/select&gt;
+    &lt;select name="V"&gt;
+        &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;
+        &lt;option value="1"&gt; in Version order&lt;/option&gt;
+    &lt;/select&gt;
+    Matching &lt;input type="text" name="P" value="*" /&gt;
+    &lt;input type="submit" name="X" value="Go" /&gt;
+&lt;/form&gt;
+    </highlight></example>
 
 </section>
 
@@ -320,7 +311,7 @@ AddDescription "My friend Marshall" friends/mars.gif
     <note><title>Arguments with path information</title>
       <p>Absolute paths are not currently supported and do not match
       anything at runtime. Arguments with relative path information,
-      which would normally only be used in htaccess context, are implicitly 
+      which would normally only be used in htaccess context, are implicitly
       prefixed with '*/' to avoid matching partial directory names.</p>
     </note>
 
@@ -559,7 +550,7 @@ a directory</description>
 
 <usage>
     <p>The <directive>IndexIgnoreReset</directive> directive removes
-    any files ignored by <directive>IndexIgnore</directive> otherwise
+    any files ignored by <directive module="mod_autoindex">IndexIgnore</directive> otherwise
     inherited from other configuration sections. </p>
 
     <highlight language="config">
@@ -612,8 +603,7 @@ indexing</description>
 
       <dt><a name="indexoptions.charset"
                id="indexoptions.charset"
-      >Charset=<var>character-set</var></a> (<em>Apache HTTP Server 2.0.61 and
-      later</em>)</dt>
+      >Charset=<var>character-set</var></a></dt>
 
       <dd>The <code>Charset</code> keyword allows you to
       specify the character set of the generated page. The
@@ -666,8 +656,8 @@ indexing</description>
       <code>FoldersFirst</code> is enabled, subdirectory
       <code>Zed</code> will be listed before subdirectory
       <code>Beta</code>, which will be listed before normal files
-      <code>Gamma</code> and <code>Alpha</code>. 
-      <strong>This option only has an effect if <a 
+      <code>Gamma</code> and <code>Alpha</code>.
+      <strong>This option only has an effect if <a
       href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a>
       is also enabled.</strong>
       </dd>
@@ -698,7 +688,7 @@ indexing</description>
       to wait until all the images have been loaded. If no value is given for
       the option, it defaults to the standard height of the icons supplied
       with the Apache httpd software.
-     
+
       <strong>This option
       only has an effect if <a href="#indexoptions.fancyindexing"
       ><code>FancyIndexing</code></a> is also enabled.</strong>
@@ -793,7 +783,7 @@ indexing</description>
       description. See also the <code><a
       href="#indexoptions.descriptionwidth">DescriptionWidth</a></code>
       index option to limit the size of the description column.
-      
+
       <strong>This option
       only has an effect if <a href="#indexoptions.fancyindexing"
       ><code>FancyIndexing</code></a> is also enabled.</strong>
@@ -834,7 +824,7 @@ indexing</description>
 
       <dd>This will suppress the display of the last modification date,
       in fancy indexing listings.
-      
+
       <strong>This option
       only has an effect if <a href="#indexoptions.fancyindexing"
       ><code>FancyIndexing</code></a> is also enabled.</strong>
@@ -850,7 +840,7 @@ indexing</description>
       by the final specification prohibits <code>img</code> and
       <code>hr</code> elements from the <code>pre</code> block (used to
       format FancyIndexed listings.)
-      
+
       <strong>This option
       only has an effect if <a href="#indexoptions.fancyindexing"
       ><code>FancyIndexing</code></a> is also enabled.</strong>
@@ -861,7 +851,7 @@ indexing</description>
                id="indexoptions.suppresssize">SuppressSize</a></dt>
 
       <dd>This will suppress the file size in fancy indexing listings.
-      
+
       <strong>This option
       only has an effect if <a href="#indexoptions.fancyindexing"
       ><code>FancyIndexing</code></a> is also enabled.</strong>
@@ -886,8 +876,7 @@ indexing</description>
 
       <dt><a name="indexoptions.type"
                id="indexoptions.type"
-      >Type=<var>MIME content-type</var></a> (<em>Apache HTTP Server 2.0.61 and
-      later</em>)</dt>
+      >Type=<var>MIME content-type</var></a></dt>
 
       <dd>The <code>Type</code> keyword allows you to
       specify the MIME content-type of the generated page. The default
@@ -909,8 +898,7 @@ indexing</description>
       restores the date format from 2.2 and earlier.</dd>
 
       <dt><a name="indexoptions.versionsort"
-               id="indexoptions.versionsort">VersionSort</a>
-      (<em>Apache HTTP Server 2.0a3 and later</em>)</dt>
+               id="indexoptions.versionsort">VersionSort</a></dt>
 
       <dd>The <code>VersionSort</code> keyword causes files containing
       version numbers to sort in a natural way. Strings are sorted as
@@ -938,8 +926,7 @@ indexing</description>
       </dd>
 
       <dt><a name="indexoptions.xhtml"
-               id="indexoptions.xhtml">XHTML</a>
-      (<em>Apache HTTP Server 2.0.49 and later</em>)</dt>
+               id="indexoptions.xhtml">XHTML</a></dt>
 
       <dd>The <code>XHTML</code> keyword forces <module>mod_autoindex</module>
       to emit XHTML 1.0 code instead of HTML 3.2.
@@ -1068,7 +1055,7 @@ Name|Date|Size|Description</syntax>
     following classes are associated with the various parts of the
     listing:</p>
 
-    <table border="1" style="zebra"> 
+    <table border="1" style="zebra">
     <tr><th>Class</th><th>Definition</th></tr>
     <tr><td>tr.indexhead</td><td>Header row of listing</td></tr>
     <tr><td>th.indexcolicon and td.indexcolicon</td> <td>Icon column</td></tr>