From: Andre Malo Date: Sat, 22 Feb 2003 21:57:22 +0000 (+0000) Subject: fix new example in mod_alias (example is not a 
 environment).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efb911f2475feadb9f9fa87ced4f5c5fec8e407e;p=thirdparty%2Fapache%2Fhttpd.git

fix new example in mod_alias (example is not a 
 environment).
update transformations of recent changes.


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

diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index 012fd7e0796..0e79b34cf6e 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -91,7 +91,6 @@
 
  • AuthLDAPGroupAttribute
    • 
 
  • AuthLDAPGroupAttributeIsDN
    • 
 
  • AuthLDAPRemoteUserIsDN
    • 
-
  • AuthLDAPStartTLS
    • 
 
  • AuthLDAPUrl
    • 
 
  • AuthName
    • 
 
  • AuthType
    • 
@@ -199,10 +198,11 @@
 
  • LanguagePriority
    • 
 
  • LDAPCacheEntries
    • 
 
  • LDAPCacheTTL
    • 
-
  • LDAPCertDBPath
    • 
 
  • LDAPOpCacheEntries
    • 
 
  • LDAPOpCacheTTL
    • 
 
  • LDAPSharedCacheSize
    • 
+
  • LDAPTrustedCA
    • 
+
  • LDAPTrustedCAType
    • 
 
  • <Limit>
    • 
 
  • <LimitExcept>
    • 
 
  • LimitRequestBody
    • 
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index 9b352bcc383..b2ecc19ade9 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -92,7 +92,6 @@
 
  • AuthLDAPGroupAttribute
    • 
 
  • AuthLDAPGroupAttributeIsDN
    • 
 
  • AuthLDAPRemoteUserIsDN
    • 
-
  • AuthLDAPStartTLS
    • 
 
  • AuthLDAPUrl
    • 
 
  • AuthName
    • 
 
  • AuthType
    • 
@@ -202,10 +201,11 @@
 
  • LanguagePriority
    • 
 
  • LDAPCacheEntries
    • 
 
  • LDAPCacheTTL
    • 
-
  • LDAPCertDBPath
    • 
 
  • LDAPOpCacheEntries
    • 
 
  • LDAPOpCacheTTL
    • 
 
  • LDAPSharedCacheSize
    • 
+
  • LDAPTrustedCA
    • 
+
  • LDAPTrustedCAType
    • 
 
  • <Limit>
    • 
 
  • <LimitExcept>
    • 
 
  • LimitRequestBody
    • 
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index d661af50af3..36900265b50 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -96,6 +96,20 @@
     sections are run through once before aliases are performed, so
     they will apply.)
    
 
+    
    In particular, if you are creating an Alias to a
+    directory outside of your DocumentRoot, you may need to explicitly
+    permit access to the target directory.
    
+
+    
    Example:
    
+        Alias /image /ftp/pub/image
    
+        <Directory /ftp/pub/image>
    
+        
+            Order allow,deny
    
+            Allow from all
    
+            
+        </Directory>
+    
    
+
 
 
 
    top
    
diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml
index 31d46c33a75..fd157696705 100644
--- a/docs/manual/mod/mod_alias.xml
+++ b/docs/manual/mod/mod_alias.xml
@@ -76,10 +76,12 @@ href="../urlmapping.html">Mapping URLs to the filesystem
     permit access to the target directory.
    
 
     Example:
-        Alias /image /ftp/pub/image
-        <Directory /ftp/pub/image>
-            Order allow,deny
-            Allow from all
+        Alias /image /ftp/pub/image
    
+        <Directory /ftp/pub/image>
    
+        
+            Order allow,deny
    
+            Allow from all
    
+            
         </Directory>
         
 
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index c2ff431a2c9..e6604a9aee9 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -168,209 +168,209 @@ authenticating the user if this one fails
 group membership
 AuthLDAPRemoteUserIsDN on|off off dhXUse the DN of the client username to set the REMOTE_USER
 environment variable
-AuthLDAPStartTLS on|off off dhXUse a secure TLS connection to the LDAP server
-AuthLDAPUrl urldhXURL specifying the LDAP search parameters
-AuthName auth-BereichdhCAutorisierungsbereich zur Verwendung in der
+AuthLDAPUrl urldhXURL specifying the LDAP search parameters
+AuthName auth-BereichdhCAutorisierungsbereich zur Verwendung in der
 HTTP-Authentisierung
-AuthType Basic|DigestdhCArt der Authentisierung
-AuthUserFile file-pathdhBSets the name of a text file containing the list of users and
+AuthType Basic|DigestdhCArt der Authentisierung
+AuthUserFile file-pathdhBSets the name of a text file containing the list of users and
 passwords for authentication
-AuthzDBMAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
+AuthzDBMAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
 modules
-AuthzDBMType default|SDBM|GDBM|NDBM|DB default dhESets the type of database file that is used to
+AuthzDBMType default|SDBM|GDBM|NDBM|DB default dhESets the type of database file that is used to
 store passwords
-AuthzDefaultAuthoritative On|Off On dhBSets whether authorization is passed to lower level
+AuthzDefaultAuthoritative On|Off On dhBSets whether authorization is passed to lower level
 modules
-AuthzGroupFileAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
+AuthzGroupFileAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
 modules
-AuthzUserAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
+AuthzUserAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
 modules
-BrowserMatch regex [!]env-variable[=value]
-[[!]env-variable[=value]] ...svdhBSets environment variables conditional on HTTP User-Agent
+BrowserMatch regex [!]env-variable[=value]
+[[!]env-variable[=value]] ...svdhBSets environment variables conditional on HTTP User-Agent
 
