You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2001/07/16 21:19:50 UTC
cvs commit: httpd-docs-1.3/htdocs/manual/mod core.html.en directive-dict.html.en
slive 01/07/16 12:19:50
Modified: htdocs/manual/mod core.html.en directive-dict.html.en
Log:
Make the argument types a little more consistent.
Revision Changes Path
1.190 +36 -34 httpd-docs-1.3/htdocs/manual/mod/core.html.en
Index: core.html.en
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/core.html.en,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -b -u -r1.189 -r1.190
--- core.html.en 2001/07/13 07:37:45 1.189
+++ core.html.en 2001/07/16 19:19:50 1.190
@@ -106,7 +106,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> AcceptFilter <EM>on|off</EM><BR>
+><STRONG>Syntax:</STRONG></A> AcceptFilter on|off<BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -143,7 +143,8 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> AccessConfig <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> AccessConfig
+<em>file-path</em>|<em>directory-path</em><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -158,7 +159,7 @@
><STRONG>Status:</STRONG></A> core<P>
The server will read this file for more directives after reading the
-<A HREF="#resourceconfig">ResourceConfig</A> file. <EM>Filename</EM> is
+<A HREF="#resourceconfig">ResourceConfig</A> file. <EM>File-path</EM> is
relative to the <A HREF="#serverroot">ServerRoot</A>.
This feature can be disabled using:
<BLOCKQUOTE><CODE>AccessConfig /dev/null</CODE></BLOCKQUOTE>
@@ -576,7 +577,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> CoreDumpDirectory <EM>directory</EM><BR>
+><STRONG>Syntax:</STRONG></A> CoreDumpDirectory <EM>directory-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -636,7 +637,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> <Directory <EM>directory</EM>>
+><STRONG>Syntax:</STRONG></A> <Directory <EM>directory-path</EM>>
... </Directory> <BR>
<A
HREF="directive-dict.html#Context"
@@ -647,17 +648,16 @@
REL="Help"
><STRONG>Status:</STRONG></A> Core. <P>
-<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 in a directory
-context may be used. <EM>Directory</EM> 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. As of Apache 1.3, 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
-behaviour of Unix shells.
-Example:
-<PRE>
+<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 in a
+directory context may be used. <EM>Directory-path</EM> 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. As of Apache 1.3, 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
+behaviour of Unix shells. Example: <PRE>
<Directory /usr/local/httpd/htdocs>
Options Indexes FollowSymLinks
</Directory>
@@ -805,7 +805,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> DocumentRoot <EM>directory-filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> DocumentRoot <EM>directory-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -1082,8 +1082,8 @@
<OL>
<LI>output a simple hardcoded error message
<LI>output a customized message
-<LI>redirect to a local URL to handle the problem/error
-<LI>redirect to an external URL to handle the problem/error
+<LI>redirect to a local <em>URL-path</em> to handle the problem/error
+<LI>redirect to an external <em>URL</em> to handle the problem/error
</OL>
<P>The first option is the default, while options 2-4 are configured
@@ -1126,7 +1126,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> ErrorLog <EM>filename</EM>|syslog[:<EM>facility</EM>]
+><STRONG>Syntax:</STRONG></A> ErrorLog <EM>file-path</EM>|syslog[:<EM>facility</EM>]
<BR>
<A
HREF="directive-dict.html#Default"
@@ -1146,11 +1146,12 @@
REL="Help"
><STRONG>Status:</STRONG></A> core<P>
-The error log directive sets the name of the file to which the server will log
-any errors it encounters. If the filename does not begin with a slash (/)
-then it is assumed to be relative to the <A HREF="#serverroot">ServerRoot</A>.
-If the filename begins with a pipe (|) then it is assumed to be a command to
-spawn to handle the error log.
+The error log directive sets the name of the file to which the server
+will log any errors it encounters. If the <em>file-path</em> does not
+begin with a slash (/) then it is assumed to be relative to the <A
+HREF="#serverroot">ServerRoot</A>. If the <em>file-path</em> begins
+with a pipe (|) then it is assumed to be a command to spawn to handle
+the error log.
<P><STRONG>Apache 1.3 and above:</STRONG>
Using <CODE>syslog</CODE> instead of a filename enables logging via syslogd(8)
@@ -1534,7 +1535,7 @@
<P> <HR>
<H2><A NAME="include">Include directive</A></H2>
-<STRONG>Syntax:</STRONG> Include <EM>filename</EM><BR>
+<STRONG>Syntax:</STRONG> Include <EM>file-path</EM>|<em>directory-path</em><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -2016,7 +2017,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> <Location <EM>URL</EM>>
+><STRONG>Syntax:</STRONG></A> <Location <EM>URL-path</EM>|<em>URL</em>>
... </Location><BR>
<A
HREF="directive-dict.html#Context"
@@ -2153,7 +2154,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> LockFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> LockFile <EM>file-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -2605,7 +2606,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> PidFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> PidFile <EM>file-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -2765,7 +2766,8 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> ResourceConfig <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> ResourceConfig
+<EM>file-path</EM>|<em>directory-path</em><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -2780,7 +2782,7 @@
><STRONG>Status:</STRONG></A> core<P>
The server will read this file for more directives after reading the
-httpd.conf file. <EM>Filename</EM> is relative to the
+httpd.conf file. <EM>File-path</EM> is relative to the
<A HREF="#serverroot">ServerRoot</A>.
This feature can be disabled using:
<BLOCKQUOTE><CODE>ResourceConfig /dev/null</CODE></BLOCKQUOTE>
@@ -2984,7 +2986,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> ScoreBoardFile <EM>filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> ScoreBoardFile <EM>file-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
@@ -3173,7 +3175,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> ServerPath <EM>pathname</EM><BR>
+><STRONG>Syntax:</STRONG></A> ServerPath <EM>directory-path</EM><BR>
<A
HREF="directive-dict.html#Context"
REL="Help"
@@ -3201,7 +3203,7 @@
<A
HREF="directive-dict.html#Syntax"
REL="Help"
-><STRONG>Syntax:</STRONG></A> ServerRoot <EM>directory-filename</EM><BR>
+><STRONG>Syntax:</STRONG></A> ServerRoot <EM>directory-path</EM><BR>
<A
HREF="directive-dict.html#Default"
REL="Help"
1.6 +3 -3 httpd-docs-1.3/htdocs/manual/mod/directive-dict.html.en
Index: directive-dict.html.en
===================================================================
RCS file: /home/cvs/httpd-docs-1.3/htdocs/manual/mod/directive-dict.html.en,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -b -u -r1.5 -r1.6
--- directive-dict.html.en 2001/07/16 01:38:47 1.5
+++ directive-dict.html.en 2001/07/16 19:19:50 1.6
@@ -104,13 +104,13 @@
<dl>
-<dt><em>url</em></dt>
+<dt><em>URL</em></dt>
<dd>A complete Uniform Resource Locator including a scheme, hostname,
and optional pathname as in
<code>http://www.example.com/path/to/file.html</code></dd>
-<dt><em>url-path</em><dt>
+<dt><em>URL-path</em><dt>
<dd>The part of a <em>url</em> which follows the scheme and hostname
as in <code>/path/to/file.html</code>. The <em>url-path</em>
@@ -156,7 +156,7 @@
<em>extension</em>s with or without the leading dot. In addition,
<em>extension</em>s are not case sensitive.</dd>
-<dt><em>mime-type</em></dt>
+<dt><em>MIME-type</em></dt>
<dd>A method of describing the format of a file which consists of a
major format type and a minor format type, separated by a slash