From: Joshua Slive Date: Wed, 6 Mar 2002 22:16:49 +0000 (+0000) Subject: Bring some more files into line with the new DTD. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bcd9ca8044613057810b8395b3bf587068d24a8;p=apache Bring some more files into line with the new DTD. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93742 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 2eb6527b2d..dbc404f20f 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -1,12 +1,12 @@ - ]> + core -Core Core Apache HTTP Server features that are always available +Core AcceptPathInfo @@ -114,10 +114,11 @@ AccessFileName .acl Specifies the 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 -AddDefaultCharset Off + @@ -294,7 +295,8 @@ authentication Selects the type of user authentication AuthType Basic|Digest directory.htaccess -AuthConfig + +AuthConfig

This directive selects the type of user authentication for a @@ -377,8 +379,8 @@ server cannot determine a type in any other way DefaultType image/gif - would be appropriate for a directory which contained many gif - images with filenames missing the .gif extension. +

would be appropriate for a directory which contained many gif + images with filenames missing the .gif extension.

Note that unlike ForceType, this directive is only @@ -421,8 +423,8 @@ named file-system directory and sub-directories <Directory ~ "^/www/.*/[0-9]{3}"> - would match directories in /www/ that consisted of three - numbers. +

would match directories in /www/ that consisted of three + numbers.

If multiple (non-regular expression) directory sections match the directory (or its parents) containing a document, @@ -470,7 +472,7 @@ named file-system directory and sub-directories /home/abc/public_html/abc and be applied.

Note that the default Apache access for - <Directory /> is Allow from All. This means + <Directory /> is Allow from All. This means that Apache will serve any file mapped from an URL. It is recommended that you change this with a block such as

@@ -689,17 +691,17 @@ HTTP response header FileETag directive allows you to choose which of these -- if any -- should be used. The recognized keywords are:

-
-
INode
+
+
INode
The file's i-node number will be included in the calculation
-
MTime
+
MTime
The date and time the file was last modified will be included
-
Size
+
Size
The number of bytes in the file will be included
-
All
+
All
All available fields will be used (equivalent to 'FileETag INode MTime Size')
-
None
+
None
If a document is file-based, no ETag field will be included in the response
@@ -1456,16 +1458,16 @@ matching URLs - + - + - + @@ -1844,7 +1846,7 @@ a resource by Apache childrenRLimitCPU number|max [number|max]Unset; uses operating system defaults ->server configvirtual host +server configvirtual host Moved in version 2.0 to the MPMs @@ -2141,13 +2143,13 @@ is accessed by an incompatible browser mod_info output, ...). The reason why you would want to enable such a footer line is that in a chain of proxies, the user often has no possibility to tell which of the chained servers actually - produced a returned error message.
The Off + produced a returned error message.
The Off setting, which is the default, suppresses the error line (and is therefore compatible with the behavior of Apache-1.2 and - below). The On setting simply adds a line with the + below). The On setting simply adds a line with the server version number and ServerName of the serving virtual host, - and the EMail setting additionally creates a + and the EMail setting additionally creates a "mailto:" reference to the ServerAdmin of the referenced document.

@@ -2162,7 +2164,7 @@ is accessed by an incompatible browser server config -

This directive controls whether Server response +

This directive controls whether Server response header field which is sent back to clients includes a description of the generic OS-type of the server as well as information about compiled-in modules.

@@ -2170,23 +2172,23 @@ is accessed by an incompatible browser
ServerTokens Prod[uctOnly]
-
Server sends (e.g.): Server: - Apache
+
Server sends (e.g.): Server: + Apache
ServerTokens Min[imal]
-
Server sends (e.g.): Server: - Apache/1.3.0
+
Server sends (e.g.): Server: + Apache/1.3.0
ServerTokens OS
-
Server sends (e.g.): Server: Apache/1.3.0 - (Unix)
+
Server sends (e.g.): Server: Apache/1.3.0 + (Unix)
ServerTokens Full (or not specified)
-
Server sends (e.g.): Server: Apache/1.3.0 - (Unix) PHP/3.0 MyMod/1.2
+
Server sends (e.g.): Server: Apache/1.3.0 + (Unix) PHP/3.0 MyMod/1.2

