You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/09/23 15:36:43 UTC
svn commit: r1174747 [5/6] - in /httpd/httpd/trunk/docs/manual: ./
developer/ howto/ misc/ mod/ platform/ programs/ rewrite/ ssl/ style/lang/
vhosts/
Modified: httpd/httpd/trunk/docs/manual/platform/win_compiling.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/win_compiling.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/win_compiling.xml (original)
+++ httpd/httpd/trunk/docs/manual/platform/win_compiling.xml Fri Sep 23 13:36:39 2011
@@ -98,7 +98,7 @@
a newer or different version of the Platform SDK.</p>
<p>To use Visual C++ 6.0 or 7.0 (Studio 2000 .NET), the Platform SDK
- environment must be prepared using the <code>setenv.bat</code>
+ environment must be prepared using the <code>setenv.bat</code>
script (installed by the Platform SDK) before starting the command
line build or launching the msdev/devenv GUI environment. Installing
the Platform SDK for Visual Studio Express versions (2003 and later)
@@ -115,7 +115,7 @@
<p>Several steps recommended here require a perl interpreter during
the build preparation process, but it is otherwise not required.</p>
-
+
<p>To install Apache within the build system, several files are
modified using the <code>awk.exe</code> utility. awk was chosen since
it is a very small download (compared with Perl or WSH/VB) and
@@ -141,12 +141,12 @@
awk.exe is in your system path.</note>
<note>Also note that if you are using Cygwin tools
- (<a href="http://www.cygwin.com/">http://www.cygwin.com/</a>)
- the awk utility is named <code>gawk.exe</code> and that the file
+ (<a href="http://www.cygwin.com/">http://www.cygwin.com/</a>)
+ the awk utility is named <code>gawk.exe</code> and that the file
<code>awk.exe</code> is really a symlink to the <code>gawk.exe</code>
- file. The Windows command shell does not recognize symlinks, and
- because of this building InstallBin will fail. A workaround is
- to delete <code>awk.exe</code> from the cygwin installation and
+ file. The Windows command shell does not recognize symlinks, and
+ because of this building InstallBin will fail. A workaround is
+ to delete <code>awk.exe</code> from the cygwin installation and
copy <code>gawk.exe</code> to <code>awk.exe</code>. Also note the
cygwin/mingw ports of gawk 3.0.x were buggy, please upgrade to 3.1.x
before attempting to use any gawk port.</note>
@@ -156,9 +156,9 @@
<p>[Optional] zlib library (for <module>mod_deflate</module>)</p>
<p>Zlib must be installed into a <code>srclib</code> subdirectory named
- <code>zlib</code>. This must be built in-place. Zlib can be obtained
+ <code>zlib</code>. This must be built in-place. Zlib can be obtained
from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
- <module>mod_deflate</module> is confirmed to work correctly with
+ <module>mod_deflate</module> is confirmed to work correctly with
version 1.2.3.</p>
<example>
@@ -177,23 +177,23 @@
software. BEFORE using any encryption software, please check your
country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see
- if this is permitted. See
+ if this is permitted. See
<a href="http://www.wassenaar.org/">http://www.wassenaar.org/</a>
for more information.</note>
<p>Configuring and building OpenSSL requires perl to be installed.</p>
- <p>OpenSSL must be installed into a <code>srclib</code> subdirectory
- named <code>openssl</code>, obtained from
+ <p>OpenSSL must be installed into a <code>srclib</code> subdirectory
+ named <code>openssl</code>, obtained from
<a href="http://www.openssl.org/source/"
- >http://www.openssl.org/source/</a>, in order to compile
+ >http://www.openssl.org/source/</a>, in order to compile
<module>mod_ssl</module> or the <code>abs.exe</code> project, which
- is ab.c with SSL support enabled. To prepare OpenSSL to be linked
+ is ab.c with SSL support enabled. To prepare OpenSSL to be linked
to Apache mod_ssl or abs.exe, and disable patent encumbered features
in OpenSSL, you might use the following build commands:</p>
<example>
- perl Configure no-rc5 no-idea enable-mdc2 enable-zlib VC-WIN32
+ perl Configure no-rc5 no-idea enable-mdc2 enable-zlib VC-WIN32
-Ipath/to/srclib/zlib -Lpath/to/srclib/zlib<br />
ms\do_masm.bat<br />
nmake -f ms\ntdll.mak
@@ -204,7 +204,7 @@
load the zlib dll. Note the suggested patch enables the -L flag to
work with windows builds, corrects the name of zdll.lib and ensures
.pdb files are generated for troubleshooting. If the assembler is
- not installed, you would add no-asm above and use ms\do_ms.bat
+ not installed, you would add no-asm above and use ms\do_ms.bat
instead of the ms\do_masm.bat script.</note>
</li>
@@ -267,7 +267,7 @@
step the code to find bugs and track down problems.</p>
<p>You can add your apr-util dbd and dbm provider choices with the
- additional make (environment) variables DBD_LIST and DBM_LIST,
+ additional make (environment) variables DBD_LIST and DBM_LIST,
see the comments about [Optional] Database libraries, above.
Review the initial comments in Makefile.win for additional options
that can be provided when invoking the build.</p>
@@ -319,7 +319,7 @@
<p>Visual Studio 2002 (.NET) and later users should also use the Build
menu, Configuration Manager dialog to uncheck both the <code>Debug</code>
- and <code>Release</code> Solution modules <code>abs</code>,
+ and <code>Release</code> Solution modules <code>abs</code>,
<module>mod_deflate</module> and <module>mod_ssl</module> components, as
well as every component starting with <code>apr_db*</code>. These modules
are built by invoking <code>nmake</code>, or the IDE directly with the
@@ -340,8 +340,8 @@
<module>mod_deflate</module>. The .mak files also support a broader
range of C++ tool chain distributions, such as Visual Studio Express.</p>
- <p>You must first build all projects in order to create all dynamic
- auto-generated targets, so that dependencies can be parsed correctly.
+ <p>You must first build all projects in order to create all dynamic
+ auto-generated targets, so that dependencies can be parsed correctly.
Build the entire project from within the Visual Studio 6.0 (98) IDE,
using the <code>BuildAll</code> target, then use the Project Menu Export
for all makefiles (checking on "with dependencies".) Run the following
@@ -364,7 +364,7 @@
a <code>sysincl.dat</code> file, which lists all exceptions. Update
this file (including both forward and backslashed paths, such as both
<code>sys/time.h</code> and <code>sys\time.h</code>) to ignore such
- newer dependencies. Including local-install paths in a distributed
+ newer dependencies. Including local-install paths in a distributed
<code>.mak</code> file will cause the build to fail completely.</p>
<p>If you contribute back a patch that revises project files, we
Modified: httpd/httpd/trunk/docs/manual/platform/windows.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/platform/windows.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/platform/windows.xml (original)
+++ httpd/httpd/trunk/docs/manual/platform/windows.xml Fri Sep 23 13:36:39 2011
@@ -29,7 +29,7 @@
<p>This document explains how to install, configure and run
Apache 2.3 under Microsoft Windows. If you have questions after
reviewing the documentation (and any event and error logs), you
- should consult the peer-supported
+ should consult the peer-supported
<a href="http://httpd.apache.org/userslist.html">users' mailing
list</a>.</p>
@@ -71,7 +71,7 @@
<p>There is a choice between an *-openssl-*.msi flavor and
a *-no_ssl.msi flavor. The *-openssl-*.msi flavor is distributed
- by the Apache Software Foundation under ECCN 5D002 pursuant to
+ by the Apache Software Foundation under ECCN 5D002 pursuant to
US Export Law license exception TSU. This law may or may not
apply to your circumstance, please review the httpd README as
well as the <a href="http://www.apache.org/licenses/exports/">ASF
@@ -132,7 +132,7 @@
<li><p><strong>Where to install.</strong> The default path is
<code>C:\Program Files\Apache Software Foundation</code>
- under which a directory called
+ under which a directory called
<code>Apache2.3</code> will be created by default.</p></li>
</ol>
@@ -182,7 +182,7 @@
<p>The installation options above can be customized by users familiar
with msiexec.exe options and silent installation. The actual installer
- sources are available in the httpd/httpd/win32-msi/ tree of the httpd
+ sources are available in the httpd/httpd/win32-msi/ tree of the httpd
project subversion respository. For reference, some of the more common
variables which may be modified are;</p>
@@ -204,7 +204,7 @@
<li><code>SetupType</code> (default "Typical")</li>
</ul>
- <p>The installation level of various features, which may be individually
+ <p>The installation level of various features, which may be individually
toggled, include;</p>
<ul>
@@ -265,7 +265,7 @@
<li><p>The directives that accept filenames as arguments must use
Windows filenames instead of Unix ones. However, because Apache
may interpret backslashes as an "escape character" sequence, you
- should consistently use forward slashes in path names, not
+ should consistently use forward slashes in path names, not
backslashes. Drive letters can be used; if omitted, the drive
of the SystemRoot directive (or -d command line option) becomes
the default.</p></li>
Modified: httpd/httpd/trunk/docs/manual/programs/apachectl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/apachectl.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apachectl.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/apachectl.xml Fri Sep 23 13:36:39 2011
@@ -127,9 +127,9 @@ restart to make sure Apache doesn't die.
<dt><code>graceful-stop</code></dt>
-<dd>Gracefully stops the Apache <program>httpd</program> daemon.
-This differs from a normal stop in that currently open connections are not
-aborted. A side effect is that old log files will not be closed immediately.
+<dd>Gracefully stops the Apache <program>httpd</program> daemon.
+This differs from a normal stop in that currently open connections are not
+aborted. A side effect is that old log files will not be closed immediately.
This is equivalent to <code>apachectl -k graceful-stop</code>.</dd>
<dt><code>configtest</code></dt>
Modified: httpd/httpd/trunk/docs/manual/programs/apxs.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/apxs.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/apxs.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/apxs.xml Fri Sep 23 13:36:39 2011
@@ -132,12 +132,12 @@
<section id="options.query"><title>Query Options</title>
<dl>
<dt><code>-q</code></dt>
- <dd>Performs a query for variables and environment settings used to
- build <code>httpd</code>. When invoked without <var>query</var> parameters,
- it prints all known variables and their values. The optional <code>-v</code>
+ <dd>Performs a query for variables and environment settings used to
+ build <code>httpd</code>. When invoked without <var>query</var> parameters,
+ it prints all known variables and their values. The optional <code>-v</code>
parameter formats the list output.
- <p>Use this to manually determine settings used to build the
+ <p>Use this to manually determine settings used to build the
<code>httpd</code> that will load your module. For instance use</p>
<example>
INC=-I`apxs -q INCLUDEDIR`
Modified: httpd/httpd/trunk/docs/manual/programs/configure.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/configure.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml Fri Sep 23 13:36:39 2011
@@ -331,7 +331,7 @@
<dl>
<dt><code>--with-mpm=MPM</code></dt>
<dd>
- <p>Choose the default MPM for your server. If MPMs are built as DSO
+ <p>Choose the default MPM for your server. If MPMs are built as DSO
modules (see <code>--enable-mpms-shared</code>), this directive
selects the MPM which will be loaded in the default configuration
file. Otherwise, this directive selects the only available MPM,
Modified: httpd/httpd/trunk/docs/manual/programs/dbmmanage.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/dbmmanage.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/dbmmanage.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/dbmmanage.xml Fri Sep 23 13:36:39 2011
@@ -110,27 +110,27 @@
<dt><code>add</code></dt>
<dd>Adds an entry for <var>username</var> to <var>filename</var> using the
encrypted password <var>encpasswd</var>.
-
+
<example>dbmmanage passwords.dat add rbowen foKntnEF3KSXA</example>
</dd>
<dt><code>adduser</code></dt>
<dd>Asks for a password and then adds an entry for <var>username</var> to
<var>filename</var>.
-
+
<example>dbmmanage passwords.dat adduser krietz</example>
</dd>
<dt><code>check</code></dt>
<dd>Asks for a password and then checks if <var>username</var> is in
<var>filename</var> and if it's password matches the specified one.
-
+
<example>dbmmanage passwords.dat check rbowen</example>
</dd>
<dt><code>delete</code></dt>
<dd>Deletes the <var>username</var> entry from <var>filename</var>.
-
+
<example>dbmmanage passwords.dat delete rbowen</example>
</dd>
@@ -142,14 +142,14 @@
<dt><code>update</code></dt>
<dd>Same as the <code>adduser</code> command, except that it makes
sure <var>username</var> already exists in <var>filename</var>.
-
+
<example>dbmmanage passwords.dat update rbowen</example>
</dd>
<dt><code>view</code></dt>
<dd>Just displays the contents of the DBM file. If you specify a
<var>username</var>, it displays the particular record only.
-
+
<example>dbmmanage passwords.dat view</example>
</dd>
</dl>
Modified: httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/htcacheclean.xml Fri Sep 23 13:36:39 2011
@@ -49,7 +49,7 @@
-<strong>p</strong><var>path</var>
[-<strong>l</strong><var>limit</var>|
-<strong>L</strong><var>limit</var>]</code></p>
-
+
<p><code><strong>htcacheclean</strong>
[ -<strong>n</strong> ]
[ -<strong>t</strong> ]
@@ -113,7 +113,7 @@
removed, however with some configurations the large number of
directories created may require attention. If your configuration
requires a very large number of directories, to the point that
- inode or file allocation table exhaustion may become an issue, use
+ inode or file allocation table exhaustion may become an issue, use
of this option is advised.</dd>
<dt><code>-p<var>path</var></code></dt>
Modified: httpd/httpd/trunk/docs/manual/programs/htpasswd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htpasswd.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htpasswd.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/htpasswd.xml Fri Sep 23 13:36:39 2011
@@ -65,7 +65,7 @@ distribution.</seealso>
[ -<strong>m</strong> |
-<strong>d</strong> |
-<strong>p</strong> |
- -<strong>s</strong> ]
+ -<strong>s</strong> ]
[ -<strong>D</strong> ] <var>passwdfile</var> <var>username</var>
<var>password</var></code></p>
@@ -122,7 +122,7 @@ distribution.</seealso>
<dt><code>-D</code></dt>
<dd>Delete user. If the username exists in the specified htpasswd file, it
will be deleted.</dd>
-
+
<dt><code><var>passwdfile</var></code></dt>
<dd>Name of the file to contain the user name and password. If
<code>-c</code> is given, this file is created if it does not already exist,
Modified: httpd/httpd/trunk/docs/manual/programs/httpd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/httpd.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httpd.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/httpd.xml Fri Sep 23 13:36:39 2011
@@ -51,7 +51,7 @@
[ -<strong>C</strong> <var>directive</var> ] [ -<strong>c</strong>
<var>directive</var> ] [ -<strong>D</strong> <var>parameter</var> ]
[ -<strong>e</strong> <var>level</var> ] [ -<strong>E</strong>
- <var>file</var> ]
+ <var>file</var> ]
[ <strong>-k</strong> start|restart|graceful|stop|graceful-stop ]
[ -<strong>R</strong> <var>directory</var> ] [ -<strong>h</strong> ]
[ -<strong>l</strong> ] [ -<strong>L</strong> ] [ -<strong>S</strong> ]
@@ -192,7 +192,7 @@ the Apache service; and uninstall the Ap
<dt><code>-w</code></dt>
-<dd>Keep the console window open on error so that the error message can
+<dd>Keep the console window open on error so that the error message can
be read.</dd>
</dl>
Modified: httpd/httpd/trunk/docs/manual/programs/httxt2dbm.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/httxt2dbm.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httxt2dbm.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/httxt2dbm.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
<p><code>httxt2dbm</code> is used to generate dbm files from text input, for
- use in <directive module="mod_rewrite">RewriteMap</directive> with the
+ use in <directive module="mod_rewrite">RewriteMap</directive> with the
<code>dbm</code> map type.
</p>
</summary>
Modified: httpd/httpd/trunk/docs/manual/programs/logresolve.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/logresolve.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/logresolve.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/logresolve.xml Fri Sep 23 13:36:39 2011
@@ -23,7 +23,7 @@
<manualpage metafile="logresolve.xml.meta">
<parentdocument href="./">Programs</parentdocument>
- <title>logresolve - Resolve IP-addresses to hostnames in Apache
+ <title>logresolve - Resolve IP-addresses to hostnames in Apache
log files</title>
<summary>
Modified: httpd/httpd/trunk/docs/manual/programs/other.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/other.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/other.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/other.xml Fri Sep 23 13:36:39 2011
@@ -52,9 +52,9 @@
combined_plus_vhost<br />
CustomLog logs/access_log combined_plus_vhost
</example>
-
+
<p>Log files will be created, in the directory where are running the
- script, for each virtual host name that appears in the combined log file.
+ script, for each virtual host name that appears in the combined log file.
These logfiles will named after the hostname, with a
<code>.log</code> file extension.</p>
Modified: httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/rotatelogs.xml Fri Sep 23 13:36:39 2011
@@ -41,7 +41,7 @@
[ -<strong>v</strong> ]
[ -<strong>e</strong> ]
<var>logfile</var>
- <var>rotationtime</var>|<var>filesize</var>(B|K|M|G)
+ <var>rotationtime</var>|<var>filesize</var>(B|K|M|G)
[ <var>offset</var> ]</code></p>
</section>
@@ -51,13 +51,13 @@
<dt><code>-l</code></dt>
<dd>Causes the use of local time rather than GMT as the base for the
-interval or for <code>strftime(3)</code> formatting with size-based
+interval or for <code>strftime(3)</code> formatting with size-based
rotation.</dd>
<dt><code>-L</code> <var>linkname</var></dt>
<dd>Causes a hard link to be made from the current logfile
to the specified link name. This can be used to watch
-the log continuously across rotations using a command like
+the log continuously across rotations using a command like
<code>tail -F linkname</code>.</dd>
<dt><code>-p</code> <var>program</var></dt>
@@ -114,7 +114,7 @@ period (midnight).</p>
be sure the log file format has enough granularity to produce
a different file name each time the logs are rotated. Otherwise
rotation will overwrite the same file instead of starting a new
-one. For example, if <var>logfile</var> was
+one. For example, if <var>logfile</var> was
<code>/var/logs/errorlog.%Y-%m-%d</code> with log rotation at 5
megabytes, but 5 megabytes was reached twice in the same day, the
same log file name would be produced and log rotation would keep
@@ -186,7 +186,7 @@ an offset.</dd>
reaches a size of 5 megabytes, and the suffix to the logfile name
will be created of the form
<code>errorlog.YYYY-mm-dd-HH_MM_SS</code>.</p>
-
+
<example>
CustomLog "|bin/rotatelogs -t /var/logs/logfile 86400" common
</example>
@@ -219,11 +219,11 @@ extensions.</p>
<tr><td><code>%m</code></td><td>2-digit month</td></tr>
<tr><td><code>%p</code></td><td>am/pm of 12 hour clock (localized)</td></tr>
<tr><td><code>%S</code></td><td>2-digit second</td></tr>
-<tr><td><code>%U</code></td><td>2-digit week of year
+<tr><td><code>%U</code></td><td>2-digit week of year
(Sunday first day of week)</td></tr>
-<tr><td><code>%W</code></td><td>2-digit week of year
+<tr><td><code>%W</code></td><td>2-digit week of year
(Monday first day of week)</td></tr>
-<tr><td><code>%w</code></td><td>1-digit weekday
+<tr><td><code>%w</code></td><td>1-digit weekday
(Sunday first day of week)</td></tr>
<tr><td><code>%X</code></td><td>time (localized)</td></tr>
<tr><td><code>%x</code></td><td>date (localized)</td></tr>
Modified: httpd/httpd/trunk/docs/manual/rewrite/access.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/access.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/access.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/access.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
how you can use <module>mod_rewrite</module> to control access to
various resources, and other related techniques.
@@ -306,4 +306,4 @@ http://badguys.example.com/bad/index3.ht
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/advanced.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/advanced.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/advanced.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/advanced.xml Fri Sep 23 13:36:39 2011
@@ -27,8 +27,8 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
-<a href="../mod/mod_rewrite.html">reference documentation</a>. It provides
+<p>This document supplements the <module>mod_rewrite</module>
+<a href="../mod/mod_rewrite.html">reference documentation</a>. It provides
a few advanced techniques using mod_rewrite.</p>
<note type="warning">Note that many of these examples won't work unchanged in your
@@ -55,8 +55,8 @@ configuration.</note>
<dt>Description:</dt>
<dd>
- <p>A common technique for distributing the burden of
- server load or storage space is called "sharding".
+ <p>A common technique for distributing the burden of
+ server load or storage space is called "sharding".
When using this method, a front-end server will use the
url to consistently "shard" users or objects to separate
backend servers.</p>
@@ -140,7 +140,7 @@ RewriteRule ^(.+)\.html$ /regen
the CGI program <code>/regenerate_page.cgi</code>, which generates
the requested resource and saves it into the document directory, so
that the next time it is requested, a static copy can be served.</p>
-
+
<p>In this way, documents that are infrequently updated can be served in
static form. if documents need to be refreshed, they can be deleted
from the document directory, and they will then be regenerated the
@@ -413,7 +413,7 @@ RewriteRule ^/~(<strong>([a-z])</stron
</dd>
<dt>Discussion:</dt>
- <dd>This technique will of course also work with other
+ <dd>This technique will of course also work with other
special characters that mod_rewrite, by default, URL-encodes.</dd>
</dl>
@@ -506,4 +506,4 @@ RewriteCond %{ENV:rewritten} =1
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/avoid.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/avoid.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/avoid.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/avoid.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
perhaps one of the most important concepts about mod_rewrite - namely,
when to avoid using it.</p>
@@ -235,5 +235,5 @@ use in <If> sections, and in certa
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.xml Fri Sep 23 13:36:39 2011
@@ -54,7 +54,7 @@ RewriteRule pattern target [Flag1,Flag2,
a longer form, such as <code>cookie</code>. Some flags take one or more
arguments. Flags are not case sensitive.</p>
-<p>Each flag (with a few exceptions)
+<p>Each flag (with a few exceptions)
has a long and short form. While it is most common to use
the short form, it is recommended that you familiarize yourself with the
long form, so that you remember what each flag is supposed to do.</p>
@@ -277,7 +277,7 @@ redirects.</p>
<section id="flag_f"><title>F|forbidden</title>
<p>Using the [F] flag causes the server to return a 403 Forbidden status
code to the client. While the same behavior can be accomplished using
-the <directive module="mod_access">Deny</directive> directive, this
+the <directive module="mod_access">Deny</directive> directive, this
allows more flexibility in assigning a Forbidden status.</p>
<p>The following rule will forbid <code>.exe</code> files from being
@@ -353,13 +353,13 @@ immediately without considering further
<p>If you are using <directive
module="mod_rewrite">RewriteRule</directive> in either
-<code>.htaccess</code> files or in
+<code>.htaccess</code> files or in
<directive type="section" module="core">Directory</directive> sections,
it is important to have some understanding of how the rules are
processed. The simplified form of this is that once the rules have been
processed, the rewritten request is handed back to the URL parsing
engine to do what it may with it. It is possible that as the rewritten
-request is handled, the <code>.htaccess</code> file or
+request is handled, the <code>.htaccess</code> file or
<directive type="section" module="core">Directory</directive> section
may be encountered again, and thus the ruleset may be run again from the
start. Most commonly this will happen if one of the rules causes a
@@ -381,7 +381,7 @@ redirects.</p>
<p>The example given here will rewrite any request to
<code>index.php</code>, giving the original request as a query string
argument to <code>index.php</code>, however, the <directive
-module="mod_rewrite">RewriteCond</directive> ensures that if the request
+module="mod_rewrite">RewriteCond</directive> ensures that if the request
is already for <code>index.php</code>, the <directive
module="mod_rewrite">RewriteRule</directive> will be skipped.</p>
@@ -463,7 +463,7 @@ On subrequests, it is not always useful,
the complete set of rules are applied. Use this flag to exclude
problematic rules.</p>
-<p>To decide whether or not to use this rule: if you prefix URLs with
+<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 will run into problems (or significant overhead)
on sub-requests. In these cases, use this flag.</p>
@@ -513,17 +513,17 @@ use of the [PT] flag causes the result o
module="mod_rewrite">RewriteRule</directive> to be passed back through
URL mapping, so that location-based mappings, such as <directive
module="mod_alias">Alias</directive>, <directive
-module="core">Redirect</directive>, or <directive
-module="mod_alias">ScriptAlias</directive>, for example, might have a
+module="core">Redirect</directive>, or <directive
+module="mod_alias">ScriptAlias</directive>, for example, might have a
chance to take effect.
</p>
<p>
-If, for example, you have an
+If, for example, you have an
<directive module="mod_alias">Alias</directive>
for /icons, and have a <directive
module="mod_rewrite">RewriteRule</directive> pointing there, you should
-use the [PT] flag to ensure that the
+use the [PT] flag to ensure that the
<directive module="mod_alias">Alias</directive> is evaluated.
</p>
@@ -605,8 +605,8 @@ will be used to generate the URL sent wi
</p>
<p>
-<em>Any</em> valid HTTP response status code may be specified,
-using the syntax [R=305], with a 302 status code being used by
+<em>Any</em> valid HTTP response status code may be specified,
+using the syntax [R=305], with a 302 status code being used by
default if none is specified. The status code specified need not
necessarily be a redirect (3xx) status code.
</p>
@@ -616,7 +616,7 @@ substitution string is dropped entirely,
the <code>L</code> were used.</p>
<p>In addition to response status codes, you may also specify redirect
-status using their symbolic names: <code>temp</code> (default),
+status using their symbolic names: <code>temp</code> (default),
<code>permanent</code>, or <code>seeother</code>.</p>
<p>
@@ -652,9 +652,9 @@ module="mod_rewrite">RewriteCond</direct
<directive module="mod_rewrite">RewriteRule</directive> immediately
following it. Thus, if you want to make a <code>RewriteCond</code> apply
to several <code>RewriteRule</code>s, one possible technique is to
-negate those conditions and use a [Skip] flag. So, you can
-use this to make pseudo if-then-else constructs: The last rule of
-the then-clause becomes <code>skip=N</code>, where N is the
+negate those conditions and use a [Skip] flag. So, you can
+use this to make pseudo if-then-else constructs: The last rule of
+the then-clause becomes <code>skip=N</code>, where N is the
number of rules in the else-clause.</p>
</section>
@@ -688,10 +688,10 @@ invariably be a less efficient solution
<p>
If used in per-directory context, use only <code>-</code> (dash)
-as the substitution <em>for the entire round of mod_rewrite processing</em>,
-otherwise the MIME-type set with this flag is lost due to an internal
+as the substitution <em>for the entire round of mod_rewrite processing</em>,
+otherwise the MIME-type set with this flag is lost due to an internal
re-processing (including subsequent rounds of mod_rewrite processing).
-The <code>L</code> flag can be useful in this context to end the
+The <code>L</code> flag can be useful in this context to end the
<em>current</em> round of mod_rewrite processing.</p>
</section>
Modified: httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
the way that the rules change when you use mod_rewrite in .htaccess files,
and how to deal with these changes.</p>
@@ -43,4 +43,4 @@ and how to deal with these changes.</p>
<seealso><a href="advanced.html">Advanced techniques</a></seealso>
<seealso><a href="avoid.html">When not to use mod_rewrite</a></seealso>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/index.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/index.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/index.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/index.xml Fri Sep 23 13:36:39 2011
@@ -28,7 +28,7 @@
<summary>
<p><module>mod_rewrite</module> provides a way to modify incoming
- URL requests, dynamically, based on <a href="intro.html#regex">regular
+ URL requests, dynamically, based on <a href="intro.html#regex">regular
expression</a> rules. This allows you to map arbitrary URLs onto
your internal URL structure in any way you like.</p>
Modified: httpd/httpd/trunk/docs/manual/rewrite/intro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/intro.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/intro.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/intro.xml Fri Sep 23 13:36:39 2011
@@ -107,7 +107,7 @@ well as write your own.</p>
character</td><td><code>c.t</code> will match <code>cat</code>,
<code>cot</code>, <code>cut</code>, etc.</td></tr>
<tr><td><code>+</code></td><td>Repeats the previous match one or more
-times</td><td><code>a+</code> matches <code>a</code>, <code>aa</code>,
+times</td><td><code>a+</code> matches <code>a</code>, <code>aa</code>,
<code>aaa</code>, etc</td></tr>
<tr><td><code>*</code></td><td>Repeats the previous match zero or more
times.</td><td><code>a*</code> matches all the same things
@@ -122,7 +122,7 @@ of the string</td><td><code>^a</code> ma
the string.</td><td><code>a$</code> matches a string that ends with
<code>a</code>.</td></tr>
<tr><td><code>( )</code></td><td>Groups several characters into a single
-unit, and captures a match for use in a backreference.</td><td><code>(ab)+</code>
+unit, and captures a match for use in a backreference.</td><td><code>(ab)+</code>
matches <code>ababab</code> - that is, the <code>+</code> applies to the group.
For more on backreferences see <a href="#InternalBackRefs">below</a>.</td></tr>
<tr><td><code>[ ]</code></td><td>A character class - matches one of the
@@ -151,7 +151,7 @@ the expression.</p>
RewriteRule, RewriteCond matching.</p>
<p class="figure">
- <img src="../images/rewrite_rule_flow.png"
+ <img src="../images/rewrite_rule_flow.png"
alt="Flow of RewriteRule and RewriteCond matching" /><br />
<dfn>Figure 1:</dfn> The back-reference flow through a rule.
</p>
@@ -174,7 +174,7 @@ expression</a> matched against the URL-P
the beginning of a query string).</p>
<p class="figure">
- <img src="../images/syntax_rewriterule.png"
+ <img src="../images/syntax_rewriterule.png"
alt="Syntax of the RewriteRule directive" /><br />
<dfn>Figure 2:</dfn> Syntax of the RewriteRule directive.
</p>
@@ -260,7 +260,7 @@ expression</a> that must match the varia
argument is a list of flags that modify how the match is evaluated.</p>
<p class="figure">
- <img src="../images/syntax_rewritecond.png"
+ <img src="../images/syntax_rewritecond.png"
alt="Syntax of the RewriteCond directive" /><br />
<dfn>Figure 3:</dfn> Syntax of the RewriteCond directive
</p>
Modified: httpd/httpd/trunk/docs/manual/rewrite/proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/proxy.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/proxy.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
how to use the RewriteRule's [P] flag to proxy content to another server.
A number of recipes are provided that describe common scenarios.</p>
@@ -91,7 +91,7 @@ ProxyPassReverse / http://old.example.co
module="mod_proxy">ProxyPassReverse</directive> directive to ensure
that any redirects issued by the backend are correctly passed on to
the client.</p>
-
+
<p>Consider using either <directive
module="mod_proxy">ProxyPass</directive> or <directive
module="mod_rewrite">ProxyPassMatch</directive> whenever possible in
@@ -101,4 +101,4 @@ ProxyPassReverse / http://old.example.co
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/remapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/remapping.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/remapping.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/remapping.xml Fri Sep 23 13:36:39 2011
@@ -27,7 +27,7 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
how you can use <module>mod_rewrite</module> to redirect and remap
request. This includes many examples of common uses of mod_rewrite,
@@ -296,7 +296,7 @@ hostname(s).</p>
</VirtualHost>
</example>
-<p>You can alternatively accomplish this using the
+<p>You can alternatively accomplish this using the
<directive module="core" type="section">If</directive>
directive:</p>
@@ -320,7 +320,7 @@ Redirect /admin/ https://www.example.com
</example>
<p>If, for whatever reason, you still want to use <code>mod_rewrite</code>
-- if, for example, you need this to work with a larger set of RewriteRules -
+- if, for example, you need this to work with a larger set of RewriteRules -
you might use one of the recipes below.</p>
<p>For sites running on a port other than 80:</p>
@@ -444,8 +444,8 @@ com http://www.example.com/<br />
<dt>Discussion</dt>
<dd>
- <note type="warning">This ruleset relies on
- <directive module="core">HostNameLookups</directive>
+ <note type="warning">This ruleset relies on
+ <directive module="core">HostNameLookups</directive>
being set <code>on</code>, which can be
a significant performance hit.</note>
@@ -564,7 +564,7 @@ using the following ruleset:</p>
<p>We redirect the URL <code>/</code> to
<code>/about/</code>:
</p>
-
+
<example>
RewriteEngine on<br />
RewriteRule <strong>^/$</strong> /about/ [<strong>R</strong>]
@@ -579,9 +579,9 @@ RedirectMatch ^/$ http://example.com/abo
<p>Note also that the example rewrites only the root URL. That is, it
rewrites a request for <code>http://example.com/</code>, but not a
-request for <code>http://example.com/page.html</code>. If you have in
-fact changed your document root - that is, if <strong>all</strong> of
-your content is in fact in that subdirectory, it is greatly preferable
+request for <code>http://example.com/page.html</code>. If you have in
+fact changed your document root - that is, if <strong>all</strong> of
+your content is in fact in that subdirectory, it is greatly preferable
to simply change your <directive module="core">DocumentRoot</directive>
directive, or move all of the content up one directory,
rather than rewriting URLs.</p>
@@ -644,4 +644,4 @@ file, as well as in a <Directory>
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/rewritemap.xml Fri Sep 23 13:36:39 2011
@@ -23,7 +23,7 @@
<title>Using RewriteMap</title>
<summary>
- <p>This document supplements the <module>mod_rewrite</module>
+ <p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
the use of the <directive module="mod_rewrite">RewriteMap</directive> directive,
and provides examples of each of the various <code>RewriteMap</code> types.</p>
@@ -63,7 +63,7 @@ configuration.</note>
<example>
RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
</example>
-
+
<p>The <a id="mapfunc" name="mapfunc"><em>MapName</em></a> is an
arbitray name that you assign to the map, and which you will use in
directives later on. Arguments are passed to the map via the
@@ -298,9 +298,9 @@ by many requests.
<title>int: Internal Function</title>
<p>When a MapType of <code>int</code> is used, the MapSource is one
- of the available internal RewriteMap functions. Module authors can provide
+ of the available internal RewriteMap functions. Module authors can provide
additional internal functions by registering them with the
- <code>ap_register_rewrite_mapfunc</code> API.
+ <code>ap_register_rewrite_mapfunc</code> API.
The functions that are provided by default are:
</p>
@@ -435,7 +435,7 @@ RewriteMap myquery "fastdbd:SELECT desti
once. For each mapping-function use one
<directive>RewriteMap</directive> directive to declare its rewriting
mapfile.</p>
-
+
<p>While you cannot <strong>declare</strong> a map in
per-directory context (<code>.htaccess</code> files or
<Directory> blocks) it is possible to
Modified: httpd/httpd/trunk/docs/manual/rewrite/tech.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/tech.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/tech.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/tech.xml Fri Sep 23 13:36:39 2011
@@ -100,7 +100,7 @@ and URL matching.</p>
the <code>RewriteBase</code> directive below for the
trick to achieve this) and then initiates a new internal
sub-request with the new URL. This restarts processing of
- the API phases.
+ the API phases.
<p>Again mod_rewrite tries hard to make this complicated
step totally transparent to the user, but you should
@@ -117,7 +117,7 @@ and URL matching.</p>
</section>
<section id="InternalRuleset"><title>Ruleset Processing</title>
-
+
<p>Now when mod_rewrite is triggered in these two API phases, it
reads the configured rulesets from its configuration
structure (which itself was either created on startup for
Modified: httpd/httpd/trunk/docs/manual/rewrite/vhosts.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/vhosts.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/vhosts.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/vhosts.xml Fri Sep 23 13:36:39 2011
@@ -27,9 +27,9 @@
<summary>
-<p>This document supplements the <module>mod_rewrite</module>
+<p>This document supplements the <module>mod_rewrite</module>
<a href="../mod/mod_rewrite.html">reference documentation</a>. It describes
-how you can use <module>mod_rewrite</module> to create dynamically
+how you can use <module>mod_rewrite</module> to create dynamically
configured virtual hosts.</p>
<note type="warning">mod_rewrite is not the best way to configure
@@ -83,9 +83,9 @@ RewriteRule ^(.*) /home/<strong>%1</st
<dt>Discussion</dt>
<dd>
- <note type="warning">You will need to take care of the DNS
+ <note type="warning">You will need to take care of the DNS
resolution - Apache does
- not handle name resolution. You'll need either to create CNAME
+ not handle name resolution. You'll need either to create CNAME
records for each hostname, or a DNS wildcard record. Creating DNS
records is beyond the scope of this document.</note>
@@ -105,7 +105,7 @@ As with many techniques discussed in thi
isn't the best way to accomplish this task. You should, instead,
consider using <module>mod_vhost_alias</module> instead, as it will much
more gracefully handle anything beyond serving static files, such as any
-dynamic content, and Alias resolution.
+dynamic content, and Alias resolution.
</p>
</dd>
</dl>
@@ -208,4 +208,4 @@ RewriteRule ^/(.*)$
</section>
-</manualpage>
+</manualpage>
Modified: httpd/httpd/trunk/docs/manual/sections.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml Fri Sep 23 13:36:39 2011
@@ -156,7 +156,7 @@ counterparts, apply directives to
parts of the filesystem. Directives enclosed in a <directive
type="section" module="core">Directory</directive> section apply to
the named filesystem directory and all subdirectories of that
-directory (as well as the files in those directories).
+directory (as well as the files in those directories).
The same effect can be obtained using <a
href="howto/htaccess.html">.htaccess files</a>. For example, in the
following configuration, directory indexes will be enabled for the
@@ -259,7 +259,7 @@ directives:</p>
ProxyPass /special-area http://special.example.com smax=5 max=10<br />
ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On
</example>
-</section>
+</section>
<section id="wildcards"><title>Wildcards and Regular Expressions</title>
@@ -417,7 +417,7 @@ Deny from all<br />
<p>To find out what directives are allowed in what types of
configuration sections, check the <a
href="mod/directive-dict.html#Context">Context</a> of the directive.
-Everything that is allowed in
+Everything that is allowed in
<directive type="section" module="core">Directory</directive>
sections is also syntactically allowed in
<directive type="section" module="core">DirectoryMatch</directive>,
Modified: httpd/httpd/trunk/docs/manual/ssl/ssl_compat.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/ssl/ssl_compat.xml?rev=1174747&r1=1174746&r2=1174747&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/ssl/ssl_compat.xml (original)
+++ httpd/httpd/trunk/docs/manual/ssl/ssl_compat.xml Fri Sep 23 13:36:39 2011
@@ -76,10 +76,10 @@ doesn't provide.</p>
<tr><td><code>SSLLogFile</code> <em>file</em></td><td><code>SSLLog</code> <em>file</em></td><td>compactified</td></tr>
<tr><td><code>SSLRequiredCiphers</code> <em>spec</em></td><td><code>SSLCipherSuite</code> <em>spec</em></td><td>renamed</td></tr>
-<tr><td><code>SSLRequireCipher</code> <em>c1</em> ...</td><td><code>SSLRequire %{SSL_CIPHER} in {"</code><em>c1</em><code>",
+<tr><td><code>SSLRequireCipher</code> <em>c1</em> ...</td><td><code>SSLRequire %{SSL_CIPHER} in {"</code><em>c1</em><code>",
...}</code></td><td>generalized</td></tr>
-<tr><td><code>SSLBanCipher</code> <em>c1</em> ...</td><td><code>SSLRequire not (%{SSL_CIPHER} in {"</code><em>c1</em><code>",
+<tr><td><code>SSLBanCipher</code> <em>c1</em> ...</td><td><code>SSLRequire not (%{SSL_CIPHER} in {"</code><em>c1</em><code>",
...})</code></td><td>generalized</td></tr>
<tr><td><code>SSLFakeBasicAuth</code></td><td><code>SSLOptions +FakeBasicAuth</code></td><td>merged</td></tr>
<tr><td><code>SSLCacheServerPath</code> <em>dir</em></td><td>-</td><td>functionality removed</td></tr>
@@ -135,7 +135,7 @@ doesn't provide.</p>
</section>
</section>
-<section id="variables"><title>Environment Variables</title>
+<section id="variables"><title>Environment Variables</title>
<p>The mapping between environment variable names used by the older
SSL solutions and the names used by mod_ssl is given in <a