You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2019/11/17 09:21:54 UTC
svn commit: r1869920 - in /httpd/httpd/branches/2.4.x/docs/manual:
install.xml sections.xml suexec.xml
Author: jailletc36
Date: Sun Nov 17 09:21:54 2019
New Revision: 1869920
URL: http://svn.apache.org/viewvc?rev=1869920&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/docs/manual/install.xml
httpd/httpd/branches/2.4.x/docs/manual/sections.xml
httpd/httpd/branches/2.4.x/docs/manual/suexec.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/install.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/install.xml?rev=1869920&r1=1869919&r2=1869920&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/install.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/install.xml Sun Nov 17 09:21:54 2019
@@ -30,7 +30,7 @@
on Unix and Unix-like systems only. For compiling and
installation on Windows, see <a
href="platform/windows.html">Using Apache HTTP Server with Microsoft
- Windows</a> and <a
+ Windows</a> and <a
href="platform/win_compiling.html">Compiling Apache for Microsoft Windows</a>.
For other platforms, see the <a
href="platform/">platform</a> documentation.</p>
@@ -40,7 +40,7 @@
projects.</p>
<p>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 <a
+ example, 2.4.8 to 2.4.9), please skip down to the <a
href="#upgrading">upgrading</a> section.</p>
</summary>
@@ -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
<code>./configure</code>'s <code>--with-included-apr</code>
- option. On some platforms, you may have to install the
- corresponding <code>-dev</code> packages to allow httpd to build
+ option. On some platforms, you may have to install the
+ corresponding <code>-dev</code> packages to allow httpd to build
against your installed copy of APR and APR-Util.</dd>
<dt>Perl-Compatible Regular Expressions Library (PCRE)</dt>
- <dd>This library is required but not longer bundled with httpd.
- Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
+ <dd>This library is required but not longer bundled with httpd.
+ Download the source code from <a href="http://www.pcre.org/">http://www.pcre.org</a>,
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 <code>--with-pcre</code> parameter. On some platforms,
- you may have to install the corresponding <code>-dev</code>
- package to allow httpd to build against your installed copy
+ using the <code>--with-pcre</code> parameter. On some platforms,
+ you may have to install the corresponding <code>-dev</code>
+ package to allow httpd to build against your installed copy
of PCRE.</dd>
-
+
<dt>Disk Space</dt>
<dd>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-<em>NN</em>.tar
<p>A <a
href="http://wiki.apache.org/httpd/DistrosDefaultLayout">description
- of these third-party distrubutions</a> is maintained in the HTTP
+ of these third-party distributions</a> 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
Modified: httpd/httpd/branches/2.4.x/docs/manual/sections.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/sections.xml?rev=1869920&r1=1869919&r2=1869920&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/sections.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/sections.xml Sun Nov 17 09:21:54 2019
@@ -305,7 +305,7 @@ and modules like <module>mod_rewrite</mo
<highlight language="config">
<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>
</highlight>
@@ -567,7 +567,7 @@ are interpreted, it is important to unde
<li><directive>Directory</directive> "/" matches and an initial configuration to set the <code>CustomHeaderName</code> header with the value <code>one</code> is created.</li>
<li><directive>Directory</directive> "/example" matches, and since <module>mod_headers</module> specifies in its code to override in case of a merge, a new configuration is created to set the <code>CustomHeaderName</code> header with the value <code>two</code>.</li>
<li><directive>FilesMatch</directive> ".*" matches and another merge opportunity arises, causing the <code>CustomHeaderName</code> header to be set with the value <code>three</code>.</li>
- <li>Eventually during the next steps of the HTTP request processing <module>mod_headers</module> will be called and it will receive the configuration to set the <code>CustomHeaderName</code> header with the value <code>three</code>. <module>mod_headers</module> 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..</li>
+ <li>Eventually during the next steps of the HTTP request processing <module>mod_headers</module> will be called and it will receive the configuration to set the <code>CustomHeaderName</code> header with the value <code>three</code>. <module>mod_headers</module> 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..</li>
</ul>
<p>This is true for .htaccess too since they have the same priority as <directive>Directory</directive> in the merge order. The important concept to understand is that configuration sections like <directive>Directory</directive> and <directive>FilesMatch</directive> are not comparable to module specific directives like <directive module="mod_headers">Header</directive> or <directive module="mod_rewrite">RewriteRule</directive> because they operate on different levels.
Modified: httpd/httpd/branches/2.4.x/docs/manual/suexec.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/suexec.xml?rev=1869920&r1=1869919&r2=1869920&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/suexec.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/suexec.xml Sun Nov 17 09:21:54 2019
@@ -554,17 +554,14 @@ Group webgroup
Warnings & Examples</title>
<p><strong>NOTE!</strong> This section may not be
- complete. For the latest revision of this section of the
- documentation, see the <a
- href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html">Online
- Documentation</a> version.</p>
+ complete.</p>
<p>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.</p>
+ <p><strong>suEXEC Points Of Interest</strong></p>
<ul>
- <li><strong>suEXEC Points Of Interest</strong></li>
<li>
Hierarchy limitations