From: Christophe Jaillet Date: Sun, 17 Nov 2019 09:21:54 +0000 (+0000) Subject: Fix some spelling errors X-Git-Tag: 2.4.42~201 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cee57366b9a60e032eedd8b5306c4c616a01ee07;p=thirdparty%2Fapache%2Fhttpd.git Fix some spelling errors (see PR 63923) in suexec.xml, remove a useless comment and slighly improve layout (r1869816 in trunk) + remove some trailing spaces to synch with trunk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1869920 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 6fe6ee3597e..176162d98fa 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -30,7 +30,7 @@ on Unix and Unix-like systems only. For compiling and installation on Windows, see Using Apache HTTP Server with Microsoft - Windows and and Compiling Apache for Microsoft Windows. For other platforms, see the platform documentation.

@@ -40,7 +40,7 @@ projects.

If you are upgrading from one minor version to the next (for - example, 2.4.9 to 2.4.10), please skip down to the upgrading section.

@@ -162,20 +162,20 @@ sudo service apache2 start (be sure the directory names do not have version numbers; for example, the APR distribution must be under /httpd_source_tree_root/srclib/apr/) and use ./configure's --with-included-apr - option. On some platforms, you may have to install the - corresponding -dev packages to allow httpd to build + option. On some platforms, you may have to install the + corresponding -dev packages to allow httpd to build against your installed copy of APR and APR-Util.
Perl-Compatible Regular Expressions Library (PCRE)
-
This library is required but not longer bundled with httpd. - Download the source code from http://www.pcre.org, +
This library is required but not longer bundled with httpd. + Download the source code from http://www.pcre.org, or install a Port or Package. If your build system can't find the pcre-config script installed by the PCRE build, point to it - using the --with-pcre parameter. On some platforms, - you may have to install the corresponding -dev - package to allow httpd to build against your installed copy + using the --with-pcre parameter. On some platforms, + you may have to install the corresponding -dev + package to allow httpd to build against your installed copy of PCRE.
- +
Disk Space
Make sure you have at least 50 MB of temporary free disk space available. After installation the server occupies @@ -461,7 +461,7 @@ $ tar xvf httpd-NN.tar

A description - of these third-party distrubutions is maintained in the HTTP + of these third-party distributions is maintained in the HTTP Server wiki, and should reflect the current state of these third-party distributions. However, you will need to familiarize yourself with your particular platform's package management and diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 339d5cf4a60..67e98481735 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -305,7 +305,7 @@ and modules like mod_rewrite.

<DirectoryMatch "^/var/www/combined/(?<SITENAME>[^/]+)"> - require ldap-group "cn=%{env:MATCH_SITENAME},ou=combined,o=Example" + Require ldap-group "cn=%{env:MATCH_SITENAME},ou=combined,o=Example" </DirectoryMatch> @@ -567,7 +567,7 @@ are interpreted, it is important to understand how this works.

  • Directory "/" matches and an initial configuration to set the CustomHeaderName header with the value one is created.
  • Directory "/example" matches, and since mod_headers specifies in its code to override in case of a merge, a new configuration is created to set the CustomHeaderName header with the value two.
  • FilesMatch ".*" matches and another merge opportunity arises, causing the CustomHeaderName header to be set with the value three.
    • -
  • Eventually during the next steps of the HTTP request processing mod_headers will be called and it will receive the configuration to set the CustomHeaderName header with the value three. mod_headers normally uses this configuration to perfom its job, namely setting the foo header. This does not mean that a module can't perform a more complex action like discarding directives because not needed or deprecated, etc..
    • +
  • Eventually during the next steps of the HTTP request processing mod_headers will be called and it will receive the configuration to set the CustomHeaderName header with the value three. mod_headers normally uses this configuration to perform its job, namely setting the foo header. This does not mean that a module can't perform a more complex action like discarding directives because not needed or deprecated, etc..

    • This is true for .htaccess too since they have the same priority as Directory in the merge order. The important concept to understand is that configuration sections like Directory and FilesMatch are not comparable to module specific directives like Header or RewriteRule because they operate on different levels. diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index f78f598f3c6..c8d7f2eddd1 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -554,17 +554,14 @@ Group webgroup Warnings & Examples

    NOTE! This section may not be - complete. For the latest revision of this section of the - documentation, see the Online - Documentation version.

    + complete.

    There are a few points of interest regarding the wrapper that can cause limitations on server setup. Please review these before submitting any "bugs" regarding suEXEC.

    +

    suEXEC Points Of Interest