From: Joshua Slive Date: Wed, 18 Jul 2001 20:25:19 +0000 (+0000) Subject: Bringing forward from 1.3: small changes to standardize argument types. X-Git-Tag: 2.0.21~32 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8861ba2169e44857d7807424be8f090ca40e28d;p=apache Bringing forward from 1.3: small changes to standardize argument types. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89603 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_access.html b/docs/manual/mod/mod_access.html index c2a1294ced..f6cef3b3b8 100644 --- a/docs/manual/mod/mod_access.html +++ b/docs/manual/mod/mod_access.html @@ -88,8 +88,8 @@ href="core.html#limit"><Limit> section.

HREF="directive-dict.html#Syntax" REL="Help" >Syntax: Allow from - all|host|env=variablename - [host|env=variablename] ...
+ all|host|env=env-variable + [host|env=env-variable] ...

The third format of the arguments to the Allow directive allows access to the server to be controlled based on the existence of an environment variable. When -Allow from env=variablename is specified, then +Allow from env=env-variable is specified, then the request is allowed access if the environment variable -variablename exists. The server provides the ability to set +env-variable exists. The server provides the ability to set environment variables in a flexible way based on characteristics of the client request using the directives provided by mod_setenvif. Therefore, this directive @@ -194,8 +194,8 @@ and SetEnvIf. HREF="directive-dict.html#Syntax" REL="Help" >Syntax: Deny from - all|host|env=variablename - [host|env=variablename] ...
+ all|host|env=env-variable + [host|env=env-variable] ...
mod_rewrite module. Syntax: Alias url-path directory-filename
+>Syntax: Alias URL-path file-path|directory-path
ScriptAlias. Syntax: AliasMatch regex directory-filename
+>Syntax: AliasMatch regex file-path|directory-path
ScriptAlias.

This directive is equivalent to Alias, but makes use of standard regular expressions, instead of simple prefix -matching. The supplied regular expression is matched against the URL, -and if it matches, the server will substitute any parenthesized -matches into the given string and use it as a filename. For example, -to activate the /icons directory, one might use: +matching. The supplied regular expression is matched against the +URL-path, and if it matches, the server will substitute any +parenthesized matches into the given string and use it as a +filename. For example, to activate the /icons directory, +one might use: 

     AliasMatch ^/icons(.*) /usr/local/apache/icons$1
@@ -164,7 +165,7 @@ to activate the /icons directory, one might use: HREF="directive-dict.html#Syntax" REL="Help" >Syntax: Redirect [status] - url-path url
+ URL-path URL
/icons directory, one might use:

The Redirect directive maps an old URL into a new one. The new URL is returned to the client which attempts to fetch it again with the new address. -Url-path a (%-decoded) path; any requests for documents beginning with -this path will be returned a redirect error to a new (%-encoded) url -beginning with url. +URL-path a (%-decoded) path; any requests for documents beginning with +this path will be returned a redirect error to a new (%-encoded) URL +beginning with URL.

Example: @@ -203,7 +204,7 @@ access http://foo2.bar.com/service/foo.txt instead. Note: Redirect directives take precedence over Alias and ScriptAlias directives, irrespective of their ordering in the configuration file. Also, -Url-path must be an absolute path, not a relative path, even +URL-path must be an absolute path, not a relative path, even when used with .htaccess files or inside of <Directory> sections.

@@ -242,7 +243,7 @@ the function send_error_response in http_protocol.c). HREF="directive-dict.html#Syntax" REL="Help" >Syntax: - RedirectMatch [status] regex url + RedirectMatch [status] regex URL
send_error_response in http_protocol.c). >Module: mod_alias

-

This directive is equivalent to Redirect, but -makes use of standard regular expressions, instead of simple prefix -matching. The supplied regular expression is matched against the URL, -and if it matches, the server will substitute any parenthesized -matches into the given string and use it as a filename. For example, -to redirect all GIF files to like-named JPEG files on another server, -one might use: +

