From: Jim Jagielski Date: Tue, 15 Nov 2005 19:39:58 +0000 (+0000) Subject: Bring auto-built docs up to date... X-Git-Tag: 2.1.10~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba5b2b7a7c26f739e014813aae5f5e661e8ba5b4;p=thirdparty%2Fapache%2Fhttpd.git Bring auto-built docs up to date... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@344417 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 886d0cab3fa..bf02621f365 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -32,15 +32,12 @@ installation on Windows, see Using Apache with Microsoft Windows. For other platforms, see the platform documentation.

-

Apache 2.0's configuration and installation environment has - changed completely from Apache 1.3. Apache 1.3 used a custom - set of scripts to achieve easy installation. Apache 2.0 now - uses libtool and autoconf - to create an environment that looks like many other Open Source +

Apache httpd uses libtool and autoconf + to create a build environment that looks like many other Open Source projects.

If you are upgrading from one minor version to the next (for - example, 2.0.50 to 2.0.51), please skip down to the upgrading section.

+ example, 2.2.50 to 2.2.51), please skip down to the upgrading section.

top

Requirements

@@ -146,8 +144,7 @@ synchronization facility on your system. Usually the ntpdate or xntpd programs are used for this purpose which are based on the Network Time Protocol (NTP). - See the Usenet newsgroup comp.protocols.time.ntp - and the NTP + See the NTP homepage for more details about NTP software and public time servers. @@ -163,14 +160,14 @@ If no Perl 5 interpreter is found by the configure script, you will not be able to use the affected support scripts. Of course, you will still be able to - build and use Apache 2.0. + build and use Apache httpd.
top

Download

-

Apache can be downloaded from the Apache HTTP Server - download site which lists several mirrors. Most users of +

The Apache HTTP Server can be downloaded from the Apache HTTP Server + download site, which lists several mirrors. Most users of Apache on unix-like systems will be better off downloading and compiling a source version. The build process (described below) is easy, and it allows you to customize your server to suit your needs. @@ -193,8 +190,8 @@ simple matter of uncompressing, and then untarring:

-$ gzip -d httpd-2_1_NN.tar.gz
-$ tar xvf httpd-2_1_NN.tar +$ gzip -d httpd-NN.tar.gz
+$ tar xvf httpd-NN.tar

This will create a new directory under the current directory @@ -209,7 +206,7 @@ $ tar xvf httpd-2_1_NN.tar particular platform and personal requirements. This is done using the script configure included in the root directory of the distribution. (Developers downloading - the CVS version of the Apache source tree will need to have + an unreleased version of the Apache source tree will need to have autoconf and libtool installed and will need to run buildconf before proceeding with the next steps. This is not necessary for official releases.)

@@ -277,9 +274,9 @@ $ tar xvf httpd-2_1_NN.tar

$ make

Please be patient here, since a base configuration takes - approximately 3 minutes to compile under a Pentium III/Linux - 2.2 system, but this will vary widely depending on your - hardware and the number of modules which you have enabled.

+ several minutes to compile and the time will vary widely + depending on your hardware and the number of modules that you + have enabled.

top

Install

@@ -311,16 +308,16 @@ $ tar xvf httpd-2_1_NN.tar

Now you can start your Apache HTTP server by immediately running:

-

$ PREFIX/bin/apachectl start

+

$ PREFIX/bin/apachectl -k start

and then you should be able to request your first document via URL http://localhost/. The web page you see is located - under the DocumentRoot + under the DocumentRoot, which will usually be PREFIX/htdocs/. Then stop the server again by running:

-

$ PREFIX/bin/apachectl stop

+

$ PREFIX/bin/apachectl -k stop

top

Upgrading

@@ -335,7 +332,7 @@ $ tar xvf httpd-2_1_NN.tar module API.

Upgrading from one minor version to the next (for example, from - 2.0.55 to 2.0.57) is easier. The make install + 2.2.55 to 2.2.57) is easier. The make install process will not overwrite any of your existing documents, log files, or configuration files. In addition, the developers make every effort to avoid incompatible changes in the @@ -343,8 +340,7 @@ $ tar xvf httpd-2_1_NN.tar module API between minor versions. In most cases you should be able to use an identical configure command line, an identical configuration file, and all of your modules should continue to - work. (This is only valid for versions after 2.0.41; earlier - versions have incompatible changes.)

+ work.

To upgrade across minor versions, start by finding the file config.nice in the build directory of @@ -360,8 +356,8 @@ $ tar xvf httpd-2_1_NN.tar $ ./config.nice
$ make
$ make install
- $ PREFIX/bin/apachectl stop
- $ PREFIX/bin/apachectl start
+ $ PREFIX/bin/apachectl -k graceful-stop
+ $ PREFIX/bin/apachectl -k start

You should always test any new version in your diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index a5a5ad5516f..e639247e19a 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -1,7 +1,7 @@ - + + + + +