From: Mike Rumph Date: Thu, 2 Jul 2015 06:11:21 +0000 (+0000) Subject: Grammar, spelling, and other minor corrections X-Git-Tag: 2.2.30~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c0178ae830976f16d2ef36076858392d9d06d16;p=thirdparty%2Fapache%2Fhttpd.git Grammar, spelling, and other minor corrections git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688765 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 781643558a2..da401dba8ef 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -54,7 +54,7 @@ available sends it to the server. See the accf_http(9) man page for more details. Since HTTPS requests are - encrypted only the + encrypted, only the accf_data(9) filter is used.

The default values on Linux are:

@@ -161,7 +161,7 @@ available -

While processing a request the server looks for +

While processing a request, the server looks for the first existing configuration file from this list of names in every directory of the path to the document, if distributed configuration files are enabled for that @@ -171,11 +171,11 @@ available AccessFileName .acl -

before returning the document +

Before returning the document /usr/local/web/index.html, the server will read /.acl, /usr/.acl, /usr/local/.acl and /usr/local/web/.acl - for directives, unless they have been disabled with

+ for directives unless they have been disabled with:

<Directory />
@@ -317,7 +317,7 @@ NoDecode option available in 2.2.18 and later.

The AllowEncodedSlashes directive allows URLs which contain encoded path separators (%2F for / - and additionally %5C for \ on according systems) + and additionally %5C for \ on accordant systems) to be used in the path info.

With the default value, Off, such URLs are refused @@ -352,7 +352,7 @@ NoDecode option available in 2.2.18 and later.

When the server finds an .htaccess file (as - specified by AccessFileName) + specified by AccessFileName), it needs to know which directives declared in that file can override earlier configuration directives.

@@ -463,8 +463,8 @@ NoDecode option available in 2.2.18 and later. Allow use of the directives controlling specific directory features (Options and XBitHack). - An equal sign may be given followed by a comma (but no spaces) - separated lists of options that may be set using the Options command. Implicit disabling of Options @@ -484,7 +484,7 @@ NoDecode option available in 2.2.18 and later. AllowOverride AuthConfig Indexes -

In the example above all directives that are neither in the group +

In the example above, all directives that are neither in the group AuthConfig nor Indexes cause an internal server error.

@@ -1078,7 +1078,7 @@ in case of an error URL in an ErrorDocument 401, the client will not know to prompt the user for a password since it will not receive the 401 status code. Therefore, if you use an - ErrorDocument 401 directive then it must refer to a local + ErrorDocument 401 directive, then it must refer to a local document.

Microsoft Internet Explorer (MSIE) will by default ignore @@ -1228,7 +1228,7 @@ HTTP response header for static files changed via FileETag. Server Side Includes - An ETag is not generated for responses parsed by mod_include, + An ETag is not generated for responses parsed by mod_include since the response entity can change without a change of the INode, MTime, or Size of the static file with embedded SSI directives. @@ -1642,7 +1642,7 @@ the server configuration files encoding will be used in order to send content of unknown length over persistent connections.

-

When a client uses a Keep-Alive connection it will be counted +

When a client uses a Keep-Alive connection, it will be counted as a single "request" for the MaxRequestsPerChild directive, regardless of how many requests are sent using the connection.

 @@ -1718,7 +1718,7 @@ methods PATCH, PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK. The method name is - case-sensitive. If GET is used it will also + case-sensitive. If GET is used, it will also restrict HEAD requests. The TRACE method cannot be limited.

@@ -1793,8 +1793,8 @@ subrequests

The directive stores two different limits, which are evaluated on per-request basis. The first number is the maximum number of - internal redirects, that may follow each other. The second number - determines, how deep subrequests may be nested. If you specify only one + internal redirects that may follow each other. The second number + determines how deeply subrequests may be nested. If you specify only one number, it will be assigned to both limits.

Example @@ -1838,7 +1838,7 @@ from the client attacks.

If, for example, you are permitting file upload to a particular - location, and wish to limit the size of the uploaded file to 100K, + location and wish to limit the size of the uploaded file to 100K, you might use the following directive:

@@ -2101,7 +2101,7 @@ URLs

The Location functionality is especially useful when combined with the SetHandler - directive. For example, to enable status requests, but allow them + directive. For example, to enable status requests but allow them only from browsers at example.com, you might use:

@@ -2281,7 +2281,7 @@ matching URLs Note -

When logging to a regular file messages of the level +

When logging to a regular file, messages of the level notice cannot be suppressed and thus are always logged. However, this doesn't apply when logging is done using syslog.

@@ -2504,7 +2504,7 @@ directory
Indexes
- If a URL which maps to a directory is requested, and there + If a URL which maps to a directory is requested and there is no DirectoryIndex (e.g., index.html) in that directory, then mod_autoindex will return a formatted listing @@ -2550,7 +2550,7 @@ directory Warning

Mixing Options with a + or - - with those without is not valid syntax, and is likely + - with those without is not valid syntax and is likely to cause unexpected results.

 @@ -2714,15 +2714,17 @@ a resource Protocol protocol server configvirtual host Available in Apache 2.1.5 and later. -On Windows from Apache 2.3.3 and later. +On Windows, from Apache 2.3.3 and later.

