From: André Malo Date: Sun, 26 Jan 2014 22:58:27 +0000 (+0000) Subject: fix various invalid module references X-Git-Tag: 2.5.0-alpha~4585 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=318936f5049b17202713499086e17e262d4ff904;p=apache fix various invalid module references git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561569 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/env.xml b/docs/manual/env.xml index 5bb7321254..5bfefb285f 100644 --- a/docs/manual/env.xml +++ b/docs/manual/env.xml @@ -453,7 +453,7 @@

If you have to support a client which sends broken headers and which can't be fixed, a simple workaround involving mod_setenvif - and mod_header allows you to still accept + and mod_headers allows you to still accept these headers:

diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 715c5b727a..79dc33e025 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -491,13 +491,11 @@ Require group GroupName other than who they are. Something such as where they are coming from.

-

The authorization providers - all, - env, - host and - ip let you allow or deny access based other host based - criteria such as host name or ip address of the machine requesting - a document.

+

The authorization providers all, + env, host and ip let you + allow or deny access based other host based criteria such as + host name or ip address of the machine requesting a + document.

The usage of these providers is specified through the Require directive. @@ -583,10 +581,11 @@ Require group GroupName

More information

You should also read the documentation for - mod_auth_basic and mod_authz_host which - contain some more information about how this all works. - The directive <AuthnProviderAlias> - can also help in simplifying certain authentication configurations.

+ mod_auth_basic and mod_authz_host + which contain some more information about how this all works. The + directive AuthnProviderAlias can also help + in simplifying certain authentication configurations.

The various ciphers supported by Apache for authentication data are explained in Password diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml index 3e3bc2a586..ada3e73ec5 100644 --- a/docs/manual/howto/htaccess.xml +++ b/docs/manual/howto/htaccess.xml @@ -47,11 +47,11 @@ changes on a per-directory basis.

Options AddHandler SetHandler - AuthType - AuthName + AuthType + AuthName AuthUserFile AuthGroupFile - Require + Require diff --git a/docs/manual/mod/mod_allowhandlers.xml b/docs/manual/mod/mod_allowhandlers.xml index f4dc7601df..2dcd165af5 100644 --- a/docs/manual/mod/mod_allowhandlers.xml +++ b/docs/manual/mod/mod_allowhandlers.xml @@ -45,7 +45,7 @@ returns 403 FORBIDDEN to the client. This can be used with directives like SetHandler -AddHandler +AddHandler AllowHandlers diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml index 161eff9e75..0d032f09f0 100644 --- a/docs/manual/mod/mod_authn_dbm.xml +++ b/docs/manual/mod/mod_authn_dbm.xml @@ -82,8 +82,8 @@ passwords for authentication

The encrypted password format depends on which authentication - frontend (e.g. mod_authn_basic or - mod_authn_digest) is being used. See mod_auth_basic or + mod_auth_digest) is being used. See Password Formats for more information.

diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index 587a33a132..1284cef8a6 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -964,8 +964,8 @@ AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html

When the CacheHeader directive is switched on, an X-Cache header will be added to the response with the cache status of this response. If the normal handler is used, this - directive may appear within a <Directory> - or <Location> directive. If the quick + directive may appear within a Directory + or Location directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.

@@ -1013,8 +1013,8 @@ CacheHeader on used by the service and client.

If the normal handler is used, this directive may appear within a - <Directory> or - <Location> directive. If the quick handler + Directory or + Location directive. If the quick handler is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.

diff --git a/docs/manual/mod/mod_ext_filter.xml b/docs/manual/mod/mod_ext_filter.xml index f663e2b4d5..e47d180f77 100644 --- a/docs/manual/mod/mod_ext_filter.xml +++ b/docs/manual/mod/mod_ext_filter.xml @@ -96,7 +96,7 @@ ExtFilterDefine gzip mode=output cmd=/bin/gzip # run on output SetOutputFilter gzip - # mod_header directive to add + # mod_headers directive to add # "Content-Encoding: gzip" header field Header set Content-Encoding gzip </Location> diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index 542e266801..d2f07b1b26 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -38,7 +38,7 @@
処理の順番 -

mod_header のディレクティブはサーバ設定のほぼどこにでも +