-BrowserMatchNoCase  regex [!]env-variable[=value]
-    [[!]env-variable[=value]] ...svdhBSets environment variables conditional on User-Agent without
+BrowserMatchNoCase  regex [!]env-variable[=value]
+    [[!]env-variable[=value]] ...svdhBSets environment variables conditional on User-Agent without
 respect to case
-BS2000Account accountsMDefine the non-privileged account on BS2000
+BS2000Account accountsMDefine the non-privileged account on BS2000
 machines
-CacheDefaultExpire seconds 3600 (one hour) svXThe default duration to cache a document when no expiry date is specified.
-CacheDirLength length 2 svXThe number of characters in subdirectory names
-CacheDirLevels levels 3 svXThe number of levels of subdirectories in the
+CacheDefaultExpire seconds 3600 (one hour) svXThe default duration to cache a document when no expiry date is specified.
+CacheDirLength length 2 svXThe number of characters in subdirectory names
+CacheDirLevels levels 3 svXThe number of levels of subdirectories in the
 cache.
-CacheDisable  url-stringsvXDisable caching of specified URLs
-CacheEnable cache_type url-stringsvXEnable caching of specified URLs using a specified storage
+CacheDisable  url-stringsvXDisable caching of specified URLs
+CacheEnable cache_type url-stringsvXEnable caching of specified URLs using a specified storage
 manager
-CacheExpiryCheck On|Off On svXIndicates if the cache observes Expires dates when seeking
+CacheExpiryCheck On|Off On svXIndicates if the cache observes Expires dates when seeking
 files
-CacheFile file-path [file-path] ...sXCache a list of file handles at startup time
-CacheForceCompletion Percentage 60 svXPercentage of document served, after which the server
+CacheFile file-path [file-path] ...sXCache a list of file handles at startup time
+CacheForceCompletion Percentage 60 svXPercentage of document served, after which the server
 will complete caching the file even if the request is cancelled.
-CacheGcClean hours url-string ? svXThe time to retain unchanged cached files that match a
+CacheGcClean hours url-string ? svXThe time to retain unchanged cached files that match a
 URL
-CacheGcDaily time ? svXThe recurring time each day for garbage collection to be run.
+CacheGcDaily time ? svXThe recurring time each day for garbage collection to be run.
 (24 hour clock)
-CacheGcInterval hourssvXThe interval between garbage collection attempts.
-CacheGcMemUsage KBytes ? svXThe maximum kilobytes of memory used for garbage
+CacheGcInterval hourssvXThe interval between garbage collection attempts.
+CacheGcMemUsage KBytes ? svXThe maximum kilobytes of memory used for garbage
 collection
-CacheGcUnused hours url-string ? svXThe time to retain unreferenced cached files that match a
+CacheGcUnused hours url-string ? svXThe time to retain unreferenced cached files that match a
 URL.
-CacheIgnoreCacheControl On|Off Off svXIgnore the fact that the client requested the content not be
+CacheIgnoreCacheControl On|Off Off svXIgnore the fact that the client requested the content not be
 cached.
-CacheIgnoreNoLastMod On|Off Off svXIgnore the fact that a response has no Last Modified
+CacheIgnoreNoLastMod On|Off Off svXIgnore the fact that a response has no Last Modified
 header.
-CacheLastModifiedFactor float 0.1 svXThe factor used to compute an expiry date based on the
+CacheLastModifiedFactor float 0.1 svXThe factor used to compute an expiry date based on the
 LastModified date.
-CacheMaxExpire seconds 86400 (one day) svXThe maximum time in seconds to cache a document
-CacheMaxFileSize bytes 1000000 svXThe maximum size (in bytes) of a document to be placed in the
+CacheMaxExpire seconds 86400 (one day) svXThe maximum time in seconds to cache a document
+CacheMaxFileSize bytes 1000000 svXThe maximum size (in bytes) of a document to be placed in the
 cache
-CacheMinFileSize bytes 1 svXThe minimum size (in bytes) of a document to be placed in the
+CacheMinFileSize bytes 1 svXThe minimum size (in bytes) of a document to be placed in the
 cache
-CacheNegotiatedDocs On|Off Off svBAllows content-negotiated documents to be 
+CacheNegotiatedDocs On|Off Off svBAllows content-negotiated documents to be 
 cached by proxy servers
-CacheRoot directorysvXThe directory root under which cache files are
+CacheRoot directorysvXThe directory root under which cache files are
 stored
-CacheSize KBytes 1000000 svXThe maximum amount of disk space that will be used by the
+CacheSize KBytes 1000000 svXThe maximum amount of disk space that will be used by the
 cache in KBytes
-CacheTimeMargin ? ? svXThe minimum time margin to cache a document
-CGIMapExtension CGI-Pfad .EndungdhCTechnik zur Bestimmung des Interpreters für
+CacheTimeMargin ? ? svXThe minimum time margin to cache a document
+CGIMapExtension CGI-Pfad .EndungdhCTechnik zur Bestimmung des Interpreters für
 CGI-Skripte
-CharsetDefault charsetsvdhXCharset to translate into
-CharsetOptions option [option] ... DebugLevel=0 NoImpl +svdhXConfigures charset translation behavior
-CharsetSourceEnc charsetsvdhXSource charset of files
-CheckSpelling on|off Off svdhEEnables the spelling 
+CharsetDefault charsetsvdhXCharset to translate into
+CharsetOptions option [option] ... DebugLevel=0 NoImpl +svdhXConfigures charset translation behavior
+CharsetSourceEnc charsetsvdhXSource charset of files
+CheckSpelling on|off Off svdhEEnables the spelling 
 module
-ChildPerUserID user-id group-id
-num-childrensMSpecify user ID and group ID for a number of child
+ChildPerUserID user-id group-id
+num-childrensMSpecify user ID and group ID for a number of child
 processes
