From: Igor Galić Date: Thu, 26 Apr 2012 16:14:31 +0000 (+0000) Subject: fix XML validation. X-Git-Tag: 2.5.0-alpha~7009 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be0a16a98dff3c89c102013e6ed9205ba0f0181;p=thirdparty%2Fapache%2Fhttpd.git fix XML validation. Revert some of the hilighting to use 
, for instance: ldiffs
Make some of the lines that were artifically broken > 40char.


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

diff --git a/docs/manual/mod/mod_authn_dbd.xml b/docs/manual/mod/mod_authn_dbd.xml
index e48132f5bd7..d176f2e2aa1 100644
--- a/docs/manual/mod/mod_authn_dbd.xml
+++ b/docs/manual/mod/mod_authn_dbd.xml
@@ -72,7 +72,7 @@ to cache credentials and take most of the load off the database.

 Configuration Example
 
This simple example shows use of this module in the context of
 the Authentication and DBD frameworks.

-
+
 # mod_dbd configuration
 # UPDATED to include authentication cacheing
 DBDriver pgsql
@@ -100,10 +100,9 @@ DBDExptime 300
   Require valid-user
 
   # mod_authn_dbd SQL query to authenticate a user
-  AuthDBDUserPWQuery \
-    "SELECT password FROM authn WHERE user = %s"
+  AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
 </Directory>
-

+
 
 
 

@@ -136,10 +135,9 @@ configuration required in some web applications.
     will be passed as a single string parameter when the SQL query is
     executed.  It may be referenced within the query statement using
     a %s format specifier.

-    
-AuthDBDUserPWQuery \
-  "SELECT password FROM authn WHERE user = %s"
-

+    
+AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
+
     
The first column value of the first row returned by the query
     statement should be a string containing the encrypted password.
     Subsequent rows will be ignored.  If no rows are returned, the user
@@ -171,10 +169,9 @@ AuthDBDUserPWQuery \
     The user's ID and the realm, in that order, will be passed as string
     parameters when the SQL query is executed.  They may be referenced
     within the query statement using %s format specifiers.

-    
-AuthDBDUserRealmQuery \
-  "SELECT password FROM authn WHERE user = %s AND realm = %s"
-

+    
+AuthDBDUserRealmQuery "SELECT password FROM authn WHERE user = %s AND realm = %s"
+
     
The first column value of the first row returned by the query
     statement should be a string containing the encrypted password.
     Subsequent rows will be ignored.  If no rows are returned, the user
diff --git a/docs/manual/mod/mod_authn_socache.xml b/docs/manual/mod/mod_authn_socache.xml
index 0bdbd049052..97cdeca3807 100644
--- a/docs/manual/mod/mod_authn_socache.xml
+++ b/docs/manual/mod/mod_authn_socache.xml
@@ -69,7 +69,7 @@ the load on backends
     
     
A simple usage example to accelerate mod_authn_dbd
     using dbm as a cache engine:

-    
+    
 <Directory /usr/www/myhost/private>
     AuthType Basic
     AuthName "Cached Authentication Example"
@@ -80,7 +80,7 @@ the load on backends
     AuthnCacheSOCache dbm
     Require valid-user
 </Directory>
-    

+    
 

 
 
Cacheing with custom modules
@@ -143,7 +143,7 @@ the load on backends
     or by a custom provider myprovider, but leave those looked
     up by lightweight providers like file or dbm lookup alone:

     
-        AuthnCacheProvideFor dbd myprovider
+AuthnCacheProvideFor dbd myprovider
     
 
 
diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml
index 8fe607bb4a2..af655eae1b9 100644
--- a/docs/manual/mod/mod_authnz_ldap.xml
+++ b/docs/manual/mod/mod_authnz_ldap.xml
@@ -366,12 +366,12 @@ Require ldap-user "Joe Manager"
     group. Note: Do not surround the group name with quotes.
     For example, assume that the following entry existed in
     the LDAP directory:

-
+
 dn: cn=Administrators, o=Example
 objectClass: groupOfUniqueNames
 uniqueMember: cn=Barbara Jenson, o=Example
 uniqueMember: cn=Fred User, o=Example
