From: André Malo Date: Wed, 29 Jan 2014 15:59:54 +0000 (+0000) Subject: fix broken references X-Git-Tag: 2.4.8~180 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1500d4aa91bd7bf5d77581c6f661be552d781e7;p=apache fix broken references git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562488 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 27c8d1c3c7..15428a91a8 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -51,7 +51,7 @@ it listens to all addresses on the machine. However, it may need to be told to listen on specific ports, or only on selected addresses, or a combination of both. This is often combined with the - Virtual Host feature, which determines how + Virtual Host feature, which determines how httpd responds to different IP addresses, hostnames and ports.

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/filter.xml b/docs/manual/filter.xml index 1b97cc5adf..d59b776d3c 100644 --- a/docs/manual/filter.xml +++ b/docs/manual/filter.xml @@ -47,7 +47,6 @@ mod_substitute mod_xml2enc mod_proxy_html - mod_policy FilterChain diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 2d0f8fc151..d83fbaac93 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -486,13 +486,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. @@ -578,10 +576,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/core.xml b/docs/manual/mod/core.xml index 2b1957aa3e..89401181c1 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -884,7 +884,7 @@ the contents of file-system directories matching a regular expression.From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of paths to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

@@ -1744,7 +1744,7 @@ filenames

From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of files to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

@@ -1907,7 +1907,7 @@ satisfied by a request at runtime documentation is available in Expressions in Apache HTTP Server.

-

Only directives that support the Only directives that support the directory context can be used within this configuration section.

@@ -2712,7 +2712,7 @@ matching URLs

From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of URLs to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml index fa8cd4393b..1d93c39e37 100644 --- a/docs/manual/mod/mod_auth_digest.xml +++ b/docs/manual/mod/mod_auth_digest.xml @@ -227,9 +227,7 @@ authentication contain at least the (set of) root URI(s) for this space. Omitting to do so will cause the client to send the Authorization header for every request sent to this - server. Apart from increasing the size of the request, it may - also have a detrimental effect on performance if AuthDigestNcCheck is on.

+ server.

The URIs specified can also point to different servers, in which case clients (which understand this) will then share diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml index 6721ba8170..251739d8a3 100644 --- a/docs/manual/mod/mod_authn_dbm.xml +++ b/docs/manual/mod/mod_authn_dbm.xml @@ -83,8 +83,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 dd05e275f7..0bc49f69ef 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -968,8 +968,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.

@@ -1017,8 +1017,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 e44ab64081..9f5b3e9c84 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..8a1aa5b279 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_proxy.xml b/docs/manual/mod/mod_proxy.xml index 987f46a60c..57e72c3e7d 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -532,7 +532,7 @@ proxied resources

    From 2.5.0 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of URLs to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

    diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml index 02f680cb41..71102f1b19 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/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml index e4f70e8890..c5fd0f1746 100644 --- a/docs/manual/mod/mpmt_os2.xml +++ b/docs/manual/mod/mpmt_os2.xml @@ -47,9 +47,9 @@ Setting which addresses and ports Apache uses -User +User -Group +Group Listen diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml index 62d4fc0dd6..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,11 +223,10 @@ 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.
    + AuthDBMType directive.
    diff --git a/docs/manual/platform/ebcdic.xml b/docs/manual/platform/ebcdic.xml index 7a355fb063..6ee9de6e1b 100644 --- a/docs/manual/platform/ebcdic.xml +++ b/docs/manual/platform/ebcdic.xml @@ -327,7 +327,7 @@ - mod_access + mod_access + @@ -351,7 +351,7 @@ - mod_auth + mod_auth + @@ -465,7 +465,7 @@ - mod_log_referer + mod_log_referer + diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml index 39e16edf88..258b80e08e 100644 --- a/docs/manual/platform/netware.xml +++ b/docs/manual/platform/netware.xml @@ -33,14 +33,17 @@ bug reporting page.

    -

    The bug reporting page and dev-httpd mailing list are not - provided to answer questions about configuration or running Apache. - Before you submit a bug report or request, first consult this document, the - Frequently Asked Questions page and the other - relevant documentation topics. If you still have a question or problem, - post it to the - novell.devsup.webserver newsgroup, where many Apache users are more than - willing to answer new and obscure questions about using Apache on NetWare.

    +

    The bug reporting page and dev-httpd mailing list are + not provided to answer questions about configuration or + running Apache. Before you submit a bug report or request, first + consult this document, the Frequently Asked + Questions page and the other relevant documentation topics. If + you still have a question or problem, post it to the + novell.devsup.webserver newsgroup, where many Apache users are + more than willing to answer new and obscure questions about using + Apache on NetWare.

    Most of this document assumes that you are installing Apache from a binary distribution. If you want to compile Apache @@ -324,7 +327,7 @@

    Apache is configured by reading configuration files usually stored in the conf directory. These are the same as files used to configure the Unix version, but there are a few different directives for - Apache on NetWare. See the Apache + Apache on NetWare. See the Apache module documentation for all the available directives.

    The main differences in Apache for NetWare are:

    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/programs/log_server_status.xml b/docs/manual/programs/log_server_status.xml