-ContentDigest On|Off Off svdhCAktiviert die Generierung von Content-MD5
+ContentDigest On|Off Off svdhCAktiviert die Generierung von Content-MD5
 HTTP-Response-Headern
-CookieDomain domainsvdhEThe domain to which the tracking cookie applies
-CookieExpires expiry-periodsvdhEExpiry time for the tracking cookie
-CookieLog filenamesvBSets filename for the logging of cookies
-CookieName token Apache svdhEName of the tracking cookie
-CookieStyle
-    Netscape|Cookie|Cookie2|RFC2109|RFC2965 Netscape svdhEFormat of the cookie header field
-CookieTracking on|off off svdhEEnables tracking cookie
-CoreDumpDirectory directorysMDirectory where Apache attempts to
+CookieDomain domainsvdhEThe domain to which the tracking cookie applies
+CookieExpires expiry-periodsvdhEExpiry time for the tracking cookie
+CookieLog filenamesvBSets filename for the logging of cookies
+CookieName token Apache svdhEName of the tracking cookie
+CookieStyle
+    Netscape|Cookie|Cookie2|RFC2109|RFC2965 Netscape svdhEFormat of the cookie header field
+CookieTracking on|off off svdhEEnables tracking cookie
+CoreDumpDirectory directorysMDirectory where Apache attempts to
 switch before dumping core
-CustomLog  file|pipe
+CustomLog  file|pipe
 format|nickname
-[env=[!]environment-variable]svBSets filename and format of log file
-Dav On|Off|provider-name Off dEEnable WebDAV HTTP methods
-DavDepthInfinity on|off off svdEAllow PROPFIND, Depth: Infinity requests
-DavLockDB file-pathsvELocation of the DAV lock database
-DavMinTimeout seconds 0 svdEMinimum amount of time the server holds a lock on
+[env=[!]environment-variable]svBSets filename and format of log file
+Dav On|Off|provider-name Off dEEnable WebDAV HTTP methods
+DavDepthInfinity on|off off svdEAllow PROPFIND, Depth: Infinity requests
+DavLockDB file-pathsvELocation of the DAV lock database
+DavMinTimeout seconds 0 svdEMinimum amount of time the server holds a lock on
 a DAV resource
-DefaultIcon url-pathsvdhBIcon to display for files when no specific icon is
+DefaultIcon url-pathsvdhBIcon to display for files when no specific icon is
 configured
-DefaultLanguage MIME-langsvdhBSets all files in the given scope to the specified
+DefaultLanguage MIME-langsvdhBSets all files in the given scope to the specified
 language
-DefaultType MIME-Type text/plain svdhCMIME-Content-Type, der gesendet wird, wenn der Server den Typ
+DefaultType MIME-Type text/plain svdhCMIME-Content-Type, der gesendet wird, wenn der Server den Typ
 nicht auf andere Weise ermitteln kann.
-DeflateBufferSize value 8096 svEFragment size to be compressed at one time by zlib
-DeflateFilterNote [type] notenamesvEPlaces the compression ratio in a note for logging
-DeflateMemLevel value 9 svEHow much memory should be used by zlib for compression
-DeflateWindowSize value 15 svEZlib compression window size
- Deny from all|host|env=env-variable
-[host|env=env-variable] ...dhBControls which hosts are denied access to the
+DeflateBufferSize value 8096 svEFragment size to be compressed at one time by zlib
+DeflateFilterNote [type] notenamesvEPlaces the compression ratio in a note for logging
+DeflateMemLevel value 9 svEHow much memory should be used by zlib for compression
+DeflateWindowSize value 15 svEZlib compression window size
+ Deny from all|host|env=env-variable
+[host|env=env-variable] ...dhBControls which hosts are denied access to the
 server
-<Directory Verzeichnispfad>
-... </Directory>svCUmschließt eine Gruppe von Direktiven, die nur auf
+<Directory Verzeichnispfad>
+... </Directory>svCUmschließt eine Gruppe von Direktiven, die nur auf
 das genannte Verzeichnis des Dateisystems und Unterverzeichnisse angewendet
 werden
-DirectoryIndex
-    local-url [local-url] ... index.html svdhBList of resources to look for when the client requests
+DirectoryIndex
+    local-url [local-url] ... index.html svdhBList of resources to look for when the client requests
 a directory
-<DirectoryMatch regex>
-... </DirectoryMatch>svCUmschließt eine Gruppe von Direktiven, die auf
+<DirectoryMatch regex>
+... </DirectoryMatch>svCUmschließt eine Gruppe von Direktiven, die auf
   Verzeichnisse des Dateisystems und ihre Unterverzeichnisse abgebildet
   werden, welche auf einen regulären Ausdruck passen
-DocumentRoot Verzeichnis /usr/local/apache/h +svCVerzeichnis, welches den Haupt-Dokumentenbaum bildet, der im
+DocumentRoot Verzeichnis /usr/local/apache/h +svCVerzeichnis, welches den Haupt-Dokumentenbaum bildet, der im
 Web sichtbar ist.
-EnableMMAP On|Off On svdhCVerwende Memory-Mapping, um Dateien während der
+EnableMMAP On|Off On svdhCVerwende Memory-Mapping, um Dateien während der
 Auslieferung zu lesen
-EnableSendfile On|Off On svdhCVerwende die sendfile-Unterstützung des Kernels, um
+EnableSendfile On|Off On svdhCVerwende die sendfile-Unterstützung des Kernels, um
 Dateien an den Client auszuliefern
-ErrorDocument Fehlercode DokumentsvdhCDas, was der Server im Fehlerfall an den Client
+ErrorDocument Fehlercode DokumentsvdhCDas, was der Server im Fehlerfall an den Client
 zurückgibt
