From: Rich Bowen Date: Tue, 23 Mar 2010 00:46:17 +0000 (+0000) Subject: 'Apache' -> 'Apache HTTP Server' etc X-Git-Tag: 2.3.6~309 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d10612f5bf8b8dd1c824cb0f05525c663dee8cc;p=apache 'Apache' -> 'Apache HTTP Server' etc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926416 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 8eac029b94..a37bd7602f 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -28,8 +28,7 @@ URLs on the fly Status:Extension Module Identifier:rewrite_module -Source File:mod_rewrite.c -Compatibility:Available in Apache 1.3 and later +Source File:mod_rewrite.c

Summary

The mod_rewrite module uses a rule-based rewriting @@ -233,7 +232,7 @@ RewriteRule ^index\.html$ newsite.html

These variables all correspond to the similarly named HTTP - MIME-headers, C variables of the Apache server or + MIME-headers, C variables of the Apache HTTP Server or struct tm fields of the Unix system. Most are documented elsewhere in the Manual or in the CGI specification. Those that are special to @@ -250,12 +249,12 @@ RewriteRule ^index\.html$ newsite.html

API_VERSION
-
This is the version of the Apache module API +
This is the version of the Apache httpd module API (the internal interface between server and module) in the current httpd build, as defined in include/ap_mmn.h. The module API version - corresponds to the version of Apache in use (in - the release version of Apache 1.3.14, for + corresponds to the version of Apache httpd in use (in + the release version of Apache httpd 1.3.14, for instance, it is 19990320:10), but is mainly of interest to module authors.
@@ -301,7 +300,7 @@ RewriteRule ^index\.html$ newsite.html

The variables SCRIPT_FILENAME and REQUEST_FILENAME contain the same value - the value of the filename field of the internal - request_rec structure of the Apache server. + request_rec structure of the Apache HTTP Server. The first name is the commonly known CGI variable name while the second is the appropriate counterpart of REQUEST_URI (which contains the value of the @@ -322,8 +321,8 @@ RewriteRule ^index\.html$ newsite.html %{ENV:variable}, where variable can be any environment variable, is also available. This is looked-up via internal - Apache structures and (if not found there) via - getenv() from the Apache server process. + Apache httpd structures and (if not found there) via + getenv() from the Apache httpd server process.

  • %{SSL:variable}, where variable is the @@ -611,7 +610,7 @@ processing

    Security

    -See the Apache Security Tips +See the Apache HTTP Server Security Tips document for details on how your security could be compromised if the directory where logfiles are stored is writable by anyone other than the user that starts the server. @@ -644,7 +643,7 @@ engine logs.

    Using a high value for - Level will slow down your Apache server + Level will slow down your Apache HTTP Server dramatically! Use the rewriting logfile at a Level greater than 2 only for debugging!
    @@ -665,7 +664,7 @@ RewriteLogLevel 3 Status:Extension Module:mod_rewrite Compatibility:The choice of different dbm types is available in -Apache 2.0.41 and later +Apache HTTP Server 2.0.41 and later

    The RewriteMap directive defines a Rewriting Map which can be used inside rule @@ -799,10 +798,10 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map

  • Internal Function
    - MapType: int, MapSource: Internal Apache + MapType: int, MapSource: Internal Apache httpd function -

    Here, the source is an internal Apache function. +

    Here, the source is an internal Apache httpd function. Currently you cannot create your own, but the following functions already exist:

    @@ -835,7 +834,7 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map '#!/path/to/interpreter' as the first line).

    -

    This program is started once, when the Apache server +

    This program is started once, when the Apache httpd server is started, and then communicates with the rewriting engine via its stdin and stdout file-handles. For each map-function lookup it will @@ -871,7 +870,7 @@ while (<STDIN>) {

    1. ``Keep it simple, stupid'' (KISS). - If this program hangs, it will cause Apache to hang + If this program hangs, it will cause Apache httpd to hang when trying to use the relevant rewrite rule.
    2. A common mistake is to use buffered I/O on @@ -984,7 +983,7 @@ later

      When the RewriteRule appears in per-directory (htaccess) context, the Pattern is matched against what remains of the URL after removing - the prefix that lead Apache to the current rules (see the + the prefix that lead Apache httpd to the current rules (see the RewriteBase). The removed prefix always ends with a slash, meaning the matching occurs against a string which never has a leading slash. A Pattern with ^/ never diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 1e75dd9c67..0723e6a8f7 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -30,7 +30,6 @@ URLs on the fly Extension mod_rewrite.c rewrite_module -Available in Apache 1.3 and later

      The mod_rewrite module uses a rule-based rewriting @@ -155,7 +154,7 @@ processing Security -See the Apache Security Tips +See the Apache HTTP Server Security Tips document for details on how your security could be compromised if the directory where logfiles are stored is writable by anyone other than the user that starts the server. @@ -189,7 +188,7 @@ engine logs.

      Using a high value for - Level will slow down your Apache server + Level will slow down your Apache HTTP Server dramatically! Use the rewriting logfile at a Level greater than 2 only for debugging! @@ -210,7 +209,7 @@ RewriteLogLevel 3 server configvirtual host The choice of different dbm types is available in -Apache 2.0.41 and later +Apache HTTP Server 2.0.41 and later

      The RewriteMap directive defines a @@ -350,10 +349,10 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map

    3. Internal Function
      - MapType: int, MapSource: Internal Apache + MapType: int, MapSource: Internal Apache httpd function -

      Here, the source is an internal Apache function. +

      Here, the source is an internal Apache httpd function. Currently you cannot create your own, but the following functions already exist:

      @@ -386,7 +385,7 @@ $ httxt2dbm -i mapfile.txt -o mapfile.map '#!/path/to/interpreter' as the first line).

      -

      This program is started once, when the Apache server +

      This program is started once, when the Apache httpd server is started, and then communicates with the rewriting engine via its stdin and stdout file-handles. For each map-function lookup it will @@ -424,7 +423,7 @@ while (<STDIN>) {

      1. ``Keep it simple, stupid'' (KISS). - If this program hangs, it will cause Apache to hang + If this program hangs, it will cause Apache httpd to hang when trying to use the relevant rewrite rule.
      2. A common mistake is to use buffered I/O on @@ -645,7 +644,7 @@ RewriteRule ^index\.html$ newsite.html

        These variables all correspond to the similarly named HTTP - MIME-headers, C variables of the Apache server or + MIME-headers, C variables of the Apache HTTP Server or struct tm fields of the Unix system. Most are documented elsewhere in the Manual or in the CGI specification. Those that are special to @@ -662,12 +661,12 @@ RewriteRule ^index\.html$ newsite.html

        API_VERSION
        -
        This is the version of the Apache module API +
        This is the version of the Apache httpd module API (the internal interface between server and module) in the current httpd build, as defined in include/ap_mmn.h. The module API version - corresponds to the version of Apache in use (in - the release version of Apache 1.3.14, for + corresponds to the version of Apache httpd in use (in + the release version of Apache httpd 1.3.14, for instance, it is 19990320:10), but is mainly of interest to module authors.
        @@ -713,7 +712,7 @@ RewriteRule ^index\.html$ newsite.html

        The variables SCRIPT_FILENAME and REQUEST_FILENAME contain the same value - the value of the filename field of the internal - request_rec structure of the Apache server. + request_rec structure of the Apache HTTP Server. The first name is the commonly known CGI variable name while the second is the appropriate counterpart of REQUEST_URI (which contains the value of the @@ -734,8 +733,8 @@ RewriteRule ^index\.html$ newsite.html %{ENV:variable}, where variable can be any environment variable, is also available. This is looked-up via internal - Apache structures and (if not found there) via - getenv() from the Apache server process.

        3. + Apache httpd structures and (if not found there) via + getenv() from the Apache httpd server process.
      3. %{SSL:variable}, where variable is the @@ -996,7 +995,7 @@ RewriteRule ^/$ /homepage.std.html [L]

        When the RewriteRule appears in per-directory (htaccess) context, the Pattern is matched against what remains of the URL after removing - the prefix that lead Apache to the current rules (see the + the prefix that lead Apache httpd to the current rules (see the RewriteBase). The removed prefix always ends with a slash, meaning the matching occurs against a string which never has a leading slash. A Pattern with ^/ never diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en index 32bd43d216..0783749667 100644 --- a/docs/manual/mod/mod_setenvif.html.en +++ b/docs/manual/mod/mod_setenvif.html.en @@ -60,7 +60,7 @@ on characteristics of the request

        See also

        top
        @@ -104,9 +104,6 @@ respect to case Override:FileInfo Status:Base Module:mod_setenvif -Compatibility:Apache 1.2 and - above (in Apache 1.2 this directive was found in the - now-obsolete mod_browser module)

        The BrowserMatchNoCase directive is @@ -222,7 +219,7 @@ of

        In the first form, the value will be set to "1". The second will remove the given variable if already defined, and the third will set the variable to the literal value given by - value. Since version 2.0.51 Apache will + value. Since version 2.0.51, Apache httpd will recognize occurrences of $1..$9 within value and replace them by parenthesized subexpressions of regex.

        @@ -259,7 +256,7 @@ of

        See also

        @@ -276,7 +273,6 @@ without respect to case Override:FileInfo Status:Base Module:mod_setenvif -Compatibility:Apache 1.3 and above

        The SetEnvIfNoCase is semantically identical to diff --git a/docs/manual/mod/mod_setenvif.xml b/docs/manual/mod/mod_setenvif.xml index 898f4ad5c4..6c0c92a9d9 100644 --- a/docs/manual/mod/mod_setenvif.xml +++ b/docs/manual/mod/mod_setenvif.xml @@ -49,7 +49,7 @@ on characteristics of the request

      4. -Environment Variables in Apache +Environment Variables in Apache HTTP Server BrowserMatch @@ -92,9 +92,6 @@ respect to case virtual hostdirectory .htaccess FileInfo -Apache 1.2 and - above (in Apache 1.2 this directive was found in the - now-obsolete mod_browser module) @@ -216,7 +213,7 @@ of

      In the first form, the value will be set to "1". The second will remove the given variable if already defined, and the third will set the variable to the literal value given by - value. Since version 2.0.51 Apache will + value. Since version 2.0.51, Apache httpd will recognize occurrences of $1..$9 within value and replace them by parenthesized subexpressions of regex.

      @@ -252,7 +249,7 @@ of

      set [a-z].

       -Environment Variables in Apache, +Environment Variables in Apache HTTP Server, for additional examples.       @@ -268,7 +265,6 @@ without respect to case virtual hostdirectory .htaccess FileInfo -Apache 1.3 and above diff --git a/docs/manual/mod/mod_so.xml.ja b/docs/manual/mod/mod_so.xml.ja index 7df17bde0b..89edcec9e3 100644 --- a/docs/manual/mod/mod_so.xml.ja +++ b/docs/manual/mod/mod_so.xml.ja @@ -1,7 +1,7 @@ - + + +