From: Rich Bowen Date: Sat, 14 Apr 2012 21:41:12 +0000 (+0000) Subject: Replace 'Apache' with more correct names for the server. X-Git-Tag: 2.5.0-alpha~7163 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12dcca5f294f7a50ed1c689bfddb573ba1594f55;p=apache Replace 'Apache' with more correct names for the server. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1326216 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en index 6f48deb4a6..bcc8e779fc 100644 --- a/docs/manual/howto/htaccess.html.en +++ b/docs/manual/howto/htaccess.html.en @@ -5,7 +5,7 @@ This file is generated from xml source: DO NOT EDIT XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --> -Apache Tutorial: .htaccess files - Apache HTTP Server +Apache HTTP Server Tutorial: .htaccess files - Apache HTTP Server @@ -16,7 +16,7 @@
<-
-Apache > HTTP Server > Documentation > Version 2.5 > How-To / Tutorials

Apache Tutorial: .htaccess files

+Apache > HTTP Server > Documentation > Version 2.5 > How-To / Tutorials

Apache HTTP Server Tutorial: .htaccess files

Available Languages:  en  |  fr  | @@ -43,7 +43,7 @@ changes on a per-directory basis.

Related ModulesRelated Directives
You should avoid using .htaccess files completely if you have access to - httpd main server config file. Using .htaccess files slows down your Apache server. + httpd main server config file. Using .htaccess files slows down your Apache http server. Any directive that you can include in a .htaccess file is better set in a Directory block, as it will have the same effect with better performance.
top
@@ -135,18 +135,18 @@ changes on a per-directory basis.

.htaccess files.

The first of these is performance. When AllowOverride - is set to allow the use of .htaccess files, Apache will + is set to allow the use of .htaccess files, httpd will look in every directory for .htaccess files. Thus, permitting .htaccess files causes a performance hit, whether or not you actually even use them! Also, the .htaccess file is loaded every time a document is requested.

-

Further note that Apache must look for .htaccess files +

Further note that httpd must look for .htaccess files in all higher-level directories, in order to have a full complement of directives that it must apply. (See section on how directives are applied.) Thus, if a file is requested out of a - directory /www/htdocs/example, Apache must look for the + directory /www/htdocs/example, httpd must look for the following files:

@@ -206,7 +206,7 @@ changes on a per-directory basis.

However, putting this configuration in your server configuration file will result in less of a performance hit, as the configuration is - loaded once when Apache starts, rather than every time a file is + loaded once when httpd starts, rather than every time a file is requested.

The use of .htaccess files can be disabled completely @@ -387,7 +387,7 @@ Options +IncludesNoExec -ExecCGI
None in effect.

If, on the other hand, you are getting server errors when trying to - access documents, check your Apache error log. It will likely tell you + access documents, check your httpd error log. It will likely tell you that the directive used in your .htaccess file is not permitted.

diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml index c3f53013f9..a50a3b2c71 100644 --- a/docs/manual/howto/htaccess.xml +++ b/docs/manual/howto/htaccess.xml @@ -23,7 +23,7 @@ How-To / Tutorials -Apache Tutorial: .htaccess files +Apache HTTP Server Tutorial: .htaccess files

.htaccess files provide a way to make configuration @@ -57,7 +57,7 @@ changes on a per-directory basis.

You should avoid using .htaccess files completely if you have access to - httpd main server config file. Using .htaccess files slows down your Apache server. + httpd main server config file. Using .htaccess files slows down your Apache http server. Any directive that you can include in a .htaccess file is better set in a Directory block, as it will have the same effect with better performance. @@ -159,18 +159,18 @@ changes on a per-directory basis.

The first of these is performance. When AllowOverride - is set to allow the use of .htaccess files, Apache will + is set to allow the use of .htaccess files, httpd will look in every directory for .htaccess files. Thus, permitting .htaccess files causes a performance hit, whether or not you actually even use them! Also, the .htaccess file is loaded every time a document is requested.

-

Further note that Apache must look for .htaccess files +

Further note that httpd must look for .htaccess files in all higher-level directories, in order to have a full complement of directives that it must apply. (See section on how directives are applied.) Thus, if a file is requested out of a - directory /www/htdocs/example, Apache must look for the + directory /www/htdocs/example, httpd must look for the following files:

@@ -232,7 +232,7 @@ changes on a per-directory basis.

However, putting this configuration in your server configuration file will result in less of a performance hit, as the configuration is - loaded once when Apache starts, rather than every time a file is + loaded once when httpd starts, rather than every time a file is requested.

The use of .htaccess files can be disabled completely @@ -420,7 +420,7 @@ Options +IncludesNoExec -ExecCGI
None in effect.

If, on the other hand, you are getting server errors when trying to - access documents, check your Apache error log. It will likely tell you + access documents, check your httpd error log. It will likely tell you that the directive used in your .htaccess file is not permitted.