From: Rich Bowen Date: Tue, 16 Mar 2010 12:48:31 +0000 (+0000) Subject: In as much as we can be said to have consensus on anything at all, we X-Git-Tag: 2.3.6~337 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c0ac0138507e9081bec7a1ec6a776b190911b84;p=thirdparty%2Fapache%2Fhttpd.git In as much as we can be said to have consensus on anything at all, we appear to have consensus that we will refer to the product (in the documentation) as Apache HTTPD, or HTTPD for short, and to the server binary executable as httpd. Here's a few changes to that effect. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@923712 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 1adf4b60077..96c48450016 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -26,7 +26,7 @@  tr 

-

Configuring Apache HTTP Server (httpd) to listen on specific addresses and ports.

+

Configuring Apache HTTPD to listen on specific addresses and ports.

-

This document describes the files used to configure the Apache HTTP server (httpd).

+

This document describes the files used to configure Apache HTTPD.

-

The Apache HTTP Server (httpd) supports content negotiation as described in +

Apache HTTPD supports content negotiation as described in the HTTP/1.1 specification. It can choose the best representation of a resource based on the browser-supplied preferences for media type, languages, character set and diff --git a/docs/manual/content-negotiation.xml b/docs/manual/content-negotiation.xml index 0d89fe4894f..306b9b7f9df 100644 --- a/docs/manual/content-negotiation.xml +++ b/docs/manual/content-negotiation.xml @@ -26,7 +26,7 @@

-

The Apache HTTP Server (httpd) supports content negotiation as described in +

Apache HTTPD supports content negotiation as described in the HTTP/1.1 specification. It can choose the best representation of a resource based on the browser-supplied preferences for media type, languages, character set and diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en index cfb0263730c..43d9ae196e7 100644 --- a/docs/manual/custom-error.html.en +++ b/docs/manual/custom-error.html.en @@ -29,7 +29,7 @@

Although the Apache HTTP Server provides generic error responses in the event of 4xx or 5xx HTTP status codes, these responses are - rather stark, uninformative, and can be indimidating to site users. + rather stark, uninformative, and can be intimidating to site users. You may wish to provide custom error responses which are either friendlier, or in some language other than English, or perhaps which are styled more in line with your site layout.

@@ -55,8 +55,8 @@

Configuration

-

Custom error documents are configured using the ErrorDocument directive. - ErrorDocument, which may be used in global, +

Custom error documents are configured using the ErrorDocument directive, + which may be used in global, virtualhost, or directory context. It may be used in .htaccess files if AllowOverride is set to FileInfo.

@@ -69,7 +69,7 @@ ErrorDocument 401 /subscription/how_to_subscribe.html

-

The syntax of the ErrorDocuemnt directrive is:

+

The syntax of the ErrorDocument directive is:

ErrorDocument <3-digit-code> <action> @@ -197,7 +197,7 @@ provide more useful information to users about your site, and what they can expect to find there.

-

mod_includes and mod_negotiation +

mod_include and mod_negotiation must be enabled to use this feature.

diff --git a/docs/manual/custom-error.xml.es b/docs/manual/custom-error.xml.es index e8b026044e4..4317ca23b59 100644 --- a/docs/manual/custom-error.xml.es +++ b/docs/manual/custom-error.xml.es @@ -1,7 +1,7 @@ - + + + + -Issues Regarding DNS and Apache HTTPD - Apache HTTP Server +Issues Regarding DNS and Apache HTTP Server - Apache HTTP Server @@ -16,7 +16,7 @@
<-

Issues Regarding DNS and Apache HTTPD

+Apache > HTTP Server > Documentation > Version 2.3

Issues Regarding DNS and Apache HTTP Server

Available Languages:  en  |  fr  | @@ -26,7 +26,7 @@

This page could be summarized with the statement: don't - configure Apache HTTPD in such a way that it relies on DNS resolution + configure Apache HTTP Server in such a way that it relies on DNS resolution for parsing of the configuration files. If HTTPD requires DNS resolution to parse the configuration files then your server may be subject to reliability problems (ie. it might not boot), diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index 7250ba10d44..e47c0b32eda 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -22,11 +22,11 @@ - Issues Regarding DNS and Apache HTTPD + Issues Regarding DNS and Apache HTTP Server

This page could be summarized with the statement: don't - configure Apache HTTPD in such a way that it relies on DNS resolution + configure Apache HTTP Server in such a way that it relies on DNS resolution for parsing of the configuration files. If HTTPD requires DNS resolution to parse the configuration files then your server may be subject to reliability problems (ie. it might not boot), diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja index c8f80dfd8e1..84976e3d61c 100644 --- a/docs/manual/dns-caveats.xml.ja +++ b/docs/manual/dns-caveats.xml.ja @@ -1,7 +1,7 @@ - + + + -Stopping and Restarting - Apache HTTP Server +Stopping and Restarting Apache HTTPD - Apache HTTP Server @@ -16,7 +16,7 @@

<-

Stopping and Restarting

+Apache > HTTP Server > Documentation > Version 2.3

Stopping and Restarting Apache HTTPD

Available Languages:  de  |  en  | @@ -27,7 +27,7 @@  tr 

-

This document covers stopping and restarting the Apache HTTP Server (httpd) on +

This document covers stopping and restarting Apache HTTPD on Unix-like systems. Windows NT, 2000 and XP users should see Running httpd as a Service and Windows 9x and ME users should see Running httpd as a diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml index d788a820346..fe94312b517 100644 --- a/docs/manual/stopping.xml +++ b/docs/manual/stopping.xml @@ -22,10 +22,10 @@ - Stopping and Restarting + Stopping and Restarting Apache HTTPD

-

This document covers stopping and restarting the Apache HTTP Server (httpd) on +

This document covers stopping and restarting Apache HTTPD on Unix-like systems. Windows NT, 2000 and XP users should see Running httpd as a Service and Windows 9x and ME users should see de en es - fr + fr ja ko tr diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta index f1be9d63998..ce2ceefd2d6 100644 --- a/docs/manual/suexec.xml.meta +++ b/docs/manual/suexec.xml.meta @@ -8,7 +8,7 @@ en - fr + fr ja ko tr diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta index 9dec7f53f96..047fb80e5ad 100644 --- a/docs/manual/upgrading.xml.meta +++ b/docs/manual/upgrading.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/urlmapping.xml.fr b/docs/manual/urlmapping.xml.fr index d6184345e4d..2c5971bb96e 100644 --- a/docs/manual/urlmapping.xml.fr +++ b/docs/manual/urlmapping.xml.fr @@ -3,7 +3,7 @@ - + + + +