'Apache' -> 'Apache HTTP Server' etc

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

8 files changed, 43 insertions, 53 deletions

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 8eac029b94..a37bd7602f 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -28,8 +28,7 @@
 URLs on the fly</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>rewrite_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_rewrite.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 1.3 and later</td></tr></table>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_rewrite.c</td></tr></table>
 <h3>Summary</h3>
 
 	<p>The <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> module uses a rule-based rewriting 
@@ -233,7 +232,7 @@ RewriteRule ^index\.html$  newsite.html
 
                 <p>These variables all
                 correspond to the similarly named HTTP
-                MIME-headers, C variables of the Apache server or
+                MIME-headers, C variables of the Apache HTTP Server or
                 <code>struct tm</code> fields of the Unix system.
                 Most are documented elsewhere in the Manual or in
                 the CGI specification. Those that are special to
@@ -250,12 +249,12 @@ RewriteRule ^index\.html$  newsite.html
 
                   <dt><code>API_VERSION</code></dt>
 
-                  <dd>This is the version of the Apache module API
+                  <dd>This is the version of the Apache httpd module API
                   (the internal interface between server and
                   module) in the current httpd build, as defined in
                   include/ap_mmn.h. The module API version
-                  corresponds to the version of Apache in use (in
-                  the release version of Apache 1.3.14, for
+                  corresponds to the version of Apache httpd in use (in
+                  the release version of Apache httpd 1.3.14, for
                   instance, it is 19990320:10), but is mainly of
                   interest to module authors.</dd>
 
@@ -301,7 +300,7 @@ RewriteRule ^index\.html$  newsite.html
         <p>The variables SCRIPT_FILENAME and REQUEST_FILENAME
         contain the same value - the value of the
         <code>filename</code> field of the internal
-        <code>request_rec</code> structure of the Apache server.
+        <code>request_rec</code> structure of the Apache HTTP Server.
         The first name is the commonly known CGI variable name
         while the second is the appropriate counterpart of
         REQUEST_URI (which contains the value of the
@@ -322,8 +321,8 @@ RewriteRule ^index\.html$  newsite.html
         <code>%{ENV:variable}</code>, where <em>variable</em> can be
         any environment variable, is also available.
         This is looked-up via internal
-        Apache structures and (if not found there) via
-        <code>getenv()</code> from the Apache server process.</li>
+        Apache httpd structures and (if not found there) via
+        <code>getenv()</code> from the Apache httpd server process.</li>
 
         <li>
         <code>%{SSL:variable}</code>, where <em>variable</em> is the
@@ -611,7 +610,7 @@ processing</td></tr>
 
 <div class="note"><h3>Security</h3>
 
-See the <a href="../misc/security_tips.html">Apache Security Tips</a>
+See the <a href="../misc/security_tips.html">Apache HTTP Server Security Tips</a>
 document for details on how your security could be compromised if the
 directory where logfiles are stored is writable by anyone other than
 the user that starts the server.
@@ -644,7 +643,7 @@ engine</td></tr>
       logs.</p>
 
 <div class="note"> Using a high value for
-          <em>Level</em> will slow down your Apache server
+          <em>Level</em> will slow down your Apache HTTP Server
           dramatically! Use the rewriting logfile at a
           <em>Level</em> greater than 2 only for debugging!
 </div>
@@ -665,7 +664,7 @@ RewriteLogLevel 3
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
 <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The choice of different dbm types is available in
-Apache 2.0.41 and later</td></tr>
+Apache HTTP Server 2.0.41 and later</td></tr>
 </table>
       <p>The <code class="directive">RewriteMap</code> directive defines a
       <em>Rewriting Map</em> which can be used inside rule
@@ -799,10 +798,10 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map
 
         <li>
           <strong>Internal Function</strong><br />
-           MapType: <code>int</code>, MapSource: Internal Apache
+           MapType: <code>int</code>, MapSource: Internal Apache httpd
           function
 
-          <p>Here, the source is an internal Apache function.
+          <p>Here, the source is an internal Apache httpd function.
           Currently you cannot create your own, but the following
           functions already exist:</p>
 
@@ -835,7 +834,7 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map
           '<code>#!/path/to/interpreter</code>' as the first
           line).</p>
 
-         <p>This program is started once, when the Apache server
+         <p>This program is started once, when the Apache httpd server
           is started, and then communicates with the rewriting engine
           via its <code>stdin</code> and <code>stdout</code>
           file-handles. For each map-function lookup it will
@@ -871,7 +870,7 @@ while (&lt;STDIN&gt;) {
 
           <ol>
             <li>``<em>Keep it simple, stupid</em>'' (KISS).
-            If this program hangs, it will cause Apache to hang
+            If this program hangs, it will cause Apache httpd to hang
             when trying to use the relevant rewrite rule.</li>
 
             <li>A common mistake is to use buffered I/O on
@@ -984,7 +983,7 @@ later</td></tr>
 
       <p>When the RewriteRule appears in per-directory (htaccess) context, the 
       <em>Pattern</em> is matched against what remains of the URL after removing
-      the prefix that lead Apache to the current rules (see the 
+      the prefix that lead Apache httpd to the current rules (see the 
       <code class="directive"><a href="#rewritebase">RewriteBase</a></code>).  The removed prefix
       always ends with a slash, meaning the matching occurs against a string which
       never has a leading slash.  A <em>Pattern</em> with <code>^/</code> never
diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 1e75dd9c67..0723e6a8f7 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -30,7 +30,6 @@ URLs on the fly</description>
 <status>Extension</status>
 <sourcefile>mod_rewrite.c</sourcefile>
 <identifier>rewrite_module</identifier>
-<compatibility>Available in Apache 1.3 and later</compatibility>
 
 <summary>
 	<p>The <module>mod_rewrite</module> module uses a rule-based rewriting 
@@ -155,7 +154,7 @@ processing</description>
 
 <note type="securitywarning"><title>Security</title>
 
-See the <a href="../misc/security_tips.html">Apache Security Tips</a>
+See the <a href="../misc/security_tips.html">Apache HTTP Server Security Tips</a>
 document for details on how your security could be compromised if the
 directory where logfiles are stored is writable by anyone other than
 the user that starts the server.
@@ -189,7 +188,7 @@ engine</description>
       logs.</p>
 
 <note> Using a high value for
-          <em>Level</em> will slow down your Apache server
+          <em>Level</em> will slow down your Apache HTTP Server
           dramatically! Use the rewriting logfile at a
           <em>Level</em> greater than 2 only for debugging!
 </note>
@@ -210,7 +209,7 @@ RewriteLogLevel 3
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 <compatibility>The choice of different dbm types is available in
-Apache 2.0.41 and later</compatibility>
+Apache HTTP Server 2.0.41 and later</compatibility>
 
 <usage>
       <p>The <directive>RewriteMap</directive> directive defines a
@@ -350,10 +349,10 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map
 
         <li>
           <strong>Internal Function</strong><br />
-           MapType: <code>int</code>, MapSource: Internal Apache
+           MapType: <code>int</code>, MapSource: Internal Apache httpd
           function
 
-          <p>Here, the source is an internal Apache function.
+          <p>Here, the source is an internal Apache httpd function.
           Currently you cannot create your own, but the following
           functions already exist:</p>
 
@@ -386,7 +385,7 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map
           '<code>#!/path/to/interpreter</code>' as the first
           line).</p>
 
-         <p>This program is started once, when the Apache server
+         <p>This program is started once, when the Apache httpd server
           is started, and then communicates with the rewriting engine
           via its <code>stdin</code> and <code>stdout</code>
           file-handles. For each map-function lookup it will
@@ -424,7 +423,7 @@ while (&lt;STDIN&gt;) {
 
           <ol>
             <li>``<em>Keep it simple, stupid</em>'' (KISS).
-            If this program hangs, it will cause Apache to hang
+            If this program hangs, it will cause Apache httpd to hang
             when trying to use the relevant rewrite rule.</li>
 
             <li>A common mistake is to use buffered I/O on
@@ -645,7 +644,7 @@ RewriteRule ^index\.html$  newsite.html
 
                 <p>These variables all
                 correspond to the similarly named HTTP
-                MIME-headers, C variables of the Apache server or
+                MIME-headers, C variables of the Apache HTTP Server or
                 <code>struct tm</code> fields of the Unix system.
                 Most are documented elsewhere in the Manual or in
                 the CGI specification. Those that are special to
@@ -662,12 +661,12 @@ RewriteRule ^index\.html$  newsite.html
 
                   <dt><code>API_VERSION</code></dt>
 
-                  <dd>This is the version of the Apache module API
+                  <dd>This is the version of the Apache httpd module API
                   (the internal interface between server and
                   module) in the current httpd build, as defined in
                   include/ap_mmn.h. The module API version
-                  corresponds to the version of Apache in use (in
-                  the release version of Apache 1.3.14, for
+                  corresponds to the version of Apache httpd in use (in
+                  the release version of Apache httpd 1.3.14, for
                   instance, it is 19990320:10), but is mainly of
                   interest to module authors.</dd>
 
@@ -713,7 +712,7 @@ RewriteRule ^index\.html$  newsite.html
         <p>The variables SCRIPT_FILENAME and REQUEST_FILENAME
         contain the same value - the value of the
         <code>filename</code> field of the internal
-        <code>request_rec</code> structure of the Apache server.
+        <code>request_rec</code> structure of the Apache HTTP Server.
         The first name is the commonly known CGI variable name
         while the second is the appropriate counterpart of
         REQUEST_URI (which contains the value of the
@@ -734,8 +733,8 @@ RewriteRule ^index\.html$  newsite.html
         <code>%{ENV:variable}</code>, where <em>variable</em> can be
         any environment variable, is also available.
         This is looked-up via internal
-        Apache structures and (if not found there) via
-        <code>getenv()</code> from the Apache server process.</li>
+        Apache httpd structures and (if not found there) via
+        <code>getenv()</code> from the Apache httpd server process.</li>
 
         <li>
         <code>%{SSL:variable}</code>, where <em>variable</em> is the
@@ -996,7 +995,7 @@ RewriteRule  ^/$                 /homepage.std.html  [L]
 
       <p>When the RewriteRule appears in per-directory (htaccess) context, the 
       <em>Pattern</em> is matched against what remains of the URL after removing
-      the prefix that lead Apache to the current rules (see the 
+      the prefix that lead Apache httpd to the current rules (see the 
       <directive module="mod_rewrite">RewriteBase</directive>).  The removed prefix
       always ends with a slash, meaning the matching occurs against a string which
       never has a leading slash.  A <em>Pattern</em> with <code>^/</code> never
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 32bd43d216..0783749667 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -60,7 +60,7 @@ on characteristics of the request</td></tr>
 </ul>
 <h3>See also</h3>
 <ul class="seealso">
-<li><a href="../env.html">Environment Variables in Apache</a></li>
+<li><a href="../env.html">Environment Variables in Apache HTTP Server</a></li>
 </ul></div>
 
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -104,9 +104,6 @@ respect to case</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_setenvif</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache 1.2 and
-    above (in Apache 1.2 this directive was found in the
-    now-obsolete mod_browser module)</td></tr>
 </table>
 
     <p>The <code class="directive">BrowserMatchNoCase</code> directive is
@@ -222,7 +219,7 @@ of</p>
     <p>In the first form, the value will be set to "1". The second
     will remove the given variable if already defined, and the
     third will set the variable to the literal value given by
-    <code><em>value</em></code>. Since version 2.0.51 Apache will
+    <code><em>value</em></code>. Since version 2.0.51, Apache httpd will
     recognize occurrences of <code>$1</code>..<code>$9</code> within
     <var>value</var> and replace them by parenthesized subexpressions
     of <var>regex</var>.</p>
@@ -259,7 +256,7 @@ of</p>
 
 <h3>See also</h3>
 <ul>
-<li><a href="../env.html">Environment Variables in Apache</a>,
+<li><a href="../env.html">Environment Variables in Apache HTTP Server</a>,
 for additional examples.
 </li>
 </ul>
@@ -276,7 +273,6 @@ without respect to case</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_setenvif</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache 1.3 and above</td></tr>
 </table>
 
     <p>The <code class="directive">SetEnvIfNoCase</code> is semantically identical to
diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml
index 898f4ad5c4..6c0c92a9d9 100644
--- a/docs/manual/mod/mod_setenvif.xml
+++ b/docs/manual/mod/mod_setenvif.xml
@@ -49,7 +49,7 @@ on characteristics of the request</description>
 </example>
 </summary>
 
-<seealso><a href="../env.html">Environment Variables in Apache</a></seealso>
+<seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a></seealso>
 
 <directivesynopsis>
 <name>BrowserMatch</name>
@@ -92,9 +92,6 @@ respect to case</description>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>Apache 1.2 and
-    above (in Apache 1.2 this directive was found in the
-    now-obsolete mod_browser module)</compatibility>
 
 <usage>
 
@@ -216,7 +213,7 @@ of</p>
     <p>In the first form, the value will be set to "1". The second
     will remove the given variable if already defined, and the
     third will set the variable to the literal value given by
-    <code><em>value</em></code>. Since version 2.0.51 Apache will
+    <code><em>value</em></code>. Since version 2.0.51, Apache httpd will
     recognize occurrences of <code>$1</code>..<code>$9</code> within
     <var>value</var> and replace them by parenthesized subexpressions
     of <var>regex</var>.</p>
@@ -252,7 +249,7 @@ of</p>
     set [a-z].</p>
 </usage>
 
-<seealso><a href="../env.html">Environment Variables in Apache</a>,
+<seealso><a href="../env.html">Environment Variables in Apache HTTP Server</a>,
 for additional examples.
 </seealso>
 </directivesynopsis>
@@ -268,7 +265,6 @@ without respect to case</description>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>Apache 1.3 and above</compatibility>
 
 <usage>
 
diff --git a/docs/manual/mod/mod_so.xml.ja b/docs/manual/mod/mod_so.xml.ja
index 7df17bde0b..89edcec9e3 100644
--- a/docs/manual/mod/mod_so.xml.ja
+++ b/docs/manual/mod/mod_so.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:926413 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_so.xml.ko b/docs/manual/mod/mod_so.xml.ko
index bcc40bc0c4..cfe96fa45c 100644
--- a/docs/manual/mod/mod_so.xml.ko
+++ b/docs/manual/mod/mod_so.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:926413 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_so.xml.meta b/docs/manual/mod/mod_so.xml.meta
index 617e01ebee..bfcd053bdd 100644
--- a/docs/manual/mod/mod_so.xml.meta
+++ b/docs/manual/mod/mod_so.xml.meta
@@ -9,8 +9,8 @@
   <variants>
     <variant>en</variant>
     <variant>fr</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_so.xml.tr b/docs/manual/mod/mod_so.xml.tr
index f92672f3c1..0d84de401c 100644
--- a/docs/manual/mod/mod_so.xml.tr
+++ b/docs/manual/mod/mod_so.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:926413 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>