From 54284b7b45051dceacf6c2997d75b3be59b53897 Mon Sep 17 00:00:00 2001 From: Erik Abele Date: Tue, 23 Oct 2007 10:26:18 +0000 Subject: [PATCH] * 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 . git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@587444 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/bind.xml | 2 +- docs/manual/dso.xml | 2 +- docs/manual/misc/perf-tuning.xml | 20 ++++++++++---------- docs/manual/mod/mod_proxy.xml | 6 +++--- docs/manual/sitemap.xml | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index b5c72a98c8..4fe8618b12 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -77,7 +77,7 @@

To make the server accept connections on port 80 for one interface, - and port 8080 on another, use

+ and port 8000 on another, use

Listen 192.0.2.1:80
diff --git a/docs/manual/dso.xml b/docs/manual/dso.xml index fdf9c4b4b5..7c446087eb 100644 --- a/docs/manual/dso.xml +++ b/docs/manual/dso.xml @@ -85,7 +85,7 @@
Usage Summary -

To give you an overview of the DSO features of Apache 2.2, +

To give you an overview of the DSO features of Apache 2.x, here is a short and concise summary:

    diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index 99b502307f..79ad2d00cd 100644 --- a/docs/manual/misc/perf-tuning.xml +++ b/docs/manual/misc/perf-tuning.xml @@ -27,19 +27,19 @@ -

    Apache 2.0 is a general-purpose webserver, designed to +

    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.

    -

    Compared to Apache 1.3, release 2.0 contains many additional +

    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.

    @@ -141,7 +141,7 @@ module="mod_access">Deny from domain 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.

    @@ -289,7 +289,7 @@ Memory-mapping -

    In situations where Apache 2.0 needs to look at the contents +

    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 mmap(2).

    @@ -302,7 +302,7 @@

  1. On some operating systems, mmap does not scale as well as read(2) 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 mmap is disabled.

    2. @@ -325,7 +325,7 @@ Sendfile -

    In situations where Apache 2.0 can ignore the contents of the file +

    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 sendfile(2) operation.

    @@ -568,7 +568,7 @@ Warning:

    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.

     @@ -1072,7 +1072,7 @@

    This write(2) call records the request in the access log. Note that one thing missing from this trace is a - time(2) call. Unlike Apache 1.3, Apache 2.0 uses + time(2) call. Unlike Apache 1.3, Apache 2.x uses gettimeofday(3) to look up the time. On some operating systems, like Linux or Solaris, gettimeofday 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 b789d308b9..5e5db191dd 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -348,7 +348,7 @@ response ProxyBadHeader IsError server configvirtual host -available in Apache 2.0.44 and later +Available in Apache 2.0.44 and later

    The ProxyBadHeader directive determines the @@ -501,7 +501,7 @@ expressions >key=value [key=value ...]] directory -BalancerMember is only available in Apache 2.2.0 +BalancerMember is only available in Apache 2.2 and later.

    This directive adds a member to a load balancing group. It must be used @@ -522,7 +522,7 @@ expressions ProxySet url key=value [key=value ...] directory -ProxySet is only available in Apache 2.2.0 +ProxySet is only available in Apache 2.2 and later.

    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 525f4f5fae..8a53f83918 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -32,9 +32,9 @@ Documentation.

    Release Notes -Upgrading to 2.2 from 2.0 -New features with Apache 2.4 -New features with Apache 2.2 +Upgrading to 2.4 from 2.2 +New features with Apache 2.3/2.4 +New features with Apache 2.1/2.2 New features with Apache 2.0 Apache License -- 2.40.0