index 034bf27092..39feb98a0c 100644
--- a/docs/manual/programs/log_server_status.xml
+++ b/docs/manual/programs/log_server_status.xml
@@ -20,7 +20,7 @@
  limitations under the License.
 -->
 
-
+
 Programs
 
 log_server_status - Log periodic status summaries
diff --git a/docs/manual/programs/split-logfile.xml b/docs/manual/programs/split-logfile.xml
index 6cb5b38463..63f8f8a43e 100644
--- a/docs/manual/programs/split-logfile.xml
+++ b/docs/manual/programs/split-logfile.xml
@@ -20,7 +20,7 @@
  limitations under the License.
 -->
 
-
+
 Programs
 
 split-logfile - Split up multi-vhost logfiles
diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml
index 170959ed91..99c986a858 100644
--- a/docs/manual/rewrite/advanced.xml
+++ b/docs/manual/rewrite/advanced.xml
@@ -20,7 +20,7 @@
  limitations under the License.
 -->
 
-
+
   Rewrite
 
 Advanced Techniques with mod_rewrite
diff --git a/docs/manual/rewrite/advanced.xml.fr b/docs/manual/rewrite/advanced.xml.fr
index c12348e04a..929f00af80 100644
--- a/docs/manual/rewrite/advanced.xml.fr
+++ b/docs/manual/rewrite/advanced.xml.fr
@@ -22,7 +22,7 @@
  limitations under the License.
 -->
 
-
+
   Rewrite
 
 Advanced Techniques with mod_rewrite
diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 05b169a4f4..d4f3a37ef4 100644
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -50,8 +50,8 @@ Documentation.
    
 Server-Wide Configuration
 Log Files
 Mapping URLs to Filesystem Locations
-Security Tips
 Dynamic Shared Object (DSO) support
+HTTP Protocol Compliance
 Content Negotiation
 Custom error responses
 Setting which addresses and ports Apache uses
@@ -62,7 +62,7 @@ Documentation.
    
 Filters
 Shared Object Cache Support
 suEXEC Support
-Performance Hints
+Issues Regarding DNS and Apache
 Frequently Asked Questions
 
 
@@ -75,7 +75,6 @@ Documentation.
    
 VirtualHost Examples
 An In-Depth Discussion of Virtual Host Matching
 File descriptor limitations
-Issues Regarding DNS and Apache
 
 
 
@@ -83,12 +82,18 @@ Documentation.
    
 Overview
 mod_rewrite reference
 documentation
-Introduction
-Flags
-Technical details
-Remapping URLs
-Access control
+Introduction to regular expressions and
+mod_rewrite
+Using mod_rewrite for redirection and
+remapping of URLs
+Using mod_rewrite to control access
+Dynamic virtual hosts with mod_rewrite
+Dynamic proxying with mod_rewrite
+Using RewriteMap
 Advanced techniques
+When NOT to use mod_rewrite
+RewriteRule Flags
+Technical details
     
 
 
@@ -103,7 +108,8 @@ documentation
 
 Guides, Tutorials, and HowTos
 Overview
-Authentication
+Authentication and Authorization
+Access Control
 Dynamic Content with CGI
 Introduction to Server Side Includes
 .htaccess files
@@ -117,6 +123,7 @@ documentation
 Windows
 Compiling Apache for
 Microsoft Windows
+Using Apache With RPM Based Systems
 Using Apache with Novell NetWare
 Running a High-Performance Web
 Server on HPUX
@@ -132,12 +139,18 @@ Server on HPUX
 Manual Page: apxs
 Manual Page: configure
 Manual Page: dbmmanage
+Manual Page: fcgistarter
+Manual Page: firehose
 Manual Page: htcacheclean
 Manual Page: htdbm
 Manual Page: htdigest
 Manual Page: htpasswd
+Manual Page: httxt2dbm
 Manual Page: logresolve
+Manual Page:
+log_server_status
 Manual Page: rotatelogs
+Manual Page: split-logfile
 Manual Page: suexec
 Other Programs
 
@@ -145,7 +158,11 @@ Server on HPUX
 
 Apache Miscellaneous Documentation
 Overview
+Performance Notes - Apache Tuning
+Performance Scaling
+Security Tips
 Relevant Standards
+Password Encryption Formats
 
 
 
@@ -159,12 +176,14 @@ Server on HPUX
 Overview
 Apache API notes
 API updates in Apache HTTPD 2.4
-Debugging Memory Allocation in APR
-Documenting Apache 2.x
+Developing modules for Apache HTTPD 2.4
+Documenting Apache HTTPD
 Apache 2.x Hook Functions
-Converting Modules from Apache 1.3 to Apache 2.x
-Request Processing in Apache 2.x
-How Filters Work in Apache 2.x
+Converting Modules from 1.3 to 2.x
+Request Processing in 2.x
+How Filters Work in 2.x
+Guidelines for output filters in 2.x
+Thread Safety Issues in 2.x
 
 
 
diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml
index c24b8821dd..f9dbbcf387 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 c2b394143e..5e22e38a5d 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