This setting applies to the entire server, and cannot be @@ -2405,9 +2407,10 @@ hostname or IP address

  • A fully qualified domain name for the IP address of the virtual host.
    • - Example: + -<VirtualHost 10.1.2.3>
    +Example + <VirtualHost 10.1.2.3>
    ServerAdmin webmaster@host.foo.com
    DocumentRoot /www/docs/host.foo.com
    ServerName host.foo.com
    diff --git a/docs/manual/mod/mod_asis.xml b/docs/manual/mod/mod_asis.xml index 171e2b6681..7fe01a05fc 100644 --- a/docs/manual/mod/mod_asis.xml +++ b/docs/manual/mod/mod_asis.xml @@ -1,4 +1,5 @@ + diff --git a/docs/manual/mod/mod_auth.xml b/docs/manual/mod/mod_auth.xml index 2bde9f139c..4ccd989c6a 100644 --- a/docs/manual/mod/mod_auth.xml +++ b/docs/manual/mod/mod_auth.xml @@ -1,4 +1,5 @@ + diff --git a/docs/manual/mod/mod_auth_anon.xml b/docs/manual/mod/mod_auth_anon.xml index 7434ca5472..75dc933f90 100644 --- a/docs/manual/mod/mod_auth_anon.xml +++ b/docs/manual/mod/mod_auth_anon.xml @@ -1,4 +1,5 @@ + diff --git a/docs/manual/mod/mod_auth_dbm.xml b/docs/manual/mod/mod_auth_dbm.xml index 6d50bcec67..04dad01a73 100644 --- a/docs/manual/mod/mod_auth_dbm.xml +++ b/docs/manual/mod/mod_auth_dbm.xml @@ -1,4 +1,5 @@ + diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml index 3d3c544278..ac1e9365e2 100644 --- a/docs/manual/mod/mod_auth_digest.xml +++ b/docs/manual/mod/mod_auth_digest.xml @@ -1,4 +1,5 @@ + mod_auth_digest diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml index 73aeb7dcc6..3b6e443e95 100644 --- a/docs/manual/mod/mod_autoindex.xml +++ b/docs/manual/mod/mod_autoindex.xml @@ -1,5 +1,5 @@ - ]> + mod_autoindex @@ -50,7 +50,7 @@ same header repeatedly toggles between ascending and descending order. These column header links are suppressed with IndexOptions directive's - SuppressColumnSorting option.

    + SuppressColumnSorting option.

    Note that when the display is sorted by "Size", it's the actual size of the files that's used, not the @@ -73,41 +73,41 @@ resource.

      -
    • C=N sorts the directory by file name
      • +
    • C=N sorts the directory by file name
      • -
    • C=M sorts the directory by last-modified +
    • C=M sorts the directory by last-modified date, then file name
      • -
    • C=S sorts the directory by size, then file +
    • C=S sorts the directory by size, then file name
      • -
    • C=D sorts the directory by description, then +
    • C=D sorts the directory by description, then file name
       
      • -
    • O=A sorts the listing in Ascending +
    • O=A sorts the listing in Ascending Order
      • -
    • O=D sorts the listing in Descending +
    • O=D sorts the listing in Descending Order
       
      • -
    • F=0 formats the listing as a simple list +
    • F=0 formats the listing as a simple list (not FancyIndexed)
      • -
    • F=1 formats the listing as a FancyIndexed +
    • F=1 formats the listing as a FancyIndexed list
      • -
    • F=2 formats the listing as an HTMLTable +
    • F=2 formats the listing as an HTMLTable FancyIndexed list
       
      • -
    • V=0 disables version sorting
      • +
    • V=0 disables version sorting
      • -
    • V=1 enables version sorting
      +
    • V=1 enables version sorting
       
      • -
    • P=pattern lists only files matching +
    • P=pattern lists only files matching the given pattern
    @@ -479,7 +479,7 @@ indexing of

    -
    DescriptionWidth=[n | *] (Apache 1.3.10 or 2.0.23 and later)
    @@ -497,22 +497,22 @@ indexing width necessary to accommodate the longest description string. -
    See the section on See the section on AddDescription for dangers - inherent in truncating descriptions.
    + inherent in truncating descriptions. -
    FancyIndexing
    This turns on fancy indexing of directories.
    -
    FoldersFirst (Apache - 1.3.10 or 2.0.23 and later)
    +
    FoldersFirst (Apache + 1.3.10 or 2.0.23 and later)
    If this option is enabled, subdirectory listings will - always appear first, followed by normal files in the + always appear first, followed by normal files in the directory. The listing is basically broken into two components, the files and the subdirectories, and each is sorted separately and then displayed subdirectories-first. @@ -520,14 +520,14 @@ indexing FoldersFirst is enabled, subdirectory Zed will be listed before subdirectory Beta, which will be listed before normal files - Gamma and Alpha. This option + Gamma and Alpha. This option only has an effect if FancyIndexing - is also enabled.
    + is also enabled. -
    HTMLTable (Experimental, - Apache 2.0.23 and later)
    +
    HTMLTable (Experimental, + Apache 2.0.23 and later)
    This experimental option with FancyIndexing constructs a @@ -537,14 +537,14 @@ indexing left-to-right and right-to-left reading order, as can happen on WinNT or other utf-8 enabled platforms.
    -
    IconsAreLinks
    This makes the icons part of the anchor for the filename, for fancy indexing.
    -
    IconHeight[=pixels] (Apache 1.3 and later)
    @@ -558,7 +558,7 @@ indexing the standard height of the icons supplied with the Apache software. -
    IconWidth[=pixels] (Apache 1.3 and later)
    @@ -572,7 +572,7 @@ indexing the standard width of the icons supplied with the Apache software. -
    IgnoreClient
    @@ -581,7 +581,7 @@ indexing SuppressColumnSorting.)
    -
    NameWidth=[n | *] (Apache 1.3.2 and later)
    @@ -597,8 +597,7 @@ indexing
    NameWidth=* grows the column to the necessary width.
    -
    ScanHTMLTitles
    +
    ScanHTMLTitles
    This enables the extraction of the title from HTML documents @@ -607,7 +606,7 @@ indexing httpd will read the document for the value of the TITLE tag. This is CPU and disk intensive.
    -
    SuppressColumnSorting (Apache 1.3 and later)
    @@ -622,7 +621,7 @@ indexing href="#indexoptions:ignoreclient">IndexOptions IgnoreClient in Apache 2.0.23. -
    SuppressDescription
    @@ -637,7 +636,7 @@ indexing index option to limit the size of the description column.
    -
    SuppressHTMLPreamble (Apache 1.3 and later)
    @@ -652,7 +651,7 @@ indexing HTML instructions in this case. If there is no header file, the preamble is generated as usual. -
    SuppressIcon (Apache 2.0.23 and later)
    @@ -663,14 +662,14 @@ indexing by the final specification prohibits IMG and HR tags from the PRE block (used to format FancyIndexed listings.) -
    SuppressLastModified
    This will suppress the display of the last modification date, in fancy indexing listings.
    -
    SuppressRules (Apache 2.0.23 and later)
    @@ -681,14 +680,14 @@ indexing by the final specification prohibits IMG and HR tags from the PRE block (used to format FancyIndexed listings.) -
    SuppressSize
    This will suppress the file size in fancy indexing listings.
    -
    TrackModified (Apache 1.3.15 or 2.0.23 and later)
    @@ -707,7 +706,7 @@ indexing Last-Modified header on all Unix platforms. If this is a concern, leave this option disabled. -
    VersionSort (Apache 2.0a3 and later)
    @@ -738,7 +737,7 @@ foo-1.04
    -

    Incremental IndexOptions

    + Incremental IndexOptions
    diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml index 4c3ea9c1ef..9e1c4cf02e 100644 --- a/docs/manual/mod/mod_cgi.xml +++ b/docs/manual/mod/mod_cgi.xml @@ -1,5 +1,5 @@ - ]> + diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml index bebea4f7c3..7766be6c83 100644 --- a/docs/manual/mod/mod_cgid.xml +++ b/docs/manual/mod/mod_cgid.xml @@ -1,5 +1,5 @@ - ]> + diff --git a/docs/manual/mod/mod_charset_lite.xml b/docs/manual/mod/mod_charset_lite.xml index b047e85200..df9f847058 100644 --- a/docs/manual/mod/mod_charset_lite.xml +++ b/docs/manual/mod/mod_charset_lite.xml @@ -1,4 +1,5 @@ + @@ -86,8 +87,8 @@ as a valid character set name by the character set support in APR. Generally, this means that it must be supported by iconv.

    - Example: - + +example <Directory "/export/home/trawick/apacheinst/htdocs/convert">
    CharsetSourceEnc UTF-16BE
    CharsetDefault ISO8859-1
    @@ -117,8 +118,8 @@ as a valid character set name by the character set support in APR. Generally, this means that it must be supported by iconv.

    - Example: - + +Example <Directory "/export/home/trawick/apacheinst/htdocs/convert">
    CharsetSourceEnc UTF-16BE
    CharsetDefault ISO8859-1
    @@ -131,8 +132,8 @@ CharsetOptions Configures charset tranlation behavior CharsetOptions option [option] ... -CharsetOptions DebugLevel=0 -NoImplicitAdd +CharsetOptions DebugLevel=0 +NoImplicitAdd server config virtual hostdirectory .htaccess diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml index 59a4283561..a8908f7ddd 100644 --- a/docs/manual/mod/mod_dav.xml +++ b/docs/manual/mod/mod_dav.xml @@ -1,5 +1,5 @@ - ]> + @@ -67,8 +67,8 @@ -Location of the DAV lock database DavLockDB +Location of the DAV lock database DavLockDB file-path server configvirtual host diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml index 44b5efda36..cf5ff40d9b 100644 --- a/docs/manual/mod/mod_deflate.xml +++ b/docs/manual/mod/mod_deflate.xml @@ -1,5 +1,5 @@ - ]> + diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml index a502fb5745..933a23c3a7 100644 --- a/docs/manual/mod/mod_env.xml +++ b/docs/manual/mod/mod_env.xml @@ -1,4 +1,5 @@ +
    Level Level Description Description
    Example Example