From: Joshua Slive
Date: Mon, 27 May 2002 02:20:17 +0000 (+0000)
Subject: A bunch of small corrections, mostly to shorten s and add
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9635232ccdbb964a97d6cf0f429cebcb18f378b8;p=apache
A bunch of small corrections, mostly to shorten s and add
s.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95300 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 13ef161060..145bc1fe94 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3,7 +3,7 @@
This file is generated from xml source: DO NOT EDIT
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-->core- Apache HTTP Server
Apache HTTP Server Version 2.0
Apache Module core
Description:
Core Apache HTTP Server features that are always
-available
When returning a document to the client the server looks for
- the first existing access control file from this list of names
- in every directory of the path to the document, if access
- control files are enabled for that directory. For example:
+ 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 directory. For
+ example:
This directive specifies the name of the character set that
will be added to any response that does not have any parameter on
@@ -92,8 +93,9 @@ response without an explicit character set
When the server finds an .htaccess file (as specified by AccessFileName) it needs to know
which directives declared in that file can override earlier
access information.
@@ -155,7 +157,7 @@ response without an explicit character set
This directive sets the name of the authorization realm for a
directory. This realm is given to the client so that the user
@@ -174,7 +176,7 @@ authentication
This directive selects the type of user authentication for a
directory. Only Basic and Digest are
currently implemented.
@@ -185,7 +187,7 @@ authentication
There will be times when the server is asked to provide a
document whose type cannot be determined by its MIME types
@@ -236,15 +238,17 @@ named file-system directory and sub-directories
<Directory> and
</Directory> are used to enclose a group of
- directives which will apply only to the named directory and
- sub-directories of that directory. Any directive which is allowed
+ directives that will apply only to the named directory and
+ sub-directories of that directory. Any directive that is allowed
in a directory context may be used. Directory-path is
- either the full path to a directory, or a wild-card string. In a
- wild-card string, `?' matches any single character, and `*'
- matches any sequences of characters. You may
- also use `[]' character ranges like in the shell. Also as of
- Apache 1.3 none of the wildcards match a `/' character, which more
- closely mimics the behavior of Unix shells. Example:
+ either the full path to a directory, or a wild-card string using
+ Unix shell-style matching. In a wild-card string, `?' matches any
+ single character, and `*' matches any sequences of characters.
+ You may also use `[]' character ranges. None of the wildcards
+ match a `/' character, so <Dircectory
+ /*/public_html> will not match
+ /home/user/public_html, but <Directory
+ /home/*/public_html> will match. Example:
<Directory /usr/local/httpd/htdocs>
Options Indexes FollowSymLinks
@@ -271,7 +275,7 @@ named file-system directory and sub-directories
This directive controls whether the httpd may use memory-mapping
- if it needs to read the contents of a file during delivery. By default,
- when the handling of a request requires access to the data within a file--
- for example, when delivering a server-parsed file using mod_include--
- Apache memory-maps the file if the OS supports it.
+Location
This directive controls whether the httpd may use
+ memory-mapping if it needs to read the contents of a file during
+ delivery. By default, when the handling of a request requires
+ access to the data within a file-- for example, when delivering a
+ server-parsed file using mod_include-- Apache
+ memory-maps the file if the OS supports it.
This memory-mapping sometimes yields a performance improvement.
@@ -390,7 +394,7 @@ during delivery
The ErrorLog directive sets the name of
the file to which the server will log any errors it encounters. If
@@ -467,7 +470,7 @@ ErrorLog logs/error.log (Windows and OS/2)
The <Files> directive
provides for access control by filename. It is comparable to the
Directory
directive and Location directives. It should be
matched with a </Files> directive. The
directives given within this section will be applied to any object
- with a basename (last component of filename) matching the
+ with a basename (not a full path) matching the
specified filename. <Files>
sections are processed in the order they appear in the
configuration file, after the <Directory> sections and
@@ -543,8 +546,8 @@ filenames
The <FilesMatch> directive
provides for access control by filename, just as the <Files> directive
does. However, it accepts a regular expression. For example:
This directive enables RFC1413-compliant logging of the
remote user name for each connection, where the client machine
runs identd or something similar. This information is logged in
@@ -621,7 +624,7 @@ user
The <IfDefine
test>...</IfDefine> section is used to
mark directives that are conditional. The directives within an
@@ -664,7 +667,7 @@ if a test is true at startup
The <IfModule
test>...</IfModule> section is used to
mark directives that are conditional. The directives within an
@@ -696,7 +699,7 @@ presence of absence of a specific module
The Keep-Alive extension to HTTP/1.0 and the persistent
connection feature of HTTP/1.1 provide long-lived HTTP sessions
which allow multiple requests to be sent over the same TCP
@@ -761,7 +764,7 @@ the server configuration files
The number of seconds Apache will wait for a subsequent
request before closing the connection. Once a request has been
@@ -772,9 +775,9 @@ requests on a persistent connection
Access controls are normally effective for
all access methods, and this is the usual
desired behavior. In the general case, access control
@@ -801,7 +804,7 @@ methods
<LimitExcept> and
</LimitExcept> are used to enclose
a group of access control directives which will then apply to any
@@ -819,7 +822,7 @@ except the named ones
This directive specifies the number of bytes from 0
(meaning unlimited) to 2147483647 (2GB) that are allowed in a
request body. The default value is defined by the compile-time
@@ -1139,7 +1142,7 @@ matching URLs
Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
@@ -1367,7 +1369,7 @@ by Apache children
Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
@@ -1386,7 +1388,7 @@ by Apache children
Takes 1 or 2 parameters. The first parameter sets the soft
resource limit for all processes and the second parameter sets
the maximum resource limit. Either parameter can be a number,
@@ -1410,8 +1412,8 @@ processes launched by Apache children
Access policy if both Allow and Require used. The parameter can be
either 'all' or 'any'. This directive is only
useful if access to a particular area is being restricted by both
@@ -1435,15 +1437,15 @@ interact
This directive is used to control how Apache finds the
interpreter used to run CGI scripts. The default technique is to
use the interpreter pointed to by the #! line in the
script. Setting ScriptInterpreterSource registry will
cause the Windows Registry to be searched using the script file
extension (e.g., .pl) as a search key.
The ServerAdmin sets the e-mail address
that the server includes in any error messages it returns to the
@@ -1454,7 +1456,7 @@ messages sent to the client
The ServerRoot directive sets the
directory in which the server lives. Typically it will contain the
subdirectories conf/ and logs/. Relative
@@ -1514,7 +1516,7 @@ is accessed by an incompatible browser
The ServerSignature directive allows the
configuration of a trailing footer line under server-generated
documents (error messages, mod_proxy ftp directory listings,
@@ -1560,7 +1562,7 @@ is accessed by an incompatible browser
The SetInputFilter directive sets the
filter or filters which will process client requests and POST
input when they are received by the server. This is in addition to
@@ -1596,7 +1598,7 @@ input
The SetOutputFilter directive sets the filters
which will process responses from the server before they are
sent to the client. This is in addition to any filters defined
@@ -1616,7 +1618,7 @@ server
In many situations Apache has to construct a
self-referential URL. That is, a URL which refers back to
the same server. With UseCanonicalName on Apache will