From: André Malo
Date: Wed, 19 Jan 2005 20:21:56 +0000 (+0000)
Subject: fix XML validation errors
X-Git-Tag: 2.1.3~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93c2e14c515473a7fce3b848546887685906802a;p=thirdparty%2Fapache%2Fhttpd.git
fix XML validation errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125651 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index 654c2e63261..0ef54414a6c 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -470,20 +470,19 @@ Certificate Authority or global client certificates
certificates and/or client certificates mod_ldap
should use when establishing an SSL or TLS connection to an LDAP
server. The type specifies the kind of certificate parameter being
- set, depending on the LDAP toolkit being used. Supported types are:
-
- - CA_DER - binary DER encoded CA certificate
- - CA_BASE64 - PEM encoded CA certificate
- - CA_CERT7_DB - Netscape cert7.db CA certificate database file
- - CA_SECMOD - Netscape secmod database file
- - CERT_DER - binary DER encoded client certificate
- - CERT_BASE64 - PEM encoded client certificate
- - CERT_KEY3_DB - Netscape key3.db client certificate database file
- - CERT_NICKNAME - Client certificate "nickname" (Netscape SDK)
- - KEY_DER - binary DER encoded private key
- - KEY_BASE64 - PEM encoded private key
-
-
+ set, depending on the LDAP toolkit being used. Supported types are:
+
+ - CA_DER - binary DER encoded CA certificate
+ - CA_BASE64 - PEM encoded CA certificate
+ - CA_CERT7_DB - Netscape cert7.db CA certificate database file
+ - CA_SECMOD - Netscape secmod database file
+ - CERT_DER - binary DER encoded client certificate
+ - CERT_BASE64 - PEM encoded client certificate
+ - CERT_KEY3_DB - Netscape key3.db client certificate database file
+ - CERT_NICKNAME - Client certificate "nickname" (Netscape SDK)
+ - KEY_DER - binary DER encoded private key
+ - KEY_BASE64 - PEM encoded private key
+
@@ -501,15 +500,14 @@ connection client certificates.
or TLS connection to an LDAP server. Not all LDAP toolkits support
per connection client certificates (See the toolkit guide for details).
The type specifies the kind of certificate parameter being
- set, depending on the LDAP toolkit being used. Supported types are:
-
- - CERT_DER - binary DER encoded client certificate
- - CERT_BASE64 - PEM encoded client certificate
- - CERT_NICKNAME - Client certificate "nickname" (Netscape SDK)
- - KEY_DER - binary DER encoded private key
- - KEY_BASE64 - PEM encoded private key
-
-
+ set, depending on the LDAP toolkit being used. Supported types are:
+
+ - CERT_DER - binary DER encoded client certificate
+ - CERT_BASE64 - PEM encoded client certificate
+ - CERT_NICKNAME - Client certificate "nickname" (Netscape SDK)
+ - KEY_DER - binary DER encoded private key
+ - KEY_BASE64 - PEM encoded private key
+
@@ -521,12 +519,11 @@ connection client certificates.
The following modes are supported:
-
- - NONE - no encryption
- - SSL - ldaps:// encryption on default port 636
- - TLS - STARTTLS encryption on default port 389
-
-
+
+ - NONE - no encryption
+ - SSL - ldaps:// encryption on default port 636
+ - TLS - STARTTLS encryption on default port 389
+
Not all LDAP toolkits support all the above modes. An error message
will be logged at runtime if a mode is not supported, and the
@@ -535,7 +532,6 @@ connection client certificates.
If an ldaps:// URL is specified, the mode becomes SSL and the setting
of LDAPTrustedMode is ignored.
-