You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/11/28 22:45:05 UTC
svn commit: r106849 - in httpd/httpd/branches/2.0.x/docs/manual: . howto misc mod platform programs ssl vhosts
Author: nd
Date: Sun Nov 28 13:45:04 2004
New Revision: 106849
URL: http://svn.apache.org/viewcvs?view=rev&rev=106849
Log:
use <program>
Modified:
httpd/httpd/branches/2.0.x/docs/manual/bind.xml
httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml
httpd/httpd/branches/2.0.x/docs/manual/dso.xml
httpd/httpd/branches/2.0.x/docs/manual/env.xml
httpd/httpd/branches/2.0.x/docs/manual/glossary.xml
httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml
httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml
httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml
httpd/httpd/branches/2.0.x/docs/manual/install.xml
httpd/httpd/branches/2.0.x/docs/manual/invoking.xml
httpd/httpd/branches/2.0.x/docs/manual/logs.xml
httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml
httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml
httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml
httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml
httpd/httpd/branches/2.0.x/docs/manual/mpm.xml
httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml
httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml
httpd/httpd/branches/2.0.x/docs/manual/sections.xml
httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml
httpd/httpd/branches/2.0.x/docs/manual/stopping.xml
httpd/httpd/branches/2.0.x/docs/manual/suexec.xml
httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml
httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml
httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml
Modified: httpd/httpd/branches/2.0.x/docs/manual/bind.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/bind.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/bind.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/bind.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/bind.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/bind.xml Sun Nov 28 13:45:04 2004
@@ -61,7 +61,8 @@
directive, the server
listens to the given port on all interfaces. If an IP address
is given as well as a port, the server will listen on the given
- port and interface. Multiple Listen directives may be used to
+ port and interface. Multiple <directive module="mpm_common"
+ >Listen</directive> directives may be used to
specify a number of addresses and ports to listen on. The
server will respond to requests from any of the listed
addresses and ports.</p>
@@ -104,12 +105,14 @@
platforms but are disallowed by default on FreeBSD, NetBSD, and
OpenBSD in order to match the system-wide policy on those
platforms. But even on systems where it is disallowed by default, a
- special configure parameter can change this behavior for Apache.</p>
+ special <program>configure</program> parameter can change this behavior
+ for Apache.</p>
<p>If you want Apache to handle IPv4 and IPv6 connections with a
minimum of sockets, which requires using IPv4-mapped IPv6 addresses,
- specify the <code>--enable-v4-mapped</code> configure option and use
- generic Listen directives like the following:</p>
+ specify the <code>--enable-v4-mapped</code> <program>configure</program>
+ option and use generic <directive module="mpm_common">Listen</directive>
+ directives like the following:</p>
<example>
Listen 80
@@ -123,7 +126,8 @@
<p>If you want Apache to handle IPv4 connections only, regardless of
what your platform and APR will support, specify an IPv4 address on all
- Listen directives, as in the following examples:</p>
+ <directive module="mpm_common">Listen</directive> directives, as in the
+ following examples:</p>
<example>
Listen 0.0.0.0:80<br />
@@ -132,8 +136,8 @@
<p>If you want Apache to handle IPv4 and IPv6 connections on separate
sockets (i.e., to disable IPv4-mapped addresses), specify the
- <code>--disable-v4-mapped</code> configure option and use specific Listen
- directives like the following:</p>
+ <code>--disable-v4-mapped</code> <program>configure</program> option and
+ use specific Listen directives like the following:</p>
<example>
Listen [::]:80<br />
@@ -150,10 +154,10 @@
<section id="virtualhost">
<title>How This Works With Virtual Hosts</title>
- <p>Listen does not implement Virtual Hosts. It only tells the
- main server what addresses and ports to listen to. If no
- <directive module="core" type="section">VirtualHost</directive>
- directives are used, the server will behave
+ <p><directive module="mpm_common">Listen</directive> does not implement
+ Virtual Hosts. It only tells the main server what addresses and ports to
+ listen to. If no <directive module="core" type="section"
+ >VirtualHost</directive> directives are used, the server will behave
the same for all accepted requests. However,
<directive module="core" type="section">VirtualHost</directive>
can be used to specify a different behavior
Modified: httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/dns-caveats.xml Sun Nov 28 13:45:04 2004
@@ -140,8 +140,8 @@
<p>The addition of <a href="vhosts/name-based.html">name-based
virtual host support</a> in Apache 1.1 requires Apache to know
- the IP address(es) of the host that httpd is running on. To get
- this address it uses either the global
+ the IP address(es) of the host that <program>httpd</program> is running
+ on. To get this address it uses either the global
<directive module="core">ServerName</directive>
(if present) or calls the C function <code>gethostname</code>
(which should return the same as typing "hostname" at the
Modified: httpd/httpd/branches/2.0.x/docs/manual/dso.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/dso.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/dso.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/dso.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/dso.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/dso.xml Sun Nov 28 13:45:04 2004
@@ -27,13 +27,13 @@
<p>The Apache HTTP Server is a modular program where the
administrator can choose the functionality to include in the
server by selecting a set of modules. The modules can be
- statically compiled into the <code>httpd</code> binary when the
+ statically compiled into the <program>httpd</program> binary when the
server is built. Alternatively, modules can be compiled as
Dynamic Shared Objects (DSOs) that exist separately from the
- main <code>httpd</code> binary file. DSO modules may be
+ main <program>httpd</program> binary file. DSO modules may be
compiled at the time the server is built, or they may be
compiled and added at a later time using the Apache Extension
- Tool (<a href="programs/apxs.html">apxs</a>).</p>
+ Tool (<program>apxs</program>).</p>
<p>This document describes how to use DSO modules as well as
the theory behind their use.</p>
@@ -57,7 +57,7 @@
<module>core</module> which cannot be put into a DSO
itself. Practically all other distributed Apache modules can then
be placed into a DSO by individually enabling the DSO build for
- them via <code>configure</code>'s
+ them via <program>configure</program>'s
<code>--enable-<em>module</em>=shared</code> option as discussed
in the <a href="install.html">install documentation</a>. After a
module is compiled into a DSO named <code>mod_foo.so</code> you
@@ -68,14 +68,14 @@
<p>To simplify this creation of DSO files for Apache modules
(especially for third-party modules) a new support program
- named <a href="programs/apxs.html">apxs</a> (<em>APache
- eXtenSion</em>) is available. It can be used to build DSO based
+ named <program>apxs</program> (<dfn>APache
+ eXtenSion</dfn>) is available. It can be used to build DSO based
modules <em>outside of</em> the Apache source tree. The idea is
- simple: When installing Apache the <code>configure</code>'s
+ simple: When installing Apache the <program>configure</program>'s
<code>make install</code> procedure installs the Apache C
header files and puts the platform-dependent compiler and
- linker flags for building DSO files into the <code>apxs</code>
- program. This way the user can use <code>apxs</code> to compile
+ linker flags for building DSO files into the <program>apxs</program>
+ program. This way the user can use <program>apxs</program> to compile
his Apache module sources without the Apache distribution
source tree and without having to fiddle with the
platform-dependent compiler and linker flags for DSO
@@ -124,7 +124,7 @@
Build and install a <em>third-party</em> Apache module, say
<code>mod_foo.c</code>, into its own DSO
<code>mod_foo.so</code> <em>outside of</em> the Apache
- source tree using <a href="programs/apxs.html">apxs</a>:
+ source tree using <program>apxs</program>:
<example>
$ cd /path/to/3rdparty<br />
@@ -252,7 +252,7 @@
the actual server process can be assembled at run-time via
<directive module="mod_so">LoadModule</directive>
<code>httpd.conf</code> configuration commands instead of
- <code>configure</code> options at build-time. For instance
+ <program>configure</program> options at build-time. For instance
this way one is able to run different server instances
(standard & SSL version, minimalistic & powered up
version [mod_perl, PHP3], <em>etc.</em>) with only one Apache
@@ -266,7 +266,7 @@
<em>etc.</em></li>
<li>Easier Apache module prototyping because with the
- DSO/<code>apxs</code> pair you can both work outside the
+ DSO/<program>apxs</program> pair you can both work outside the
Apache source tree and only need an <code>apxs -i</code>
command followed by an <code>apachectl restart</code> to
bring a new version of your currently developed module into
Modified: httpd/httpd/branches/2.0.x/docs/manual/env.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/env.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/env.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/env.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/env.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/env.xml Sun Nov 28 13:45:04 2004
@@ -117,7 +117,7 @@
<li>It is not possible to override or change the standard CGI
variables using the environment manipulation directives.</li>
- <li>When <a href="suexec.html">suexec</a> is used to launch
+ <li>When <program>suexec</program> is used to launch
CGI scripts, the environment will be cleaned down to a set of
<em>safe</em> variables before CGI scripts are launched. The
list of <em>safe</em> variables is defined at compile-time in
Modified: httpd/httpd/branches/2.0.x/docs/manual/glossary.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/glossary.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/glossary.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/glossary.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/glossary.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/glossary.xml Sun Nov 28 13:45:04 2004
@@ -52,7 +52,7 @@
ref="module">module</glossary> sources into Dynamic Shared Objects
(<glossary ref="dso">DSO</glossary>s) and helps install them in the
Apache Web server.<br />
- See: <a href="programs/apxs.html">Manual Page: apxs</a>
+ See: Manual Page: <program>apxs</program>
</dd>
<dt><a name="authentication" id="authentication">Authentication</a></dt>
@@ -165,7 +165,7 @@
<dt><a name="dynamicsharedobject" id="dynamicsharedobject">Dynamic
Shared Object</a> <a name="dso" id="dso">(DSO)</a></dt>
<dd><glossary ref="module">Modules</glossary> compiled separately from the
- Apache httpd binary that can be loaded on-demand.<br />
+ Apache <program>httpd</program> binary that can be loaded on-demand.<br />
See: <a href="dso.html">Dynamic Shared Object Support</a>
</dd>
@@ -289,7 +289,7 @@
<dt><a name="module" id="module">Module</a></dt>
<dd>An independent part of a program. Much of Apache's functionality is
contained in modules that you can choose to include or exclude. Modules
- that are compiled into the Apache httpd binary are
+ that are compiled into the Apache <program>httpd</program> binary are
called <dfn>static modules</dfn>, while modules that are stored
separately and can be optionally loaded at run-time are called
<dfn>dynamic modules</dfn> or <glossary ref="dso">DSOs</glossary>.
Modified: httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml Sun Nov 28 13:45:04 2004
@@ -103,16 +103,15 @@
might want to put the password file(s) in
<code>/usr/local/apache/passwd</code>.</p>
- <p>To create the file, use the <a
- href="../programs/htpasswd.html">htpasswd</a> utility that came
- with Apache. This will be located in the <code>bin</code> directory
+ <p>To create the file, use the <program>htpasswd</program> utility that
+ came with Apache. This will be located in the <code>bin</code> directory
of wherever you installed Apache. To create the file, type:</p>
<example>
htpasswd -c /usr/local/apache/passwd/passwords rbowen
</example>
- <p><code>htpasswd</code> will ask you for the password, and
+ <p><program>htpasswd</program> will ask you for the password, and
then ask you to type it again to confirm it:</p>
<example>
@@ -122,7 +121,7 @@
Adding password for user rbowen
</example>
- <p>If <code>htpasswd</code> is not in your path, of course
+ <p>If <program>htpasswd</program> is not in your path, of course
you'll have to type the full path to the file to get it to run.
On my server, it's located at
<code>/usr/local/apache/bin/htpasswd</code></p>
@@ -176,14 +175,14 @@
<p>The <directive module="mod_auth">AuthUserFile</directive>
directive sets the path to the password file that we just
- created with <code>htpasswd</code>. If you have a large number
+ created with <program>htpasswd</program>. If you have a large number
of users, it can be quite slow to search through a plain text
file to authenticate the user on each request. Apache also has
the ability to store user information in fast database files.
The <module>mod_auth_dbm</module> module provides the <directive
module="mod_auth_dbm">AuthDBMUserFile</directive> directive. These
- files can be created and manipulated with the <a
- href="../programs/dbmmanage.html">dbmmanage</a> program. Many
+ files can be created and manipulated with the <program>
+ dbmmanage</program> program. Many
other types of authentication options are available from third
party modules in the <a
href="http://modules.apache.org/">Apache Modules
Modified: httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/howto/cgi.xml Sun Nov 28 13:45:04 2004
@@ -400,11 +400,11 @@
<p>To check if you are using suexec, run <code>apachectl
-V</code> and check for the location of <code>SUEXEC_BIN</code>.
- If Apache finds an suexec binary there on startup, suexec will
- be activated.</p>
+ If Apache finds an <program>suexec</program> binary there on startup,
+ suexec will be activated.</p>
<p>Unless you fully understand suexec, you should not be using it.
- To disable suexec, simply remove (or rename) the <code>suexec</code>
+ To disable suexec, simply remove (or rename) the <program>suexec</program>
binary pointed to by <code>SUEXEC_BIN</code> and then restart the
server. If, after reading about <a href="../suexec.html">suexec</a>,
you still wish to use it, then run <code>suexec -V</code> to find
Modified: httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml Sun Nov 28 13:45:04 2004
@@ -84,7 +84,7 @@
honored if they are found in a <code>.htaccess</code> file. If a
directive is permitted in a <code>.htaccess</code> file, the
documentation for that directive will contain an Override section,
- specifying what value must be in <directive
+ specifying what value must be in <directive
module="core">AllowOverride</directive> in order for that
directive to be permitted.</p>
@@ -164,12 +164,12 @@
directory <code>/www/htdocs/example</code>, Apache must look for the
following files:</p>
- <example>
+ <example>
/.htaccess<br />
/www/.htaccess<br />
/www/htdocs/.htaccess<br />
/www/htdocs/example/.htaccess
- </example>
+ </example>
<p>And so, for each file access out of that directory, there are 4
additional file-system accesses, even if none of those files are
@@ -289,11 +289,11 @@
<p><code>.htaccess</code> file contents:</p>
<example>
- AuthType Basic<br />
- AuthName "Password Required"<br />
- AuthUserFile /www/passwords/password.file<br />
- AuthGroupFile /www/passwords/group.file<br />
- Require Group admins
+ AuthType Basic<br />
+ AuthName "Password Required"<br />
+ AuthUserFile /www/passwords/password.file<br />
+ AuthGroupFile /www/passwords/group.file<br />
+ Require Group admins
</example>
<p>Note that <code>AllowOverride AuthConfig</code> must be in effect
Modified: httpd/httpd/branches/2.0.x/docs/manual/install.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/install.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/install.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/install.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/install.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/install.xml Sun Nov 28 13:45:04 2004
@@ -148,18 +148,17 @@
<dt><a href="http://www.perl.org/">Perl 5</a>
[OPTIONAL]</dt>
- <dd>For some of the support scripts like <a
- href="programs/apxs.html">apxs</a> or <a
- href="programs/dbmmanage.html">dbmmanage</a> (which are
+ <dd>For some of the support scripts like <program>
+ apxs</program> or <program>dbmmanage</program> (which are
written in Perl) the Perl 5 interpreter is required (versions
5.003 or newer are sufficient). If no such interpreter is found by
- the `<code>configure</code>' script there is no harm. Of course, you
+ the <program>configure</program> script there is no harm. Of course, you
still can build and install Apache 2.0. Only those support scripts
cannot be used. If you have multiple Perl interpreters
installed (perhaps a Perl 4 from the vendor and a Perl 5 from
your own), then it is recommended to use the <code>--with-perl</code>
option (see below) to make sure the correct one is selected
- by <code>./configure</code>.</dd>
+ by <program>configure</program>.</dd>
</dl>
</section>
@@ -206,8 +205,7 @@
<p>The next step is to configure the Apache source tree for your
particular platform and personal requirements. This is done using
- the script <code><a
- href="programs/configure.html">configure</a></code> included in
+ the script <program>configure</program> included in
the root directory of the distribution. (Developers downloading
the CVS version of the Apache source tree will need to have
<code>autoconf</code> and <code>libtool</code> installed and will
@@ -216,7 +214,7 @@
<p>To configure the source tree using all the default options,
simply type <code>./configure</code>. To change the default
- options, <code>configure</code> accepts a variety of variables
+ options, <program>configure</program> accepts a variety of variables
and command line options.</p>
<p>The most important option is the location <code>--prefix</code>
@@ -241,16 +239,16 @@
<code>--enable-<var>module</var>=shared</code>. Similarly, you can
disable Base modules with the
<code>--disable-<var>module</var></code> option. Be careful when
- using these options, since <code>configure</code> cannot warn you
+ using these options, since <program>configure</program> cannot warn you
if the module you specify does not exist; it will simply ignore the
option.</p>
<p>In addition, it is sometimes necessary to provide the
- <code>configure</code> script with extra information about the
+ <program>configure</program> script with extra information about the
location of your compiler, libraries, or header files. This is
done by passing either environment variables or command line
- options to <code>configure</code>. For more information, see the
- <a href="programs/configure.html">configure manual page</a>.</p>
+ options to <program>configure</program>. For more information, see the
+ <program>configure</program> manual page.</p>
<p>For a short impression of what possibilities you have, here
is a typical example which compiles Apache for the installation
@@ -266,14 +264,12 @@
--enable-speling=shared
</example>
- <p>When <code>configure</code> is run it will take several minutes to
+ <p>When <program>configure</program> is run it will take several minutes to
test for the availability of features on your system and build
Makefiles which will later be used to compile the server.</p>
- <p>Details on all the different <code>configure</code> options are
- available on the <a href="programs/configure.html">configure
- manual page</a>.</p>
-
+ <p>Details on all the different <program>configure</program> options are
+ available on the <program>configure</program> manual page.</p>
</section>
<section id="compile"><title>Build</title>
@@ -349,9 +345,9 @@
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
- <code>configure</code> options, run-time configuration, or the
+ <program>configure</program> options, run-time configuration, or the
module API between minor versions. In most cases you should be able to
- use an identical <code>configure</code> command line, an identical
+ use an identical <program>configure</program> 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.)</p>
@@ -359,7 +355,7 @@
<p>If you kept the source tree from your last installation,
upgrading is even easier. The file <code>config.nice</code> in
the root of the old source tree contains the exact
- <code>configure</code> command line that you used to configure the
+ <program>configure</program> command line that you used to configure the
source tree. Then to upgrade from one version to the next, you
need only copy the <code>config.nice</code> file to the source
tree of the new version, edit it to make any desired changes, and
Modified: httpd/httpd/branches/2.0.x/docs/manual/invoking.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/invoking.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/invoking.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/invoking.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/invoking.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/invoking.xml Sun Nov 28 13:45:04 2004
@@ -31,15 +31,15 @@
and <a href="platform/windows.html#wincons">Running Apache as a
Console Application</a>.</p>
- <p>On Unix, the <a href="programs/httpd.html">httpd</a> program
+ <p>On Unix, the <program>httpd</program> program
is run as a daemon that executes continuously in the
background to handle requests. This document describes how
- to invoke <code>httpd</code>.</p>
+ to invoke <program>httpd</program>.</p>
</summary>
<seealso><a href="stopping.html">Stopping and Restarting</a></seealso>
-<seealso><a href="programs/httpd.html">httpd</a></seealso>
-<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+<seealso><program>httpd</program></seealso>
+<seealso><program>apachectl</program></seealso>
<section id="startup"><title>How Apache Starts</title>
@@ -55,18 +55,17 @@
run as a less privileged user. This is controlled by the selected
<a href="mpm.html">Multi-Processing Module</a>.</p>
- <p>The recommended method of invoking the <code>httpd</code>
- executable is to use the <a
- href="programs/apachectl.html">apachectl</a> control script. This
+ <p>The recommended method of invoking the <program>httpd</program>
+ executable is to use the <program>apachectl</program> control script. This
script sets certain environment variables that are necessary for
- <code>httpd</code> to function correctly under some operating
- systems, and then invokes the <code>httpd</code> binary.
- <code>apachectl</code> will pass through any command line
- arguments, so any <code>httpd</code> options may also be used with
- <code>apachectl</code>. You may also directly edit the
- <code>apachectl</code> script by changing the <code>HTTPD</code>
+ <program>httpd</program> to function correctly under some operating
+ systems, and then invokes the <program>httpd</program> binary.
+ <program>apachectl</program> will pass through any command line
+ arguments, so any <program>httpd</program> options may also be used with
+ <program>apachectl</program>. You may also directly edit the
+ <program>apachectl</program> script by changing the <code>HTTPD</code>
variable near the top to specify the correct location of the
- <code>httpd</code> binary and any command-line arguments that you
+ <program>httpd</program> binary and any command-line arguments that you
wish to be <em>always</em> present.</p>
<p>The first thing that <code>httpd</code> does when it is
@@ -114,27 +113,26 @@
<section id="boot"><title>Starting at Boot-Time</title>
<p>If you want your server to continue running after a system
- reboot, you should add a call to <code>apachectl</code> to your
+ reboot, you should add a call to <program>apachectl</program> to your
system startup files (typically <code>rc.local</code> or a file in
an <code>rc.N</code> directory). This will start Apache as
root. Before doing this ensure that your server is properly
configured for security and access restrictions.</p>
- <p>The <code>apachectl</code> script is designed to act like a
+ <p>The <program>apachectl</program> script is designed to act like a
standard SysV init script; it can take the arguments
<code>start</code>, <code>restart</code>, and <code>stop</code>
and translate them into the appropriate signals to
- <code>httpd</code>. So you can often simply link
- <code>apachectl</code> into the appropriate init directory. But be
+ <program>httpd</program>. So you can often simply link
+ <program>apachectl</program> into the appropriate init directory. But be
sure to check the exact requirements of your system.</p>
</section>
<section id="info"><title>Additional Information</title>
- <p>Additional information about the command-line options of <a
- href="programs/httpd.html">httpd</a> and <a
- href="programs/apachectl.html">apachectl</a> as well as other
- support programs included with the server is available on the
+ <p>Additional information about the command-line options of <program>
+ httpd</program> and <program>apachectl</program> as well as other support
+ programs included with the server is available on the
<a href="programs/">Server and Supporting Programs</a> page.
There is also documentation on all the <a
href="mod/">modules</a> included with the Apache distribution
Modified: httpd/httpd/branches/2.0.x/docs/manual/logs.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/logs.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/logs.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/logs.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/logs.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/logs.xml Sun Nov 28 13:45:04 2004
@@ -224,8 +224,7 @@
the hostname and log it in place of the IP address. However,
this configuration is not recommended since it can
significantly slow the server. Instead, it is best to use a
- log post-processor such as <a
- href="programs/logresolve.html">logresolve</a> to determine
+ log post-processor such as <program>logresolve</program> to determine
the hostnames. The IP address reported here is not
necessarily the address of the machine at which the user is
sitting. If a proxy server exists between the user and the
@@ -492,9 +491,8 @@
<p>One important use of piped logs is to allow log rotation
without having to restart the server. The Apache HTTP Server
- includes a simple program called <a
- href="programs/rotatelogs.html">rotatelogs</a> for this
- purpose. For example, to rotate the logs every 24 hours, you
+ includes a simple program called <program>rotatelogs</program>
+ for this purpose. For example, to rotate the logs every 24 hours, you
can use:</p>
<example>
Modified: httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/misc/fin_wait_2.xml Sun Nov 28 13:45:04 2004
@@ -292,7 +292,7 @@
function, add <code>-DNO_LINGCLOSE</code> to the end of the
<code>EXTRA_CFLAGS</code> line in your
<code>Configuration</code> file, rerun
- <code>Configure</code> and rebuild the server.</p>
+ <program>Configure</program> and rebuild the server.</p>
</section>
@@ -312,7 +312,7 @@
-DNO_LINGCLOSE</code> to the end of the
<code>EXTRA_CFLAGS</code> line in your
<code>Configuration</code> file, rerun
- <code>Configure</code> and rebuild the server.</p>
+ <program>Configure</program> and rebuild the server.</p>
<note><title>NOTE</title>Attempting to use
<code>SO_LINGER</code> and <code>lingering_close()</code>
Modified: httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/misc/perf-tuning.xml Sun Nov 28 13:45:04 2004
@@ -126,7 +126,7 @@
DNS lookup to complete before the request is finished. In
Apache 1.3 this setting defaults to <code>Off</code>. If you need
to have addresses in your log files resolved to hostnames, use the
- <a href="../programs/logresolve.html"><code>logresolve</code></a>
+ <program>logresolve</program>
program that comes with Apache, on one of the numerous log
reporting packages which are available.</p>
@@ -736,7 +736,7 @@
semaphore API allows for a denial of service attack by any
CGIs running under the same uid as the webserver
(<em>i.e.</em>, all CGIs, unless you use something like
- <code>suexec</code> or <code>cgiwrapper</code>). For these
+ <program>suexec</program> or <code>cgiwrapper</code>). For these
reasons this method is not used on any architecture except
IRIX (where the previous two are prohibitively expensive
on most IRIX boxes).</p>
Modified: httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/misc/security_tips.xml Sun Nov 28 13:45:04 2004
@@ -75,8 +75,8 @@
</example>
<p>It is assumed that /, /usr, and /usr/local are only modifiable by
- root. When you install the httpd executable, you should ensure that
- it is similarly protected:</p>
+ root. When you install the <program>httpd</program> executable, you
+ should ensure that it is similarly protected:</p>
<example>
cp httpd /usr/local/apache/bin <br />
@@ -91,9 +91,9 @@
<p>If you allow non-root users to modify any files that root either
executes or writes on then you open your system to root compromises.
- For example, someone could replace the httpd binary so that the next
- time you start it, it will execute some arbitrary code. If the logs
- directory is writeable (by a non-root user), someone could replace
+ For example, someone could replace the <program>httpd</program> binary so
+ that the next time you start it, it will execute some arbitrary code. If
+ the logs directory is writeable (by a non-root user), someone could replace
a log file with a symlink to some other system file, and then root
might overwrite that file with arbitrary data. If the log files
themselves are writeable (by a non-root user), then someone may be
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml Sun Nov 28 13:45:04 2004
@@ -719,7 +719,7 @@
</contextlist>
<usage>
- <p>This directive sets the directory from which <code>httpd</code>
+ <p>This directive sets the directory from which <program>httpd</program>
will serve files. Unless matched by a directive like <directive
module="mod_alias">Alias</directive>, the server appends the
path from the requested URL to the document root to make the
@@ -751,7 +751,7 @@
<override>FileInfo</override>
<usage>
- <p>This directive controls whether the <code>httpd</code> may use
+ <p>This directive controls whether the <program>httpd</program> may use
memory-mapping if it needs to read the contents of a file during
delivery. By default, when the handling of a request requires
access to the data within a file -- for example, when delivering a
@@ -764,10 +764,10 @@
<ul>
<li>On some multiprocessor systems, memory-mapping can reduce the
- performance of the <code>httpd</code>.</li>
+ performance of the <program>httpd</program>.</li>
<li>With an NFS-mounted <directive module="core">DocumentRoot</directive>,
- the <code>httpd</code> may crash due to a segmentation fault if a file
- is deleted or truncated while the <code>httpd</code> has it
+ the <program>httpd</program> may crash due to a segmentation fault if a file
+ is deleted or truncated while the <program>httpd</program> has it
memory-mapped.</li>
</ul>
@@ -803,8 +803,8 @@
<compatibility>Available in version 2.0.44 and later</compatibility>
<usage>
- <p>This directive controls whether <code>httpd</code> may use the sendfile
- support from the kernel to transmit file contents to the client.
+ <p>This directive controls whether <program>httpd</program> may use the
+ sendfile support from the kernel to transmit file contents to the client.
By default, when the handling of a request requires no access
to the data within a file -- for example, when delivering a
static file -- Apache uses sendfile to deliver the file contents
@@ -1217,10 +1217,10 @@
don't have to suffer the extra latency that a lookup entails.
Heavily loaded sites should leave this directive
<code>Off</code>, since DNS lookups can take considerable
- amounts of time. The utility <a
- href="../programs/logresolve.html">logresolve</a>, compiled by default
- to the <code>bin</code> subdirectory of your installation directory, can
- be used to look up host names from logged IP addresses offline.</p>
+ amounts of time. The utility <program>logresolve</program>, compiled by
+ default to the <code>bin</code> subdirectory of your installation
+ directory, can be used to look up host names from logged IP addresses
+ offline.</p>
</usage>
</directivesynopsis>
@@ -1285,7 +1285,7 @@
<var>parameter-name</var> is <strong>not</strong> defined.</p>
<p>The <var>parameter-name</var> argument is a define as given on
- the <code>httpd</code> command line via <code>-D<var>parameter-</var>
+ the <program>httpd</program> command line via <code>-D<var>parameter-</var>
</code>, at the time the server was started.</p>
<p><directive type="section">IfDefine</directive> sections are
@@ -1380,7 +1380,7 @@
rather than a file, Apache will read all files in that directory
and any subdirectory. But including entire directories is not
recommended, because it is easy to accidentally leave temporary
- files in a directory that can cause <code>httpd</code> to
+ files in a directory that can cause <program>httpd</program> to
fail.</p>
<p>The file path specified may be an absolute path, or may be relative
@@ -1414,7 +1414,7 @@
</example>
</usage>
-<seealso><a href="../programs/apachectl.html">apachectl</a></seealso>
+<seealso><program>apachectl</program></seealso>
</directivesynopsis>
<directivesynopsis>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/leader.xml Sun Nov 28 13:45:04 2004
@@ -40,15 +40,16 @@
>http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf</a>.</p>
<p>To use the <module>leader</module> MPM, add
- <code>--with-mpm=leader</code> to the <code>configure</code> script's
- arguments when building the <code>httpd</code>.</p>
+ <code>--with-mpm=leader</code> to the <program>configure</program>
+ script's arguments when building the <program>httpd</program>.</p>
<p>This MPM depends on APR's atomic compare-and-swap operations for
thread synchronization. If you are compiling for an x86 target
and you don't need to support 386s, or you are compiling for a
SPARC and you don't need to run on pre-UltraSPARC chips, add
- <code>--enable-nonportable-atomics=yes</code> to the <code>configure</code>
- script's arguments. This will cause APR to implement atomic operations
+ <code>--enable-nonportable-atomics=yes</code> to the
+ <program>configure</program> script's arguments. This will cause
+ APR to implement atomic operations
using efficient opcodes not available in older CPUs.</p>
</summary>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth.xml Sun Nov 28 13:45:04 2004
@@ -98,7 +98,7 @@
ID is defined multiple times, <module>mod_auth</module> will
use the first occurrence to verify the password.</p>
- <p>The utility <a href="../programs/htpasswd.html">htpasswd</a>
+ <p>The utility <program>htpasswd</program>
which is installed as part of the binary distribution, or which
can be found in <code>src/support</code>, is used to maintain
this password file. See the <a href="../programs/htpasswd.html">man
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_dbm.xml Sun Nov 28 13:45:04 2004
@@ -133,7 +133,7 @@
problem.</p>
<p>A perl script called
- <a href="../programs/dbmmanage.html">dbmmanage</a> is included with
+ <program>dbmmanage</program> is included with
Apache. This program can be used to create and update DBM
format password files for use with this module.</p>
</usage>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_auth_digest.xml Sun Nov 28 13:45:04 2004
@@ -52,7 +52,7 @@
containing at least the root URI(s) for this protection space.</p>
<p>Appropriate user (text) files can be created using the
- <a href="../programs/htdigest.html">htdigest</a> tool.</p>
+ <program>htdigest</program> tool.</p>
<example><title>Example:</title>
<Location /private/><br />
@@ -129,8 +129,7 @@
absolute path to the user file.</p>
<p>The digest file uses a special format. Files in this format
- can be created using the <a
- href="../programs/htdigest.html">htdigest</a> utility found in
+ can be created using the <program>htdigest</program> utility found in
the <code>support/</code> subdirectory of the Apache distribution.</p>
</usage>
</directivesynopsis>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_env.xml Sun Nov 28 13:45:04 2004
@@ -30,8 +30,8 @@
<summary>
<p>This module allows for control of the environment that will
be provided to CGI scripts and SSI pages. Environment variables
- may be passed from the shell which invoked the httpd process.
- Alternatively, environment variables may be set or unset within
+ may be passed from the shell which invoked the <program>httpd</program>
+ process. Alternatively, environment variables may be set or unset within
the configuration process.</p>
</summary>
<seealso><a href="../env.html">Environment Variables</a></seealso>
@@ -48,7 +48,7 @@
<usage>
<p>Specifies one or more environment variables to pass to CGI
scripts and SSI pages from the environment of the shell which
- invoked the httpd process.</p>
+ invoked the <program>httpd</program> process.</p>
<example><title>Example</title>
PassEnv LD_LIBRARY_PATH
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_ldap.xml Sun Nov 28 13:45:04 2004
@@ -38,7 +38,7 @@
<p>To enable this module, LDAP support must be compiled into
apr-util. This is achieved by adding the <code>--with-ldap</code>
- flag to the <code>./configure</code> script when building
+ flag to the <program>configure</program> script when building
Apache.</p>
<p>SSL support requires that <module>mod_ldap</module> be linked
@@ -174,9 +174,9 @@
<p>By fetching the URL <code>http://servername/cache-info</code>,
the administrator can get a status report of every cache that is used
by <module>mod_ldap</module> cache. Note that if Apache does not
- support shared memory, then each <code>httpd</code> instance has its
+ support shared memory, then each <program>httpd</program> instance has its
own cache, so reloading the URL will result in different
- information each time, depending on which <code>httpd</code>
+ information each time, depending on which <program>httpd</program>
instance processes the request.</p>
</section>
</section>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_config.xml Sun Nov 28 13:45:04 2004
@@ -324,8 +324,8 @@
<note type="warning"><title>Security:</title>
<p>If a program is used, then it will be run as the user who
- started httpd. This will be root if the server was started by root;
- be sure that the program is secure.</p>
+ started <program>httpd</program>. This will be root if the server was
+ started by root; be sure that the program is secure.</p>
</note>
<note type="warning"><title>Note</title>
<p>When entering a file path on non-Unix platforms, care should be taken
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_log_forensic.xml Sun Nov 28 13:45:04 2004
@@ -58,7 +58,7 @@
<seealso><module>mod_log_config</module></seealso>
<section id="formats"><title>Forensic Log Format</title>
- <p>Each request is logged two times. The first time <em>before</em> it's
+ <p>Each request is logged two times. The first time is <em>before</em> it's
processed further (that is, after receiving the headers). The second log
entry is written <em>after</em> the request processing at the same time
where normal logging occurs.</p>
@@ -79,7 +79,7 @@
Firefox/0.8|Accept:image/png, <var>etc...</var>
</example>
- <p>The plus character at the beginning indicates that this is first log
+ <p>The plus character at the beginning indicates that this is the first log
line of this request. The second line just contains a minus character and
the ID again:</p>
@@ -136,9 +136,9 @@
<note type="warning"><title>Security:</title>
<p>If a program is used, then it will be run as the user who
- started httpd. This will be root if the server was started by root;
- be sure that the program is secure or switches to a less privileged
- user.</p>
+ started <program>httpd</program>. This will be root if the server was
+ started by root; be sure that the program is secure or switches to a
+ less privileged user.</p>
</note>
<note><title>Note</title>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_suexec.xml Sun Nov 28 13:45:04 2004
@@ -31,8 +31,8 @@
<summary>
- <p>This module, in combination with the <a
- href="../programs/suexec.html">suexec support program</a> allows
+ <p>This module, in combination with the <program>
+ suexec</program> support program allows
CGI scripts to run as a specified user and Group.</p>
</summary>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mod_unique_id.xml Sun Nov 28 13:45:04 2004
@@ -49,7 +49,7 @@
process requests one at a time. Each child can serve multiple
requests in its lifetime. For the purpose of this discussion,
the children don't share any data with each other. We'll refer
- to the children as httpd processes.</p>
+ to the children as <dfn>httpd processes</dfn>.</p>
<p>Your website has one or more machines under your
administrative control, together we'll call them a cluster of
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/mpm_common.xml Sun Nov 28 13:45:04 2004
@@ -210,7 +210,7 @@
<p>Special note: Use of this directive in <directive module="core"
type="section">VirtualHost</directive> is no longer supported. To
- configure your server for <a href="mod_suexec.html">suexec</a> use
+ configure your server for <program>suexec</program> use
<directive module="mod_suexec">SuexecUserGroup</directive>.</p>
<note><title>Note</title>
@@ -257,9 +257,8 @@
href="../misc/security_tips.html#serverroot">security</a>.</p>
<note><title>Note</title>
- <p>As of Apache 2 it is recommended to use only the <a
- href="../programs/apachectl.html">apachectl</a> script for
- (re-)starting or stopping the server.</p>
+ <p>As of Apache 2 it is recommended to use only the <program>
+ apachectl</program> script for (re-)starting or stopping the server.</p>
</note>
</usage>
</directivesynopsis>
@@ -319,15 +318,15 @@
Listen [fe80::a00:20ff:fea7:ccea]:80
</example>
- <note type="warning"><title>Error condition</title>
- Multiple <code>Listen</code> directives for the same ip address and
- port will result in an 'Address already in use' error message.
+ <note><title>Error condition</title>
+ Multiple <directive>Listen</directive> directives for the same ip
+ address and port will result in an <code>Address already in use</code>
+ error message.
</note>
-
</usage>
<seealso><a href="../dns-caveats.html">DNS Issues</a></seealso>
<seealso><a href="../bind.html">Setting which addresses and ports Apache
-uses</a></seealso>
+ uses</a></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -897,7 +896,7 @@
<p>Special note: Use of this directive in <directive module="core"
type="section">VirtualHost</directive> is no longer supported. To
- configure your server for <a href="../suexec.html">suexec</a> use
+ configure your server for <program>suexec</program> use
<directive module="mod_suexec">SuexecUserGroup</directive>.</p>
<note><title>Note</title>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/perchild.xml Sun Nov 28 13:45:04 2004
@@ -78,9 +78,9 @@
set the privileges of the Apache child processes. The child
processes must be able to read all the content that will be
served, but should have as few privileges beyond that as
- possible. In addition, unless <a
- href="../suexec.html">suexec</a> is used, these directives also
- set the privileges which will be inherited by CGI scripts.</p>
+ possible. In addition, unless <program>suexec</program> is used,
+ these directives also set the privileges which will be inherited
+ by CGI scripts.</p>
<p><directive module="mpm_common">MaxRequestsPerChild</directive>
controls how frequently the
Modified: httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mod/worker.xml Sun Nov 28 13:45:04 2004
@@ -129,7 +129,7 @@
the privileges of the Apache child processes. The child processes
must be able to read all the content that will be served, but
should have as few privileges beyond that as possible. In
- addition, unless <a href="../suexec.html">suexec</a> is used,
+ addition, unless <program>suexec</program> is used,
these directives also set the privileges which will be inherited
by CGI scripts.</p>
Modified: httpd/httpd/branches/2.0.x/docs/manual/mpm.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/mpm.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/mpm.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/mpm.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/mpm.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/mpm.xml Sun Nov 28 13:45:04 2004
@@ -87,7 +87,7 @@
is chosen at configuration time and built into Apache.</p>
<p>To actually choose the desired MPM, use the argument
- --with-mpm= <em>NAME</em> with the ./configure script.
+ --with-mpm= <em>NAME</em> with the <program>configure</program> script.
<em>NAME</em> is the name of the desired MPM.</p>
<p>Once the server has been compiled, it is possible to
Modified: httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/platform/win_compiling.xml Sun Nov 28 13:45:04 2004
@@ -231,7 +231,8 @@
<p>Exported <code>.mak</code> files pose a greater hassle, but they are
required for Visual C++ 5.0 users to build <module>mod_ssl</module>,
- abs (ab with SSL support) and/or <module>mod_deflate</module>.
+ abs (<program>ab</program> with SSL support) and/or
+ <module>mod_deflate</module>.
VC++ 7.0 (.net) users also benefit, <code>nmake</code> builds
are faster than <code>binenv</code> builds.
Build the entire project from within the VC++ 5.0 or 6.0 IDE,
@@ -246,7 +247,7 @@
</example>
<p>You must type this command from the <em>top level</em>
- directory of the <code>httpd</code> source tree. Every
+ directory of the httpd source tree. Every
<code>.mak</code> and <code>.dep</code> project file within
the current directory and below will be corrected, and the
timestamps adjusted to reflect the <code>.dsp</code>.</p>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/ab.xml Sun Nov 28 13:45:04 2004
@@ -31,7 +31,7 @@
you how many requests per second your Apache installation is capable of
serving.</p>
</summary>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>httpd</program></seealso>
<section id="synopsis"><title>Synopsis</title>
<p><code><strong>ab</strong>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/apachectl.xml Sun Nov 28 13:45:04 2004
@@ -28,21 +28,21 @@
<p><code>apachectl</code> is a front end to the Apache HyperText
Transfer Protocol (HTTP) server. It is designed to help the
administrator control the functioning of the Apache
- <a href="httpd.html">httpd</a> daemon.</p>
+ <program>httpd</program> daemon.</p>
<p>The <code>apachectl</code> script can operate in two modes.
- First, it can act as a simple front-end to the <code>httpd</code>
+ First, it can act as a simple front-end to the <program>httpd</program>
command that simply sets any necessary environment variables and
- then invokes <code>httpd</code>, passing through any command line
+ then invokes <program>httpd</program>, passing through any command line
arguments. Second, <code>apachectl</code> can act as a SysV init
script, taking simple one-word arguments like <code>start</code>,
<code>restart</code>, and <code>stop</code>, and translating them
- into appropriate signals to <code>httpd</code>.</p>
+ into appropriate signals to <program>httpd</program>.</p>
<p>If your Apache installation uses non-standard paths, you will
need to edit the <code>apachectl</code> script to set the
- appropriate paths to the <code>httpd</code> binary. You can also
- specify any necessary <code>httpd</code> command line arguments.
+ appropriate paths to the <program>httpd</program> binary. You can also
+ specify any necessary <program>httpd</program> command line arguments.
See the comments in the script for details.</p>
<p>The <code>apachectl</code> script returns a 0 exit value on
@@ -53,12 +53,12 @@
<seealso><a href="../stopping.html">Stopping Apache</a></seealso>
<seealso><a href="../configuring.html">Configuration Files</a></seealso>
<seealso><a href="../platform/">Platform Docs</a></seealso>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>httpd</program></seealso>
<section id="synopsis"><title>Synopsis</title>
<p>When acting in pass-through mode, <code>apachectl</code> can take
-all the arguments available for the <a href="httpd.html">httpd</a>
+all the arguments available for the <program>httpd</program>
binary.</p>
<p><code><strong>apachectl</strong> [ <var>httpd-argument</var> ]</code></p>
@@ -73,24 +73,24 @@
<section id="options"><title>Options</title>
<p>Only the SysV init-style options are defined here. Other arguments
-are defined on the <a href="httpd.html">httpd</a> manual page.</p>
+are defined on the <program>httpd</program> manual page.</p>
<dl>
<dt><code>start</code></dt>
-<dd>Start the Apache <code>httpd</code> daemon. Gives an error if it
+<dd>Start the Apache <program>httpd</program> daemon. Gives an error if it
is already running. This is equivalent to <code>apachectl -k
start</code>.</dd>
<dt><code>stop</code></dt>
-<dd>Stops the Apache <code>httpd</code> daemon. This is equivalent to
+<dd>Stops the Apache <program>httpd</program> daemon. This is equivalent to
<code>apachectl -k stop</code>.</dd>
<dt><code>restart</code></dt>
-<dd>Restarts the Apache <code>httpd</code> daemon. If the daemon is
+<dd>Restarts the Apache <program>httpd</program> daemon. If the daemon is
not running, it is started. This command automatically checks the
configuration files as in <code>configtest</code> before initiating
the restart to make sure the daemon doesn't die. This is equivalent
@@ -113,7 +113,7 @@
<dt><code>graceful</code></dt>
-<dd>Gracefully restarts the Apache <code>httpd</code> daemon. If the
+<dd>Gracefully restarts the Apache <program>httpd</program> daemon. If the
daemon is not running, it is started. This differs from a normal
restart in that currently open connections are not aborted. A side
effect is that old log files will not be closed immediately. This
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/apxs.xml Sun Nov 28 13:45:04 2004
@@ -33,7 +33,7 @@
directive from <module>mod_so</module>.</p>
<p>So to use this extension mechanism your platform has to support the DSO
- feature and your Apache <code>httpd</code> binary has to be built with the
+ feature and your Apache <program>httpd</program> binary has to be built with the
<module>mod_so</module> module. The <code>apxs</code> tool automatically
complains if this is not the case. You can check this yourself by manually
running the command</p>
@@ -76,8 +76,8 @@
<module>mod_so</module> or perhaps even read the
<code>src/modules/standard/mod_so.c</code> source file.</p>
</summary>
-<seealso><a href="apachectl.html">apachectl</a></seealso>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>apachectl</program></seealso>
+<seealso><program>httpd</program></seealso>
<section id="synopsis"><title>Synopsis</title>
<p><code><strong>apxs</strong> -<strong>g</strong>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/configure.xml Sun Nov 28 13:45:04 2004
@@ -158,8 +158,8 @@
everything else is stored at sbindir. ==> clarify/change this -->
<dt><code>--bindir=<var>DIR</var></code></dt>
<dd>Install user executables in <var>DIR</var>. The user executables
- are supporting programs like <code>htpasswd</code>,
- <code>dbmmanage</code>, etc. which are useful for site
+ are supporting programs like <program>htpasswd</program>,
+ <program>dbmmanage</program>, etc. which are useful for site
administrators. By default <var>DIR</var> is set to
<code><var>EPREFIX</var>/bin</code>.</dd>
@@ -209,10 +209,11 @@
<dt><code>--sbindir=<var>DIR</var></code></dt>
<dd>Install the system administrator executables in <var>DIR</var>.
- Those are server programs like <code>httpd</code>,
- <code>apachectl</code>, <code>suexec</code>, etc. which are neccessary
- to run the Apache HTTP Server. By default <code>sbindir</code> is
- set to <code><var>EPREFIX</var>/sbin</code>.</dd>
+ Those are server programs like <program>httpd</program>,
+ <program>apachectl</program>, <program>suexec</program>, etc. which
+ are neccessary to run the Apache HTTP Server. By default
+ <code>sbindir</code> is set to
+ <code><var>EPREFIX</var>/sbin</code>.</dd>
<dt><code>--sharedstatedir=<var>DIR</var></code></dt>
<dd>Install modifiable architecture-independent data in <var>DIR</var>.
@@ -628,7 +629,7 @@
vendor's documentation.</p>
<note><title>Note</title>
If you want to build a DSO module instead of a statically linked
- use <a href="apxs.html">apxs</a>.</note>
+ use <program>apxs</program>.</note>
</dd>
<dt><code>--with-mpm=MPM</code></dt>
@@ -673,7 +674,7 @@
<dt><code>--enable-modules=<var>MODULE-LIST</var></code></dt>
<dd>This option behaves similar to <code>--enable-mods-shared</code>,
but will link the given modules statically. This mean, these modules
- will always be present while running <code>httpd</code>. They need
+ will always be present while running <program>httpd</program>. They need
not be loaded with <directive
module="mod_so">LoadModule</directive>.</dd>
@@ -681,8 +682,8 @@
<dd>Allow IPv6 sockets to handle IPv4 connections.</dd>
<dt><code>--with-port=<var>PORT</var></code></dt>
- <dd>This defines the port on which <code>httpd</code> will listen. This
- port number is used when generating the configuration file
+ <dd>This defines the port on which <program>httpd</program> will listen.
+ This port number is used when generating the configuration file
<code>httpd.conf</code>. The default is 80.</dd>
<dt><code>--with-program-name</code></dt>
@@ -718,7 +719,7 @@
<section id="packageopt"><title>Specific packages</title>
<dl>
<dt><code>--with-apr=<var>DIR</var>|<var>FILE</var></code></dt>
- <dd>The Apache Portable Runtime (APR) is part of the <code>httpd</code>
+ <dd>The Apache Portable Runtime (APR) is part of the httpd
source distribution and will automatically be build together with the
HTTP server. If you want to use an already installed APR instead you
have to tell <code>configure</code> the path to the
@@ -729,7 +730,7 @@
<dt><code>--with-apr-util=<var>DIR</var>|<var>FILE</var></code></dt>
<dd>The Apache Portable Runtime Utilities (APU) are part of the
- <code>httpd</code> source distribution and will automatically be build
+ httpd source distribution and will automatically be build
together with the HTTP server. If you want to use an already installed
APU instead you have to tell <code>configure</code> the path to the
<code>apu-config</code> script. You may set the absolute path and name
@@ -797,12 +798,12 @@
dynamically by default.</dd>
<dt><code>--enable-suexec</code></dt>
- <dd>Use this option to enable <code><a
- href="suexec.html">suexec</a></code>, which allows you to set
+ <dd>Use this option to enable <program>
+ suexec</program>, which allows you to set
uid and gid for spawned processes. <strong>Do not use this
option unless you understand all the security implications of
running a suid binary on your server.</strong> Further options
- to configure <code>suexec</code> are described <a
+ to configure <program>suexec</program> are described <a
href="#suexec">below</a>.</dd> </dl>
<p>It is possible to create a statically linked binary of a single
@@ -810,8 +811,8 @@
<dl>
<dt><code>--enable-static-ab</code></dt>
- <dd>Build a statically linked version of <code><a
- href="ab.html">ab</a></code>.</dd>
+ <dd>Build a statically linked version of <program>
+ ab</program>.</dd>
<!-- missing documentation for chechgid -->
<dt><code>--enable-static-checkgid</code></dt>
@@ -822,25 +823,25 @@
<dd>Build a statically linked version of <code>htdbm</code>.</dd>
<dt><code>--enable-static-htdigest</code></dt>
- <dd>Build a statically linked version of <code><a
- href="htdigest.html">htdigest</a></code>.</dd>
+ <dd>Build a statically linked version of <program>
+ htdigest</program>.</dd>
<dt><code>--enable-static-htpasswd</code></dt>
- <dd>Build a statically linked version of <code><a
- href="htpasswd.html">htpasswd</a></code>.</dd>
+ <dd>Build a statically linked version of <program>
+ htpasswd</program>.</dd>
<dt><code>--enable-static-logresolve</code></dt>
- <dd>Build a statically linked version of <code><a
- href="logresolve.html">logresolve</a></code>.</dd>
+ <dd>Build a statically linked version of <program>
+ logresolve</program>.</dd>
<dt><code>--enable-static-rotatelogs</code></dt>
- <dd>Build a statically linked version of <code><a
- href="rotatelogs.html">rotatelogs</a></code>.</dd>
+ <dd>Build a statically linked version of <program>
+ rotatelogs</program>.</dd>
</dl>
<section id="suexec"><title>suexec configuration options</title>
- <p>The following options are used to fine tune the behavior of <code><a
- href="suexec.html">suexec</a></code>. See <a
+ <p>The following options are used to fine tune the behavior of <program>
+ suexec</program>. See <a
href="suexec.html#install">Configuring and installing suEXEC</a>
for further information.</p>
@@ -848,47 +849,47 @@
<dt><code>--with-suexec-bin</code></dt>
<dd>This defines the path to suexec binary. Default is
<code>--sbindir</code> (see <a href="directoryfinetuning">Fine
- tuning of installation directories</a>).</dd>
+ tuning of installation directories</a>).</dd>
<dt><code>--with-suexec-caller</code></dt>
- <dd>This defines the user allowed to call <code>suexec</code>. It should
- be the same as the user under which <code>httpd</code> normally
- runs.</dd>
+ <dd>This defines the user allowed to call <program>suexec</program>.
+ It should be the same as the user under which <program>httpd</program>
+ normally runs.</dd>
<dt><code>--with-suexec-docroot</code></dt>
- <dd>This defines the directory tree under which <code>suexec</code>
- access is allowed for executables. Default value is
+ <dd>This defines the directory tree under which <program>
+ suexec</program> access is allowed for executables. Default value is
<code>--datadir/htdocs</code>.</dd>
<dt><code>--with-suexec-gidmin</code></dt>
<dd>Define this as the lowest GID allowed to be a target user for
- <code>suexec</code>. The default value is 100.</dd>
+ <program>suexec</program>. The default value is 100.</dd>
<dt><code>--with-suexec-logfile</code></dt>
- <dd>This defines the filename of the <code>suexec</code> logfile. By
- default the logfile is named <code>suexec_log</code> and located in
+ <dd>This defines the filename of the <program>suexec</program> logfile.
+ By default the logfile is named <code>suexec_log</code> and located in
<code>--logfiledir</code>.</dd>
<dt><code>--with-suexec-safepath</code></dt>
<dd>Define the value of the environment variable <code>PATH</code> to
- be set for processes started by <code>suexec</code>. Default value is
- <code>/usr/local/bin:/usr/bin:/bin</code>.</dd>
+ be set for processes started by <program>suexec</program>. Default
+ value is <code>/usr/local/bin:/usr/bin:/bin</code>.</dd>
<dt><code>--with-suexec-userdir</code></dt>
<dd>This defines the subdirectory under the user's directory that
- contains all executables for which <code>suexec</code> access is
- allowed. This setting is necessary when you want to use
- <code>suexec</code> together with user-specific directories (as
+ contains all executables for which <program>suexec</program> access
+ is allowed. This setting is necessary when you want to use
+ <program>suexec</program> together with user-specific directories (as
provided by <module>mod_userdir</module>). The default is
<code>public_html</code>.</dd>
<dt><code>--with-suexec-uidmin</code></dt>
<dd>Define this as the lowest UID allowed to be a target user for
- <code>suexec</code>. The default value is 100.</dd>
+ <program>suexec</program>. The default value is 100.</dd>
<dt><code>--with-suexec-umask</code></dt>
- <dd>Set <code>umask</code> for processes started by <code>suexec</code>.
- It defaults to your system settings.</dd>
+ <dd>Set <code>umask</code> for processes started by
+ <program>suexec</program>. It defaults to your system settings.</dd>
</dl>
</section>
</section>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/dbmmanage.xml Sun Nov 28 13:45:04 2004
@@ -31,15 +31,15 @@
Resources available from the Apache HTTP server can be restricted to just
the users listed in the files created by <code>dbmmanage</code>. This
program can only be used when the usernames are stored in a DBM file. To
- use a flat-file database see <a href="htpasswd.html">htpasswd</a>.</p>
+ use a flat-file database see <program>htpasswd</program>.</p>
<p>This manual page only lists the command line arguments. For details of
the directives necessary to configure user authentication in
- <a href="httpd.html">httpd</a> see the httpd manual, which is part of
+ <program>httpd</program> see the httpd manual, which is part of
the Apache distribution or can be found at <a
href="http://httpd.apache.org/">http://httpd.apache.org/</a>.</p>
</summary>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>httpd</program></seealso>
<seealso><module>mod_auth_dbm</module></seealso>
<section id="synopsis"><title>Synopsis</title>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/htdigest.xml Sun Nov 28 13:45:04 2004
@@ -32,11 +32,11 @@
<p>This manual page only lists the command line arguments. For details of
the directives necessary to configure digest authentication in
- <a href="httpd.html">httpd</a> see the Apache manual, which is part
+ <program>httpd</program> see the Apache manual, which is part
of the Apache distribution or can be found at
<a href="http://httpd.apache.org/">http://httpd.apache.org/</a>.</p>
</summary>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>httpd</program></seealso>
<seealso><module>mod_auth_digest</module></seealso>
<section id="synopsis"><title>Synopsis</title>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/htpasswd.xml Sun Nov 28 13:45:04 2004
@@ -35,8 +35,7 @@
just the users listed in the files created by <code>htpasswd</code>. This
program can only manage usernames and passwords stored in a flat-file. It
can encrypt and display password information for use in other types of data
- stores, though. To use a DBM database see <a
- href="dbmmanage.html">dbmmanage</a>.</p>
+ stores, though. To use a DBM database see <program>dbmmanage</program>.</p>
<p><code>htpasswd</code> encrypts passwords using either a version of MD5
modified for Apache, or the system's <code>crypt()</code> routine. Files
@@ -46,11 +45,11 @@
<p>This manual page only lists the command line arguments. For details of
the directives necessary to configure user authentication in
- <a href="httpd.html">httpd</a> see the Apache manual, which is part of the
+ <program>httpd</program> see the Apache manual, which is part of the
Apache distribution or can be found at <a href="http://httpd.apache.org"
>http://httpd.apache.org/</a>.</p>
</summary>
-<seealso><a href="httpd.html">httpd</a></seealso>
+<seealso><program>httpd</program></seealso>
<seealso>The scripts in support/SHA1 which come with the
distribution.</seealso>
@@ -110,7 +109,7 @@
<dd>Use <code>crypt()</code> encryption for passwords. The default on all
platforms but Windows, Netware and TPF. Though possibly supported by
<code>htpasswd</code> on all platforms, it is not supported by the
- <a href="httpd.html">httpd</a> server on Windows, Netware and TPF.</dd>
+ <program>httpd</program> server on Windows, Netware and TPF.</dd>
<dt><code>-s</code></dt>
<dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape
@@ -118,7 +117,7 @@
<dt><code>-p</code></dt>
<dd>Use plaintext passwords. Though <code>htpasswd</code> will support
- creation on all platforms, the <a href="httpd.html">httpd</a> daemon will
+ creation on all platforms, the <program>httpd</program> daemon will
only accept plain text passwords on Windows, Netware and TPF.</dd>
<dt><code>-D</code></dt>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/httpd.xml Sun Nov 28 13:45:04 2004
@@ -31,8 +31,8 @@
child processes or threads to handle requests.</p>
<p>In general, <code>httpd</code> should not be invoked directly,
- but rather should be invoked via <a
- href="apachectl.html">apachectl</a> on Unix-based systems or <a
+ but rather should be invoked via <program>
+ apachectl</program> on Unix-based systems or <a
href="../platform/windows.html#winsvc">as a service on Windows NT,
2000 and XP</a> and <a href="../platform/windows.html#wincons">as
a console application on Windows 9x and ME</a>.</p>
@@ -42,7 +42,7 @@
<seealso><a href="../stopping.html">Stopping Apache</a></seealso>
<seealso><a href="../configuring.html">Configuration Files</a></seealso>
<seealso><a href="../platform/">Platform-specific Documentation</a></seealso>
-<seealso><a href="apachectl.html">apachectl</a></seealso>
+<seealso><program>apachectl</program></seealso>
<section id="synopsis"><title>Synopsis</title>
<p><code><strong>httpd</strong> [ -<strong>d</strong>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/index.xml Sun Nov 28 13:45:04 2004
@@ -32,51 +32,51 @@
<section id="index"><title>Index</title>
<dl>
- <dt><a href="httpd.html">httpd</a></dt>
+ <dt><program>httpd</program></dt>
<dd>Apache hypertext transfer protocol server</dd>
- <dt><a href="apachectl.html">apachectl</a></dt>
+ <dt><program>apachectl</program></dt>
<dd>Apache HTTP server control interface</dd>
- <dt><a href="ab.html">ab</a></dt>
+ <dt><program>ab</program></dt>
<dd>Apache HTTP server benchmarking tool</dd>
- <dt><a href="apxs.html">apxs</a></dt>
+ <dt><program>apxs</program></dt>
<dd>APache eXtenSion tool</dd>
- <dt><a href="configure.html">configure</a></dt>
+ <dt><program>configure</program></dt>
<dd>Configure the source tree</dd>
- <dt><a href="dbmmanage.html">dbmmanage</a></dt>
+ <dt><program>dbmmanage</program></dt>
<dd>Create and update user authentication files in DBM format
for basic authentication</dd>
- <dt><a href="htdigest.html">htdigest</a></dt>
+ <dt><program>htdigest</program></dt>
<dd>Create and update user authentication files for digest
authentication</dd>
- <dt><a href="htpasswd.html">htpasswd</a></dt>
+ <dt><program>htpasswd</program></dt>
<dd>Create and update user authentication files for basic
authentication</dd>
- <dt><a href="logresolve.html">logresolve</a></dt>
+ <dt><program>logresolve</program></dt>
<dd>Resolve hostnames for IP-addresses in Apache
logfiles</dd>
- <dt><a href="rotatelogs.html">rotatelogs</a></dt>
+ <dt><program>rotatelogs</program></dt>
<dd>Rotate Apache logs without having to kill the server</dd>
- <dt><a href="suexec.html">suexec</a></dt>
+ <dt><program>suexec</program></dt>
<dd>Switch User For Exec</dd>
Modified: httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/programs/rotatelogs.xml Sun Nov 28 13:45:04 2004
@@ -44,7 +44,7 @@
<p>This configuration will rotate the logfile whenever it reaches
a size of 5 megabytes.</p>
-
+
<example>
ErrorLog "|bin/rotatelogs /var/logs/errorlog.%Y-%m-%d-%H_%M_%S 5M"
</example>
Modified: httpd/httpd/branches/2.0.x/docs/manual/sections.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/sections.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/sections.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/sections.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/sections.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/sections.xml Sun Nov 28 13:45:04 2004
@@ -65,7 +65,7 @@
<p>The <directive type="section" module="core">IfDefine</directive> directive
encloses directives that will only be applied if an appropriate
-parameter is defined on the <code>httpd</code> command line. For example,
+parameter is defined on the <program>httpd</program> command line. For example,
with the following configuration, all requests will be redirected
to another site only if the server is started using
<code>httpd -DClosedForNow</code>:</p>
Modified: httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/ssl/ssl_faq.xml Sun Nov 28 13:45:04 2004
@@ -266,9 +266,9 @@
<section id="refused"><title>Why do I get ``Connection Refused'' messages when trying to access my freshly
installed Apache+mod_ssl server via HTTPS?</title>
<p>There can be various reasons. Some of the common mistakes is that people
- start Apache with just ``<code>apachectl start</code>'' (or
- ``<code>httpd</code>'') instead of ``<code>apachectl startssl</code>'' (or
- ``<code>httpd -DSSL</code>''. Or you're configuration is not correct. At
+ start Apache with just <code>apachectl start</code> (or
+ <program>httpd</program>) instead of <code>apachectl startssl</code> (or
+ <code>httpd -DSSL</code>. Or you're configuration is not correct. At
least make sure that your <directive module="mpm_common">Listen</directive>
directives match your <directive type="section" module="core">VirtualHost</directive>
directives. And if all fails, please do yourself a favor and start over with the
@@ -910,8 +910,8 @@
First look inside the F.A.Q. (this text), perhaps your problem is such
popular that it was already answered a lot of times in the past.
</dd>
- <dt>Postings from the modssl-users Support Mailing List <a
- href="http://www.modssl.org/support/"
+ <dt>Postings from the modssl-users Support Mailing List
+ <a href="http://www.modssl.org/support/"
>http://www.modssl.org/support/</a></dt>
<dd>Second search for your problem in one of the existing archives of the
modssl-users mailing list. Perhaps your problem popped up at least once for
@@ -952,17 +952,17 @@
<dl>
<dt>Apache and OpenSSL version information</dt>
<dd>The Apache version can be determined
- by running ``<code>httpd -v</code>''. The OpenSSL version can be
- determined by running ``<code>openssl version</code>''. Alternatively when
- you have Lynx installed you can run the command ``<code>lynx -mime_header
- http://localhost/ | grep Server</code>'' to determine all information in a
+ by running <code>httpd -v</code>. The OpenSSL version can be
+ determined by running <code>openssl version</code>. Alternatively when
+ you have Lynx installed you can run the command <code>lynx -mime_header
+ http://localhost/ | grep Server</code> to determine all information in a
single step.
</dd>
<dt>The details on how you built and installed Apache+mod_ssl+OpenSSL</dt>
<dd>For this you can provide a logfile of your terminal session which shows
the configuration and install steps. Alternatively you can at least
- provide the <code>configure</code> command line you used.
+ provide the <program>configure</program> command line you used.
</dd>
<dt>In case of core dumps please include a Backtrace</dt>
@@ -1007,7 +1007,7 @@
most "current" kernels do not allow a process to dump core after it has
done a <code>setuid()</code> (unless it does an <code>exec()</code>) for
security reasons (there can be privileged information left over in
- memory). Additionally you can run ``<code>/path/to/httpd -X</code>''
+ memory). Additionally you can run <code>/path/to/httpd -X</code>
manually to force Apache to not fork.
</li>
Modified: httpd/httpd/branches/2.0.x/docs/manual/stopping.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/stopping.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/stopping.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/stopping.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/stopping.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/stopping.xml Sun Nov 28 13:45:04 2004
@@ -33,16 +33,16 @@
Apache on those platforms.</p>
</summary>
-<seealso><a href="programs/httpd.html">httpd</a></seealso>
-<seealso><a href="programs/apachectl.html">apachectl</a></seealso>
+<seealso><program>httpd</program></seealso>
+<seealso><program>apachectl</program></seealso>
<section id="introduction"><title>Introduction</title>
<p>In order to stop or restart Apache, you must send a signal to
- the running <code>httpd</code> processes. There are two ways to
+ the running <program>httpd</program> processes. There are two ways to
send the signals. First, you can use the unix <code>kill</code>
- command to directly send signals to the processes. You will
- notice many <code>httpd</code> executables running on your system,
+ command to directly send signals to the processes. You will
+ notice many <program>httpd</program> executables running on your system,
but you should not send signals to any of them except the parent,
whose pid is in the <directive
module="mpm_common">PidFile</directive>. That is to say you
@@ -58,16 +58,15 @@
<example>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</example>
- <p>The second method of signaling the <code>httpd</code> processes
+ <p>The second method of signaling the <program>httpd</program> processes
is to use the <code>-k</code> command line options: <code>stop</code>,
<code>restart</code>, and <code>graceful</code>,
- as described below. These are arguments to the <a
- href="programs/httpd.html">httpd</a> binary, but we recommend that
- you send them using the <a
- href="programs/apachectl.html">apachectl</a> control script, which
- will pass them through to <code>httpd</code>.</p>
+ as described below. These are arguments to the <program>
+ httpd</program> binary, but we recommend that
+ you send them using the <program>apachectl</program> control script, which
+ will pass them through to <program>httpd</program>.</p>
- <p>After you have signaled <code>httpd</code>, you can read about
+ <p>After you have signaled <program>httpd</program>, you can read about
its progress by issuing:</p>
<example>tail -f /usr/local/apache2/logs/error_log</example>
@@ -153,15 +152,14 @@
attempt to restart the server -- it will not be able to bind to
its listening ports. Before doing a restart, you can check the
syntax of the configuration files with the <code>-t</code>
- command line argument (see <a
- href="programs/httpd.html">httpd</a>). This still will not
+ command line argument (see <program>httpd</program>). This still will not
guarantee that the server will restart correctly. To check the
semantics of the configuration files as well as the syntax, you
- can try starting <code>httpd</code> as a non-root user. If there are no
- errors it will attempt to open its sockets and logs and fail
- because it's not root (or because the currently running <code>httpd</code>
- already has those ports bound). If it fails for any other
- reason then it's probably a config file error and the error
+ can try starting <program>httpd</program> as a non-root user. If there
+ are no errors it will attempt to open its sockets and logs and fail
+ because it's not root (or because the currently running
+ <program>httpd</program> already has those ports bound). If it fails
+ for any other reason then it's probably a config file error and the error
should be fixed before issuing the graceful restart.</note>
</section>
Modified: httpd/httpd/branches/2.0.x/docs/manual/suexec.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/suexec.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/suexec.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/suexec.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/suexec.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/suexec.xml Sun Nov 28 13:45:04 2004
@@ -446,7 +446,8 @@
<p><strong>Setting paranoid permissions</strong><br />
Although the suEXEC wrapper will check to ensure that its
caller is the correct user as specified with the
- <code>--with-suexec-caller</code> configure option, there is
+ <code>--with-suexec-caller</code> <program>configure</program>
+ option, there is
always the possibility that a system or library call suEXEC uses
before this check may be exploitable on your system. To counter
this, and because it is best-practise in general, you should use
@@ -460,7 +461,7 @@
Group webgroup<br />
</example>
- <p>and <code>suexec</code> is installed at
+ <p>and <program>suexec</program> is installed at
"/usr/local/apache2/sbin/suexec", you should run:</p>
<example>
@@ -476,14 +477,14 @@
suEXEC</title>
<p>Upon startup of Apache, it looks for the file
- <code>suexec</code> in the directory defined by the
+ <program>suexec</program> in the directory defined by the
<code>--sbindir</code> option (default is
"/usr/local/apache/sbin/suexec"). If Apache finds a properly
configured suEXEC wrapper, it will print the following message
to the error log:</p>
<example>
- [notice] suEXEC mechanism enabled (wrapper: <em>/path/to/suexec</em>)
+ [notice] suEXEC mechanism enabled (wrapper: <var>/path/to/suexec</var>)
</example>
<p>If you don't see this message at server startup, the server is
@@ -495,7 +496,7 @@
restart Apache. Restarting it with a simple HUP or USR1 signal
will not be enough. </p>
<p>If you want to disable suEXEC you should kill and restart
- Apache after you have removed the <code>suexec</code> file. </p>
+ Apache after you have removed the <program>suexec</program> file.</p>
</section>
<section id="usage"><title>Using suEXEC</title>
Modified: httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/vhosts/details.xml Sun Nov 28 13:45:04 2004
@@ -60,7 +60,7 @@
<p>The default value of the <code>Listen</code> field for
main_server is 80. The main_server has no default
<code>ServerPath</code>, or <code>ServerAlias</code>. The
- default <code>ServerName</code> is deduced from the servers IP
+ default <code>ServerName</code> is deduced from the server's IP
address.</p>
<p>The main_server Listen directive has two functions. One
@@ -213,8 +213,8 @@
vhost definition.</p>
<p>If the main_server has no <code>ServerName</code> at this
- point, then the hostname of the machine that httpd is running
- on is used instead. We will call the <em>main_server address
+ point, then the hostname of the machine that <program>httpd</program>
+ is running on is used instead. We will call the <em>main_server address
set</em> those IP addresses returned by a DNS lookup on the
<code>ServerName</code> of the main_server.</p>
Modified: httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/vhosts/index.xml Sun Nov 28 13:45:04 2004
@@ -98,10 +98,9 @@
<p>This command will dump out a description of how Apache parsed
the configuration file. Careful examination of the IP addresses and
- server names may help uncover configuration mistakes. (See <a
- href="../programs/httpd.html">the docs for the httpd program</a> for
+ server names may help uncover configuration mistakes. (See
+ the docs for the <program>httpd</program> program for
other command line options)</p>
</section>
</manualpage>
-
Modified: httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml?view=diff&rev=106849&p1=httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml&r1=106848&p2=httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml&r2=106849
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/vhosts/ip-based.xml Sun Nov 28 13:45:04 2004
@@ -43,8 +43,8 @@
<section id="howto"><title>How to set up Apache</title>
<p>There are two ways of configuring apache to support multiple
- hosts. Either by running a separate httpd daemon for each
- hostname, or by running a single daemon which supports all the
+ hosts. Either by running a separate <program>httpd</program> daemon for
+ each hostname, or by running a single daemon which supports all the
virtual hosts.</p>
<p>Use multiple daemons when:</p>
@@ -67,7 +67,7 @@
address, or to specific addresses. So if you have a need to
listen to a specific address for whatever reason, then you
will need to listen to all specific addresses. (Although one
- httpd could listen to N-1 of the addresses, and another could
+ <program>httpd</program> could listen to N-1 of the addresses, and another could
listen to the remaining address.)</li>
</ul>
@@ -86,8 +86,8 @@
<section id="multiple"><title>Setting up multiple daemons</title>
- <p>Create a separate httpd installation for each virtual host. For
- each installation, use the <directive
+ <p>Create a separate <program>httpd</program> installation for each
+ virtual host. For each installation, use the <directive
module="mpm_common">Listen</directive> directive in the
configuration file to select which IP address (or virtual host)
that daemon services. e.g.</p>