This directive is equivalent to Redirect, +but makes use of standard regular expressions, instead of simple +prefix matching. The supplied regular expression is matched against +the URL-path, and if it matches, the server will substitute any +parenthesized matches into the given string and use it as a +filename. For example, to redirect all GIF files to like-named JPEG +files on another server, one might use: 

     RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
@@ -283,7 +284,7 @@ one might use: Syntax: RedirectTemp url-path url
+>Syntax: RedirectTemp URL-path URL
. Syntax: RedirectPermanent url-path url
+>Syntax: RedirectPermanent URL-path URL
Syntax: ScriptAlias url-path directory-filename +>Syntax: ScriptAlias URL-path file-path|directory-path
Alias directive, except that in addition it marks the target directory as containing CGI scripts. -URLs with a (%-decoded) path beginning with url-path will be -mapped to scripts beginning with directory-filename. +URLs with a (%-decoded) path beginning with URL-path will be +mapped to scripts beginning with the second argument which is a full +pathname in the local filesystem.

Example:

@@ -384,7 +386,7 @@ run the script /web/cgi-bin/foo. HREF="directive-dict.html#Syntax" REL="Help" >Syntax: ScriptAliasMatch - regex directory-filename
+ regex file-path|directory-path
Module: mod_alias

-

This directive is equivalent to ScriptAlias, but -makes use of standard regular expressions, instead of simple prefix -matching. The supplied regular expression is matched against the URL, -and if it matches, the server will substitute any parenthesized -matches into the given string and use it as a filename. For example, -to activate the standard /cgi-bin, one might use: +

This directive is equivalent to ScriptAlias, but makes use of standard regular +expressions, instead of simple prefix matching. The supplied regular +expression is matched against the URL-path, and if it matches, the +server will substitute any parenthesized matches into the given string +and use it as a filename. For example, to activate the standard +/cgi-bin, one might use: 

     ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html index 04508d4468..d624f6519d 100644 --- a/docs/manual/mod/mod_auth.html +++ b/docs/manual/mod/mod_auth.html @@ -63,7 +63,7 @@ and satisfy.

Syntax: AuthGroupFile filename
+>Syntax: AuthGroupFile file-path
satisfy.

>Module: mod_auth

