From 1fa372d3afceed66db74bacfcdded9b533d1c465 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Sat, 1 Feb 2014 14:35:39 +0000 Subject: [PATCH] resolve invalid references git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1563423 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/install.xml | 4 ++-- docs/manual/mod/mod_alias.xml | 2 +- docs/manual/mod/mod_info.xml | 14 +++++++------- docs/manual/new_features_2_0.xml | 7 +++---- docs/manual/platform/ebcdic.xml | 11 +++++------ docs/manual/platform/netware.xml | 4 ++-- docs/manual/programs/configure.xml | 8 ++------ docs/manual/rewrite/advanced.xml | 2 +- docs/manual/sitemap.xml | 24 +++++++++++++++--------- docs/manual/vhosts/examples.xml | 14 +++++++------- docs/manual/vhosts/fd-limits.xml | 3 +-- 11 files changed, 46 insertions(+), 47 deletions(-) diff --git a/docs/manual/install.xml b/docs/manual/install.xml index c8e1cd0f364..ef43bd407cb 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -347,8 +347,8 @@ $ vi PREFIX/conf/httpd.conf -

Have a look at the Apache HTTP Server manual under docs/manual/ or consult Have a look at the Apache manual under + PREFIX/docs/manual/ or consult http://httpd.apache.org/docs/&httpd.docs;/ for the most recent version of this manual and a complete reference of available mod_rewrite Mapping URLs to the filesystem +href="../urlmapping.html">Mapping URLs to the filesystem

Order of Processing diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index f7d5b3ac532..b6040fdaab2 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -130,18 +130,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> - are listed normally, but mod_info cannot figure - out the line number for the closing - </Directory>.
    • +
  • Container directives such as Directory are listed normally, but + mod_info cannot figure out the line number for the + closing /Directory.
  • Directives generated by third party modules such as mod_perl might not be listed.
    • diff --git a/docs/manual/new_features_2_0.xml b/docs/manual/new_features_2_0.xml index 887899b0a47..582a27af683 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 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 5dade15348c..080f6977b4f 100644 --- a/docs/manual/platform/ebcdic.xml +++ b/docs/manual/platform/ebcdic.xml @@ -1,4 +1,3 @@ - @@ -327,7 +326,7 @@ - mod_access + mod_access + @@ -351,19 +350,19 @@ - mod_auth + mod_auth + - mod_auth_anon + mod_auth_anon + - mod_auth_dbm + mod_auth_dbm ? with own libdb.a @@ -459,7 +458,7 @@ - mod_log_referer + mod_log_referer + diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml index 898fcc48fed..d365a9c1143 100644 --- a/docs/manual/platform/netware.xml +++ b/docs/manual/platform/netware.xml @@ -36,7 +36,7 @@

    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 + 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 @@ -324,7 +324,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 c148f9fd57f..0d8bf142352 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -309,7 +309,7 @@
    --disable-auth-basic
    Disable user-based access control provided by - mod_auth. This module provides for HTTP Basic + mod_auth_basic. This module provides for HTTP Basic Authentication, where the usernames and passwords are stored in plain text files.
    @@ -317,10 +317,6 @@
    Disable the directory listing functionality provided by mod_autoindex.
    -
    --disable-access
    -
    Disable host-based access control provided by - mod_access.
    -
    --disable-cgi
    mod_cgi, which provides support for CGI scripts, is enabled by default when using a non-threaded MPM. Use this @@ -403,7 +399,7 @@
    --enable-authn-anon
    Enable anonymous user access provided by - mod_auth_anon.
    + mod_authn_anon.
    --enable-authn-dbm
    mod_authn_dbm provides for HTTP Basic diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml index 4d3b2983efc..287a9b56be3 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/sitemap.xml b/docs/manual/sitemap.xml index 54e4b513480..baa02b99b2c 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -49,7 +49,6 @@ Documentation.

    Server-Wide Configuration Log Files Mapping URLs to Filesystem Locations -Security Tips Dynamic Shared Object (DSO) support Content Negotiation Custom error responses @@ -59,7 +58,7 @@ Documentation.

    Apache's Handler Use Filters suEXEC Support -Performance Hints +Issues Regarding DNS and Apache Frequently Asked Questions @@ -72,7 +71,6 @@ Documentation.

    VirtualHost Examples An In-Depth Discussion of Virtual Host Matching File descriptor limitations -Issues Regarding DNS and Apache @@ -80,16 +78,18 @@ Documentation.

    Overview mod_rewrite reference documentation -Introduction -Flags -Technical details -Using mod_rewrite for redirection and remapping of URLs +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 and tricks +Advanced techniques When NOT to use mod_rewrite +RewriteRule Flags +Technical details     @@ -104,7 +104,8 @@ documentation Guides, Tutorials, and HowTos Overview -Authentication +Authentication and Authorization +Access Control Dynamic Content with CGI Introduction to Server Side Includes .htaccess files @@ -137,6 +138,7 @@ Server on HPUX Manual Page: htdbm Manual Page: htdigest Manual Page: htpasswd +Manual Page: httxt2dbm Manual Page: logresolve Manual Page: rotatelogs Manual Page: suexec @@ -146,7 +148,10 @@ Server on HPUX Apache Miscellaneous Documentation Overview +Performance Notes - Apache Tuning +Security Tips Relevant Standards +Password Encryption Formats @@ -165,6 +170,7 @@ Server on HPUX Converting Modules from Apache 1.3 to Apache 2.0 Request Processing in Apache 2.0 How Filters Work in Apache 2.0 +Thread Safety Issues in 2.0 diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index eb93bf04682..18f39f3b7c9 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -408,13 +408,13 @@
    Using <code>Virtual_host</code> and mod_proxy together -

    The following example allows a front-end machine to proxy a - 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.

    +

    The following example allows a front-end machine to proxy a 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.

    <VirtualHost *:*>
    diff --git a/docs/manual/vhosts/fd-limits.xml b/docs/manual/vhosts/fd-limits.xml index 1bb819ba047..d5b2feeba69 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 -- 2.47.2