- ErrorLog Dateiname|syslog[:facility] logs/error_log (Uni +svCAblageort, an dem der Server Fehler protokolliert
-ExamplesvdhXDemonstration directive to illustrate the Apache module
+ ErrorLog Dateiname|syslog[:facility] logs/error_log (Uni +svCAblageort, an dem der Server Fehler protokolliert
+ExamplesvdhXDemonstration directive to illustrate the Apache module
 API
-ExpiresActive On|OffsvdhEEnables generation of Expires
+ExpiresActive On|OffsvdhEEnables generation of Expires
 headers
-ExpiresByType MIME-type
-<code>secondssvdhEValue of the Expires header configured
+ExpiresByType MIME-type
+<code>secondssvdhEValue of the Expires header configured
 by MIME type
-ExpiresDefault <code>secondssvdhEDefault algorithm for calculating expiration time
-ExtendedStatus On|Off Off sBKeep track of extended status information for each 
+ExpiresDefault <code>secondssvdhEDefault algorithm for calculating expiration time
+ExtendedStatus On|Off Off sBKeep track of extended status information for each 
 request
-ExtFilterDefine filtername parameterssEDefine an external filter
-ExtFilterOptions option [option] ... DebugLevel=0 NoLogS +dEConfigure mod_ext_filter options
-FileETag Komponente ... INode MTime Size svdhCDateiattribute, die zur Erstellung des HTTP-Response-Headers
+ExtFilterDefine filtername parameterssEDefine an external filter
+ExtFilterOptions option [option] ... DebugLevel=0 NoLogS +dEConfigure mod_ext_filter options
+FileETag Komponente ... INode MTime Size svdhCDateiattribute, die zur Erstellung des HTTP-Response-Headers
 ETag verwendet werden
-<Files Dateiname> ... </Files>svdhCEnthält Direktiven, die sich nur auf passende Dateinamen
+<Files Dateiname> ... </Files>svdhCEnthält Direktiven, die sich nur auf passende Dateinamen
 beziehen
-<FilesMatch regex> ... </FilesMatch>svdhCEnthält Direktiven, die für Dateinamen gelten, die
+<FilesMatch regex> ... </FilesMatch>svdhCEnthält Direktiven, die für Dateinamen gelten, die
   auf einen regulären Ausdruck passen
-ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback] Prefer svdhBAction to take if a single acceptable document is not 
+ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback] Prefer svdhBAction to take if a single acceptable document is not 
 found
-ForceType MIME-Type|nonedhCErzwingt die Auslieferung aller passendenden Dateien mit dem
+ForceType MIME-Type|nonedhCErzwingt die Auslieferung aller passendenden Dateien mit dem
 angegebenen MIME-Content-Type
-Group unix-group #-1 sMGroup under which the server will answer
+Group unix-group #-1 sMGroup under which the server will answer
 requests
-Header set|append|add|unset|echo  header
-[value [env=[!]variable]]svdhEConfigure HTTP response headers
-HeaderName filenamesvdhBName of the file that will be inserted at the top
+Header set|append|add|unset|echo  header
+[value [env=[!]variable]]svdhEConfigure HTTP response headers
+HeaderName filenamesvdhBName of the file that will be inserted at the top
 of the index listing
-HostnameLookups On|Off|Double Off svdCAktiviert DNS-Lookups auf Client-IP-Adressen
-IdentityCheck On|Off Off svdCErmöglicht die Protokollierung der Identität des
+HostnameLookups On|Off|Double Off svdCAktiviert DNS-Lookups auf Client-IP-Adressen
+IdentityCheck On|Off Off svdCErmöglicht die Protokollierung der Identität des
 entfernten Anwenders nach RFC1413
-<IfDefine [!]Parametername> ...
-    </IfDefine>svdhCSchließt Direktiven ein, die nur ausgeführt werden,
+<IfDefine [!]Parametername> ...
+    </IfDefine>svdhCSchließt Direktiven ein, die nur ausgeführt werden,
 wenn eine Testbedingung beim Start wahr ist
-<IfModule [!]Modulname> ...
-    </IfModule>svdhCSchließt Direktiven ein, die abhängig vom
+<IfModule [!]Modulname> ...
+    </IfModule>svdhCSchließt Direktiven ein, die abhängig vom
 Vorhandensein oder Fehlen eines speziellen Moduls ausgeführt
 werden
-ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files
-ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates
+ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files
+ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates
 that are not explicitly mapped
-ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling
+ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling
 an imagemap
-Include Dateiname|VerzeichnissvdCFügt andere Konfigurationsdateien innerhalb der
+Include Dateiname|VerzeichnissvdCFügt andere Konfigurationsdateien innerhalb der
 Server-Konfigurationsdatei ein
-IndexIgnore file [file] ...svdhBAdds to the list of files to hide when listing 
+IndexIgnore file [file] ...svdhBAdds to the list of files to hide when listing 
 a directory
-IndexOptions  [+|-]option [[+|-]option]
-...svdhBVarious configuration settings for directory 
+IndexOptions  [+|-]option [[+|-]option]
+...svdhBVarious configuration settings for directory 
 indexing
-IndexOrderDefault Ascending|Descending
-Name|Date|Size|Description Ascending Name svdhBSets the default ordering of the directory index
-ISAPIAppendLogToErrors on|off off svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
+IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description Ascending Name svdhBSets the default ordering of the directory index
+ISAPIAppendLogToErrors on|off off svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
 ISAPI extensions to the error log
-ISAPIAppendLogToQuery on|off on svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
+ISAPIAppendLogToQuery on|off on svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
 ISAPI extensions to the query field
