[deployment-guide/comm-rel: 567/727] Minor clean-up.
Jaromir Hradilek
jhradile at fedoraproject.org
Tue Oct 19 13:12:40 UTC 2010
commit f49a937ef5f71d5e97c2e6cdb27247020f1336ea
Author: Jaromir Hradilek <jhradile at redhat.com>
Date: Thu Sep 2 13:35:20 2010 +0200
Minor clean-up.
en-US/The_Apache_HTTP_Server.xml | 49 +++++++++++++++++--------------------
1 files changed, 23 insertions(+), 26 deletions(-)
---
diff --git a/en-US/The_Apache_HTTP_Server.xml b/en-US/The_Apache_HTTP_Server.xml
index c772763..181c585 100644
--- a/en-US/The_Apache_HTTP_Server.xml
+++ b/en-US/The_Apache_HTTP_Server.xml
@@ -235,7 +235,7 @@ httpd (pid 19014) is running...</screen>
<para>
The <option>AccessFileName</option> directive allows you to specify the file to be used to customize access control information for each directory. It takes the following form:
</para>
- <screen>AccessFileName <replaceable>filename</replaceable>...</screen>
+ <screen>AccessFileName <replaceable>filename</replaceable>…</screen>
<para>
The <replaceable>filename</replaceable> is a name of the file to look for in the requested directory. By default, the server looks for <filename>.htaccess</filename>.
</para>
@@ -276,7 +276,7 @@ httpd (pid 19014) is running...</screen>
<para>
The <option>AddDescription</option> directive allows you to specify a short description to be displayed in server-generated directory listings for a given file. It takes the following form:
</para>
- <screen>AddDescription "<replaceable>description</replaceable>" <replaceable>filename</replaceable>...</screen>
+ <screen>AddDescription "<replaceable>description</replaceable>" <replaceable>filename</replaceable>…</screen>
<para>
The <replaceable>description</replaceable> should be a short text enclosed in double quotes (that is, <literal>"</literal>). The <replaceable>filename</replaceable> can be a full filename, a file extension, or a wildcard expression.
</para>
@@ -292,7 +292,7 @@ httpd (pid 19014) is running...</screen>
<para>
The <option>AddEncoding</option> directive allows you to specify an encoding type for a particular file extension. It takes the following form:
</para>
- <screen>AddEncoding <replaceable>encoding</replaceable> <replaceable>extension</replaceable>...</screen>
+ <screen>AddEncoding <replaceable>encoding</replaceable> <replaceable>extension</replaceable>…</screen>
<para>
The <replaceable>encoding</replaceable> has to be a valid MIME encoding such as <literal>x-compress</literal>, <literal>x-gzip</literal>, etc. The <replaceable>extension</replaceable> is a case sensitive file extension, and is conventionally written with a leading dot (for example, <literal>.gz</literal>).
</para>
@@ -311,7 +311,7 @@ httpd (pid 19014) is running...</screen>
<para>
The <option>AddHandler</option> directive allows you to map certain file extensions to a selected handler. It takes the following form:
</para>
- <screen>AddHandler <replaceable>handler</replaceable> <replaceable>extension</replaceable>...</screen>
+ <screen>AddHandler <replaceable>handler</replaceable> <replaceable>extension</replaceable>…</screen>
<para>
The <replaceable>handler</replaceable> has to be a name of previously defined handler. The <replaceable>extension</replaceable> is a case sensitive file extension, and is conventionally written with a leading dot (for example, <literal>.cgi</literal>).
</para>
@@ -330,7 +330,7 @@ httpd (pid 19014) is running...</screen>
<para>
The <option>AddIcon</option> directive allows you to specify an icon to be displayed for a particular file in server-generated directory listings. It takes the following form:
</para>
- <screen>AddIcon <replaceable>path</replaceable> <replaceable>pattern</replaceable>...</screen>
+ <screen>AddIcon <replaceable>path</replaceable> <replaceable>pattern</replaceable>…</screen>
<para>
The <replaceable>path</replaceable> refers to an existing icon file, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/icons/folder.png</literal>). The <replaceable>pattern</replaceable> can be a filename, a file extension, a wildcard expression, or a special form as described in the following table:
</para>
@@ -371,10 +371,7 @@ httpd (pid 19014) is running...</screen>
</table>
<example id="example-apache-httpdconf-addicon">
<title>Using the <option>AddIcon</option> directive</title>
- <screen>AddIcon /icons/back.png ..
-AddIcon /icons/text.png .txt README
-AddIcon /icons/folder.png ^^DIRECTORY^^
-AddIcon /icons/blank.png ^^BLANKICON^^</screen>
+ <screen>AddIcon /icons/text.png .txt README</screen>
</example>
</listitem>
</varlistentry>
@@ -384,7 +381,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>AddIconByEncoding</option> directive allows you to specify an icon to be displayed for a particular encoding type in server-generated directory listings. It takes the following form:
</para>
- <screen>AddIconByEncoding <replaceable>path</replaceable> <replaceable>encoding</replaceable>...</screen>
+ <screen>AddIconByEncoding <replaceable>path</replaceable> <replaceable>encoding</replaceable>…</screen>
<para>
The <replaceable>path</replaceable> refers to an existing icon file, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/icons/compressed.png</literal>). The <replaceable>encoding</replaceable> has to be a valid MIME encoding such as <literal>x-compress</literal>, <literal>x-gzip</literal>, etc.
</para>
@@ -400,7 +397,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>AddIconByType</option> directive allows you to specify an icon to be displayed for a particular media type in server-generated directory listings. It takes the following form:
</para>
- <screen>AddIconByType <replaceable>path</replaceable> <replaceable>content-type</replaceable>...</screen>
+ <screen>AddIconByType <replaceable>path</replaceable> <replaceable>content-type</replaceable>…</screen>
<para>
The <replaceable>path</replaceable> refers to an existing icon file, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/icons/text.png</literal>). The <replaceable>content-type</replaceable> has to be either a valid MIME type (for example, <literal>text/html</literal> or <literal>image/png</literal>), or a wildcard expression such as <literal>text/*</literal>, <literal>image/*</literal>, etc.
</para>
@@ -416,7 +413,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>AddLanguage</option> directive allows you to associate a file extension with a specific language. It takes the following form:
</para>
- <screen>AddLanguage <replaceable>language</replaceable> <replaceable>extension</replaceable>...</screen>
+ <screen>AddLanguage <replaceable>language</replaceable> <replaceable>extension</replaceable>…</screen>
<para>
The <replaceable>language</replaceable> has to be a valide MIME language such as <literal>cs</literal>, <literal>en</literal>, or <literal>fr</literal>. The <replaceable>extension</replaceable> is a case sensitive file extension, and is conventionally written with a leading dot (for example, <literal>.cs</literal>).
</para>
@@ -435,7 +432,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>AddType</option> directive allows you to define or override the media type for a particular file extension. It takes the following form:
</para>
- <screen>AddType <replaceable>content-type</replaceable> <replaceable>extension</replaceable>...</screen>
+ <screen>AddType <replaceable>content-type</replaceable> <replaceable>extension</replaceable>…</screen>
<para>
The <replaceable>content-type</replaceable> has to be a valid MIME type such as <literal>text/html</literal>, <literal>image/png</literal>, etc. The <replaceable>extension</replaceable> is a case sensitive file extension, and is conventionally written with a leading dot (for example, <literal>.cs</literal>).
</para>
@@ -477,7 +474,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>Allow</option> directive allows you to specify which clients have permission to access a given directory. It takes the following form:
</para>
- <screen>Allow from <replaceable>client</replaceable>...</screen>
+ <screen>Allow from <replaceable>client</replaceable>…</screen>
<para>
The <replaceable>client</replaceable> can be a domain name, an IP address (both full and partial), a <replaceable>network</replaceable>/<replaceable>netmask</replaceable> pair, or <literal>all</literal> for all clients.
</para>
@@ -493,7 +490,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>AllowOverride</option> directive allows you to specify which directives in a <filename>.htaccess</filename> file can override the default configuration. It takes the following form:
</para>
- <screen>AllowOverride <replaceable>type</replaceable>...</screen>
+ <screen>AllowOverride <replaceable>type</replaceable>…</screen>
<para>
The <replaceable>type</replaceable> has to be one of the available grouping options as described in <xref linkend="table-apache-httpdconf-allowoverride" />.
</para>
@@ -563,7 +560,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
</row>
<row>
<entry>
- <option>Options[=<replaceable>option</replaceable>,...]</option>
+ <option>Options<optional>=<replaceable>option</replaceable>,…</optional></option>
</entry>
<entry>
Allows the use of the <option>Options</option> directive. Additionally, you can provide a comma-separated list of options to customize which options can be set using this directive.
@@ -584,7 +581,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>BrowserMatch</option> directive allows you to modify the server behavior based on the client's web browser type. It takes the following form:
</para>
- <screen>BrowserMatch <replaceable>pattern</replaceable> <replaceable>variable</replaceable>...</screen>
+ <screen>BrowserMatch <replaceable>pattern</replaceable> <replaceable>variable</replaceable>…</screen>
<para>
The <replaceable>pattern</replaceable> is a regular expression to match the User-Agent HTTP header field. The <replaceable>variable</replaceable> is an environment variable that is set when the header field matches the pattern.
</para>
@@ -841,7 +838,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>Deny</option> directive allows you to specify which clients are denied access to a given directory. It takes the following form:
</para>
- <screen>Deny from <replaceable>client</replaceable>...</screen>
+ <screen>Deny from <replaceable>client</replaceable>…</screen>
<para>
The <replaceable>client</replaceable> can be a domain name, an IP address (both full and partial), a <replaceable>network</replaceable>/<replaceable>netmask</replaceable> pair, or <literal>all</literal> for all clients.
</para>
@@ -857,7 +854,7 @@ AddIcon /icons/blank.png ^^BLANKICON^^</screen>
<para>
The <option>DirectoryIndex</option> directive allows you to specify a document to be served to a client when a directory is requested (that is, when the URL ends with the <literal>/</literal> character). It takes the following form:
</para>
- <screen>DirectoryIndex <replaceable>filename</replaceable>...</screen>
+ <screen>DirectoryIndex <replaceable>filename</replaceable>…</screen>
<para>
The <replaceable>filename</replaceable> is a name of the file to look for in the requested directory. By default, the server looks for <filename>index.html</filename>, and <filename>index.html.var</filename>.
</para>
@@ -1086,7 +1083,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>IndexIgnore</option> directive allows you to specify a list of filenames to be omitted from the server-generated directory listings. It takes the following form:
</para>
- <screen>IndexIgnore <replaceable>filename</replaceable>...</screen>
+ <screen>IndexIgnore <replaceable>filename</replaceable>…</screen>
<para>
The <replaceable>filename</replaceable> option can be either a full filename, or a wildcard expression.
</para>
@@ -1173,7 +1170,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>LanguagePriority</option> directive allows you to customize the precedence of languages. It takes the following form:
</para>
- <screen>LanguagePriority <replaceable>language</replaceable>...</screen>
+ <screen>LanguagePriority <replaceable>language</replaceable>…</screen>
<para>
The <replaceable>language</replaceable> has to be a valide MIME language such as <literal>cs</literal>, <literal>en</literal>, or <literal>fr</literal>.
</para>
@@ -1192,7 +1189,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <replaceable>Listen</replaceable> directive allows you to specify IP addresses or ports to listen to. It takes the following form:
</para>
- <screen>Listen [<replaceable>ip-address</replaceable>:]<replaceable>port</replaceable> [<replaceable>protocol</replaceable>]</screen>
+ <screen>Listen <optional><replaceable>ip-address</replaceable>:</optional><replaceable>port</replaceable> <optional><replaceable>protocol</replaceable></optional></screen>
<para>
The <replaceable>ip-address</replaceable> is optional and unless supplied, the server will accept incoming requests on a given <replaceable>port</replaceable> from all IP addresses. Since the <replaceable>protocol</replaceable> is determined automatically from the port number, it can be usually omitted. The default option is to listen to port <literal>80</literal>.
</para>
@@ -1444,7 +1441,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>NameVirtualHost</option> directive allows you to specify the IP address and port number for a name-based virtual host. It takes the following form:
</para>
- <screen>NameVirtualHost <replaceable>ip-address</replaceable>[:<replaceable>port</replaceable>]</screen>
+ <screen>NameVirtualHost <replaceable>ip-address</replaceable><optional>:<replaceable>port</replaceable></optional></screen>
<para>
The <replaceable>ip-address</replaceable> can be either a full IP address, or an asterisk (that is, <literal>*</literal>) representing all interfaces. Note that IPv6 addresses have to be enclosed in square brackets (that is, <literal>[</literal> and <literal>]</literal>). The <replaceable>port</replaceable> is optional.
</para>
@@ -1469,7 +1466,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>Options</option> directive allows you to specify which server features are available in a particular directory. It takes the following form:
</para>
- <screen>Options <replaceable>option</replaceable>...</screen>
+ <screen>Options <replaceable>option</replaceable>…</screen>
<para>
The <replaceable>option</replaceable> has to be a valid keyword as described in <xref linkend="table-apache-httpdconf-options" />.
</para>
@@ -1710,7 +1707,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>Redirect</option> directive allows you to redirect a client to another URL. It takes the following form:
</para>
- <screen>Redirect [<replaceable>status</replaceable>] <replaceable>path</replaceable> <replaceable>url</replaceable></screen>
+ <screen>Redirect <optional><replaceable>status</replaceable></optional> <replaceable>path</replaceable> <replaceable>url</replaceable></screen>
<para>
The <replaceable>status</replaceable> is optional, and if provided, it has to be a valid keyword as described in <xref linkend="table-apache-httpdconf-redirect" />. The <replaceable>path</replaceable> refers to the old location, and must be relative to the directory specified by the <option>DocumentRoot</option> directive (for example, <literal>/docs</literal>). The <replaceable>url</replaceable> refers to the current location of the content (for example, <literal>http://docs.example.com</literal>).
</para>
@@ -1828,7 +1825,7 @@ ErrorDocument 404 /404-not_found.html</screen>
<para>
The <option>ServerName</option> directive allows you to specify the hostname and the port number of a web server. It takes the following form:
</para>
- <screen>ServerName <replaceable>hostname</replaceable>[:<replaceable>port</replaceable>]</screen>
+ <screen>ServerName <replaceable>hostname</replaceable><optional>:<replaceable>port</replaceable></optional></screen>
<para>
The <replaceable>hostname</replaceable> has to be a <firstterm>fully qualified domain name</firstterm> (FQDN) of the server. The <replaceable>port</replaceable> is optional, but when supplied, it has to match the number specified by the <option>Listen</option> directive.
</para>
More information about the docs-commits
mailing list