mod_headers のディレクティブはサーバ設定のほぼどこにでも 書くことができ、影響する範囲を設定用セクションで囲むことで限定する ことができます。

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 1fdad686af..c0a0286539 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -139,18 +139,18 @@ configuration LoadFile.
  • Directives which control the configuration file itself, such as Include, - <IfModule> and - <IfDefine> are not + IfModule and + IfDefine are not listed, but the included configuration directives are.
  • Comments are not listed. (This may be considered a feature.)
  • Configuration directives from .htaccess files are not listed (since they do not form part of the permanent server configuration).
  • Container directives such as - <Directory> + Directory are listed normally, but mod_info cannot figure out the line number for the closing - </Directory>.
    • + /Directory.
  • Directives generated by third party modules such as mod_perl might not be listed.
    • diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml index 02f680cb41..ba127a7f6b 100644 --- a/docs/manual/mod/mod_remoteip.xml +++ b/docs/manual/mod/mod_remoteip.xml @@ -44,7 +44,7 @@ via the request headers.

    Once replaced as instructed, this overridden useragent IP address is then used for the mod_authz_host - Require ip + Require ip feature, is reported by mod_status, and is recorded by mod_log_config %a and core %a format strings. The underlying client IP of the connection diff --git a/docs/manual/mod/mod_session_crypto.xml b/docs/manual/mod/mod_session_crypto.xml index 5d873df2a0..c2446c251d 100644 --- a/docs/manual/mod/mod_session_crypto.xml +++ b/docs/manual/mod/mod_session_crypto.xml @@ -120,11 +120,12 @@ SessionCryptoPassphrase secret -

    The NSS crypto driver might have already been configured by another - part of the server, for example from mod_nss or - mod_ldap. If found to have already been configured, - a warning will be logged, and the existing configuration will have taken affect. - To avoid this warning, use the noinit parameter as follows.

    +

    The NSS crypto driver might have already been + configured by another part of the server, for example from + mod_nss or mod_ldap. If found to + have already been configured, a warning will be logged, and the + existing configuration will have taken affect. To avoid this + warning, use the noinit parameter as follows.

    NSS with certificate database diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml index d24723a9bf..ca8032e560 100644 --- a/docs/manual/new_features_2_0.xml +++ b/docs/manual/new_features_2_0.xml @@ -154,7 +154,7 @@ browsers to request that content be compressed before delivery, saving network bandwidth. -
    mod_auth_ldap
    +
    mod_auth_ldap
    New module in Apache httpd 2.0.41. This module allows an LDAP database to be used to store credentials for HTTP Basic @@ -223,7 +223,7 @@ using mod_include's variables $0 .. $9.
    -
    mod_auth_dbm
    +
    mod_auth_dbm
    Now supports multiple types of DBM-like databases using the AuthDBMType directive.
    diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml index f7961ff9a3..38ed6703e8 100644 --- a/docs/manual/new_features_2_2.xml +++ b/docs/manual/new_features_2_2.xml @@ -124,7 +124,7 @@ certain authentication configurations. -
    mod_authnz_ldap
    +
    mod_authnz_ldap
    This module is a port of the 2.0 mod_auth_ldap module to the 2.2 Authn/Authz framework. New features include using LDAP attribute values and diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml index 8212e966fd..387ff084a1 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -302,8 +302,8 @@

    To find out which modules are compiled by default, run ./configure -h or ./configure --help and look under Optional Features. Suppose you - are interested in mod_example1 and - mod_example2, and you + are interested in mod_example1 and + mod_example2, and you see this:

    Optional Features:
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index 0e340a2f6a..3839ee63dd 100644
--- a/docs/manual/ssl/ssl_faq.xml
+++ b/docs/manual/ssl/ssl_faq.xml
@@ -765,7 +765,7 @@ SetEnvIf User-Agent "MSIE [2-5]" \
     command. Alternatively, you can append the following standard 1024-bit DH
     parameters from RFC 2409,
     section 6.2 to the respective
-    SSLCertificateFile file:
    
+    SSLCertificateFile file:
    
     
    -----BEGIN DH PARAMETERS-----
 MIGHAoGBAP//////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR
 Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL
diff --git a/docs/manual/urlmapping.xml b/docs/manual/urlmapping.xml
index 9d148f4b5b..71cdad84d6 100644
--- a/docs/manual/urlmapping.xml
+++ b/docs/manual/urlmapping.xml
@@ -50,7 +50,7 @@
 Alias
 AliasMatch
 CheckSpelling
-DirectoryIndex
+DirectoryIndex
 DocumentRoot
 ErrorDocument
 Options
@@ -88,7 +88,7 @@
 
     
    If a directory is requested (i.e. a path ending with
     /), the file served from that directory is defined by
-    the DirectoryIndex directive.
+    the DirectoryIndex directive.
     For example, if DocumentRoot were set as above, and 
     you were to set:
    
 
diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml
index 86f99f07bf..f00b9454f0 100644
--- a/docs/manual/vhosts/examples.xml
+++ b/docs/manual/vhosts/examples.xml
@@ -330,9 +330,10 @@ Listen 80
     virtual host through to a server running on another machine. In the
     example, a virtual host of the same name is configured on a machine
     at 192.168.111.2. The ProxyPreserveHost On directive is
-    used so that the desired hostname is passed through, in case we are
-    proxying multiple hostnames to a single machine.
    
+    module="mod_proxy" name="ProxyPreserveHost">ProxyPreserveHost
+    On directive is used so that the desired hostname is
+    passed through, in case we are proxying multiple hostnames to a
+    single machine.
    
 
     
 <VirtualHost *:*>
diff --git a/docs/manual/vhosts/fd-limits.xml b/docs/manual/vhosts/fd-limits.xml
index cd9802eb6e..56c78c24b7 100644
--- a/docs/manual/vhosts/fd-limits.xml
+++ b/docs/manual/vhosts/fd-limits.xml
@@ -99,8 +99,7 @@ CustomLog logs/multiple_vhost_log vhost
 
    This will create a log file in the common log format, but with the
 canonical virtual host (whatever appears in the
 ServerName directive) prepended to
-each line. (See Custom Log Formats for
+each line. (See mod_log_config for
 more about customizing your log files.)
    
 
 
    When you wish to split your log file into its component parts (one