-ISAPICacheFile file-path [file-path]
-...svBISAPI .dll files to be loaded at startup
-ISAPIFakeAsync on|off off svdhBFake asynchronous support for ISAPI callbacks
-ISAPILogNotSupported on|off off svdhBLog unsupported feature requests from ISAPI
+ISAPICacheFile file-path [file-path]
+...svBISAPI .dll files to be loaded at startup
+ISAPIFakeAsync on|off off svdhBFake asynchronous support for ISAPI callbacks
+ISAPILogNotSupported on|off off svdhBLog unsupported feature requests from ISAPI
 extensions
-ISAPIReadAheadBuffer size 49152 svdhBSize of the Read Ahead Buffer sent to ISAPI
+ISAPIReadAheadBuffer size 49152 svdhBSize of the Read Ahead Buffer sent to ISAPI
 extensions
-KeepAlive On|Off On svCAktiviert persistente HTTP-Verbindungen
-KeepAliveTimeout Sekunden 15 svCZeitspanne, die der Server während persistenter Verbindungen
+KeepAlive On|Off On svCAktiviert persistente HTTP-Verbindungen
+KeepAliveTimeout Sekunden 15 svCZeitspanne, die der Server während persistenter Verbindungen
 auf nachfolgende Anfragen wartet
-LanguagePriority MIME-lang [MIME-lang]
-...svdhBThe precendence of language variants for cases where
+LanguagePriority MIME-lang [MIME-lang]
+...svdhBThe precendence of language variants for cases where
 the client does not express a preference
-LDAPCacheEntries number 1024 sXMaximum number of entires in the primary LDAP cache
-LDAPCacheTTL seconds 600 sXTime that cached items remain valid
-LDAPCertDBPath directory-pathsXDirectory containing certificates for SSL support
+LDAPCacheEntries number 1024 sXMaximum number of entires in the primary LDAP cache
+LDAPCacheTTL seconds 600 sXTime that cached items remain valid
 LDAPOpCacheEntries number 1024 sXNumber of entries used to cache LDAP compare 
 operations
 LDAPOpCacheTTL seconds 600 sXTime that entries in the operation cache remain
 valid
 LDAPSharedCacheSize bytes 102400 sXSize in bytes of the shared-memory cache
+LDAPTrustedCA directory-path/filenamesXSets the file containing the trusted Certificate Authority certificate or database
+LDAPTrustedCAType typesXSpecifies the type of the Certificate Authority file
 <Limit Methode [Methode] ... > ...
     </Limit>svdhCBeschränkt die eingeschlossenen Zugriffskontrollen auf
 bestimmte HTTP-Methoden
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 0a9c75552ee..410917bcd6a 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -164,208 +164,208 @@ authenticating the user if this one fails
 group membership
 AuthLDAPRemoteUserIsDN on|off off dhXUse the DN of the client username to set the REMOTE_USER
 environment variable
-AuthLDAPStartTLS on|off off dhXUse a secure TLS connection to the LDAP server
-AuthLDAPUrl urldhXURL specifying the LDAP search parameters
-AuthName auth-domaindhCAuthorization realm for use in HTTP
+AuthLDAPUrl urldhXURL specifying the LDAP search parameters
+AuthName auth-domaindhCAuthorization realm for use in HTTP
 authentication
-AuthType Basic|DigestdhCType of user authentication
-AuthUserFile file-pathdhBSets the name of a text file containing the list of users and
+AuthType Basic|DigestdhCType of user authentication
+AuthUserFile file-pathdhBSets the name of a text file containing the list of users and
 passwords for authentication
-AuthzDBMAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
+AuthzDBMAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
 modules
-AuthzDBMType default|SDBM|GDBM|NDBM|DB default dhESets the type of database file that is used to
+AuthzDBMType default|SDBM|GDBM|NDBM|DB default dhESets the type of database file that is used to
 store passwords
-AuthzDefaultAuthoritative On|Off On dhBSets whether authorization is passed to lower level
+AuthzDefaultAuthoritative On|Off On dhBSets whether authorization is passed to lower level
 modules
-AuthzGroupFileAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
+AuthzGroupFileAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
 modules
-AuthzOwnerAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
+AuthzOwnerAuthoritative On|Off On dhESets whether authorization will be passed on to lower level
 modules
-AuthzUserAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
+AuthzUserAuthoritative On|Off On dhBSets whether authorization will be passed on to lower level
 modules
-BrowserMatch regex [!]env-variable[=value]
-[[!]env-variable[=value]] ...svdhBSets environment variables conditional on HTTP User-Agent
+BrowserMatch regex [!]env-variable[=value]
+[[!]env-variable[=value]] ...svdhBSets environment variables conditional on HTTP User-Agent
 
-BrowserMatchNoCase  regex [!]env-variable[=value]
-    [[!]env-variable[=value]] ...svdhBSets environment variables conditional on User-Agent without
+BrowserMatchNoCase  regex [!]env-variable[=value]
+    [[!]env-variable[=value]] ...svdhBSets environment variables conditional on User-Agent without
 respect to case
-BS2000Account accountsMDefine the non-privileged account on BS2000
+BS2000Account accountsMDefine the non-privileged account on BS2000
 machines
-CacheDefaultExpire seconds 3600 (one hour) svXThe default duration to cache a document when no expiry date is specified.
-CacheDirLength length 2 svXThe number of characters in subdirectory names
-CacheDirLevels levels 3 svXThe number of levels of subdirectories in the
+CacheDefaultExpire seconds 3600 (one hour) svXThe default duration to cache a document when no expiry date is specified.
+CacheDirLength length 2 svXThe number of characters in subdirectory names
+CacheDirLevels levels 3 svXThe number of levels of subdirectories in the
 cache.
-CacheDisable  url-stringsvXDisable caching of specified URLs
-CacheEnable cache_type url-stringsvXEnable caching of specified URLs using a specified storage
+CacheDisable  url-stringsvXDisable caching of specified URLs
+CacheEnable cache_type url-stringsvXEnable caching of specified URLs using a specified storage
 manager
