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 c2a1294ced5aab09dcb09a8389649073d0911804..f6cef3b3b8073a162b174cd65c1bc8cbd3ddd0fd 100644 (file)
--- a/docs/manual/mod/mod_access.html
+++ b/docs/manual/mod/mod_access.html
@@ -88,8 +88,8 @@ href="core.html#limit">&lt;Limit&gt;</a> section.</p>
  HREF="directive-dict.html#Syntax"
  REL="Help"
 ><STRONG>Syntax:</STRONG></A> Allow from 
-   all|<EM>host</em>|env=<em>variablename</em> 
-   [<em>host</em>|env=<em>variablename</em>] ...<BR>
+   all|<EM>host</em>|env=<em>env-variable</em> 
+   [<em>host</em>|env=<em>env-variable</em>] ...<BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -156,9 +156,9 @@ same set of hosts.</p>
 <p>The third format of the arguments to the <code>Allow</code>
 directive allows access to the server to be controlled based on the
 existence of an <a href="../env.html">environment variable</a>.  When
-<code>Allow from env=</code><em>variablename</em> is specified, then
+<code>Allow from env=</code><em>env-variable</em> is specified, then
 the request is allowed access if the environment variable
-<em>variablename</em> exists.  The server provides the ability to set
+<em>env-variable</em> 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 <a
 href="mod_setenvif.html">mod_setenvif</a>.  Therefore, this directive
@@ -194,8 +194,8 @@ and <A HREF="mod_setenvif.html#SetEnvIf">SetEnvIf</A>.
  HREF="directive-dict.html#Syntax"
  REL="Help"
 ><STRONG>Syntax:</STRONG></A> Deny from 
-   all|<EM>host</em>|env=<em>variablename</em> 
-   [<em>host</em>|env=<em>variablename</em>] ...<BR>
+   all|<EM>host</em>|env=<em>env-variable</em> 
+   [<em>host</em>|env=<em>env-variable</em>] ...<BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"

diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html
index f19829250a4c3e314f2d5cdd46a1aa6927bd2113..2e86ec4dee14d432ce4ce6c7b7bb0175c3cbc6ff 100644 (file)
--- a/docs/manual/mod/mod_alias.html
+++ b/docs/manual/mod/mod_alias.html
@@ -77,7 +77,7 @@ HREF="mod_rewrite.html"><CODE>mod_rewrite</CODE></A> module.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> Alias <EM>url-path directory-filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> Alias <EM>URL-path file-path</em>|<em>directory-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -129,7 +129,7 @@ See also <A HREF="#scriptalias">ScriptAlias</A>.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AliasMatch <EM>regex directory-filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AliasMatch <EM>regex file-path</em>|<em>directory-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -146,10 +146,11 @@ See also <A HREF="#scriptalias">ScriptAlias</A>.
 
 <P>This directive is equivalent to <A HREF="#alias">Alias</A>, 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 <CODE>/icons</CODE> 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 <CODE>/icons</CODE> directory,
+one might use:
 <PRE>
     AliasMatch ^/icons(.*) /usr/local/apache/icons$1
 </PRE>
@@ -164,7 +165,7 @@ to activate the <CODE>/icons</CODE> directory, one might use:
  HREF="directive-dict.html#Syntax"
  REL="Help"
 ><STRONG>Syntax:</STRONG></A> Redirect [<EM>status</EM>]
- <EM>url-path url</EM><BR>
+ <EM>URL-path URL</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -186,9 +187,9 @@ to activate the <CODE>/icons</CODE> directory, one might use:
 <P>
 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.
-<EM>Url-path</EM> a (%-decoded) path; any requests for documents beginning with
-this path will be returned a redirect error to a new (%-encoded) url
-beginning with <EM>url</EM>.
+<EM>URL-path</EM> a (%-decoded) path; any requests for documents beginning with
+this path will be returned a redirect error to a new (%-encoded) URL
+beginning with <EM>URL</EM>.
 </P>
 <P>
 Example:
@@ -203,7 +204,7 @@ access http://foo2.bar.com/service/foo.txt instead.
 <STRONG>Note:</STRONG> Redirect directives take precedence over Alias
 and ScriptAlias
 directives, irrespective of their ordering in the configuration file.  Also,
-<EM>Url-path</EM> must be an absolute path, not a relative path, even
+<EM>URL-path</EM> must be an absolute path, not a relative path, even
 when used with .htaccess files or inside of &lt;Directory&gt; sections.
 </P>
 <P>
@@ -242,7 +243,7 @@ the function <CODE>send_error_response</CODE> in http_protocol.c).
  HREF="directive-dict.html#Syntax"
  REL="Help"
 ><STRONG>Syntax:</STRONG></A>