-
+

 
     
The following directive would grant access to both Fred and
     Barbara:

@@ -381,7 +381,7 @@ uniqueMember: cn=Fred User, o=Example
     if AuthLDAPMaxSubGroupDepth
     is set to a value greater than 0. For example, assume the following entries
     exist in the LDAP directory:

-
+
 dn: cn=Employees, o=Example
 objectClass: groupOfUniqueNames
 uniqueMember: cn=Managers, o=Example
@@ -408,7 +408,7 @@ dn: cn=Temporary Employees, o=Example
 objectClass: groupOfUniqueNames
 uniqueMember: cn=Jim Swenson, o=Example
 uniqueMember: cn=Elliot Rhodes, o=Example
-
+

 
     
The following directives would allow access for Bob Ellis, Tom Jackson,
     Barbara Jensen, Fred User, Allan Jefferson, and Paul Tilley but would not
@@ -690,11 +690,11 @@ AuthLDAPURL ldap://10.0.0.1:3268/?userPrincipalName?sub
     authentication to it is a matter of adding the following
     directives to every .htaccess file
     that gets created in the web

-
+
 AuthLDAPURL            "the url"
 AuthGroupFile mygroupfile
 Require group mygroupfile
-

+
 
 
How It Works
 
diff --git a/docs/manual/mod/mod_authz_dbd.xml b/docs/manual/mod/mod_authz_dbd.xml
index b7060cf7547..8b57120ea1c 100644
--- a/docs/manual/mod/mod_authz_dbd.xml
+++ b/docs/manual/mod/mod_authz_dbd.xml
@@ -81,7 +81,7 @@ to implement functions that start and end client-side sessions.

 
 

 Configuration example
-
+
 # mod_dbd configuration
 DBDriver pgsql
 DBDParams "dbname=apacheauth user=apache pass=xxxxxx"
@@ -115,13 +115,11 @@ DBDExptime 300
 
   <Files login.html>
     # don't require user to already be logged in!
-    AuthDBDUserPWQuery \
-      "SELECT password FROM authn WHERE user = %s"
+    AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
 
     # dbd-login action executes a statement to log user in
     Require dbd-login
-    AuthzDBDQuery \
-      "UPDATE authn SET login = 'true' WHERE user = %s"
+    AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"
 
     # return user to referring page (if any) after
     # successful login
@@ -131,11 +129,10 @@ DBDExptime 300
   <Files logout.html>
     # dbd-logout action executes a statement to log user out
     Require dbd-logout
-    AuthzDBDQuery \
-      "UPDATE authn SET login = 'false' WHERE user = %s"
+    AuthzDBDQuery "UPDATE authn SET login = 'false' WHERE user = %s"
   </Files>
 </Directory>
-

+
 

 
 
@@ -159,8 +156,7 @@ DBDExptime 300
     may be returned.
     
 Require dbd-group
-AuthzDBDQuery \
-  "SELECT group FROM groups WHERE user = %s"
+AuthzDBDQuery "SELECT group FROM groups WHERE user = %s"
 
     
     
  • When used with a Require dbd-login or
@@ -168,11 +164,10 @@ AuthzDBDQuery \
     but will instead execute a SQL statement designed to log the user
     in or out.  The user must already be authenticated with
     mod_authn_dbd.
-    
    +    
 Require dbd-login
-AuthzDBDQuery \
-  "UPDATE authn SET login = 'true' WHERE user = %s"
-
    
+AuthzDBDQuery "UPDATE authn SET login = 'true' WHERE user = %s"
+
     
    • 
     
     
    In all cases, the user's ID will be passed as a single string
@@ -194,8 +189,7 @@ AuthzDBDQuery \
     parameter when the SQL query is executed.  It may be referenced within
     the query statement using a %s format specifier.
    
     
-AuthzDBDRedirectQuery \
-  "SELECT userpage FROM userpages WHERE user = %s"
+AuthzDBDRedirectQuery "SELECT userpage FROM userpages WHERE user = %s"
 
     
    The first column value of the first row returned by the query
     statement should be a string containing a URL to which to redirect