-CacheExpiryCheck On|Off On svXIndicates if the cache observes Expires dates when seeking
+CacheExpiryCheck On|Off On svXIndicates if the cache observes Expires dates when seeking
 files
-CacheFile file-path [file-path] ...sXCache a list of file handles at startup time
-CacheForceCompletion Percentage 60 svXPercentage of document served, after which the server
+CacheFile file-path [file-path] ...sXCache a list of file handles at startup time
+CacheForceCompletion Percentage 60 svXPercentage of document served, after which the server
 will complete caching the file even if the request is cancelled.
-CacheGcClean hours url-string ? svXThe time to retain unchanged cached files that match a
+CacheGcClean hours url-string ? svXThe time to retain unchanged cached files that match a
 URL
-CacheGcDaily time ? svXThe recurring time each day for garbage collection to be run.
+CacheGcDaily time ? svXThe recurring time each day for garbage collection to be run.
 (24 hour clock)
-CacheGcInterval hourssvXThe interval between garbage collection attempts.
-CacheGcMemUsage KBytes ? svXThe maximum kilobytes of memory used for garbage
+CacheGcInterval hourssvXThe interval between garbage collection attempts.
+CacheGcMemUsage KBytes ? svXThe maximum kilobytes of memory used for garbage
 collection
-CacheGcUnused hours url-string ? svXThe time to retain unreferenced cached files that match a
+CacheGcUnused hours url-string ? svXThe time to retain unreferenced cached files that match a
 URL.
-CacheIgnoreCacheControl On|Off Off svXIgnore the fact that the client requested the content not be
+CacheIgnoreCacheControl On|Off Off svXIgnore the fact that the client requested the content not be
 cached.
-CacheIgnoreNoLastMod On|Off Off svXIgnore the fact that a response has no Last Modified
+CacheIgnoreNoLastMod On|Off Off svXIgnore the fact that a response has no Last Modified
 header.
-CacheLastModifiedFactor float 0.1 svXThe factor used to compute an expiry date based on the
+CacheLastModifiedFactor float 0.1 svXThe factor used to compute an expiry date based on the
 LastModified date.
-CacheMaxExpire seconds 86400 (one day) svXThe maximum time in seconds to cache a document
-CacheMaxFileSize bytes 1000000 svXThe maximum size (in bytes) of a document to be placed in the
+CacheMaxExpire seconds 86400 (one day) svXThe maximum time in seconds to cache a document
+CacheMaxFileSize bytes 1000000 svXThe maximum size (in bytes) of a document to be placed in the
 cache
-CacheMinFileSize bytes 1 svXThe minimum size (in bytes) of a document to be placed in the
+CacheMinFileSize bytes 1 svXThe minimum size (in bytes) of a document to be placed in the
 cache
-CacheNegotiatedDocs On|Off Off svBAllows content-negotiated documents to be 
+CacheNegotiatedDocs On|Off Off svBAllows content-negotiated documents to be 
 cached by proxy servers
-CacheRoot directorysvXThe directory root under which cache files are
+CacheRoot directorysvXThe directory root under which cache files are
 stored
-CacheSize KBytes 1000000 svXThe maximum amount of disk space that will be used by the
+CacheSize KBytes 1000000 svXThe maximum amount of disk space that will be used by the
 cache in KBytes
-CacheTimeMargin ? ? svXThe minimum time margin to cache a document
-CGIMapExtension cgi-path .extensiondhCTechnique for locating the interpreter for CGI
+CacheTimeMargin ? ? svXThe minimum time margin to cache a document
+CGIMapExtension cgi-path .extensiondhCTechnique for locating the interpreter for CGI
 scripts
-CharsetDefault charsetsvdhXCharset to translate into
-CharsetOptions option [option] ... DebugLevel=0 NoImpl +svdhXConfigures charset translation behavior
-CharsetSourceEnc charsetsvdhXSource charset of files
-CheckSpelling on|off Off svdhEEnables the spelling 
+CharsetDefault charsetsvdhXCharset to translate into
+CharsetOptions option [option] ... DebugLevel=0 NoImpl +svdhXConfigures charset translation behavior
+CharsetSourceEnc charsetsvdhXSource charset of files
+CheckSpelling on|off Off svdhEEnables the spelling 
 module
-ChildPerUserID user-id group-id
-num-childrensMSpecify user ID and group ID for a number of child
+ChildPerUserID user-id group-id
+num-childrensMSpecify user ID and group ID for a number of child
 processes
-ContentDigest On|Off Off svdhCEnables the generation of Content-MD5 HTTP Response
+ContentDigest On|Off Off svdhCEnables the generation of Content-MD5 HTTP Response
 headers
-CookieDomain domainsvdhEThe domain to which the tracking cookie applies
-CookieExpires expiry-periodsvdhEExpiry time for the tracking cookie
-CookieLog filenamesvBSets filename for the logging of cookies
-CookieName token Apache svdhEName of the tracking cookie
-CookieStyle
-    Netscape|Cookie|Cookie2|RFC2109|RFC2965 Netscape svdhEFormat of the cookie header field
-CookieTracking on|off off svdhEEnables tracking cookie
-CoreDumpDirectory directorysMDirectory where Apache attempts to
+CookieDomain domainsvdhEThe domain to which the tracking cookie applies
+CookieExpires expiry-periodsvdhEExpiry time for the tracking cookie
+CookieLog filenamesvBSets filename for the logging of cookies
+CookieName token Apache svdhEName of the tracking cookie
+CookieStyle
+    Netscape|Cookie|Cookie2|RFC2109|RFC2965 Netscape svdhEFormat of the cookie header field
+CookieTracking on|off off svdhEEnables tracking cookie
+CoreDumpDirectory directorysMDirectory where Apache attempts to
 switch before dumping core
