VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

'Apache' -> 'Apache HTTP Server' etc

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@927046 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rich Bowen
2010-03-24 13:11:51 +00:00
parent dff71ed506
commit a85a7ee5ea
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/manual/install.html.en
View File

@ -28,9 +28,9 @@
</div>
<p>This document covers compilation and installation of Apache
<p>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 <a href="platform/windows.html">Using Apache with Microsoft
installation on Windows, see <a href="platform/windows.html">Using Apache HTTP Server with Microsoft
Windows</a>. For other platforms, see the <a href="platform/">platform</a> documentation.</p>
<p>Apache httpd uses <code>libtool</code> and <code>autoconf</code>
@ -52,7 +52,7 @@
<li><img alt="" src="./images/down.gif" /> <a href="#customize">Customize</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#test">Test</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#upgrading">Upgrading</a></li>
</ul><h3>See also</h3><ul class="seealso"><li><a href="programs/configure.html">Configure the source tree</a></li><li><a href="invoking.html">Starting Apache</a></li><li><a href="stopping.html">Stopping and Restarting</a></li></ul></div>
</ul><h3>See also</h3><ul class="seealso"><li><a href="programs/configure.html">Configure the source tree</a></li><li><a href="invoking.html">Starting Apache httpd</a></li><li><a href="stopping.html">Stopping and Restarting</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="overview" id="overview">Overview for the
@ -121,12 +121,12 @@
<div class="section">
<h2><a name="requirements" id="requirements">Requirements</a></h2>
<p>The following requirements exist for building Apache:</p>
<p>The following requirements exist for building Apache httpd:</p>
<dl>
<dt>Disk Space</dt>
<dd>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.</dd>

10
docs/manual/install.xml
View File

@ -26,10 +26,10 @@
<summary>
<p>This document covers compilation and installation of Apache
<p>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 <a
href="platform/windows.html">Using Apache with Microsoft
href="platform/windows.html">Using Apache HTTP Server with Microsoft
Windows</a>. For other platforms, see the <a
href="platform/">platform</a> documentation.</p>
@ -44,7 +44,7 @@
</summary>
<seealso><a href="programs/configure.html">Configure the source tree</a></seealso>
<seealso><a href="invoking.html">Starting Apache</a></seealso>
<seealso><a href="invoking.html">Starting Apache httpd</a></seealso>
<seealso><a href="stopping.html">Stopping and Restarting</a></seealso>
<section id="overview"><title>Overview for the
@ -113,12 +113,12 @@
<section id="requirements"><title>Requirements</title>
<p>The following requirements exist for building Apache:</p>
<p>The following requirements exist for building Apache httpd:</p>
<dl>
<dt>Disk Space</dt>
<dd>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.</dd>

10
docs/manual/logs.html.en
View File

@ -27,8 +27,8 @@
<p>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.</p>
@ -46,7 +46,7 @@
<h2><a name="security" id="security">Security Warning</a></h2>
<p>Anyone who can write to the directory where Apache is
<p>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
<em>NOT</em> 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 <a href="stopping.html">restarted</a> after the log files are
moved or deleted so that it will open new log files.</p>
@ -458,7 +458,7 @@
In order to write logs to a pipe, simply replace the filename
with the pipe character "<code>|</code>", 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".)</p>

10
docs/manual/logs.xml
View File

@ -27,8 +27,8 @@
<summary>
<p>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.</p>
@ -37,7 +37,7 @@
<section id="security">
<title>Security Warning</title>
<p>Anyone who can write to the directory where Apache is
<p>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
<em>NOT</em> 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 <a
href="stopping.html">restarted</a> 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 "<code>|</code>", 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".)</p>

12
docs/manual/mpm.html.en
View File

@ -44,13 +44,13 @@ how they are used by the Apache HTTP Server.</p>
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.</p>
<p>Apache 2.0 extends this modular design to the most basic
<p>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.</p>
allows two important benefits:</p>
<ul>
<li>Apache can more cleanly and efficiently support a wide
<li>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
<code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code> 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.</li>
<li>The server can be better customized for the needs of the
@ -76,7 +76,7 @@ how they are used by the Apache HTTP Server.</p>
<code class="module"><a href="./mod/prefork.html">prefork</a></code>.</li>
</ul>
<p>At the user level, MPMs appear much like other Apache
<p>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 <a href="mod/">module index page</a>.</p>

12
docs/manual/mpm.xml
View File

@ -36,13 +36,13 @@ how they are used by the Apache HTTP Server.</p>
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.</p>
<p>Apache 2.0 extends this modular design to the most basic
<p>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.</p>
allows two important benefits:</p>
<ul>
<li>Apache can more cleanly and efficiently support a wide
<li>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
<module>mpm_winnt</module> 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.</li>
<li>The server can be better customized for the needs of the
@ -68,7 +68,7 @@ how they are used by the Apache HTTP Server.</p>
<module>prefork</module>.</li>
</ul>
<p>At the user level, MPMs appear much like other Apache
<p>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 <a href="mod/">module index page</a>.</p>