-    RedirectMatch [<EM>status</EM>] <EM>regex url</EM>
+    RedirectMatch [<EM>status</EM>] <EM>regex URL</EM>
 <BR>
 <A
  HREF="directive-dict.html#Context"
@@ -263,13 +264,13 @@ the function <CODE>send_error_response</CODE> in http_protocol.c).
 ><STRONG>Module:</STRONG></A> mod_alias
 </P>
 
-<P>This directive is equivalent to <A HREF="#redirect">Redirect</A>, 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:
+<P>This directive is equivalent to <A HREF="#redirect">Redirect</A>,
+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:
 <PRE>
     RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
 </PRE>
@@ -283,7 +284,7 @@ one might use:
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RedirectTemp <EM>url-path url</EM><BR>
+><STRONG>Syntax:</STRONG></A> RedirectTemp <EM>URL-path URL</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -315,7 +316,7 @@ temp</CODE>.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RedirectPermanent <EM>url-path url</EM><BR>
+><STRONG>Syntax:</STRONG></A> RedirectPermanent <EM>URL-path URL</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -346,7 +347,7 @@ This directive makes the client know that the Redirect is permanent
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> ScriptAlias <EM>url-path directory-filename</EM>
+><STRONG>Syntax:</STRONG></A> ScriptAlias <EM>URL-path file-path</em>|<em>directory-path</em>
 <BR>
 <A
  HREF="directive-dict.html#Context"
@@ -365,8 +366,9 @@ This directive makes the client know that the Redirect is permanent
 The ScriptAlias directive has the same behavior as the
 <A HREF="#alias">Alias</A> directive, except that in addition it
 marks the target directory as containing CGI scripts.
-URLs with a (%-decoded) path beginning with <EM>url-path</EM> will be
-mapped to scripts beginning with <EM>directory-filename</EM>.
+URLs with a (%-decoded) path beginning with <EM>URL-path</EM> will be
+mapped to scripts beginning with the second argument which is a full
+pathname in the local filesystem.
 <P>
 Example:
 </P>
@@ -384,7 +386,7 @@ run the script /web/cgi-bin/foo.
  HREF="directive-dict.html#Syntax"
  REL="Help"
 ><STRONG>Syntax:</STRONG></A> ScriptAliasMatch
- <EM>regex directory-filename</EM><BR>
+ <EM>regex file-path</em>|<em>directory-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -399,12 +401,13 @@ run the script /web/cgi-bin/foo.
 ><STRONG>Module:</STRONG></A> mod_alias
 </P>
 
-<P>This directive is equivalent to <A HREF="#scriptalias">ScriptAlias</A>, 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 <CODE>/cgi-bin</CODE>, one might use:
+<P>This directive is equivalent to <A
+HREF="#scriptalias">ScriptAlias</A>, 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
+<CODE>/cgi-bin</CODE>, one might use:
 <PRE>
     ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
 </PRE>

diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html
index 04508d4468b226c74e7eb7b1f1e434cc2429f440..d624f6519d1fb70d817625db4a9090d365b585b0 100644 (file)
--- a/docs/manual/mod/mod_auth.html
+++ b/docs/manual/mod/mod_auth.html
@@ -63,7 +63,7 @@ and <A HREF="core.html#satisfy">satisfy</A>.</P>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthGroupFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthGroupFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -82,7 +82,7 @@ and <A HREF="core.html#satisfy">satisfy</A>.</P>
 ><STRONG>Module:</STRONG></A> mod_auth<P>
 
 The AuthGroupFile directive sets the name of a textual file containing the list
