You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2008/05/25 05:28:36 UTC
svn commit: r659902 - in /httpd/httpd/trunk/docs/manual: ./ howto/ mod/
programs/ ssl/ style/lang/ vhosts/
Author: takashi
Date: Sat May 24 20:28:34 2008
New Revision: 659902
URL: http://svn.apache.org/viewvc?rev=659902&view=rev
Log:
Style fix. Almost all are detabs.
Modified:
httpd/httpd/trunk/docs/manual/env.xml
httpd/httpd/trunk/docs/manual/filter.xml
httpd/httpd/trunk/docs/manual/howto/public_html.xml
httpd/httpd/trunk/docs/manual/howto/ssi.xml
httpd/httpd/trunk/docs/manual/logs.xml
httpd/httpd/trunk/docs/manual/mod/core.xml
httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.xml
httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.xml
httpd/httpd/trunk/docs/manual/mod/mod_dav.xml
httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
httpd/httpd/trunk/docs/manual/mod/mod_usertrack.xml
httpd/httpd/trunk/docs/manual/new_features_2_2.xml
httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml
httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml
httpd/httpd/trunk/docs/manual/ssl/ssl_howto.xml
httpd/httpd/trunk/docs/manual/ssl/ssl_intro.xml
httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
httpd/httpd/trunk/docs/manual/vhosts/examples.xml
httpd/httpd/trunk/docs/manual/vhosts/fd-limits.xml
httpd/httpd/trunk/docs/manual/vhosts/ip-based.xml
httpd/httpd/trunk/docs/manual/vhosts/mass.xml
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml
Modified: httpd/httpd/trunk/docs/manual/env.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/env.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/env.xml (original)
+++ httpd/httpd/trunk/docs/manual/env.xml Sat May 24 20:28:34 2008
@@ -459,9 +459,9 @@
</Directory></pre></example>
<p>For more information about this technique, see the
- "<a href="http://www.serverwatch.com/tutorials/article.php/1132731"
- >Keeping Your Images from Adorning Other Sites</a>"
- tutorial on ServerWatch.</p>
+ "<a href="http://www.serverwatch.com/tutorials/article.php/1132731"
+ >Keeping Your Images from Adorning Other Sites</a>"
+ tutorial on ServerWatch.</p>
</section>
</section>
</manualpage>
Modified: httpd/httpd/trunk/docs/manual/filter.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/filter.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/filter.xml (original)
+++ httpd/httpd/trunk/docs/manual/filter.xml Sat May 24 20:28:34 2008
@@ -32,11 +32,11 @@
<title>Filtering in Apache 2</title>
<related>
<modulelist>
- <module>mod_filter</module>
+ <module>mod_filter</module>
<module>mod_deflate</module>
<module>mod_ext_filter</module>
<module>mod_include</module>
- <module>mod_charset_lite</module>
+ <module>mod_charset_lite</module>
</modulelist>
<directivelist>
<directive module="mod_filter">FilterChain</directive>
Modified: httpd/httpd/trunk/docs/manual/howto/public_html.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.xml Sat May 24 20:28:34 2008
@@ -37,7 +37,7 @@
enabled. You can enable access when using <directive module="mod_userdir"
>UserDir</directive> by uncommenting the line</p>
<example>
- #Include conf/extra/httpd-userdir.conf
+ #Include conf/extra/httpd-userdir.conf
</example>
<p>in the default config file, and adapting the <code
>httpd-userdir.conf</code>
Modified: httpd/httpd/trunk/docs/manual/howto/ssi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/ssi.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/ssi.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/ssi.xml Sat May 24 20:28:34 2008
@@ -100,7 +100,7 @@
the following directives:</p>
<example>
AddType text/html .shtml<br />
- AddOutputFilter INCLUDES .shtml
+ AddOutputFilter INCLUDES .shtml
</example>
<p>One disadvantage to this approach is that if you wanted to
Modified: httpd/httpd/trunk/docs/manual/logs.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/logs.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/logs.xml (original)
+++ httpd/httpd/trunk/docs/manual/logs.xml Sat May 24 20:28:34 2008
@@ -163,8 +163,8 @@
directives to control access logging, including
mod_log_referer, mod_log_agent, and the
<code>TransferLog</code> directive. The <directive
- module="mod_log_config">CustomLog</directive> directive now subsumes
- the functionality of all the older directives.</p>
+ module="mod_log_config">CustomLog</directive> directive now subsumes
+ the functionality of all the older directives.</p>
<p>The format of the access log is highly configurable. The format
is specified using a format string that looks much like a C-style
@@ -196,11 +196,11 @@
control characters "<code>\n</code>" for new-line and
"<code>\t</code>" for tab.</p>
- <p>The <directive module="mod_log_config">CustomLog</directive>
- directive sets up a new log file using the defined
- <em>nickname</em>. The filename for the access log is relative to
- the <directive module="core">ServerRoot</directive> unless it
- begins with a slash.</p>
+ <p>The <directive module="mod_log_config">CustomLog</directive>
+ directive sets up a new log file using the defined
+ <em>nickname</em>. The filename for the access log is relative to
+ the <directive module="core">ServerRoot</directive> unless it
+ begins with a slash.</p>
<p>The above configuration will write log entries in a format
known as the Common Log Format (CLF). This standard format can
@@ -374,7 +374,7 @@
information. The last two <directive
module="mod_log_config">CustomLog</directive> lines show how
to mimic the effects of the <code>ReferLog</code> and <code
- >AgentLog</code> directives.</p>
+ >AgentLog</code> directives.</p>
<example>
LogFormat "%h %l %u %t \"%r\" %>s %b" common<br />
@@ -385,9 +385,9 @@
<p>This example also shows that it is not necessary to define a
nickname with the <directive
- module="mod_log_config">LogFormat</directive> directive. Instead,
+ module="mod_log_config">LogFormat</directive> directive. Instead,
the log format can be specified directly in the <directive
- module="mod_log_config">CustomLog</directive> directive.</p>
+ module="mod_log_config">CustomLog</directive> directive.</p>
</section>
<section id="conditional">
@@ -401,9 +401,9 @@
meets certain conditions. This is usually accomplished with
<directive module="mod_setenvif">SetEnvIf</directive>. Then the
<code>env=</code> clause of the <directive
- module="mod_log_config">CustomLog</directive> directive is used to
- include or exclude requests where the environment variable is
- set. Some examples:</p>
+ module="mod_log_config">CustomLog</directive> directive is used to
+ include or exclude requests where the environment variable is
+ set. Some examples:</p>
<example>
# Mark requests from the loop-back interface<br />
@@ -609,7 +609,7 @@
<p>On startup, Apache httpd saves the process id of the parent
httpd process to the file <code>logs/httpd.pid</code>. This
filename can be changed with the <directive
- module="mpm_common">PidFile</directive> directive. The
+ module="mpm_common">PidFile</directive> directive. The
process-id is for use by the administrator in restarting and
terminating the daemon by sending signals to the parent
process; on Windows, use the -k command line option instead.
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml Sat May 24 20:28:34 2008
@@ -2628,7 +2628,7 @@
<usage>
<p>The <directive>ServerAlias</directive> directive sets the
alternate names for a host, for use with <a
- href="../vhosts/name-based.html">name-based virtual hosts</a>. The
+ href="../vhosts/name-based.html">name-based virtual hosts</a>. The
<directive>ServerAlias</directive> may include wildcards, if appropriate.</p>
<example>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_auth_digest.xml Sat May 24 20:28:34 2008
@@ -61,8 +61,8 @@
AuthType Digest<br />
AuthName "private area"<br />
AuthDigestDomain /private/ http://mirror.my.dom/private2/<br />
- <br />
- AuthDigestProvider file<br />
+ <br />
+ AuthDigestProvider file<br />
AuthUserFile /web/auth/.digest_pw<br />
Require valid-user<br />
</indent>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authn_anon.xml Sat May 24 20:28:34 2008
@@ -87,7 +87,7 @@
AuthType Basic<br />
AuthBasicProvider file anon<br />
AuthUserFile /path/to/your/.htpasswd<br />
- <br />
+ <br />
Anonymous_NoUserID off<br />
Anonymous_MustGiveEmail on<br />
Anonymous_VerifyEmail on<br />
Modified: httpd/httpd/trunk/docs/manual/mod/mod_dav.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dav.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dav.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dav.xml Sat May 24 20:28:34 2008
@@ -79,23 +79,23 @@
<example><title>Full Example</title>
DavLockDB /usr/local/apache2/var/DavLock<br />
<br />
- <Directory /usr/local/apache2/htdocs/foo><br />
- <indent>
- Order Allow,Deny<br />
- Allow from all<br />
- Dav On<br />
- <br />
- AuthType Basic<br />
- AuthName DAV<br />
- AuthUserFile user.passwd<br />
- <br />
- <LimitExcept GET POST OPTIONS><br />
- <indent>
- Require user admin<br />
- </indent>
- </LimitExcept><br />
- </indent>
- </Directory><br />
+ <Directory /usr/local/apache2/htdocs/foo><br />
+ <indent>
+ Order Allow,Deny<br />
+ Allow from all<br />
+ Dav On<br />
+ <br />
+ AuthType Basic<br />
+ AuthName DAV<br />
+ AuthUserFile user.passwd<br />
+ <br />
+ <LimitExcept GET POST OPTIONS><br />
+ <indent>
+ Require user admin<br />
+ </indent>
+ </LimitExcept><br />
+ </indent>
+ </Directory><br />
</example>
<p><module>mod_dav</module> is a descendent of Greg Stein's <a
Modified: httpd/httpd/trunk/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_mime.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mime.xml Sat May 24 20:28:34 2008
@@ -231,7 +231,7 @@
<example>
Content-Language: en, fr<br />
- Content-Type: text/plain; charset=ISO-8859-1
+ Content-Type: text/plain; charset=ISO-8859-1
</example>
<p>The language specification is the two-letter abbreviation
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Sat May 24 20:28:34 2008
@@ -517,11 +517,11 @@
<name>BalancerMember</name>
<description>Add a member to a load balancing group</description>
<syntax>BalancerMember <var>url</var> [<var
- >key=value [key=value ...]]</var></syntax>
+ >key=value [key=value ...]]</var></syntax>
<contextlist><context>directory</context>
</contextlist>
<compatibility>BalancerMember is only available in Apache 2.2
- and later.</compatibility>
+ and later.</compatibility>
<usage>
<p>This directive adds a member to a load balancing group. It must be used
within a <code><Proxy <var>balancer://</var>...></code> container
@@ -542,7 +542,7 @@
<contextlist><context>directory</context>
</contextlist>
<compatibility>ProxySet is only available in Apache 2.2
- and later.</compatibility>
+ and later.</compatibility>
<usage>
<p>This directive is used as an alternate method of setting any of the
parameters available to Proxy balancers and workers normally done via the
@@ -593,7 +593,7 @@
<name>ProxyPass</name>
<description>Maps remote servers into the local server URL-space</description>
<syntax>ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
- <var>[key=value</var> ...]] [nocanon] [interpolate]</syntax>
+ <var>[key=value</var> ...]] [nocanon] [interpolate]</syntax>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context>
</contextlist>
@@ -776,8 +776,8 @@
<td>-</td>
<td>Single letter value defining the initial status of
this worker: 'D' is disabled, 'S' is stopped, 'I' is ignore-errors,
- 'H' is hot-standby and 'E' is in an error state. Status
- can be set (which is the default) by prepending with '+' or
+ 'H' is hot-standby and 'E' is in an error state. Status
+ can be set (which is the default) by prepending with '+' or
cleared by prepending with '-'.
Thus, a setting of 'S-E' sets this worker to Stopped and
clears the in-error flag.
@@ -1277,7 +1277,7 @@
<p>A <dfn>Hostname</dfn> is a fully qualified DNS domain name which can
be resolved to one or more <var><a href="#ipaddr">IPAddrs</a></var> via the
DNS domain name service. It represents a logical host (in contrast to
- <var><a href="#domain">Domain</a></var>s, see above) and must be resolvable
+ <var><a href="#domain">Domain</a></var>s, see above) and must be resolvable
to at least one <var><a href="#ipaddr">IPAddr</a></var> (or often to a list
of hosts with different <var><a href="#ipaddr">IPAddr</a></var>s).</p>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml Sat May 24 20:28:34 2008
@@ -59,19 +59,19 @@
</section>
<section id="example">
- <title>Example of a balancer configuration</title>
- <p>Before we dive into the technical details, here's an example of
- how you might use <module>mod_proxy_balancer</module> to provide
- load balancing between two back-end servers:
- </p>
-
- <example>
- <Proxy balancer://mycluster><br />
- BalancerMember http://192.168.1.50:80<br />
- BalancerMember http://192.168.1.51:80<br />
- </Proxy><br />
- ProxyPass /test balancer://mycluster/
- </example>
+ <title>Example of a balancer configuration</title>
+ <p>Before we dive into the technical details, here's an example of
+ how you might use <module>mod_proxy_balancer</module> to provide
+ load balancing between two back-end servers:
+ </p>
+
+ <example>
+ <Proxy balancer://mycluster><br />
+ BalancerMember http://192.168.1.50:80<br />
+ BalancerMember http://192.168.1.51:80<br />
+ </Proxy><br />
+ ProxyPass /test balancer://mycluster/
+ </example>
</section>
<section id="requests">
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ftp.xml Sat May 24 20:28:34 2008
@@ -57,7 +57,7 @@
<example>
<pre>application/octet-stream bin dms lha lzh exe class tgz taz</pre>
</example>
- <p>Alternatively you may prefer to default everything to binary:</p>
+ <p>Alternatively you may prefer to default everything to binary:</p>
<example>
<pre>DefaultType application/octet-stream</pre>
</example>
@@ -74,8 +74,8 @@
</section> <!-- /type -->
<section id="ftpnonget"><title>How can I do FTP upload?</title>
- <p>Currently, only GET is supported for FTP in mod_proxy. You can
- of course use HTTP upload (POST or PUT) through an Apache proxy.</p>
+ <p>Currently, only GET is supported for FTP in mod_proxy. You can
+ of course use HTTP upload (POST or PUT) through an Apache proxy.</p>
</section>
<section id="percent2fhck"><title>How can I access FTP files outside
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Sat May 24 20:28:34 2008
@@ -487,16 +487,16 @@
<ol>
<li>``<em>Keep it simple, stupid</em>'' (KISS).
- If this program hangs, it will cause Apache to hang
- when trying to use the relevant rewrite rule.</li>
+ If this program hangs, it will cause Apache to hang
+ when trying to use the relevant rewrite rule.</li>
<li>A common mistake is to use buffered I/O on
<code>stdout</code>. Avoid this, as it will cause a deadloop!
``<code>$|=1</code>'' is used above, to prevent this.</li>
<li>The <directive
- module="mod_rewrite">RewriteLock</directive> directive can
- be used to define a lockfile which mod_rewrite can use to synchronize
+ module="mod_rewrite">RewriteLock</directive> directive can
+ be used to define a lockfile which mod_rewrite can use to synchronize
communication with the mapping program. By default no such
synchronization takes place.</li>
</ol>
@@ -625,8 +625,8 @@
has to be re-injected into the Apache kernel.
This is not the serious overhead it may seem to be -
this re-injection is completely internal to the
- Apache server (and the same procedure is used by
- many other operations within Apache).</p>
+ Apache server (and the same procedure is used by
+ many other operations within Apache).</p>
</note>
</usage>
@@ -661,7 +661,7 @@
(0 <= N <= 9), which provide access to the grouped
parts (in parentheses) of the pattern, from the
<code>RewriteRule</code> which is subject to the current
- set of <code>RewriteCond</code> conditions..
+ set of <code>RewriteCond</code> conditions..
</li>
<li>
<strong>RewriteCond backreferences</strong>: These are
@@ -674,7 +674,7 @@
<li>
<strong>RewriteMap expansions</strong>: These are
expansions of the form <strong><code
- >${mapname:key|default}</code></strong>.
+ >${mapname:key|default}</code></strong>.
See <a href="#mapfunc">the documentation for
RewriteMap</a> for more details.
</li>
@@ -691,11 +691,11 @@
<column width=".3"/></columnspec>
<tr>
<th>HTTP headers:</th> <th>connection & request:</th> <th></th>
- </tr>
+ </tr>
<tr>
- <td>
- HTTP_USER_AGENT<br />
+ <td>
+ HTTP_USER_AGENT<br />
HTTP_REFERER<br />
HTTP_COOKIE<br />
HTTP_FORWARDED<br />
@@ -716,17 +716,17 @@
QUERY_STRING<br />
AUTH_TYPE<br />
</td>
-
- <td></td>
+
+ <td></td>
</tr>
<tr>
<th>server internals:</th> <th>date and time:</th> <th>specials:</th>
- </tr>
+ </tr>
<tr>
- <td>
- DOCUMENT_ROOT<br />
+ <td>
+ DOCUMENT_ROOT<br />
SERVER_ADMIN<br />
SERVER_NAME<br />
SERVER_ADDR<br />
@@ -764,7 +764,7 @@
Most are documented elsewhere in the Manual or in
the CGI specification. Those that are special to
mod_rewrite include those below.</p>
- <note>
+ <note>
<dl>
<dt><code>IS_SUBREQ</code></dt>
@@ -830,8 +830,8 @@
<li>
<code>%{ENV:variable}</code>, where <em>variable</em> can be
- any environment variable, is also available.
- This is looked-up via internal
+ any environment variable, is also available.
+ This is looked-up via internal
Apache structures and (if not found there) via
<code>getenv()</code> from the Apache server process.</li>
@@ -846,8 +846,8 @@
<li>
<code>%{HTTP:header}</code>, where <em>header</em> can be
- any HTTP MIME-header name, can always be used to obtain the
- value of a header sent in the HTTP request.
+ any HTTP MIME-header name, can always be used to obtain the
+ value of a header sent in the HTTP request.
Example: <code>%{HTTP:Proxy-Connection}</code> is
the value of the HTTP header
``<code>Proxy-Connection:</code>''.
@@ -863,21 +863,21 @@
<li>
<code>%{LA-U:variable}</code> can be used for look-aheads which perform
an internal (URL-based) sub-request to determine the final
- value of <em>variable</em>. This can be used to access
+ value of <em>variable</em>. This can be used to access
variable for rewriting which is not available at the current
- stage, but will be set in a later phase.
- <p>For instance, to rewrite according to the
+ stage, but will be set in a later phase.
+ <p>For instance, to rewrite according to the
<code>REMOTE_USER</code> variable from within the
per-server context (<code>httpd.conf</code> file) you must
use <code>%{LA-U:REMOTE_USER}</code> - this
variable is set by the authorization phases, which come
- <em>after</em> the URL translation phase (during which mod_rewrite
- operates).</p>
- <p>On the other hand, because mod_rewrite implements
+ <em>after</em> the URL translation phase (during which mod_rewrite
+ operates).</p>
+ <p>On the other hand, because mod_rewrite implements
its per-directory context (<code>.htaccess</code> file) via
the Fixup phase of the API and because the authorization
phases come <em>before</em> this phase, you just can use
- <code>%{REMOTE_USER}</code> in that context.</p></li>
+ <code>%{REMOTE_USER}</code> in that context.</p></li>
<li>
<code>%{LA-F:variable}</code> can be used to perform an internal
@@ -908,7 +908,7 @@
<ul>
<li>'<strong><CondPattern</strong>' (lexicographically
- precedes)<br />
+ precedes)<br />
Treats the <em>CondPattern</em> as a plain string and
compares it lexicographically to <em>TestString</em>. True if
<em>TestString</em> lexicographically precedes
@@ -955,9 +955,9 @@
<li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable
permissions)<br />
Treats the <em>TestString</em> as a pathname and tests
- whether or not it exists, and has executable permissions.
- These permissions are determined according to
- the underlying OS.</li>
+ whether or not it exists, and has executable permissions.
+ These permissions are determined according to
+ the underlying OS.</li>
<li>'<strong>-F</strong>' (is existing file, via
subrequest)<br />
@@ -983,7 +983,7 @@
</note>
</li>
- <li>You can also set special flags for
+ <li>You can also set special flags for
<em>CondPattern</em> by appending
<strong><code>[</code><em>flags</em><code>]</code></strong>
as the third argument to the <code>RewriteCond</code>
@@ -994,7 +994,7 @@
<li>'<strong><code>nocase|NC</code></strong>'
(<strong>n</strong>o <strong>c</strong>ase)<br />
This makes the test case-insensitive - differences
- between 'A-Z' and 'a-z' are ignored, both in the
+ between 'A-Z' and 'a-z' are ignored, both in the
expanded <em>TestString</em> and the <em>CondPattern</em>.
This flag is effective only for comparisons between
<em>TestString</em> and <em>CondPattern</em>. It has no
@@ -1051,14 +1051,14 @@
</example>
<p>Explanation: If you use a browser which identifies itself
- as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you
+ as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you
get the max homepage (which could include frames, or other special
- features).
+ features).
If you use the Lynx browser (which is terminal-based), then
- you get the min homepage (which could be a version designed for
- easy, text-only browsing).
- If neither of these conditions apply (you use any other browser,
- or your browser identifies itself as something non-standard), you get
+ you get the min homepage (which could be a version designed for
+ easy, text-only browsing).
+ If neither of these conditions apply (you use any other browser,
+ or your browser identifies itself as something non-standard), you get
the std (standard) homepage.</p>
</usage>
@@ -1102,8 +1102,8 @@
the <a href="../rewrite/rewrite_intro.html#regex">mod_rewrite
Introduction</a>.</p>
- <p>In mod_rewrite, the NOT character
- ('<code>!</code>') is also available as a possible pattern
+ <p>In mod_rewrite, the NOT character
+ ('<code>!</code>') is also available as a possible pattern
prefix. This enables you to negate a pattern; to say, for instance:
``<em>if the current URL does <strong>NOT</strong> match this
pattern</em>''. This can be used for exceptional cases, where
@@ -1184,7 +1184,7 @@
</ol>
<p>Back-references are identifiers of the form
- <code>$</code><strong>N</strong>
+ <code>$</code><strong>N</strong>
(<strong>N</strong>=0..9), which will be replaced
by the contents of the <strong>N</strong>th group of the
matched <em>Pattern</em>. The server-variables are the same
@@ -1273,17 +1273,17 @@
<code>%N</code>) which will be expanded. You can use this
flag more than once, to set more than one variable. The
variables can later be dereferenced in many situations, most commonly
- from within XSSI (via <code><!--#echo
+ from within XSSI (via <code><!--#echo
var="VAR"--></code>) or CGI (<code>$ENV{'VAR'}</code>).
- You can also dereference the variable in a later RewriteCond pattern, using
+ You can also dereference the variable in a later RewriteCond pattern, using
<code>%{ENV:VAR}</code>. Use this to strip
information from URLs, while maintaining a record of that information.</dd>
<dt>'<code>forbidden|F</code>' (force URL
to be forbidden)</dt><dd>
This forces the current URL to be forbidden - it immediately
- sends back a HTTP response of 403 (FORBIDDEN).
- Use this flag in conjunction with
+ sends back a HTTP response of 403 (FORBIDDEN).
+ Use this flag in conjunction with
appropriate RewriteConds to conditionally block some
URLs.</dd>
@@ -1299,8 +1299,8 @@
Force the Content-handler of the target file to be
<em>Content-handler</em>. For instance, this can be used to
simulate the <module>mod_alias</module> directive
- <directive module="mod_alias">ScriptAlias</directive>,
- which internally forces all files
+ <directive module="mod_alias">ScriptAlias</directive>,
+ which internally forces all files
inside the mapped directory to have a handler of
``<code>cgi-script</code>''.</dd>
@@ -1369,7 +1369,7 @@
exclude some rules.</p>
<p>To decide whether or not to use this rule: if you
prefix URLs with CGI-scripts, to force them to be
- processed by the CGI-script, it's likely that you
+ processed by the CGI-script, it's likely that you
will run into problems (or significant overhead) on
sub-requests. In these cases, use this flag.</p>
</dd>
@@ -1378,8 +1378,8 @@
'<code>proxy|P</code>' (force
proxy)</dt><dd>
This flag forces the substitution part to be internally
- sent as a proxy request and immediately (rewrite
- processing stops here) put through the <a
+ sent as a proxy request and immediately (rewrite
+ processing stops here) put through the <a
href="mod_proxy.html">proxy module</a>. You must make
sure that the substitution string is a valid URI
(typically starting with
@@ -1418,7 +1418,7 @@
</example>
If you omit the <code>PT</code> flag,
<code>mod_rewrite</code> will rewrite
- <code>uri=/abc/...</code> to
+ <code>uri=/abc/...</code> to
<code>filename=/def/...</code> as a full API-compliant
URI-to-filename translator should do. Then
<code>mod_alias</code> will try to do a
Modified: httpd/httpd/trunk/docs/manual/mod/mod_usertrack.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_usertrack.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_usertrack.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_usertrack.xml Sat May 24 20:28:34 2008
@@ -136,7 +136,6 @@
should still use your actual domain, as you would with any other top
level domain (for example <code>.foo.co.uk</code>).
</note>
-
</usage>
</directivesynopsis>
Modified: httpd/httpd/trunk/docs/manual/new_features_2_2.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_2.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_2.xml (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_2.xml Sat May 24 20:28:34 2008
@@ -90,7 +90,6 @@
ordering problems in the 2.0 architecture.</dd>
<dt>Large File Support</dt>
-
<dd>httpd is now built with support for files larger than 2GB on
modern 32-bit Unix systems. Support for handling >2GB request
bodies has also been added.</dd>
@@ -103,10 +102,9 @@
timeout was reached.</dd>
<dt>SQL Database Support</dt>
- <dd><p><module>mod_dbd</module>, together with the apr_dbd framework,
+ <dd><module>mod_dbd</module>, together with the apr_dbd framework,
brings direct SQL support to modules that need it. Supports
- connection pooling in threaded MPMs.</p>
- </dd>
+ connection pooling in threaded MPMs.</dd>
</dl>
</section>
Modified: httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml Sat May 24 20:28:34 2008
@@ -103,7 +103,7 @@
<example>
CustomLog "|bin/rotatelogs /var/logs/logfile 86400" common
</example>
-
+
<p>This creates the files /var/logs/logfile.nnnn where nnnn is
the system time at which the log nominally starts (this time
will always be a multiple of the rotation time, so you can
@@ -113,7 +113,7 @@
<example>
CustomLog "|bin/rotatelogs -l /var/logs/logfile.%Y.%m.%d 86400" common
</example>
-
+
<p>This creates the files /var/logs/logfile.yyyy.mm.dd where
yyyy is the year, mm is the month, and dd is the day of the month.
Logging will switch to a new file every day at midnight, local time.</p>
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_faq.xml Sat May 24 20:28:34 2008
@@ -111,7 +111,7 @@
</ul>
<section id="mutex"><title>Why do I get permission errors related to
- SSLMutex when I start Apache?</title>
+ SSLMutex when I start Apache?</title>
<p>Errors such as ``<code>mod_ssl: Child could not open
SSLMutex lockfile /opt/apache/logs/ssl_mutex.18332 (System error follows)
[...] System: Permission denied (errno: 13)</code>'' are usually
@@ -123,8 +123,8 @@
</section>
<section id="entropy"><title>Why does mod_ssl stop with the error
- "Failed to generate temporary 512 bit RSA private key" when I start
- Apache?</title>
+ "Failed to generate temporary 512 bit RSA private key" when I start
+ Apache?</title>
<p>Cryptographic software needs a source of unpredictable data
to work correctly. Many open source operating systems provide
a "randomness device" that serves this purpose (usually named
@@ -160,7 +160,7 @@
</ul>
<section id="parallel"><title>Is it possible to provide HTTP and HTTPS
- from the same server?</title>
+ from the same server?</title>
<p>Yes. HTTP and HTTPS use different server ports (HTTP binds to
port 80, HTTPS to port 443), so there is no direct conflict between
them. You can either run two separate server instances bound to
@@ -327,24 +327,24 @@
</li>
<li>Run the following command, to create <code>server.key</code> and
<code>server.crt</code> files:<br />
- <code><strong>$ openssl req -new -x509 -nodes -out server.crt
- -keyout server.key</strong></code><br />
- These can be used as follows in your <code>httpd.conf</code>
- file:
+ <code><strong>$ openssl req -new -x509 -nodes -out server.crt
+ -keyout server.key</strong></code><br />
+ These can be used as follows in your <code>httpd.conf</code>
+ file:
<pre>
SSLCertificateFile /path/to/this/server.crt
SSLCertificateKeyFile /path/to/this/server.key
- </pre>
+ </pre>
</li>
<li>It is important that you are aware that this
- <code>server.key</code> does <em>not</em> have any passphrase.
- To add a passphrase to the key, you should run the following
- command, and enter & verify the passphrase as requested.<br />
- <p><code><strong>$ openssl rsa -des3 -in server.key -out
- server.key.new</strong></code><br />
- <code><strong>$ mv server.key.new server.key</strong></code><br /></p>
- Please backup the <code>server.key</code> file, and the passphrase
- you entered, in a secure location.
+ <code>server.key</code> does <em>not</em> have any passphrase.
+ To add a passphrase to the key, you should run the following
+ command, and enter & verify the passphrase as requested.<br />
+ <p><code><strong>$ openssl rsa -des3 -in server.key -out
+ server.key.new</strong></code><br />
+ <code><strong>$ mv server.key.new server.key</strong></code><br /></p>
+ Please backup the <code>server.key</code> file, and the passphrase
+ you entered, in a secure location.
</li>
</ol>
</section>
@@ -481,7 +481,7 @@
with the RSA key you just created (output will be PEM formatted):<br />
<br />
<code><strong>$ openssl req -new -x509 -nodes -sha1 -days 365
- -key server.key -out server.crt</strong></code><br />
+ -key server.key -out server.crt</strong></code><br />
<br />
This signs the server CSR and results in a <code>server.crt</code> file.<br />
You can see the details of this Certificate using:<br />
@@ -924,16 +924,16 @@
<dl>
<dt>Answers in the User Manual's F.A.Q. List (this)</dt>
<dd><a href="http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html">
- http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html</a><br />
- First check the F.A.Q. (this text). If your problem is a common
- one, it may have been answered several times before, and been included
- in this doc.
+ http://httpd.apache.org/docs/&httpd.docs;/ssl/ssl_faq.html</a><br />
+ First check the F.A.Q. (this text). If your problem is a common
+ one, it may have been answered several times before, and been included
+ in this doc.
</dd>
<dt>Postings from the modssl-users Support Mailing List
<a href="http://www.modssl.org/support/"
>http://www.modssl.org/support/</a></dt>
<dd>Search for your problem in the archives of the modssl-users mailing list.
- You're probably not the first person to have had this problem!
+ You're probably not the first person to have had this problem!
</dd>
</dl>
</section>
@@ -941,16 +941,16 @@
<section id="contact"><title>What support contacts are available in case
of mod_ssl problems?</title>
<p>The following lists all support possibilities for mod_ssl, in order of
- preference. Please go through these possibilities
- <em>in this order</em> - don't just pick the one you like the look of. </p>
+ preference. Please go through these possibilities
+ <em>in this order</em> - don't just pick the one you like the look of. </p>
<ol>
<li><em>Send a Problem Report to the modssl-users Support Mailing List</em><br />
<a href="mailto:modssl-users@modssl.org">
modssl-users@modssl.org</a><br />
This is the preferred way of submitting your problem report, because this way,
- others can see the problem, and learn from any answers. You must subscribe to
+ others can see the problem, and learn from any answers. You must subscribe to
the list first, but you can then easily discuss your problem with both the
- author and the whole mod_ssl user community.
+ author and the whole mod_ssl user community.
</li>
<li><em>Send a Problem Report to the Apache httpd Users Support Mailing List</em><br />
@@ -962,11 +962,11 @@
</li>
<li><em>Write a Problem Report in the Bug Database</em><br />
- <a href="http://httpd.apache.org/bug_report.html">
- http://httpd.apache.org/bug_report.html</a><br />
+ <a href="http://httpd.apache.org/bug_report.html">
+ http://httpd.apache.org/bug_report.html</a><br />
This is the last way of submitting your problem report. You should only
- do this if you've already posted to the mailing lists, and had no success.
- Please follow the instructions on the above page <em>carefully</em>.
+ do this if you've already posted to the mailing lists, and had no success.
+ Please follow the instructions on the above page <em>carefully</em>.
</li>
</ol>
</section>
@@ -1029,8 +1029,8 @@
<li>Start the server and try to reproduce the core-dump. For this you may
want to use a directive like ``<code>CoreDumpDirectory /tmp</code>'' to
- make sure that the core-dump file can be written. This should result
- in a <code>/tmp/core</code> or <code>/tmp/httpd.core</code> file. If you
+ make sure that the core-dump file can be written. This should result
+ in a <code>/tmp/core</code> or <code>/tmp/httpd.core</code> file. If you
don't get one of these, try running your server under a non-root UID.
Many modern 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
@@ -1041,7 +1041,7 @@
<li>Analyze the core-dump. For this, run <code>gdb /path/to/httpd
/tmp/httpd.core</code> or a similar command. In GDB, all you
- have to do then is to enter <code>bt</code>, and voila, you get the
+ have to do then is to enter <code>bt</code>, and voila, you get the
backtrace. For other debuggers consult your local debugger manual.
</li>
</ol>
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_howto.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_howto.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_howto.xml (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_howto.xml Sat May 24 20:28:34 2008
@@ -159,10 +159,11 @@
<section id="arbitraryclients">
<title>How can I force clients to authenticate using certificates for a
- particular URL, but still allow arbitrary clients to access the rest of the server?</title>
+ particular URL, but still allow arbitrary clients to access the rest of the server?</title>
-<p>To force clients to authenticate using certificates for a particular URL,
- you can use the per-directory reconfiguration features of <module>mod_ssl</module>:</p>
+ <p>To force clients to authenticate using certificates for a particular URL,
+ you can use the per-directory reconfiguration features of
+ <module>mod_ssl</module>:</p>
<example><title>httpd.conf</title>
SSLVerifyClient none<br />
@@ -177,7 +178,7 @@
<section id="certauthenticate">
<title>How can I allow only clients who have certificates to access a
- particular URL, but allow all clients to access the rest of the server?</title>
+ particular URL, but allow all clients to access the rest of the server?</title>
<p>The key to doing this is checking that part of the client certificate
matches what you expect. Usually this means checking all or part of the
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_intro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_intro.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_intro.xml (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_intro.xml Sat May 24 20:28:34 2008
@@ -356,7 +356,7 @@
they also manage them -- that is, they determine for how long
certificates remain valid, they renew them, and they keep lists of
certificates that were issued in the past but are no longer valid
- (Certificate Revocation Lists, or CRLs).</p>
+ (Certificate Revocation Lists, or CRLs).</p>
<p>For example, if Alice is entitled to a certificate as an
employee of a company, but has now left
Modified: httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml (original)
+++ httpd/httpd/trunk/docs/manual/style/lang/pt-br.xml Sat May 24 20:28:34 2008
@@ -129,7 +129,7 @@
<message id="glossary">Glossário</message>
<message id="sitemap">Mapa do site</message>
- <!-- footer line -->
+ <!-- footer line -->
<message id="before-license">Licenciado sob a</message>
<message id="after-license"></message>
<message id="langavail">Línguas Disponíveis</message>
Modified: httpd/httpd/trunk/docs/manual/vhosts/examples.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/examples.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/examples.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/examples.xml Sat May 24 20:28:34 2008
@@ -101,9 +101,9 @@
<example>
NameVirtualHost 172.20.30.40<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
- # etc ...
+ # etc ...
</example>
<p>However, it is additionally useful to use <code>*</code>
@@ -120,15 +120,15 @@
configuration will not work for, in fact, is when you are serving
different content based on differing IP addresses or ports.</p>
- </section>
+ </section>
- <section id="twoips"><title>Name-based hosts on more than one
+ <section id="twoips"><title>Name-based hosts on more than one
IP address.</title>
- <note>
- <title>Note</title><p>Any of the
- techniques discussed here can be extended to any number of IP
- addresses.</p>
+ <note>
+ <title>Note</title>
+ <p>Any of the techniques discussed here can be extended to any
+ number of IP addresses.</p>
</note>
<p>The server has two IP addresses. On one (<code>172.20.30.40</code>), we
@@ -139,31 +139,31 @@
<title>Server configuration</title>
Listen 80<br />
- <br />
+ <br />
# This is the "main" server running on 172.20.30.40<br />
ServerName server.domain.com<br />
DocumentRoot /www/mainserver<br />
- <br />
+ <br />
# This is the other address<br />
NameVirtualHost 172.20.30.50<br />
- <br />
+ <br />
<VirtualHost 172.20.30.50><br />
<indent>
DocumentRoot /www/example1<br />
ServerName www.example.com<br />
- <br />
+ <br />
# Other directives here ...<br />
- <br />
+ <br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.50><br />
<indent>
DocumentRoot /www/example2<br />
ServerName www.example.org<br />
- <br />
+ <br />
# Other directives here ...<br />
- <br />
+ <br />
</indent>
</VirtualHost>
</example>
@@ -173,9 +173,9 @@
unknown hostname, or no <code>Host:</code> header, will be served from
<code>www.example.com</code>.</p>
- </section>
+ </section>
- <section id="intraextra"><title>Serving the same content on
+ <section id="intraextra"><title>Serving the same content on
different IP addresses (such as an internal and external
address).</title>
@@ -196,7 +196,7 @@
NameVirtualHost 192.168.1.1<br />
NameVirtualHost 172.20.30.40<br />
- <br />
+ <br />
<VirtualHost 192.168.1.1 172.20.30.40><br />
<indent>
DocumentRoot /www/server1<br />
@@ -220,9 +220,9 @@
respond the same on all addresses.</p>
</note>
- </section>
+ </section>
- <section id="port"><title>Running different sites on different
+ <section id="port"><title>Running different sites on different
ports.</title>
<p>You have multiple domains going to the same IP and also want to
@@ -236,31 +236,31 @@
Listen 80<br />
Listen 8080<br />
- <br />
+ <br />
NameVirtualHost 172.20.30.40:80<br />
NameVirtualHost 172.20.30.40:8080<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:80><br />
<indent>
ServerName www.example.com<br />
DocumentRoot /www/domain-80<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:8080><br />
<indent>
ServerName www.example.com<br />
DocumentRoot /www/domain-8080<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:80><br />
<indent>
ServerName www.example.org<br />
DocumentRoot /www/otherdomain-80<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:8080><br />
<indent>
ServerName www.example.org<br />
@@ -269,9 +269,9 @@
</VirtualHost>
</example>
- </section>
+ </section>
- <section id="ip"><title>IP-based virtual hosting</title>
+ <section id="ip"><title>IP-based virtual hosting</title>
<p>The server has two IP addresses (<code>172.20.30.40</code> and
<code>172.20.30.50</code>) which resolve to the names
@@ -282,14 +282,14 @@
<title>Server configuration</title>
Listen 80<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/example1<br />
ServerName www.example.com<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.50><br />
<indent>
DocumentRoot /www/example2<br />
@@ -303,10 +303,10 @@
<code>localhost</code>, for example) will go to the main server, if
there is one.</p>
- </section>
+ </section>
- <section id="ipport"><title>Mixed port-based and ip-based virtual
- hosts</title>
+ <section id="ipport"><title>Mixed port-based and ip-based virtual
+ hosts</title>
<p>The server machine has two IP addresses (<code>172.20.30.40</code> and
<code>172.20.30.50</code>) which resolve to the names
@@ -321,28 +321,28 @@
Listen 172.20.30.40:8080<br />
Listen 172.20.30.50:80<br />
Listen 172.20.30.50:8080<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:80><br />
<indent>
DocumentRoot /www/example1-80<br />
ServerName www.example.com<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40:8080><br />
<indent>
DocumentRoot /www/example1-8080<br />
ServerName www.example.com<br />
- </indent>
+ </indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.50:80><br />
<indent>
DocumentRoot /www/example2-80<br />
ServerName www.example.org<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.50:8080><br />
<indent>
DocumentRoot /www/example2-8080<br />
@@ -351,9 +351,9 @@
</VirtualHost>
</example>
- </section>
+ </section>
- <section id="mixed"><title>Mixed name-based and IP-based
+ <section id="mixed"><title>Mixed name-based and IP-based
vhosts</title>
<p>On some of my addresses, I want to do name-based virtual hosts, and
@@ -363,30 +363,30 @@
<title>Server configuration</title>
Listen 80<br />
- <br />
+ <br />
NameVirtualHost 172.20.30.40<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/example1<br />
ServerName www.example.com<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/example2<br />
ServerName www.example.org<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/example3<br />
ServerName www.example3.net<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
# IP-based<br />
<VirtualHost 172.20.30.50><br />
<indent>
@@ -394,7 +394,7 @@
ServerName www.example4.edu<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.60><br />
<indent>
DocumentRoot /www/example5<br />
@@ -403,7 +403,7 @@
</VirtualHost>
</example>
- </section>
+ </section>
<section id="proxy"><title>Using <code>Virtual_host</code> and
mod_proxy together</title>
@@ -427,10 +427,10 @@
</section>
- <section id="default"><title>Using <code>_default_</code>
+ <section id="default"><title>Using <code>_default_</code>
vhosts</title>
- <section id="defaultallports"><title><code>_default_</code> vhosts
+ <section id="defaultallports"><title><code>_default_</code> vhosts
for all ports</title>
<p>Catching <em>every</em> request to any unspecified IP address and
@@ -476,7 +476,7 @@
# ...<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost _default_:*><br />
<indent>
DocumentRoot /www/default<br />
@@ -511,9 +511,9 @@
served from the main server.</p>
</section>
- </section>
+ </section>
- <section id="migrate"><title>Migrating a name-based vhost to an
+ <section id="migrate"><title>Migrating a name-based vhost to an
IP-based vhost</title>
<p>The name-based vhost with the hostname
@@ -534,9 +534,9 @@
Listen 80<br />
ServerName www.example.com<br />
DocumentRoot /www/example1<br />
- <br />
+ <br />
NameVirtualHost 172.20.30.40<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40 172.20.30.50><br />
<indent>
DocumentRoot /www/example2<br />
@@ -544,7 +544,7 @@
# ...<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/example3<br />
@@ -559,10 +559,10 @@
IP-based vhost) and through the old address (as a name-based
vhost).</p>
- </section>
+ </section>
- <section id="serverpath"><title>Using the <code>ServerPath</code>
- directive</title>
+ <section id="serverpath"><title>Using the <code>ServerPath</code>
+ directive</title>
<p>We have a server with two name-based vhosts. In order to match the
correct virtual host a client must send the correct <code>Host:</code>
@@ -577,7 +577,7 @@
<title>Server configuration</title>
NameVirtualHost 172.20.30.40<br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
# primary vhost<br />
@@ -587,7 +587,7 @@
# ...<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
DocumentRoot /www/subdomain/sub1<br />
<indent>
@@ -598,7 +598,7 @@
# ...<br />
</indent>
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost 172.20.30.40><br />
<indent>
DocumentRoot /www/subdomain/sub2<br />
@@ -629,6 +629,6 @@
<code>Host:</code> header can use both URL variants, <em>i.e.</em>,
with or without URL prefix.</p>
- </section>
+ </section>
</manualpage>
Modified: httpd/httpd/trunk/docs/manual/vhosts/fd-limits.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/fd-limits.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/fd-limits.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/fd-limits.xml Sat May 24 20:28:34 2008
@@ -54,7 +54,7 @@
below 256. (Solaris 2)</li>
</ol>
- <p>In the event of problems you can:</p>
+ <p>In the event of problems you can:</p>
<ul>
<li>Reduce the number of log files; don't specify log files
Modified: httpd/httpd/trunk/docs/manual/vhosts/ip-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/ip-based.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/ip-based.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/ip-based.xml Sat May 24 20:28:34 2008
@@ -102,7 +102,7 @@
</section>
<section id="single"><title>Setting up a single daemon
- with virtual hosts</title>
+ with virtual hosts</title>
<p>For this case, a single <program>httpd</program> will service
requests for the main server and all the virtual hosts. The <directive
@@ -125,7 +125,7 @@
ErrorLog /groups/smallco/logs/error_log<br />
TransferLog /groups/smallco/logs/access_log<br />
</VirtualHost><br />
- <br />
+ <br />
<VirtualHost www.baygroup.org><br />
ServerAdmin webmaster@mail.baygroup.org<br />
DocumentRoot /groups/baygroup/www<br />
@@ -133,7 +133,7 @@
ErrorLog /groups/baygroup/logs/error_log<br />
TransferLog /groups/baygroup/logs/access_log<br />
</VirtualHost>
- </example>
+ </example>
<p>It is recommended that you use an IP address instead of a
hostname (see <a href="../dns-caveats.html">DNS caveats</a>).</p>
Modified: httpd/httpd/trunk/docs/manual/vhosts/mass.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/mass.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/mass.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/mass.xml Sat May 24 20:28:34 2008
@@ -189,7 +189,7 @@
</section>
<section id="combinations"><title>Using Multiple Virtual
- Hosting Systems on the Same Server</title>
+ Hosting Systems on the Same Server</title>
<p>With more complicated setups, you can use Apache's normal
<code><VirtualHost></code> directives to control the
@@ -242,15 +242,15 @@
</example>
<note>
- <title>Note</title>
- <p>If the first VirtualHost block does <em>not</em> include a
- <directive module="core">ServerName</directive> directive, the reverse
- DNS of the relevant IP will be used instead.
- If this is not the server name you
- wish to use, a bogus entry (<code>ServerName
- none.example.com</code>) can be added to get around this
- behaviour.</p>
-</note>
+ <title>Note</title>
+ <p>If the first VirtualHost block does <em>not</em> include a
+ <directive module="core">ServerName</directive> directive, the reverse
+ DNS of the relevant IP will be used instead.
+ If this is not the server name you
+ wish to use, a bogus entry (<code>ServerName
+ none.example.com</code>) can be added to get around this
+ behaviour.</p>
+</note>
</section>
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml?rev=659902&r1=659901&r2=659902&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml Sat May 24 20:28:34 2008
@@ -79,12 +79,12 @@
</modulelist>
<directivelist>
- <directive module="core">DocumentRoot</directive>
- <directive module="core">NameVirtualHost</directive>
- <directive module="core">ServerAlias</directive>
- <directive module="core">ServerName</directive>
- <directive module="core">ServerPath</directive>
- <directive module="core" type="section">VirtualHost</directive>
+ <directive module="core">DocumentRoot</directive>
+ <directive module="core">NameVirtualHost</directive>
+ <directive module="core">ServerAlias</directive>
+ <directive module="core">ServerName</directive>
+ <directive module="core">ServerPath</directive>
+ <directive module="core" type="section">VirtualHost</directive>
</directivelist>
</related>
@@ -101,7 +101,7 @@
automatically make the server listen to that IP address. See
<a href="../bind.html">Setting which addresses and ports Apache uses</a>
for more details. In addition, any IP address specified here must be
- associated with a network interface on the server.</p>
+ associated with a network interface on the server.</p>
<p>The next step is to create a <directive type="section"
module="core">VirtualHost</directive> block for
@@ -109,7 +109,7 @@
<directive type="section" module="core">VirtualHost</directive> directive
must match a defined <directive
module="core">NameVirtualHost</directive> directive. (In this usual case,
- this will be "*:80"). Inside each <directive type="section"
+ this will be "*:80"). Inside each <directive type="section"
module="core">VirtualHost</directive> block, you will need at minimum a
<directive module="core">ServerName</directive> directive to designate
which host is served and a <directive module="core">DocumentRoot</directive>
@@ -205,7 +205,7 @@
the <em>main server</em> will <strong>never</strong> be used when an IP
address matches the <directive module="core">NameVirtualHost</directive>
directive. If you would like to have a special configuration for requests
- that do not match any particular virtual host, simply put that configuration
+ that do not match any particular virtual host, simply put that configuration
in a <directive type="section" module="core">VirtualHost</directive>
container and list it first in the configuration file.</p>