Fix up a few small xml validity problems.

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

diff --git a/docs/manual/mod/mod_auth_ldap.html.en b/docs/manual/mod/mod_auth_ldap.html.en
index cc4c8cc1a85d380956c1249fa158087eb27a8620..8ddeaea802e03c59b93504156e2e160e4fbc2638 100644 (file)
--- a/docs/manual/mod/mod_auth_ldap.html.en
+++ b/docs/manual/mod/mod_auth_ldap.html.en
@@ -379,13 +379,13 @@ require valid-user
         Fred User connects as <code>fuser</code>, the filter would look
         like</p>
 
-        <div class="example"><p><code>(&amp;<font color="red">(|(qpagePagerID=*)(uid=jmanager))</font>(<font color="blue">uid</font>=<font color="green">fuser</font>))</code></p></div>
+        <div class="example"><p><code>(&amp;(|(qpagePagerID=*)(uid=jmanager))(uid=fuser))</code></p></div>
 
         <p>The above search will only succeed if <em>fuser</em> has a
         pager. When Joe Manager connects as <em>jmanager</em>, the
         filter looks like</p>
 
-        <div class="example"><p><code>(&amp;<font color="red">(|(qpagePagerID=*)(uid=jmanager))</font>(<font color="blue">uid</font>=<font color="green">jmanager</font>))</code></p></div>
+        <div class="example"><p><code>(&amp;(|(qpagePagerID=*)(uid=jmanager))(uid=jmanager))</code></p></div>
 
         <p>The above search will succeed whether <em>jmanager</em>
         has a pager or not.</p>

diff --git a/docs/manual/mod/mod_auth_ldap.xml b/docs/manual/mod/mod_auth_ldap.xml
index 1599974f8855c55bf502e634849deea2c6bd6617..0ac0f4899239c49929864fb76884a54237926c4f 100644 (file)
--- a/docs/manual/mod/mod_auth_ldap.xml
+++ b/docs/manual/mod/mod_auth_ldap.xml
@@ -403,19 +403,13 @@ require valid-user
         Fred User connects as <code>fuser</code>, the filter would look
         like</p>
 
-        <example>(&amp;<font
-        color="red">(|(qpagePagerID=*)(uid=jmanager))</font>(<font
-        color="blue">uid</font>=<font
-        color="green">fuser</font>))</example>
+        <example>(&amp;(|(qpagePagerID=*)(uid=jmanager))(uid=fuser))</example>
 
         <p>The above search will only succeed if <em>fuser</em> has a
         pager. When Joe Manager connects as <em>jmanager</em>, the
         filter looks like</p>
 
-        <example>(&amp;<font
-        color="red">(|(qpagePagerID=*)(uid=jmanager))</font>(<font
-        color="blue">uid</font>=<font
-        color="green">jmanager</font>))</example>
+        <example>(&amp;(|(qpagePagerID=*)(uid=jmanager))(uid=jmanager))</example>
 
         <p>The above search will succeed whether <em>jmanager</em>
         has a pager or not.</p>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 70dc9b814184d08b27c336645fdd18386924b4fc..83319eca416506368488c31a04f70a653018d1ae 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -228,45 +228,6 @@ authentication</td></tr>
                  
                Sets the name of a text file containing the list
 of user groups for authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapauthoritative" style="text-decoration: none">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               Prevent other authentication modules from
-authenticating the user if this one fails</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapbinddn" style="text-decoration: none">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               Optional DN to use in binding to the LDAP server</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbindpassword" style="text-decoration: none">AuthLDAPBindPassword <em>password</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               Password used in conjuction with the bind DN</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapcomparednonserver" style="text-decoration: none">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               Use the LDAP server to compare the DNs</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapdereferencealiases" style="text-decoration: none">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               When will the module de-reference aliases</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapenabled" style="text-decoration: none"> AuthLDAPEnabled on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               Turn on or off LDAP authentication</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapfrontpagehack" style="text-decoration: none">AuthLDAPFrontPageHack on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               Allow LDAP authentication to work with MS FrontPage</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapgroupattribute" style="text-decoration: none">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               LDAP attributes used to check for group membership</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn" style="text-decoration: none">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               Use the DN of the client username when checking for
-group membership</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn" style="text-decoration: none">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               Use the DN of the client username to set the REMOTE_USER
-environment variable</td></tr>
-<tr class="odd"><td><a href="mod_auth_ldap.html#authldapstarttls directive" style="text-decoration: none">AuthLDAPStartTLS on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4">
-                 
-               Use a secure TLS connection to the LDAP server</td></tr>
-<tr class="even"><td><a href="mod_auth_ldap.html#authldapurl" style="text-decoration: none">AuthLDAPUrl <em>url</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4">
-                 
-               URL specifying the LDAP search parameters</td></tr>
 <tr class="odd"><td><a href="core.html#authname" style="text-decoration: none">AuthName <em>auth-domain</em></a></td><td /><td>C</td><td>dh</td></tr><tr class="odd"><td colspan="4">
                  
                Authorization realm for use in HTTP

diff --git a/docs/manual/mod/quickreference.xml b/docs/manual/mod/quickreference.xml
index 193043f8bd282f9ed9ce4dc0b1dee45dcef455f0..01e582b8aa36bdf6e59136a6ca79ab386dfaab93 100644 (file)
--- a/docs/manual/mod/quickreference.xml
+++ b/docs/manual/mod/quickreference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE directiveindex SYSTEM "../style/modulesynopsis.dtd"
+<!DOCTYPE quickreference SYSTEM "../style/modulesynopsis.dtd"
   [ <!ENTITY allmodules SYSTEM "allmodules.xml"> ]
 >
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>

diff --git a/docs/manual/style/modulesynopsis.dtd b/docs/manual/style/modulesynopsis.dtd
index ee1269d24ec4b32ab8ca13f722482084bc4468cd..c4c503e931ba658f002e67bca829cb8c7943a0c8 100644 (file)
--- a/docs/manual/style/modulesynopsis.dtd
+++ b/docs/manual/style/modulesynopsis.dtd
@@ -48,5 +48,8 @@ usage?, seealso*)>
 <!-- Used in directive.xml -->
 <!ELEMENT directiveindex (title | summary | modulefilelist | letters)+>
 
+<!-- Used in quickreference.xml -->
+<!ELEMENT quickreference (title | summary | modulefilelist | letters)+>
+
 <!ELEMENT letters (letter+)>
 <!ELEMENT letter (#PCDATA)>
\ No newline at end of file