From a85a7ee5ea22f5b381f90c7a37750f8245e58ea8 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Wed, 24 Mar 2010 13:11:51 +0000 Subject: [PATCH] 'Apache' -> 'Apache HTTP Server' etc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@927046 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/install.html.en | 10 +++++----- docs/manual/install.xml | 10 +++++----- docs/manual/logs.html.en | 10 +++++----- docs/manual/logs.xml | 10 +++++----- docs/manual/mpm.html.en | 12 ++++++------ docs/manual/mpm.xml | 12 ++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index c4b735581f..ab38294dfa 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -28,9 +28,9 @@ -

This document covers compilation and installation of Apache +

This document covers compilation and installation of the Apache HTTP Server on Unix and Unix-like systems only. For compiling and - installation on Windows, see Using Apache with Microsoft + installation on Windows, see Using Apache HTTP Server with Microsoft Windows. For other platforms, see the platform documentation.

Apache httpd uses libtool and autoconf @@ -52,7 +52,7 @@

  • Customize
  • Test
  • Upgrading
    • -

    See also

    +

    See also

    top

    Overview for the @@ -121,12 +121,12 @@

    Requirements

    -

    The following requirements exist for building Apache:

    +

    The following requirements exist for building Apache httpd:

    Disk Space
    Make sure you have at least 50 MB of temporary free disk - space available. After installation Apache occupies + space available. After installation the server occupies approximately 10 MB of disk space. The actual disk space requirements will vary considerably based on your chosen configuration options and any third-party modules.
    diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 0b9a562683..94a6c71b98 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -26,10 +26,10 @@ -

    This document covers compilation and installation of Apache +

    This document covers compilation and installation of the Apache HTTP Server on Unix and Unix-like systems only. For compiling and installation on Windows, see Using Apache with Microsoft + href="platform/windows.html">Using Apache HTTP Server with Microsoft Windows. For other platforms, see the platform documentation.

    @@ -44,7 +44,7 @@     Configure the source tree -Starting Apache +Starting Apache httpd Stopping and Restarting
    Overview for the @@ -113,12 +113,12 @@ <section id="requirements"><title>Requirements -

    The following requirements exist for building Apache:

    +

    The following requirements exist for building Apache httpd:

    Disk Space
    Make sure you have at least 50 MB of temporary free disk - space available. After installation Apache occupies + space available. After installation the server occupies approximately 10 MB of disk space. The actual disk space requirements will vary considerably based on your chosen configuration options and any third-party modules.
    diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en index f6b26c1d53..153199800d 100644 --- a/docs/manual/logs.html.en +++ b/docs/manual/logs.html.en @@ -27,8 +27,8 @@

    In order to effectively manage a web server, it is necessary to get feedback about the activity and performance of the - server as well as any problems that may be occurring. The Apache - HTTP Server provides very comprehensive and flexible logging + server as well as any problems that may be occurring. The Apache HTTP Server + provides very comprehensive and flexible logging capabilities. This document describes how to configure its logging capabilities, and how to understand what the logs contain.

    @@ -46,7 +46,7 @@

    Security Warning

    -

    Anyone who can write to the directory where Apache is +

    Anyone who can write to the directory where Apache httpd is writing a log file can almost certainly gain access to the uid that the server is started as, which is normally root. Do NOT give people write access to the directory the logs @@ -421,7 +421,7 @@ log file typically grows 1 MB or more per 10,000 requests. It will consequently be necessary to periodically rotate the log files by moving or deleting the existing logs. This cannot be - done while the server is running, because Apache will continue + done while the server is running, because Apache httpd will continue writing to the old log file as long as it holds the file open. Instead, the server must be restarted after the log files are moved or deleted so that it will open new log files.

    @@ -458,7 +458,7 @@ In order to write logs to a pipe, simply replace the filename with the pipe character "|", followed by the name of the executable which should accept log entries on its - standard input. Apache will start the piped-log process when + standard input. The server will start the piped-log process when the server starts, and will restart it if it crashes while the server is running. (This last feature is why we can refer to this technique as "reliable piped logging".)

    diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index 591baa9773..d159d396f0 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -27,8 +27,8 @@

    In order to effectively manage a web server, it is necessary to get feedback about the activity and performance of the - server as well as any problems that may be occurring. The Apache - HTTP Server provides very comprehensive and flexible logging + server as well as any problems that may be occurring. The Apache HTTP Server + provides very comprehensive and flexible logging capabilities. This document describes how to configure its logging capabilities, and how to understand what the logs contain.

    @@ -37,7 +37,7 @@
    Security Warning -

    Anyone who can write to the directory where Apache is +

    Anyone who can write to the directory where Apache httpd is writing a log file can almost certainly gain access to the uid that the server is started as, which is normally root. Do NOT give people write access to the directory the logs @@ -441,7 +441,7 @@ log file typically grows 1 MB or more per 10,000 requests. It will consequently be necessary to periodically rotate the log files by moving or deleting the existing logs. This cannot be - done while the server is running, because Apache will continue + done while the server is running, because Apache httpd will continue writing to the old log file as long as it holds the file open. Instead, the server must be restarted after the log files are @@ -480,7 +480,7 @@ In order to write logs to a pipe, simply replace the filename with the pipe character "|", followed by the name of the executable which should accept log entries on its - standard input. Apache will start the piped-log process when + standard input. The server will start the piped-log process when the server starts, and will restart it if it crashes while the server is running. (This last feature is why we can refer to this technique as "reliable piped logging".)

    diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en index 293528dad3..bfcc3eb54f 100644 --- a/docs/manual/mpm.html.en +++ b/docs/manual/mpm.html.en @@ -44,13 +44,13 @@ how they are used by the Apache HTTP Server.

    platforms in a range of different environments. Different platforms and different environments often require different features, or may have different ways of implementing the same - feature most efficiently. Apache has always accommodated a wide + feature most efficiently. Apache httpd has always accommodated a wide variety of environments through its modular design. This design allows the webmaster to choose which features will be included in the server by selecting which modules to load either at compile-time or at run-time.

    -

    Apache 2.0 extends this modular design to the most basic +

    Apache HTTP Server 2.0 extends this modular design to the most basic functions of a web server. The server ships with a selection of Multi-Processing Modules (MPMs) which are responsible for binding to network ports on the machine, accepting requests, @@ -60,12 +60,12 @@ how they are used by the Apache HTTP Server.

    allows two important benefits:

      -
    • Apache can more cleanly and efficiently support a wide +
    • Apache httpd can more cleanly and efficiently support a wide variety of operating systems. In particular, the Windows - version of Apache is now much more efficient, since + version of the server is now much more efficient, since mpm_winnt can use native networking features in place of the POSIX layer used in - Apache 1.3. This benefit also extends to other operating + Apache httpd 1.3. This benefit also extends to other operating systems that implement specialized MPMs.
    • The server can be better customized for the needs of the @@ -76,7 +76,7 @@ how they are used by the Apache HTTP Server.

      prefork.
    -

    At the user level, MPMs appear much like other Apache +

    At the user level, MPMs appear much like other Apache httpd modules. The main difference is that one and only one MPM must be loaded into the server at any time. The list of available MPMs appears on the module index page.

    diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml index e30a16d1d4..8661a27b3e 100644 --- a/docs/manual/mpm.xml +++ b/docs/manual/mpm.xml @@ -36,13 +36,13 @@ how they are used by the Apache HTTP Server.

    platforms in a range of different environments. Different platforms and different environments often require different features, or may have different ways of implementing the same - feature most efficiently. Apache has always accommodated a wide + feature most efficiently. Apache httpd has always accommodated a wide variety of environments through its modular design. This design allows the webmaster to choose which features will be included in the server by selecting which modules to load either at compile-time or at run-time.

    -

    Apache 2.0 extends this modular design to the most basic +

    Apache HTTP Server 2.0 extends this modular design to the most basic functions of a web server. The server ships with a selection of Multi-Processing Modules (MPMs) which are responsible for binding to network ports on the machine, accepting requests, @@ -52,12 +52,12 @@ how they are used by the Apache HTTP Server.

    allows two important benefits:

      -
    • Apache can more cleanly and efficiently support a wide +
    • Apache httpd can more cleanly and efficiently support a wide variety of operating systems. In particular, the Windows - version of Apache is now much more efficient, since + version of the server is now much more efficient, since mpm_winnt can use native networking features in place of the POSIX layer used in - Apache 1.3. This benefit also extends to other operating + Apache httpd 1.3. This benefit also extends to other operating systems that implement specialized MPMs.
    • The server can be better customized for the needs of the @@ -68,7 +68,7 @@ how they are used by the Apache HTTP Server.

      prefork.
    -

    At the user level, MPMs appear much like other Apache +

    At the user level, MPMs appear much like other Apache httpd modules. The main difference is that one and only one MPM must be loaded into the server at any time. The list of available MPMs appears on the module index page.

    -- 2.40.0