-CustomLog  file|pipe
+CustomLog  file|pipe
 format|nickname
-[env=[!]environment-variable]svBSets filename and format of log file
-Dav On|Off|provider-name Off dEEnable WebDAV HTTP methods
-DavDepthInfinity on|off off svdEAllow PROPFIND, Depth: Infinity requests
-DavLockDB file-pathsvELocation of the DAV lock database
-DavMinTimeout seconds 0 svdEMinimum amount of time the server holds a lock on
+[env=[!]environment-variable]svBSets filename and format of log file
+Dav On|Off|provider-name Off dEEnable WebDAV HTTP methods
+DavDepthInfinity on|off off svdEAllow PROPFIND, Depth: Infinity requests
+DavLockDB file-pathsvELocation of the DAV lock database
+DavMinTimeout seconds 0 svdEMinimum amount of time the server holds a lock on
 a DAV resource
-DefaultIcon url-pathsvdhBIcon to display for files when no specific icon is
+DefaultIcon url-pathsvdhBIcon to display for files when no specific icon is
 configured
-DefaultLanguage MIME-langsvdhBSets all files in the given scope to the specified
+DefaultLanguage MIME-langsvdhBSets all files in the given scope to the specified
 language
-DefaultType MIME-type text/plain svdhCMIME content-type that will be sent if the
+DefaultType MIME-type text/plain svdhCMIME content-type that will be sent if the
 server cannot determine a type in any other way
-DeflateBufferSize value 8096 svEFragment size to be compressed at one time by zlib
-DeflateFilterNote [type] notenamesvEPlaces the compression ratio in a note for logging
-DeflateMemLevel value 9 svEHow much memory should be used by zlib for compression
-DeflateWindowSize value 15 svEZlib compression window size
- Deny from all|host|env=env-variable
-[host|env=env-variable] ...dhBControls which hosts are denied access to the
+DeflateBufferSize value 8096 svEFragment size to be compressed at one time by zlib
+DeflateFilterNote [type] notenamesvEPlaces the compression ratio in a note for logging
+DeflateMemLevel value 9 svEHow much memory should be used by zlib for compression
+DeflateWindowSize value 15 svEZlib compression window size
+ Deny from all|host|env=env-variable
+[host|env=env-variable] ...dhBControls which hosts are denied access to the
 server
-<Directory directory-path>
-... </Directory>svCEnclose a group of directives that apply only to the
+<Directory directory-path>
+... </Directory>svCEnclose a group of directives that apply only to the
 named file-system directory and sub-directories
-DirectoryIndex
-    local-url [local-url] ... index.html svdhBList of resources to look for when the client requests
+DirectoryIndex
+    local-url [local-url] ... index.html svdhBList of resources to look for when the client requests
 a directory
-<DirectoryMatch regex>
-... </DirectoryMatch>svCEnclose directives that apply to
+<DirectoryMatch regex>
+... </DirectoryMatch>svCEnclose directives that apply to
 file-system directories matching a regular expression and their
 subdirectories
-DocumentRoot directory-path /usr/local/apache/h +svCDirectory that forms the main document tree visible
+DocumentRoot directory-path /usr/local/apache/h +svCDirectory that forms the main document tree visible
 from the web
-EnableMMAP On|Off On svdhCUse memory-mapping to read files during delivery
-EnableSendfile On|Off On svdhCUse the kernel sendfile support to deliver files to the client
-ErrorDocument error-code documentsvdhCWhat the server will return to the client
+EnableMMAP On|Off On svdhCUse memory-mapping to read files during delivery
+EnableSendfile On|Off On svdhCUse the kernel sendfile support to deliver files to the client
+ErrorDocument error-code documentsvdhCWhat the server will return to the client
 in case of an error
- ErrorLog file-path|syslog[:facility] logs/error_log (Uni +svCLocation where the server will log errors
-ExamplesvdhXDemonstration directive to illustrate the Apache module
+ ErrorLog file-path|syslog[:facility] logs/error_log (Uni +svCLocation where the server will log errors
+ExamplesvdhXDemonstration directive to illustrate the Apache module
 API
-ExpiresActive On|OffsvdhEEnables generation of Expires
+ExpiresActive On|OffsvdhEEnables generation of Expires
 headers
-ExpiresByType MIME-type
-<code>secondssvdhEValue of the Expires header configured
+ExpiresByType MIME-type
+<code>secondssvdhEValue of the Expires header configured
 by MIME type
-ExpiresDefault <code>secondssvdhEDefault algorithm for calculating expiration time
-ExtendedStatus On|Off Off sBKeep track of extended status information for each 
+ExpiresDefault <code>secondssvdhEDefault algorithm for calculating expiration time
+ExtendedStatus On|Off Off sBKeep track of extended status information for each 
 request
-ExtFilterDefine filtername parameterssEDefine an external filter
-ExtFilterOptions option [option] ... DebugLevel=0 NoLogS +dEConfigure mod_ext_filter options
-FileETag component ... INode MTime Size svdhCFile attributes used to create the ETag
+ExtFilterDefine filtername parameterssEDefine an external filter
+ExtFilterOptions option [option] ... DebugLevel=0 NoLogS +dEConfigure mod_ext_filter options
+FileETag component ... INode MTime Size svdhCFile attributes used to create the ETag
 HTTP response header
-<Files filename> ... </Files>svdhCContains directives that apply to matched
+<Files filename> ... </Files>svdhCContains directives that apply to matched
 filenames
-<FilesMatch regex> ... </FilesMatch>svdhCContains directives that apply to regular-expression matched
+<FilesMatch regex> ... </FilesMatch>svdhCContains directives that apply to regular-expression matched
 filenames
-ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback] Prefer svdhBAction to take if a single acceptable document is not 
+ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback] Prefer svdhBAction to take if a single acceptable document is not 
 found
