From bc823de7c3dcff7902a6e110baa6a6375f588cb5 Mon Sep 17 00:00:00 2001 From: Joshua Slive Date: Fri, 8 Mar 2002 18:00:37 +0000 Subject: [PATCH] Make the xml match the DTD. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93797 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_include.xml | 71 +++++++------ docs/manual/mod/mod_info.xml | 18 ++-- docs/manual/mod/mod_log_config.xml | 18 +--- docs/manual/mod/mod_mime.xml | 156 ++++++++++++++--------------- 4 files changed, 124 insertions(+), 139 deletions(-) diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index 022c0880b4..a421ce7d00 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -1,14 +1,13 @@ + mod_include +Server-parsed html documents (Server Side Includes) Base +mod_include.c include_module -mod_include.c - -This module provides for server-parsed html -documents. @@ -19,12 +18,10 @@ documents. inclusion other files or programs, as well as the setting and printing of environment variables.

- See also: - Options, - SetOutputFilter - and AcceptPathInfo. - + Options + SetOutputFilter + AcceptPathInfo
Enabling Server-Side Includes @@ -59,9 +56,9 @@ documents. text/x-server-parsed-html3 (and the resulting output will have the mime type text/html).

- For more information, see our For more information, see our Tutorial on Server Side - Includes. + Includes.

@@ -76,7 +73,7 @@ documents.

The value will often be enclosed in double quotes; many commands only allow a single attribute-value pair. Note that - the comment terminator (-->) should be preceded + the comment terminator (-->) should be preceded by whitespace to ensure that it isn't considered part of an SSI token.

@@ -111,7 +108,7 @@ documents. -
echo
+
echo

This command prints one of the include @@ -369,10 +366,10 @@ documents.

Include Variables - In addition to the variables in the standard CGI environment, +

In addition to the variables in the standard CGI environment, these are available for the echo command, for if and elif, and to any program - invoked by the document. + invoked by the document.

DATE_GMT
@@ -406,9 +403,9 @@ documents.

Variable substitution is done within quoted strings in most cases where they may reasonably occur as an argument to an SSI - directive. This includes the config, - exec, flastmod, fsize, - include, and set directives, as well + directive. This includes the config, + exec, flastmod, fsize, + include, and set directives, as well as the arguments to conditional operators. You can insert a literal dollar sign into the string using backslash quoting:

@@ -426,10 +423,10 @@ documents. <!--#set var="Zed" value="${REMOTE_HOST}_${REQUEST_METHOD}" --> -

This will result in the Zed variable being set - to "X_Y" if REMOTE_HOST is - "X" and REQUEST_METHOD is - "Y".

+

This will result in the Zed variable being set + to "X_Y" if REMOTE_HOST is + "X" and REQUEST_METHOD is + "Y".

EXAMPLE: the below example will print "in foo" if the DOCUMENT_URI is /foo/file.html, "in bar" if it is @@ -446,11 +443,11 @@ documents.

-
- Flow Control Elements +
+ Flow Control Elements - These are available in Apache 1.2 and above. The basic flow - control elements are: +

These are available in Apache 1.2 and above. The basic flow + control elements are:

<!--#if expr="test_condition" -->
@@ -492,7 +489,7 @@ documents.
Compare string1 with string 2. If string2 has the form /string/ then it is compared as a regular expression. Regular expressions have the same syntax as those - found in the Unix egrep command.
+ found in the Unix egrep command.
( test_condition )
@@ -540,11 +537,13 @@ documents.
Using Server Side Includes for ErrorDocuments - There is a document +

There is a document which describes how to use the features of mod_include to offer - internationalized customized server error documents. + internationalized customized server error documents.

-

PATH_INFO with Server Side Includes

+
+ +
PATH_INFO with Server Side Includes

Files processed for server-side includes no longer accept requests with PATH_INFO (trailing pathname information) by @@ -570,9 +569,10 @@ include command.

This directive changes the string that mod_include looks for to mark the end of a include command.

- See also: SSIStartTag. +SSIStartTag + SSIUndefinedEcho Changes the string that mod_include displays when @@ -587,7 +587,7 @@ a variable isn't set.

