From: Rich Bowen Date: Mon, 22 Mar 2010 23:37:14 +0000 (+0000) Subject: 'Apache' -> 'Apache HTTP Server' and 'httpd' X-Git-Tag: 2.3.6~316 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e82ab74bc7602cb914bed956916be17f416b053;p=apache 'Apache' -> 'Apache HTTP Server' and 'httpd' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926398 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en index ff3f046093..4b9b2e94bf 100644 --- a/docs/manual/sections.html.en +++ b/docs/manual/sections.html.en @@ -115,15 +115,15 @@ ones that change the configuration of particular places in the filesystem or webspace. First, it is important to understand the difference between the two. The filesystem is the view of your disks as seen by your operating system. For example, in a default install, -Apache resides at /usr/local/apache2 in the Unix +Apache httpd resides at /usr/local/apache2 in the Unix filesystem or "c:/Program Files/Apache Group/Apache2" in the Windows filesystem. (Note that forward slashes should always be -used as the path separator in Apache, even for Windows.) In contrast, +used as the path separator in Apache httpd configuration files, even for Windows.) In contrast, the webspace is the view of your site as delivered by the web server and seen by the client. So the path /dir/ in the webspace corresponds to the path /usr/local/apache2/htdocs/dir/ in the filesystem of a -default Apache install on Unix. The webspace need not map directly to +default Apache httpd install on Unix. The webspace need not map directly to the filesystem, since webpages may be generated dynamically from databases or other locations.

@@ -202,7 +202,7 @@ Deny from all

The <Location> directive need not have anything to do with the filesystem. For example, the following example shows how to map a particular -URL to an internal Apache handler provided by mod_status. +URL to an internal Apache HTTP Server handler provided by mod_status. No file called server-status needs to exist in the filesystem.

diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index 98d806cbb6..2f6afa93df 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -135,15 +135,15 @@ ones that change the configuration of particular places in the filesystem or webspace. First, it is important to understand the difference between the two. The filesystem is the view of your disks as seen by your operating system. For example, in a default install, -Apache resides at /usr/local/apache2 in the Unix +Apache httpd resides at /usr/local/apache2 in the Unix filesystem or "c:/Program Files/Apache Group/Apache2" in the Windows filesystem. (Note that forward slashes should always be -used as the path separator in Apache, even for Windows.) In contrast, +used as the path separator in Apache httpd configuration files, even for Windows.) In contrast, the webspace is the view of your site as delivered by the web server and seen by the client. So the path /dir/ in the webspace corresponds to the path /usr/local/apache2/htdocs/dir/ in the filesystem of a -default Apache install on Unix. The webspace need not map directly to +default Apache httpd install on Unix. The webspace need not map directly to the filesystem, since webpages may be generated dynamically from databases or other locations.

@@ -225,7 +225,7 @@ Deny from all

The Location directive need not have anything to do with the filesystem. For example, the following example shows how to map a particular -URL to an internal Apache handler provided by mod_status. +URL to an internal Apache HTTP Server handler provided by mod_status. No file called server-status needs to exist in the filesystem.