The AuthGroupFile directive sets the name of a textual file containing the list -of user groups for user authentication. Filename is the path +of user groups for user authentication. File-path is the path to the group file. If it is not absolute (i.e., if it doesn't begin with a slash), it is treated as relative to the ServerRoot.

@@ -106,7 +106,7 @@ See also AuthName, Syntax: AuthUserFile filename
+>Syntax: AuthUserFile file-path
AuthName, The AuthUserFile directive sets the name of a textual file containing the list of users and passwords for user -authentication. Filename is the path to the user +authentication. File-path is the path to the user file. If it is not absolute (i.e., if it doesn't begin with a slash), it is treated as relative to the ServerRoot.

Each line of the user file file contains a username followed diff --git a/docs/manual/mod/mod_auth_db.html b/docs/manual/mod/mod_auth_db.html index 4d57738dcd..04e24637ca 100644 --- a/docs/manual/mod/mod_auth_db.html +++ b/docs/manual/mod/mod_auth_db.html @@ -70,7 +70,7 @@ compatibility mode is enabled.

Syntax: AuthDBGroupFile filename
+>Syntax: AuthDBGroupFile file-path
>Module: mod_auth_db

The AuthDBGroupFile directive sets the name of a DB file containing the list -of user groups for user authentication. Filename is the absolute path +of user groups for user authentication. File-path is the absolute path to the group file.

The group file is keyed on the username. The value for a user is a @@ -133,7 +133,7 @@ See also AuthName, Syntax: AuthDBUserFile filename
+>Syntax: AuthDBUserFile file-path
AuthName, >Module: mod_auth_db

The AuthDBUserFile directive sets the name of a DB file containing the list -of users and passwords for user authentication. Filename is the +of users and passwords for user authentication. File-path is the absolute path to the user file.

The user file is keyed on the username. The value for a user is the diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html index 43cd444aa6..41e71b0b58 100644 --- a/docs/manual/mod/mod_auth_dbm.html +++ b/docs/manual/mod/mod_auth_dbm.html @@ -60,7 +60,7 @@ provided by mod_auth_db.

Syntax: AuthDBMGroupFile filename
+>Syntax: AuthDBMGroupFile file-path
mod_auth_db.

>Module: mod_auth_dbm

The AuthDBMGroupFile directive sets the name of a DBM file containing the list -of user groups for user authentication. Filename is the absolute path +of user groups for user authentication. File-path is the absolute path to the group file.

The group file is keyed on the username. The value for a user is a @@ -124,7 +124,7 @@ See also AuthName, Syntax: AuthDBMUserFile filename
+>Syntax: AuthDBMUserFile file-path
AuthName, >Module: mod_auth_dbm

The AuthDBMUserFile directive sets the name of a DBM file containing the list -of users and passwords for user authentication. Filename is the +of users and passwords for user authentication. File-path is the absolute path to the user file.

The user file is keyed on the username. The value for a user is the diff --git a/docs/manual/mod/mod_auth_digest.html b/docs/manual/mod/mod_auth_digest.html index 5cda2a778b..8a0108e84a 100644 --- a/docs/manual/mod/mod_auth_digest.html +++ b/docs/manual/mod/mod_auth_digest.html @@ -97,7 +97,7 @@ ideal. Syntax: AuthDigestFile filename
+>Syntax: AuthDigestFile file-path
The AuthDigestFile directive sets the name of a textual file containing the list of users and encoded passwords for digest authentication. -Filename is the absolute path to the user file. +File-path is the absolute path to the user file.

The digest file uses a special format. Files in this format can be created using the htdigest @@ -129,7 +129,7 @@ utility found in the support/ subdirectory of the Apache distribution. Syntax: AuthDigestGroupFile filename
+>Syntax: AuthDigestGroupFile file-path
The AuthDigestGroupFile directive sets the name of a textual file containing the list of groups and their members (user names). -Filename is the absolute path to the group file. +File-path is the absolute path to the group file.

Each line of the group file contains a groupname followed by a colon, followed by the member usernames separated by spaces. Example: diff --git a/docs/manual/mod/mod_env.html b/docs/manual/mod/mod_env.html index 3d6d610fe9..65d330075b 100644 --- a/docs/manual/mod/mod_env.html +++ b/docs/manual/mod/mod_env.html @@ -63,8 +63,8 @@ process.

Syntax: PassEnv variable - [variable] ...
+>Syntax: PassEnv env-variable + [env-variable] ...
Syntax: SetEnv variable value
+>Syntax: SetEnv env-variable value
Syntax: UnsetEnv variable - [variable] ...
+>Syntax: UnsetEnv env-variable + [env-variable] ...
Syntax: TypesConfig filename
+>Syntax: TypesConfig file-path
Syntax: MimeMagicFile magic-file-name + >Syntax: MimeMagicFile file-path
Syntax: RewriteLog Filename
+>Syntax: RewriteLog file-path
Syntax: RewriteLock Filename
+>Syntax: RewriteLock file-path
Syntax: RewriteBase BaseURL
+>Syntax: RewriteBase URL-path
Syntax: BrowserMatch regex - envar[=value] [envar[=value]] ... + env-variable[=value] [env-variable[=value]] ...
Syntax: BrowserMatchNoCase regex - envar[=value] [envar[=value]] ... + env-variable[=value] [env-variable[=value]] ...
Syntax: SetEnvIf attribute regex - envar[=value] [envar[=value]] ... + env-variable[=value] [env-variable[=value]] ...
Syntax: SetEnvIfNoCase attribute regex - envar[=value] [envar[=value]] ... + env-variable[=value] [env-variable[=value]] ...