This directive changes the string that mod_include displays - when a variable is not set and "echoed" + when a variable is not set and "echoed".

 @@ -641,9 +641,8 @@ include element output of a file each processing different commands (possibly at different times).

- See also: SSIEndTag - +SSIEndTag @@ -673,6 +672,8 @@ displayed XBitHack +Parse SSI directives in files with the execute +bit set XBitHack on|off|full XBitHack off @@ -683,8 +684,6 @@ displayed Options -Parse SSI directives in files with the execute -bit set

The XBitHack directives controls the parsing of ordinary diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index c086a891f0..f565d484d2 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -1,22 +1,19 @@ + mod_info +Provides a comprehensive overview of the server +configuration Extension -This module provides a comprehensive overview of the server -configuration including all installed modules and directives in the -configuration files. -info_module mod_info.c -Available in Apache 1.1 and later +info_module

-

Using mod_info

- -

To configure it, add the following to your +

To configure mod_info, add the following to your httpd.conf file.

@@ -25,12 +22,12 @@ SetHandler server-info
</Location>
 - You may wish to add a +

You may wish to add a <Limit> clause inside the <location> directive to limit access to your server configuration - information. + information.

Once configured, the server information is obtained by accessing http://your.host.dom/server-info

@@ -59,7 +56,6 @@ SetHandler server-info
Allows additional information to be added to the module information displayed by the server-info handler AddModuleInfo module-name string -none server config virtual host Apache 1.3 and above diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index edcc9eba6d..196000cbcd 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -1,15 +1,13 @@ + mod_log_config +Logging of the requests made to the server Base +mod_log_config.c log_config_module - - -This module provides for logging of the requests -made to the server, using the Common Log Format or a -user-specified format. @@ -27,9 +25,9 @@ user-specified format. step. The TransferLog and CustomLog directives can be used multiple times in each server to cause each request to be logged to multiple files.

+ -See also: -Apache Log Files. +Apache Log Files
Custom Log Formats @@ -211,13 +209,10 @@ this conflicted with the historical ssl %...{var}c syntax.)
- - CookieLog Sets filename for the logging of cookies CookieLog filename -none server configvirtual host Only available in Apache 1.2 and above @@ -239,7 +234,6 @@ host CustomLog file|pipe format|nickname [env=[!]environment-variable] -none server configvirtual host Nickname only available in Apache 1.3 or later. @@ -319,7 +313,6 @@ Conditional logging available in 1.3.5 or later. Describes a format for use in a log file LogFormat format|nickname [nickname] -none server configvirtual host Nickname only available in Apache 1.3 or later. @@ -361,7 +354,6 @@ host TransferLog Specifly location of a log file TransferLog file|pipe -none server configvirtual host diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml index 77bf64b267..4b0738d43a 100644 --- a/docs/manual/mod/mod_mime.xml +++ b/docs/manual/mod/mod_mime.xml @@ -4,14 +4,13 @@ mod_mime -This module associates the request filename's extensions +Associates the request filename's extensions (e.g. .html) with the file's behavior (handlers and filters) and content (mime-type, language, character set and - encoding.) - + encoding) +Base mod_mime.c mime_module -Base

This module is used to associate various bits of "meta @@ -90,8 +89,8 @@ See also: MimeMagicFile -

-Files with Multiple Extensions +
+Files with Multiple Extensions

Files can have more than one extension, and the order of the extensions is normally irrelevant. For example, if the @@ -118,13 +117,13 @@ file.

-
Content encoding +
Content encoding

A file of a particular MIME type can additionally be encoded a particular way to simplify transmission over the Internet. While this usually will refer to compression, such as - gzip, it can also refer to encryption, such a - pgp or to an encoding such as UUencoding, which is + gzip, it can also refer to encryption, such a + pgp or to an encoding such as UUencoding, which is designed for transmitting a binary file in an ASCII (text) format.

@@ -149,13 +148,13 @@