-of user groups for user authentication. <EM>Filename</EM> is the path
+of user groups for user authentication. <EM>File-path</EM> is the path
 to the group file.  If it is not absolute (<EM>i.e.</EM>, if it
 doesn't begin with a slash), it is treated as relative to the ServerRoot.
 <P>
@@ -106,7 +106,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthUserFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthUserFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -126,7 +126,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 
 The AuthUserFile directive sets the name of a textual file containing
 the list of users and passwords for user
-authentication. <EM>Filename</EM> is the path to the user
+authentication. <EM>File-path</EM> is the path to the user
 file. If it is not absolute (<EM>i.e.</EM>, if it doesn't begin with a
 slash), it is treated as relative to the ServerRoot.
 <P> 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 4d57738dcdaa492c072ab703f360c04776984b01..04e24637ca7c06034dd3176743aa4459f65bab24 100644 (file)
--- a/docs/manual/mod/mod_auth_db.html
+++ b/docs/manual/mod/mod_auth_db.html
@@ -70,7 +70,7 @@ compatibility mode is enabled.</p>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDBGroupFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDBGroupFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -89,7 +89,7 @@ compatibility mode is enabled.</p>
 ><STRONG>Module:</STRONG></A> mod_auth_db<P>
 
 The AuthDBGroupFile directive sets the name of a DB file containing the list
-of user groups for user authentication. <EM>Filename</EM> is the absolute path
+of user groups for user authentication. <EM>File-path</EM> is the absolute path
 to the group file.<P>
 
 The group file is keyed on the username. The value for a user is a
@@ -133,7 +133,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDBUserFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDBUserFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -152,7 +152,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 ><STRONG>Module:</STRONG></A> mod_auth_db<P>
 
 The AuthDBUserFile directive sets the name of a DB file containing the list
-of users and passwords for user authentication. <EM>Filename</EM> is the
+of users and passwords for user authentication. <EM>File-path</EM> is the
 absolute path to the user file.<P>
 
 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 43cd444aa62e248c470e3783216172edb98cf1fd..41e71b0b58cd5eda06d554685d2fd031db27fa38 100644 (file)
--- a/docs/manual/mod/mod_auth_dbm.html
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -60,7 +60,7 @@ provided by <a href="mod_auth_db.html">mod_auth_db</a>.</p>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDBMGroupFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDBMGroupFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -79,7 +79,7 @@ provided by <a href="mod_auth_db.html">mod_auth_db</a>.</p>
 ><STRONG>Module:</STRONG></A> mod_auth_dbm<P>
 
 The AuthDBMGroupFile directive sets the name of a DBM file containing the list
-of user groups for user authentication. <EM>Filename</EM> is the absolute path
+of user groups for user authentication. <EM>File-path</EM> is the absolute path
 to the group file.<P>
 
 The group file is keyed on the username. The value for a user is a
@@ -124,7 +124,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDBMUserFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDBMUserFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -143,7 +143,7 @@ See also <A HREF="core.html#authname">AuthName</A>,
 ><STRONG>Module:</STRONG></A> mod_auth_dbm<P>
 
 The AuthDBMUserFile directive sets the name of a DBM file containing the list
-of users and passwords for user authentication. <EM>Filename</EM> is the
+of users and passwords for user authentication. <EM>File-path</EM> is the
 absolute path to the user file.<P>
 
 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 5cda2a778b4208d8a84936bf17a3f0f1e929edfa..8a0108e84a512ed53084570d44a9a4da7027b70f 100644 (file)
--- a/docs/manual/mod/mod_auth_digest.html
+++ b/docs/manual/mod/mod_auth_digest.html
@@ -97,7 +97,7 @@ ideal.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDigestFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDigestFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -117,7 +117,7 @@ ideal.
 
 <P>The AuthDigestFile directive sets the name of a textual file containing
 the list of users and encoded passwords for digest authentication.
-<EM>Filename</EM> is the absolute path to the user file.
+<EM>File-path</EM> is the absolute path to the user file.
 
 <P>The digest file uses a special format. Files in this format can be
 created using the <a href="../programs/htdigest.html">htdigest</a>
@@ -129,7 +129,7 @@ utility found in the support/ subdirectory of the Apache distribution.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AuthDigestGroupFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AuthDigestGroupFile <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -149,7 +149,7 @@ utility found in the support/ subdirectory of the Apache distribution.
 
 <P>The AuthDigestGroupFile directive sets the name of a textual file
 containing the list of groups and their members (user names).
-<EM>Filename</EM> is the absolute path to the group file.
+<EM>File-path</EM> is the absolute path to the group file.
 
 <P>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 3d6d610fe93fc1c7b26220af073636f55bf46cf1..65d330075be149a7707db0344cbf22094bcf4474 100644 (file)
--- a/docs/manual/mod/mod_env.html
+++ b/docs/manual/mod/mod_env.html
@@ -63,8 +63,8 @@ process.</p>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> PassEnv <EM>variable</em> 
-    [<em>variable</em>] ...<BR>
+><STRONG>Syntax:</STRONG></A> PassEnv <EM>env-variable</em> 
+    [<em>env-variable</em>] ...<BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -96,7 +96,7 @@ the httpd process. Example:
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> SetEnv <EM>variable value</EM><BR>
+><STRONG>Syntax:</STRONG></A> SetEnv <EM>env-variable value</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -127,8 +127,8 @@ scripts and SSI pages. Example:
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> UnsetEnv <EM>variable</em> 
-   [<em>variable</em>] ...<BR>
+><STRONG>Syntax:</STRONG></A> UnsetEnv <EM>env-variable</em> 
+   [<em>env-variable</em>] ...<BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"

diff --git a/docs/manual/mod/mod_mime.html b/docs/manual/mod/mod_mime.html
index 341c8bd4d49a886b3877ba6292afe885d8e30bb5..8b2de5858bc6e685f30074f9fe579799c3877454 100644 (file)
--- a/docs/manual/mod/mod_mime.html
+++ b/docs/manual/mod/mod_mime.html
@@ -582,7 +582,7 @@ called, you might put the following into access.conf:
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> TypesConfig <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> TypesConfig <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Default"
  REL="Help"

diff --git a/docs/manual/mod/mod_mime_magic.html b/docs/manual/mod/mod_mime_magic.html
index cffa5dec46248145bed37125277aa00c730f4c63..3e0327abf2437889c21c4f433d953691575700dc 100644 (file)
--- a/docs/manual/mod/mod_mime_magic.html
+++ b/docs/manual/mod/mod_mime_magic.html
@@ -254,7 +254,7 @@ REL="Help"
   <A
    HREF="directive-dict.html#Syntax"
    REL="Help"
-  ><STRONG>Syntax:</STRONG></A> MimeMagicFile <EM>magic-file-name</EM>
+  ><STRONG>Syntax:</STRONG></A> MimeMagicFile <EM>file-path</EM>
   <BR>
   <A
    HREF="directive-dict.html#Default"

diff --git a/docs/manual/mod/mod_rewrite.html b/docs/manual/mod/mod_rewrite.html
index 25f916f829c02b9c1d59db1f51eec6cf5574bc3b..0de41934de1cb34d5dc54a7eb849ba8870d6bf2c 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html
+++ b/docs/manual/mod/mod_rewrite.html
@@ -433,7 +433,7 @@ strings can be one of the following:
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RewriteLog <EM>Filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> RewriteLog <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Default"
  REL="Help"
@@ -570,7 +570,7 @@ RewriteLogLevel 3
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RewriteLock <EM>Filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> RewriteLock <EM>file-path</EM><BR>
 <A
  HREF="directive-dict.html#Default"
  REL="Help"
@@ -855,7 +855,7 @@ external lookup only happens once!
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RewriteBase <EM>BaseURL</EM><BR>
+><STRONG>Syntax:</STRONG></A> RewriteBase <EM>URL-path</EM><BR>
 <A
  HREF="directive-dict.html#Default"
  REL="Help"

diff --git a/docs/manual/mod/mod_setenvif.html b/docs/manual/mod/mod_setenvif.html
index 53cca77a57b2e64bce4013a604d84af3d4c6ab06..763fc613713f04d56ff8107a64f2537cc9ac5e32 100644 (file)
--- a/docs/manual/mod/mod_setenvif.html
+++ b/docs/manual/mod/mod_setenvif.html
@@ -79,7 +79,7 @@ REL="Help"
    HREF="directive-dict.html#Syntax"
    REL="Help"
   ><STRONG>Syntax:</STRONG></A> BrowserMatch <EM>regex 
-   envar</em>[=<em>value</em>] [<em>envar</em>[=<em>value</em>]] ...
+   env-variable</em>[=<em>value</em>] [<em>env-variable</em>[=<em>value</em>]] ...
   <BR>
   <A
    HREF="directive-dict.html#Default"
@@ -181,7 +181,7 @@ REL="Help"
    HREF="directive-dict.html#Syntax"
    REL="Help"
   ><STRONG>Syntax:</STRONG></A> BrowserMatchNoCase <EM>regex
-   envar</em>[=<em>value</em>] [<em>envar</em>[=<em>value</em>]] ...
+   env-variable</em>[=<em>value</em>] [<em>env-variable</em>[=<em>value</em>]] ...
   <BR>
   <A
    HREF="directive-dict.html#Default"
@@ -255,7 +255,7 @@ REL="Help"
    HREF="directive-dict.html#Syntax"
    REL="Help"
   ><STRONG>Syntax:</STRONG></A> SetEnvIf <EM> attribute regex
-   envar</em>[=<em>value</em>] [<em>envar</em>[=<em>value</em>]] ...
+   env-variable</em>[=<em>value</em>] [<em>env-variable</em>[=<em>value</em>]] ...
   <BR>
   <A
    HREF="directive-dict.html#Default"
@@ -378,7 +378,7 @@ REL="Help"
    HREF="directive-dict.html#Syntax"
    REL="Help"
   ><STRONG>Syntax:</STRONG></A> SetEnvIfNoCase  <EM> attribute regex
-   envar</em>[=<em>value</em>] [<em>envar</em>[=<em>value</em>]] ...
+   env-variable</em>[=<em>value</em>] [<em>env-variable</em>[=<em>value</em>]] ...
   <BR>
   <A
    HREF="directive-dict.html#Default"