From: Joshua Slive Date: Mon, 27 May 2002 02:22:09 +0000 (+0000) Subject: A bunch of small corrections, mostly to s and s. X-Git-Tag: 2.0.37~246 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74588926f4204dfe15a2e80cd6ee58d7e75ed843;p=thirdparty%2Fapache%2Fhttpd.git A bunch of small corrections, mostly to s and s. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95302 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 0cff0eb0324..50a82e06f22 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -10,7 +10,7 @@ available AcceptPathInfo -Controls whether requests can contain trailing pathname information +Resources accept trailing pathname information AcceptPathInfo On|Off|Default AcceptPathInfo Default server config @@ -77,7 +77,7 @@ available AccessFileName -Sets the name of the .htaccess file +Name of the distributed configuration file AccessFileName filename [filename] ... AccessFileName .htaccess server configvirtual host @@ -85,9 +85,10 @@ 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:

AccessFileName .acl @@ -111,14 +112,14 @@ AccessFileName .acl AddDefaultCharset -Specifies the default character set to be added for a +Default character set to be added for a response without an explicit character set AddDefaultCharset On|Off|charset AddDefaultCharset Off server config virtual hostdirectory .htaccess - +FileInfo @@ -141,9 +142,10 @@ response without an explicit character set AllowOverride -Sets the types of directives that are allowed in +Types of directives that are allowed in .htaccess files -AllowOverride All|None|directive-type [directive-type] ... +AllowOverride All|None|directive-type +[directive-type] ... AllowOverride All directory @@ -239,7 +241,7 @@ response without an explicit character set AuthName -Sets the authorization realm for use in HTTP +Authorization realm for use in HTTP authentication AuthName auth-domain directory.htaccess @@ -273,7 +275,7 @@ authentication AuthType -Selects the type of user authentication +Type of user authentication AuthType Basic|Digest directory.htaccess @@ -306,7 +308,6 @@ headers Options Experimental -Available in Apache 1.1 and later

This directive enables the generation of @@ -339,7 +340,7 @@ headers DefaultType -Sets the MIME content-type that will be sent if the +MIME content-type that will be sent if the server cannot determine a type in any other way DefaultType MIME-type DefaultType text/plain @@ -383,15 +384,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
@@ -419,7 +422,7 @@ named file-system directory and sub-directories   AllowOverride None
</Directory>