For example, you may have a file which is a Microsoft Word document, which is pkzipped to reduce its size. If the - .doc extension is associated with the Microsoft - Word file type, and the .zip extension is + .doc extension is associated with the Microsoft + Word file type, and the .zip extension is associated with the pkzip file encoding, then the file - Resume.doc.zipwould be known to be a pkzip'ed Word + Resume.doc.zipwould be known to be a pkzip'ed Word document.

-

Apache send a Content-encoding header with the +

Apache send a Content-encoding header with the resource, in order to tell the client browser about the encoding method.

@@ -194,9 +193,9 @@ Charset

To convey this further information, Apache optionally sends - a Content-Language header, to specify the language + a Content-Language header, to specify the language that the document is in, and can append additional information - onto the Content-Type header to indicate the + onto the Content-Type header to indicate the particular character set that should be used to correctly render the information.

@@ -206,7 +205,7 @@ Content-Type: text/plain; charset=ISO-8859-2

The language specification is the two-letter abbreviation - for the language. The charset is the name of the + for the language. The charset is the name of the particular character set which should be used.

@@ -214,6 +213,8 @@ Content-Type: text/plain; charset=ISO-8859-2 AddCharset +Maps the given filename extensions + to the specified content charset AddCharset charset extension [extension] ... None @@ -226,16 +227,14 @@ Content-Type: text/plain; charset=ISO-8859-2 FileInfo AddCharset is only available in Apache 1.3.10 and later -Maps the given filename extensions - to the specified content charset

The AddCharset directive maps the given filename extensions - to the specified content charset. charset is the MIME - charset parameter of filenames containing extension. + to the specified content charset. charset is the MIME + charset parameter of filenames containing extension. This mapping is added to any already in force, overriding any - mappings that already exist for the same extension.

+ mappings that already exist for the same extension.

Example:

@@ -258,15 +257,15 @@ Content-Type: text/plain; charset=ISO-8859-2

The extension argument is case-insensitive, and can be specified with or without a leading dot.

- See also: - mod_negotiation - +mod_negotiation AddEncoding +Maps the given filename extensions + to the specified encoding type AddEncoding MIME-enc extension [extension] ... None @@ -275,10 +274,9 @@ Content-Type: text/plain; charset=ISO-8859-2 virtual host directory .htaccess -FileInfo -Maps the given filename extensions - to the specified encoding type +FileInfo + @@ -317,13 +315,16 @@ Content-Type: text/plain; charset=ISO-8859-2

The extension argument is case-insensitive, and can be specified with or without a leading dot.

- See also: Files with - multiple extensions +Files with + multiple extensions AddHandler +AddHandler maps the filename extensions +to the handler +handler-name AddHandler handler-name extension [extension] ... None @@ -335,9 +336,6 @@ Content-Type: text/plain; charset=ISO-8859-2 FileInfo -AddHandler maps the filename extensions extension -to the handler handler-name. -

This mapping is added to any already in @@ -356,13 +354,16 @@ to the handler handler-name.

The extension argument is case-insensitive, and can be specified with or without a leading dot.

- See also: Files with - multiple extensions + Files with + multiple extensions AddInputFilter +Maps the filename extensions + to the filter or filters which will process + client requests AddInputFilter filter[;filter...] extension [extension ...] @@ -375,10 +376,6 @@ to the handler handler-name. AddInputFilter is only available in Apache 2.0.26 and later. -Maps the filename extensions - extension to the filter or filters which will process - client requests and POST input when they are received by the - server. @@ -398,15 +395,17 @@ to the handler handler-name. case-insensitive, and the extension may be specified with or without a leading dot.

- See also the Filters - documentation. +Filters + documentation. AddLanguage +Maps the given filename extension +to the specified content language AddLanguage MIME-lang extension [extension] ... None @@ -417,8 +416,6 @@ to the handler handler-name. .htaccess FileInfo -maps the given filename extension -to the specified content language. @@ -462,13 +459,17 @@ to the specified content language.

The extension argument is case-insensitive, and can be specified with or without a leading dot.

