* Fix typo: '8080' vs. '8000'

* Fix versioning information where it makes sense
* Clarify DNS lookups: 'double reverse lookup' vs. 'two lookups'

Submitted, in parts, by <lucien.gentis lorraine.iufm.fr>.

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

diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index b5c72a98c8261b9ad42097f7a0fd7a3d3e7a8432..4fe8618b129dabca8589e966f9c081357d736225 100644 (file)
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -77,7 +77,7 @@
     </example>
 
     <p>To make the server accept connections on port 80 for one interface,
-       and port 8080 on another, use</p>
+       and port 8000 on another, use</p>
 
     <example>
       Listen 192.0.2.1:80<br />

diff --git a/docs/manual/dso.xml b/docs/manual/dso.xml
index fdf9c4b4b5f7bce633095749a237a0c0e026462f..7c446087eb6fdf406c0d935b521a10b68c57b146 100644 (file)
--- a/docs/manual/dso.xml
+++ b/docs/manual/dso.xml
@@ -85,7 +85,7 @@
 
 <section id="usage"><title>Usage Summary</title>
 
-    <p>To give you an overview of the DSO features of Apache 2.2,
+    <p>To give you an overview of the DSO features of Apache 2.x,
     here is a short and concise summary:</p>
 
     <ol>

diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml
index 99b502307f91d1948cdde35fd0d1c337472a6b0f..79ad2d00cd9643bb744bf373c45d3c02b11301d3 100644 (file)
--- a/docs/manual/misc/perf-tuning.xml
+++ b/docs/manual/misc/perf-tuning.xml
@@ -27,19 +27,19 @@
 
   <summary>
 
-    <p>Apache 2.0 is a general-purpose webserver, designed to
+    <p>Apache 2.x is a general-purpose webserver, designed to
     provide a balance of flexibility, portability, and performance.
     Although it has not been designed specifically to set benchmark
-    records, Apache 2.0 is capable of high performance in many
+    records, Apache 2.x is capable of high performance in many
     real-world situations.</p>
 
-    <p>Compared to Apache 1.3, release 2.0 contains many additional
+    <p>Compared to Apache 1.3, release 2.x contains many additional
     optimizations to increase throughput and scalability. Most of
     these improvements are enabled by default. However, there are
     compile-time and run-time configuration choices that can
     significantly affect performance. This document describes the
     options that a server administrator can configure to tune the
-    performance of an Apache 2.0 installation. Some of these
+    performance of an Apache 2.x installation. Some of these
     configuration options enable the httpd to better take advantage
     of the capabilities of the hardware and OS, while others allow
     the administrator to trade functionality for speed.</p>
@@ -141,7 +141,7 @@
       module="mod_access">Deny</directive> from domain</code> 
       directives (i.e., using a hostname, or a domain name, rather than
       an IP address) then you will pay for
-      a double reverse DNS lookup (a reverse, followed by a forward
+      two DNS lookups (a reverse, followed by a forward lookup
       to make sure that the reverse is not being spoofed). For best
       performance, therefore, use IP addresses, rather than names, when
       using these directives, if possible.</p>
@@ -289,7 +289,7 @@
 
       <title>Memory-mapping</title>
 
-      <p>In situations where Apache 2.0 needs to look at the contents
+      <p>In situations where Apache 2.x needs to look at the contents
       of a file being delivered--for example, when doing server-side-include
       processing--it normally memory-maps the file if the OS supports
       some form of <code>mmap(2)</code>.</p>
@@ -302,7 +302,7 @@
         <li>
           <p>On some operating systems, <code>mmap</code> does not scale
           as well as <code>read(2)</code> when the number of CPUs increases.
-          On multiprocessor Solaris servers, for example, Apache 2.0 sometimes
+          On multiprocessor Solaris servers, for example, Apache 2.x sometimes
           delivers server-parsed files faster when <code>mmap</code> is disabled.</p>
         </li>
 
@@ -325,7 +325,7 @@
 
       <title>Sendfile</title>
 
-      <p>In situations where Apache 2.0 can ignore the contents of the file
+      <p>In situations where Apache 2.x can ignore the contents of the file
       to be delivered -- for example, when serving static file content -- 
       it normally uses the kernel sendfile support the file if the OS 
       supports the <code>sendfile(2)</code> operation.</p>
@@ -568,7 +568,7 @@
 
     <note type="warning"><title>Warning:</title>
       <p>This section has not been fully updated
-      to take into account changes made in the 2.0 version of the
+      to take into account changes made in the 2.x version of the
       Apache HTTP Server. Some of the information may still be
       relevant, but please use it with care.</p>
     </note>
@@ -1072,7 +1072,7 @@
 
     <p>This <code>write(2)</code> call records the request in the
     access log. Note that one thing missing from this trace is a
-    <code>time(2)</code> call. Unlike Apache 1.3, Apache 2.0 uses
+    <code>time(2)</code> call. Unlike Apache 1.3, Apache 2.x uses
     <code>gettimeofday(3)</code> to look up the time. On some operating
     systems, like Linux or Solaris, <code>gettimeofday</code> has an
     optimized implementation that doesn't require as much overhead

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index b789d308b98d681d4a55599f5a1686362f7dfeeb..5e5db191dd5e6fb6b08df05ad1dd868bfb3ee5d2 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -348,7 +348,7 @@ response</description>
 <default>ProxyBadHeader IsError</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
-<compatibility>available in Apache 2.0.44 and later</compatibility>
+<compatibility>Available in Apache 2.0.44 and later</compatibility>
 
 <usage>
     <p>The <directive>ProxyBadHeader</directive> directive determines the
@@ -501,7 +501,7 @@ expressions</description>
                >key=value [key=value ...]]</var></syntax>
 <contextlist><context>directory</context>
 </contextlist>
-<compatibility>BalancerMember is only available in Apache 2.2.0
+<compatibility>BalancerMember is only available in Apache 2.2
        and later.</compatibility>
 <usage>
     <p>This directive adds a member to a load balancing group. It must be used
@@ -522,7 +522,7 @@ expressions</description>
 <syntax>ProxySet <var>url</var> <var>key=value [key=value ...]</var></syntax>
 <contextlist><context>directory</context>
 </contextlist>
-<compatibility>ProxySet is only available in Apache 2.2.0
+<compatibility>ProxySet is only available in Apache 2.2
        and later.</compatibility>
 <usage>
     <p>This directive is used as an alternate method of setting any of the

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index 525f4f5fae2c24df0b7ccf3581c8fda0906365ee..8a53f83918189da54fb723223bb6d919dbf91265 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -32,9 +32,9 @@ Documentation</a>.</p>
 
 <category id="release">
 <title>Release Notes</title>
-<page href="upgrading.html">Upgrading to 2.2 from 2.0</page>
-<page href="new_features_2_4.html">New features with Apache 2.4</page>
-<page href="new_features_2_2.html">New features with Apache 2.2</page>
+<page href="upgrading.html">Upgrading to 2.4 from 2.2</page>
+<page href="new_features_2_4.html">New features with Apache 2.3/2.4</page>
+<page href="new_features_2_2.html">New features with Apache 2.1/2.2</page>
 <page href="new_features_2_0.html">New features with Apache 2.0</page>
 <page href="license.html">Apache License</page>
 </category>