- <Directory /home/*>
+ <Directory /home/>
  AllowOverride FileInfo
</Directory> @@ -518,7 +521,7 @@ combined when a request is received DocumentRoot -Sets the directory that forms the main document tree visible +Directory that forms the main document tree visible from the web DocumentRoot directory-path DocumentRoot /usr/local/apache/htdocs @@ -546,20 +549,21 @@ Location EnableMMAP -Controls whether the httpd uses memory-mapping to read files -during delivery +Use memory-mapping to read files during delivery EnableMMAP on|off EnableMMAP on server configvirtual host directory.htaccess +FileInfo -

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 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. @@ -585,7 +589,7 @@ during delivery ErrorDocument -Specifies what the server will return to the client +What the server will return to the client in case of an error ErrorDocument error-code document server configvirtual host @@ -656,8 +660,7 @@ in case of an error ErrorLog -Sets the name of the file to which the server -will log errors +Location where the server will log errors ErrorLog file-path|syslog[:facility] ErrorLog logs/error_log (Unix) ErrorLog logs/error.log (Windows and OS/2) @@ -692,7 +695,7 @@ ErrorLog logs/error.log (Windows and OS/2) FileETag -Configures the file attributes used to create the ETag +File attributes used to create the ETag HTTP response header FileETag component ... server configvirtual host @@ -745,12 +748,13 @@ HTTP response header Files -Contains that directives that apply to matched +Contains directives that apply to matched filenames <Files filename> ... </Files> server configvirtual host directory.htaccess +All

The Files directive @@ -760,7 +764,7 @@ filenames type="directive">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 FilesMatch -Contains that directives that apply to regular-expression matched +Contains directives that apply to regular-expression matched filenames <FilesMatch regex> ... </FilesMatch> server configvirtual host directory.htaccess +All

The FilesMatch directive @@ -832,6 +837,7 @@ MIME content-type ForceType mime-type directory.htaccess +FileInfo Moved to the core in Apache 2.0 @@ -901,7 +907,8 @@ MIME content-type user IdentityCheck on|off IdentityCheck off - +server configvirtual host +directory

This directive enables RFC1413-compliant logging of the remote user name for each connection, where the client machine @@ -929,6 +936,7 @@ if a test is true at startup server configvirtual host directory.htaccess +All

The <IfDefine @@ -984,6 +992,7 @@ presence of absence of a specific module server configvirtual host directory.htaccess +All

The <IfModule @@ -1026,7 +1035,9 @@ presence of absence of a specific module Includes other configuration files from within the server configuration files Include file-path|directory-path -server config +server configvirtual host +directory +

This directive allows inclusion of other configuration files @@ -1080,7 +1091,7 @@ the server configuration files KeepAlive -Turns on or off HTTP persistent connections. +Enables HTTP persistent connections KeepAlive on|off KeepAlive On server config @@ -1112,7 +1123,7 @@ the server configuration files KeepAliveTimeout -Sets the amount of time the server will wait for subsequent +Amount of time the server will wait for subsequent requests on a persistent connection KeepAliveTimeout seconds KeepAliveTimeout 15 @@ -1133,13 +1144,14 @@ requests on a persistent connection Limit -Restrict access controls to only certain HTTP +Restrict enclosed access controls to only certain HTTP methods <Limit method [method] ... > ... </Limit> server configvirtual host directory.htaccess +All

Access controls are normally effective for @@ -1178,6 +1190,7 @@ except the named ones server configvirtual host directory.htaccess +All

LimitExcept and @@ -1210,6 +1223,7 @@ from the client server configvirtual host directory.htaccess +All

This directive specifies the number of bytes from 0 @@ -1618,7 +1632,7 @@ matching URLs MaxKeepAliveRequests -Sets the number of requests allowed on a persistent +Number of requests allowed on a persistent connection MaxKeepAliveRequests number MaxKeepAliveRequests 100 @@ -1640,7 +1654,7 @@ connection NameVirtualHost -Configures an IP address for name-virtual +Designates an IP address for name-virtual hosting NameVirtualHost addr[:port] server config @@ -1883,8 +1897,6 @@ by Apache children Unset; uses operating system defaults server configvirtual host -Moved in version 2.0 to - the MPMs

Takes 1 or 2 parameters. The first parameter sets the soft @@ -1917,8 +1929,6 @@ by Apache children Unset; uses operating system defaults server configvirtual host -Moved in version 2.0 to the MPMs.

Takes 1 or 2 parameters. The first parameter sets the soft @@ -1951,8 +1961,6 @@ processes launched by Apache children Unset; uses operating system defaults server configvirtual host -Moved in version 2.0 to the MPMs.

Takes 1 or 2 parameters. The first parameter sets the soft @@ -1985,12 +1993,13 @@ href="../mpm.html">MPMs. Satisfy -Configures how host-level access control and user authentication -interact +Interaction between host-level access control and +user authentication Satisfy any|all Satisfy all directory.htaccess +AuthConfig

Access policy if both ScriptInterpreterSource -Controls how the interpreter for CGI scripts is -located +Technique for locating the interpreter for CGI +scripts ScriptInterpreterSource registry|script ScriptInterpreterSource script directory.htaccess +FileInfo Win32 only @@ -2045,7 +2055,7 @@ located ServerAdmin -Sets the email address that the server includes in error +Email address that the server includes in error messages sent to the client ServerAdmin email-address server configvirtual host @@ -2066,7 +2076,7 @@ messages sent to the client ServerAlias -Sets alternate names for a host used when matching requests +Alternate names for a host used when matching requests to name-virtual hosts ServerAlias hostname [hostname] ... virtual host @@ -2089,7 +2099,7 @@ to name-virtual hosts ServerName -Sets the hostname and port that the server uses to identify +Hostname and port that the server uses to identify itself ServerName fully-qualified-domain-name[:port] server configvirtual host @@ -2142,7 +2152,7 @@ itself ServerPath -Sets the legacy URL pathname for a name-virtual host that +Legacy URL pathname for a name-virtual host that is accessed by an incompatible browser ServerPath directory-path virtual host @@ -2157,7 +2167,7 @@ is accessed by an incompatible browser ServerRoot -Sets the base directory for the server installation +Base directory for the server installation ServerRoot directory-path ServerRoot /usr/local/apache server config @@ -2184,6 +2194,7 @@ is accessed by an incompatible browser server configvirtual host directory.htaccess +All

The ServerSignature directive allows the @@ -2253,6 +2264,7 @@ handler server configvirtual host directory.htaccess +FileInfo Moved into the core in Apache 2.0 @@ -2289,6 +2301,7 @@ input server configvirtual host directory.htaccess +FileInfo

The SetInputFilter directive sets the @@ -2313,6 +2326,7 @@ server server configvirtual host directory.htaccess +FileInfo

The SetOutputFilter directive sets the filters @@ -2340,7 +2354,7 @@ server TimeOut -Defines the amount of time the server will wait for +Amount of time the server will wait for certain events before failing a request TimeOut number TimeOut 300 @@ -2377,8 +2391,7 @@ port UseCanonicalName on|off|dns UseCanonicalName on server configvirtual host -directory.htaccess -Options +directory

In many situations Apache has to construct a