-ForceType MIME-type|NonedhCForces all matching files to be served with the specified
+ForceType MIME-type|NonedhCForces all matching files to be served with the specified
 MIME content-type
-Group unix-group #-1 sMGroup under which the server will answer
+Group unix-group #-1 sMGroup under which the server will answer
 requests
-Header set|append|add|unset|echo  header
-[value [env=[!]variable]]svdhEConfigure HTTP response headers
-HeaderName filenamesvdhBName of the file that will be inserted at the top
+Header set|append|add|unset|echo  header
+[value [env=[!]variable]]svdhEConfigure HTTP response headers
+HeaderName filenamesvdhBName of the file that will be inserted at the top
 of the index listing
-HostnameLookups On|Off|Double Off svdCEnables DNS lookups on client IP addresses
-IdentityCheck On|Off Off svdEEnables logging of the RFC 1413 identity of the remote
+HostnameLookups On|Off|Double Off svdCEnables DNS lookups on client IP addresses
+IdentityCheck On|Off Off svdEEnables logging of the RFC 1413 identity of the remote
 user
-IdentityCheckTimeout seconds 30 svdEDetermines the timeout duration for ident requests
-<IfDefine [!]parameter-name> ...
-    </IfDefine>svdhCEncloses directives that will be processed only
+IdentityCheckTimeout seconds 30 svdEDetermines the timeout duration for ident requests
+<IfDefine [!]parameter-name> ...
+    </IfDefine>svdhCEncloses directives that will be processed only
 if a test is true at startup
-<IfModule [!]module-name> ...
-    </IfModule>svdhCEncloses directives that are processed conditional on the
+<IfModule [!]module-name> ...
+    </IfModule>svdhCEncloses directives that are processed conditional on the
 presence or absence of a specific module
-ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files
-ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates
+ImapBase map|referer|URL http://servername/ svdhBDefault base for imagemap files
+ImapDefault error|nocontent|map|referer|URL nocontent svdhBDefault action when an imagemap is called with coordinates
 that are not explicitly mapped
-ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling
+ImapMenu none|formatted|semiformatted|unformattedsvdhBAction if no coordinates are given when calling
 an imagemap
-Include file-path|directory-pathsvdCIncludes other configuration files from within
+Include file-path|directory-pathsvdCIncludes other configuration files from within
 the server configuration files
-IndexIgnore file [file] ...svdhBAdds to the list of files to hide when listing 
+IndexIgnore file [file] ...svdhBAdds to the list of files to hide when listing 
 a directory
-IndexOptions  [+|-]option [[+|-]option]
-...svdhBVarious configuration settings for directory 
+IndexOptions  [+|-]option [[+|-]option]
+...svdhBVarious configuration settings for directory 
 indexing
-IndexOrderDefault Ascending|Descending
-Name|Date|Size|Description Ascending Name svdhBSets the default ordering of the directory index
-ISAPIAppendLogToErrors on|off off svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
+IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description Ascending Name svdhBSets the default ordering of the directory index
+ISAPIAppendLogToErrors on|off off svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
 ISAPI extensions to the error log
-ISAPIAppendLogToQuery on|off on svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
+ISAPIAppendLogToQuery on|off on svdhBRecord HSE_APPEND_LOG_PARAMETER requests from
 ISAPI extensions to the query field
-ISAPICacheFile file-path [file-path]
-...svBISAPI .dll files to be loaded at startup
-ISAPIFakeAsync on|off off svdhBFake asynchronous support for ISAPI callbacks
-ISAPILogNotSupported on|off off svdhBLog unsupported feature requests from ISAPI
+ISAPICacheFile file-path [file-path]
+...svBISAPI .dll files to be loaded at startup
+ISAPIFakeAsync on|off off svdhBFake asynchronous support for ISAPI callbacks
+ISAPILogNotSupported on|off off svdhBLog unsupported feature requests from ISAPI
 extensions
-ISAPIReadAheadBuffer size 49152 svdhBSize of the Read Ahead Buffer sent to ISAPI
+ISAPIReadAheadBuffer size 49152 svdhBSize of the Read Ahead Buffer sent to ISAPI
 extensions
-KeepAlive On|Off On svCEnables HTTP persistent connections
-KeepAliveTimeout seconds 15 svCAmount of time the server will wait for subsequent
+KeepAlive On|Off On svCEnables HTTP persistent connections
+KeepAliveTimeout seconds 15 svCAmount of time the server will wait for subsequent
 requests on a persistent connection
-LanguagePriority MIME-lang [MIME-lang]
-...svdhBThe precendence of language variants for cases where
+LanguagePriority MIME-lang [MIME-lang]
+...svdhBThe precendence of language variants for cases where
 the client does not express a preference
-LDAPCacheEntries number 1024 sXMaximum number of entires in the primary LDAP cache
-LDAPCacheTTL seconds 600 sXTime that cached items remain valid
-LDAPCertDBPath directory-pathsXDirectory containing certificates for SSL support
+LDAPCacheEntries number 1024 sXMaximum number of entires in the primary LDAP cache
+LDAPCacheTTL seconds 600 sXTime that cached items remain valid
 LDAPOpCacheEntries number 1024 sXNumber of entries used to cache LDAP compare 
 operations
 LDAPOpCacheTTL seconds 600 sXTime that entries in the operation cache remain
 valid
 LDAPSharedCacheSize bytes 102400 sXSize in bytes of the shared-memory cache
+LDAPTrustedCA directory-path/filenamesXSets the file containing the trusted Certificate Authority certificate or database
+LDAPTrustedCAType typesXSpecifies the type of the Certificate Authority file
 <Limit method [method] ... > ...
     </Limit>svdhCRestrict enclosed access controls to only certain HTTP
 methods