Fix some typos and inaccuracies and incorrectnesses.

PR:		3016
Submitted by:	Youichirou Koga <y-koga@jp.FreeBSD.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@82061 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/content-negotiation.html b/docs/manual/content-negotiation.html
index 3f9d60ecf2c137a7fcda6af9427f69e8cbdafbe1..75354654d9a05fc767def34b8118b24c5a0fb046 100644 (file)
--- a/docs/manual/content-negotiation.html
+++ b/docs/manual/content-negotiation.html
@@ -422,7 +422,7 @@ different naming conventions, because files can have more than one
 extension, and the order of the extensions is normally irrelevant
 (see <A HREF="mod/mod_mime.html">mod_mime</A> documentation for details).
 <P>
-A typical file has a mime-type extension (e.g. <SAMP>html</SAMP>),
+A typical file has a MIME-type extension (e.g. <SAMP>html</SAMP>),
 maybe an encoding extension (e.g. <SAMP>gz</SAMP> and of course a
 language extension (e.g. <SAMP>en</SAMP>) when we have different
 language variants of this file.
@@ -496,9 +496,9 @@ to <SAMP>shtml</SAMP> or <SAMP>cgi</SAMP> without changing any
 hyperlink references.
 
 <P>
-If you want to continue to use a mime-type in your hyperlinks (e.g.
+If you want to continue to use a MIME-type in your hyperlinks (e.g.
 <SAMP>foo.html</SAMP>) the language extension (including an encoding extension
-if there is one) must be on the right hand side of the mime-type extension
+if there is one) must be on the right hand side of the MIME-type extension
 (e.g. <SAMP>foo.html.en</SAMP>).
 
 

diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index 3f9d60ecf2c137a7fcda6af9427f69e8cbdafbe1..75354654d9a05fc767def34b8118b24c5a0fb046 100644 (file)
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -422,7 +422,7 @@ different naming conventions, because files can have more than one
 extension, and the order of the extensions is normally irrelevant
 (see <A HREF="mod/mod_mime.html">mod_mime</A> documentation for details).
 <P>
-A typical file has a mime-type extension (e.g. <SAMP>html</SAMP>),
+A typical file has a MIME-type extension (e.g. <SAMP>html</SAMP>),
 maybe an encoding extension (e.g. <SAMP>gz</SAMP> and of course a
 language extension (e.g. <SAMP>en</SAMP>) when we have different
 language variants of this file.
@@ -496,9 +496,9 @@ to <SAMP>shtml</SAMP> or <SAMP>cgi</SAMP> without changing any
 hyperlink references.
 
 <P>
-If you want to continue to use a mime-type in your hyperlinks (e.g.
+If you want to continue to use a MIME-type in your hyperlinks (e.g.
 <SAMP>foo.html</SAMP>) the language extension (including an encoding extension
-if there is one) must be on the right hand side of the mime-type extension
+if there is one) must be on the right hand side of the MIME-type extension
 (e.g. <SAMP>foo.html.en</SAMP>).
 
 

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 18db47fdaa899dd85c816a099823f24db2c6069c..6d64e93eeb5e069d45a6edc6896ffd761f565d87 100644 (file)
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -513,7 +513,7 @@ it in a different location.<P><HR>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> DefaultType <EM>mime-type</EM><BR>
+><STRONG>Syntax:</STRONG></A> DefaultType <EM>MIME-type</EM><BR>
 <A
  HREF="directive-dict.html#Default"
  REL="Help"
@@ -1213,7 +1213,7 @@ simple multiple-module tests.
 <P> <HR>
 
 <H2><A NAME="include">Include directive</A></H2>
-<STRONG>Syntax: (Apache 1.2)</STRONG> Include <EM>filename</EM><BR>
+<STRONG>Syntax:</STRONG> Include <EM>filename</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -2074,7 +2074,7 @@ virtual hosts should be used, e.g.
 
 <STRONG>See also:</STRONG>
 <A HREF="../vhosts/index.html">Apache Virtual Host documentation</A>
-
+<HR>
 <H2><A NAME="options">Options directive</A></H2>
 <!--%plaintext &lt;?INDEX {\tt Options} directive&gt; -->
 <A
@@ -2887,7 +2887,7 @@ Standalone is the most common setting for ServerType since
 it is far more efficient. The server is started once, and services all
 subsequent connections. If you intend running Apache to serve a busy site,
 standalone will probably be your only option.<P>
-
+<HR>
 <H2><A NAME="startservers">StartServers directive</A></H2>
 <!--%plaintext &lt;?INDEX {\tt StartServers} directive&gt; -->
 <A

diff --git a/docs/manual/mod/mod_actions.html b/docs/manual/mod/mod_actions.html
index a9f449002c1e6744df95c32b56a204d8110f904e..58682094ddae27fb6e4c16d6d21a8172dfeff0f4 100644 (file)
--- a/docs/manual/mod/mod_actions.html
+++ b/docs/manual/mod/mod_actions.html
@@ -39,7 +39,7 @@ process files.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> Action <EM>mime-type cgi-script</EM><BR>
+><STRONG>Syntax:</STRONG></A> Action <EM>MIME-type cgi-script</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -65,7 +65,7 @@ and later
 </P>
 <P>
 This directive adds an action, which will activate <EM>cgi-script</EM> when
-a file of content type <EM>mime-type</EM> is requested. It sends the
+a file of content type <EM>MIME-type</EM> is requested. It sends the
 URL and file path of the requested document using the standard
 CGI PATH_INFO and PATH_TRANSLATED environment variables.
 </P>

diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html
index 6ec10f13e43b69ddf95a996eae3c0242ca457b1d..b98f22bb9108e499c6cde12364e398e5ea8f29a2 100644 (file)
--- a/docs/manual/mod/mod_alias.html
+++ b/docs/manual/mod/mod_alias.html
@@ -211,7 +211,8 @@ the function <CODE>send_error_response</CODE> in http_protocol.c).
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> RedirectMatch [<EM>status</EM> <EM>regex url</EM>
+><STRONG>Syntax:</STRONG></A>
+    RedirectMatch [<EM>status</EM>] <EM>regex url</EM>
 <BR>
 <A
  HREF="directive-dict.html#Context"

diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html
index d518605175d762a09787623c2b7068c68f394e28..36218ef8ee8da2e15b2f34f643fd5b6f6263c3a0 100644 (file)
--- a/docs/manual/mod/mod_auth_dbm.html
+++ b/docs/manual/mod/mod_auth_dbm.html
@@ -29,8 +29,8 @@ DBM files.
 <HR>
 
 
-<H2><A NAME="authdbmgroupfile">AuthDbmGroupFile</A></H2>
-<!--%plaintext &lt;?INDEX {\tt AuthDbmGroupFile} directive&gt; -->
+<H2><A NAME="authdbmgroupfile">AuthDBMGroupFile</A></H2>
+<!--%plaintext &lt;?INDEX {\tt AuthDBMGroupFile} directive&gt; -->
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"

diff --git a/docs/manual/mod/mod_autoindex.html b/docs/manual/mod/mod_autoindex.html
index 8fd8c1365b2b3c0b4dbe58c6c56f250f534e4cf5..9d7b62a01f2423037f6e366c2d5d2d57c929894b 100644 (file)
--- a/docs/manual/mod/mod_autoindex.html
+++ b/docs/manual/mod/mod_autoindex.html
@@ -249,7 +249,7 @@ AddIcon, when possible.<P><HR>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AddIconByEncoding <EM>icon mime-encoding mime-encoding
+><STRONG>Syntax:</STRONG></A> AddIconByEncoding <EM>icon MIME-encoding MIME-encoding
 ...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
@@ -269,7 +269,7 @@ AddIcon, when possible.<P><HR>
 ><STRONG>Module:</STRONG></A> mod_autoindex<P>
 
 This sets the icon to display next to files with
-<EM>mime-encoding</EM> for <A HREF="#fancyindexing">FancyIndexing</A>.
+<EM>MIME-encoding</EM> for <A HREF="#fancyindexing">FancyIndexing</A>.
 <EM>Icon</EM> is either a (%-escaped) relative URL to the icon, or of the
 format (<EM>alttext</EM>,<EM>url</EM>) where <EM>alttext</EM> is the text tag
 given for an icon for non-graphical browsers.<P>
@@ -285,7 +285,7 @@ AddIconByEncoding /icons/compress.xbm x-compress
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AddIconByType <EM>icon mime-type mime-type ...</EM><BR>
+><STRONG>Syntax:</STRONG></A> AddIconByType <EM>icon MIME-type MIME-type ...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -303,7 +303,7 @@ AddIconByEncoding /icons/compress.xbm x-compress
  REL="Help"
 ><STRONG>Module:</STRONG></A> mod_autoindex<P>
 
-This sets the icon to display next to files of type <EM>mime-type</EM> for
+This sets the icon to display next to files of type <EM>MIME-type</EM> for
 <A HREF="#fancyindexing">FancyIndexing</A>. <EM>Icon</EM> is either a
 (%-escaped) relative URL to the icon, or of the format
 (<EM>alttext</EM>,<EM>url</EM>) where <EM>alttext</EM> is the text tag given

diff --git a/docs/manual/mod/mod_expires.html b/docs/manual/mod/mod_expires.html
index 3b10d2b39406e2e992786603996182d8ee60ba68..141a96959839998fbd6955564ee01696e8b01762 100644 (file)
--- a/docs/manual/mod/mod_expires.html
+++ b/docs/manual/mod/mod_expires.html
@@ -116,7 +116,7 @@
   <A
    HREF="directive-dict.html#Syntax"
    REL="Help"
-  ><STRONG>Syntax:</STRONG></A> ExpiresByType <EM>mime-type
+  ><STRONG>Syntax:</STRONG></A> ExpiresByType <EM>MIME-type
   &lt;code&gt;seconds</EM>
   <BR>
   <A

diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html
index fe355d28b1b1f3d8b48addfc73ee0df15d85ffb4..ea18b80eceb05ae0f50be00359d364a8cecb5a15 100644 (file)
--- a/docs/manual/mod/mod_include.html
+++ b/docs/manual/mod/mod_include.html
@@ -17,8 +17,8 @@
 
 This module is contained in the <CODE>mod_include.c</CODE> file, and
 is compiled in by default. It provides for server-parsed html
-documents. Several directives beyond the original NCSA definition have been
-included in Apache 1.2 - these are flagged below with the phrase
+documents. Several directives beyond the original NCSA definition were
+introduced in Apache 1.2 - these are flagged below with the phrase
 "Apache 1.2 and above".  Of particular significance are the new flow
 control directives documented at the bottom.
 

diff --git a/docs/manual/mod/mod_mime.html b/docs/manual/mod/mod_mime.html
index d7e95f1b32cd73f2506fec2473f3b232a6abe088..e0431b185179074d8cae9898db84923a6f2307be 100644 (file)
--- a/docs/manual/mod/mod_mime.html
+++ b/docs/manual/mod/mod_mime.html
@@ -34,7 +34,7 @@ HREF="#addhandler">AddHandler</A>, <A
 HREF="#addlanguage">AddLanguage</A> and <A HREF="#addtype">AddType</A>
 are all used to map file extensions onto the meta-information for that
 file.  Respectively they set the content-encoding, handler,
-content-language and mime-type (content-type) of documents.  The
+content-language and MIME-type (content-type) of documents.  The
 directive <A HREF="#typesconfig">TypesConfig</A> is used to specify a
 file which also maps extensions onto mime types. The directives <A
 HREF="#forcetype">ForceType</A> and <A
@@ -89,7 +89,7 @@ copies may still be used by a client or proxy.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AddEncoding <EM>mime-enc extension extension...</EM><BR>
+><STRONG>Syntax:</STRONG></A> AddEncoding <EM>MIME-enc extension extension...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -179,7 +179,7 @@ program.</P>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AddLanguage <EM>mime-lang extension extension...</EM><BR>
+><STRONG>Syntax:</STRONG></A> AddLanguage <EM>MIME-lang extension extension...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -218,7 +218,7 @@ from several documents based on the client's language preference.<P><HR>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> AddType <EM>mime-type extension extension...</EM><BR>
+><STRONG>Syntax:</STRONG></A> AddType <EM>MIME-type extension extension...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -359,7 +359,7 @@ file. <EM>Filename</EM> is relative to the
 mappings from filename extensions to content types; changing this file is not
 recommended. Use the <A HREF="#addtype">AddType</A> directive instead. The
 file contains lines in the format of the arguments to an AddType command:
-<BLOCKQUOTE><EM>mime-type extension extension ...</EM></BLOCKQUOTE>
+<BLOCKQUOTE><EM>MIME-type extension extension ...</EM></BLOCKQUOTE>
 The extensions are lower-cased. Blank lines, and lines beginning with a hash
 character (`#') are ignored.<P>
 

diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index e2578bd27db8a81ef760f92fd1c71b761d83a07d..f51c37a0f267f4917bb48d84e4f6db7669fbe3c8 100644 (file)
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -136,7 +136,7 @@ HTTP/1.1 requests.
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> LanguagePriority <EM>mime-lang mime-lang...</EM><BR>
+><STRONG>Syntax:</STRONG></A> LanguagePriority <EM>MIME-lang MIME-lang...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -156,7 +156,7 @@ HTTP/1.1 requests.
 
 The LanguagePriority sets the precedence of language variants for the case
 where the client does not express a preference, when handling a
-MultiViews request. The list of <EM>mime-lang</EM> are in order of decreasing
+MultiViews request. The list of <EM>MIME-lang</EM> are in order of decreasing
 preference. Example:
 
 <BLOCKQUOTE><CODE>LanguagePriority en fr de</CODE></BLOCKQUOTE>

diff --git a/docs/manual/mod/mod_rewrite.html b/docs/manual/mod/mod_rewrite.html
index d784315bbfa19848cb3ffccbcf41cb853cbbae65..69e23e3cdf5ab88faad52dc7b5f75b9869ee5bbb 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html
+++ b/docs/manual/mod/mod_rewrite.html
@@ -1535,8 +1535,8 @@ comma-separated list of the following flags:
     external redirect happen (where the ``<CODE>.www</CODE>'' part should not to
     occur!).
 <P>
-<LI>'<STRONG><CODE>type|T</CODE></STRONG>=<EM>mime-type</EM>' (force MIME <STRONG>t</STRONG>ype)<BR>
-    Force the MIME-type of the target file to be <EM>mime-type</EM>. For
+<LI>'<STRONG><CODE>type|T</CODE></STRONG>=<EM>MIME-type</EM>' (force MIME <STRONG>t</STRONG>ype)<BR>
+    Force the MIME-type of the target file to be <EM>MIME-type</EM>. For
     instance, this can be used to simulate the old <CODE>mod_alias</CODE>
     directive <CODE>ScriptAlias</CODE> which internally forces all files inside
     the mapped directory to have a MIME type of