- See also: Files with - multiple extensions, mod_negotiation +Files with + multiple extensions +mod_negotiation AddOutputFilter +maps the filename +extensions to the filters that will process +responses from the server AddOutputFilter filter[;filter...] extension [extension ...] @@ -482,10 +483,6 @@ to the specified content language. AddOutputFilter is only available in Apache 2.0.26 and later. -maps the filename -extensions extension to the filters which will process -responses from the server before they are sent to the -client. @@ -512,14 +509,15 @@ client. case-insensitive, and the extension may be specified with or without a leading dot.

- See also the Filters - documentation. - +Filters documentation + AddType +Maps the given filename extensions +onto the specified content type AddType MIME-type extension [extension] ... None @@ -530,8 +528,6 @@ client. .htaccess FileInfo -maps the given filename extensions -onto the specified content type. @@ -560,9 +556,9 @@ onto the specified content type.

The extension argument is case-insensitive, and can be specified with or without a leading dot.

- See also: Files with - multiple extensions +Files with + multiple extensions @@ -611,6 +607,8 @@ onto the specified content type. DefaultLanguage +Sets all files in the given scope to the +specified language DefaultLanguage MIME-lang None @@ -623,31 +621,30 @@ onto the specified content type. FileInfo DefaultLanguage is only available in Apache 1.3.4 and later. -Sets all files in the given scope to the -specified language

The DefaultLanguage directive tells Apache that all files in the directive's scope (e.g., all files covered by the current <Directory> container) that don't - have an explicit language extension (such as .fr - or .de as configured by AddLanguage) + have an explicit language extension (such as .fr + or .de as configured by AddLanguage) should be considered to be in the specified MIME-lang language. This allows entire directories to be marked as containing Dutch content, for instance, without having to rename each file. Note that unlike using extensions to specify - languages, DefaultLanguage can only specify a + languages, DefaultLanguage can only specify a single language.

-

If no DefaultLanguage directive is in force, +

If no DefaultLanguage directive is in force, and a file does not have any language extensions as configured - by AddLanguage, then that file will be considered + by AddLanguage, then that file will be considered to have no language attribute.

- See also: Files with - multiple extensions, mod_negotiation +Files with + multiple extensions +mod_negotiation @@ -664,7 +661,7 @@ specified language only available in Apache 2.0.24 and later. -

The RemoveCharset directive removes any +

The RemoveCharset directive removes any character set associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the @@ -689,7 +686,7 @@ specified language -

The RemoveEncoding directive removes any +

The RemoveEncoding directive removes any encoding associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the @@ -712,8 +709,8 @@ specified language encoded with the gzip method, but foo.gz.asc as an unencoded plaintext file.

-

Note:RemoveEncoding directives are processed - after any AddEncoding directives, so it is possible they +

Note:RemoveEncoding directives are processed + after any AddEncoding directives, so it is possible they may undo the effects of the latter if both occur within the same directory configuration.

@@ -737,7 +734,7 @@ specified language -

The RemoveHandler directive removes any handler +

The RemoveHandler directive removes any handler associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the server @@ -755,10 +752,10 @@ specified language -

This has the effect of returning .html files in - the /foo/bar directory to being treated as normal +

This has the effect of returning .html files in + the /foo/bar directory to being treated as normal files, rather than as candidates for parsing (see the mod_include + href="mod_include.html">mod_include module).

The extension argument is case-insensitive, and can @@ -781,7 +778,7 @@ specified language -

The RemoveInputFilter directive removes any +

The RemoveInputFilter directive removes any input filter associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the @@ -807,7 +804,7 @@ specified language -

The RemoveLanguage directive removes any +

The RemoveLanguage directive removes any language associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the @@ -833,7 +830,7 @@ specified language -

The RemoveOutputFilter directive removes any +

The RemoveOutputFilter directive removes any output filter associations for files with the given extensions. This allows .htaccess files in subdirectories to undo any associations inherited from parent directories or the @@ -878,10 +875,11 @@ specified language causing the files to be treated as being of the default type.

- Note:RemoveType directives are processed - after any AddType directives, so it is - possible they may undo the effects of the latter if both occur - within the same directory configuration. + Note:RemoveType directives + are processed after any AddType + directives, so it is possible they may undo the effects of the + latter if both occur within the same directory + configuration.

The extension argument is case-insensitive, and can be specified with or without a leading dot.

-- 2.40.0