This directive specifies the protocol used for a specific listening socket. - The protocol is used to determine which module should handle a request, and + The protocol is used to determine which module should handle a request and to apply protocol specific optimizations with the AcceptFilter directive.

-

You only need to set the protocol if you are running on non-standard ports, otherwise http is assumed for port 80 and https for port 443.

+

You only need to set the protocol if you are running on non-standard ports; + otherwise, http is assumed for port 80 and https + for port 443.

For example, if you are running https on a non-standard port, specify the protocol explicitly:

@@ -2754,13 +2756,13 @@ by Apache children or max to indicate to the server that the limit should be set to the maximum allowed by the operating system configuration. Raising the maximum resource limit requires that - the server is running as root, or in the initial startup + the server is running as root or in the initial startup phase.

-

This applies to processes forked off from Apache children +

This applies to processes forked from Apache children servicing requests, not the Apache children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked from the Apache parent, such as piped logs.

CPU resource limits are expressed in seconds per @@ -2787,13 +2789,13 @@ by Apache children or max to indicate to the server that the limit should be set to the maximum allowed by the operating system configuration. Raising the maximum resource limit requires that - the server is running as root, or in the initial startup + the server is running as root or in the initial startup phase.

-

This applies to processes forked off from Apache children +

This applies to processes forked from Apache children servicing requests, not the Apache children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked from the Apache parent, such as piped logs.

Memory resource limits are expressed in bytes per @@ -2815,18 +2817,18 @@ processes launched by Apache children

Takes 1 or 2 parameters. The first parameter sets the soft - resource limit for all processes and the second parameter sets + resource limit for all processes, and the second parameter sets the maximum resource limit. Either parameter can be a number, or max to indicate to the server that the limit should be set to the maximum allowed by the operating system configuration. Raising the maximum resource limit requires that - the server is running as root, or in the initial startup + the server is running as root or in the initial startup phase.

-

This applies to processes forked off from Apache children +

This applies to processes forked from Apache children servicing requests, not the Apache children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked from the Apache parent, such as piped logs.

Process limits control the number of processes per user.

@@ -3234,7 +3236,7 @@ header (Unix) PHP/4.2.2 MyMod/1.2
-

This setting applies to the entire server, and cannot be +

This setting applies to the entire server and cannot be enabled or disabled on a virtualhost-by-virtualhost basis.

After version 2.0.44, this directive also controls the @@ -3464,9 +3466,9 @@ port

An example where this may be useful is on an intranet server where you have users connecting to the machine using short names such as www. You'll notice that if the users - type a shortname, and a URL which is a directory, such as + type a shortname and a URL which is a directory, such as http://www/splat, without the trailing - slash then Apache will redirect them to + slash, then Apache will redirect them to http://www.domain.com/splat/. If you have authentication enabled, this will cause the user to have to authenticate twice (once for www and once again @@ -3479,15 +3481,15 @@ port

There is a third option, UseCanonicalName DNS, which is intended for use with mass IP-based virtual hosting to support ancient clients that do not provide a - Host: header. With this option Apache does a + Host: header. With this option, Apache does a reverse DNS lookup on the server IP address that the client connected to in order to work out self-referential URLs.

Warning -

If CGIs make assumptions about the values of SERVER_NAME +

If CGIs make assumptions about the values of SERVER_NAME, they may be broken by this option. The client is essentially free to give whatever value they want as a hostname. But if the CGI is - only using SERVER_NAME to construct self-referential URLs + only using SERVER_NAME to construct self-referential URLs, then it should be just fine.

 @@ -3508,11 +3510,11 @@ port

In many situations Apache must construct a self-referential URL -- that is, a URL that refers back to the same server. With - UseCanonicalPhysicalPort On Apache will, when + UseCanonicalPhysicalPort On, Apache will, when constructing the canonical port for the server to honor the UseCanonicalName directive, provide the actual physical port number being used by this request - as a potential port. With UseCanonicalPhysicalPort Off + as a potential port. With UseCanonicalPhysicalPort Off, Apache will not ever use the actual physical port number, instead relying on all configured information to construct a valid port number.

@@ -3604,7 +3606,7 @@ hostname or IP address

Each Virtual Host must correspond to a different IP address, - different port number or a different host name for the server, + different port number, or a different host name for the server, in the former case the server machine must be configured to accept IP packets for multiple addresses. (If the machine does not have multiple network interfaces, then this can be @@ -3663,18 +3665,18 @@ hostname or IP address MergeTrailers -Determins whether trailers are merged into headers +Determines whether trailers are merged into headers MergeTrailers [on|off] MergeTrailers off server configvirtual host -2.2.29 and later +2.2.28 and later

This directive controls whether HTTP trailers are copied into the - internal representation of HTTP headers. This mergeing occurs when the + internal representation of HTTP headers. This merging occurs when the request body has been completely consumed, long after most header processing would have a chance to examine or modify request headers.

-

This option is provided for compatibility with releases prior to 2.4.10, +

This option is provided for compatibility with releases prior to 2.2.28, where trailers were always merged.