You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2008/03/12 17:25:27 UTC
svn commit: r636404 - in /httpd/httpd/branches/2.2.x/docs/manual:
mod/mod_rewrite.html.en mod/mod_rewrite.xml rewrite/rewrite_intro.html.en
rewrite/rewrite_intro.xml
Author: slive
Date: Wed Mar 12 09:25:21 2008
New Revision: 636404
URL: http://svn.apache.org/viewvc?rev=636404&view=rev
Log:
Merge r636398 from trunk:
Make the RewriteRule docs shorter (!) by referencing the regex docs in the
rewrite intro.
Modified:
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml
httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en
httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en?rev=636404&r1=636403&r2=636404&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en Wed Mar 12 09:25:21 2008
@@ -1066,50 +1066,10 @@
<code>%{QUERY_STRING}</code> variables respectively.</p>
</div>
-
-
- <p>Some hints on the syntax of <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular
- expressions</a>:</p>
-
-<div class="note"><pre>
-<strong>Text:</strong>
- <strong><code>.</code></strong> Any single character
- <strong><code>[</code></strong>chars<strong><code>]</code></strong> Character class: Any character of the class ``chars''
- <strong><code>[^</code></strong>chars<strong><code>]</code></strong> Character class: Not a character of the class ``chars''
- text1<strong><code>|</code></strong>text2 Alternative: text1 or text2
-
-<strong>Quantifiers:</strong>
- <strong><code>?</code></strong> 0 or 1 occurrences of the preceding text
- <strong><code>*</code></strong> 0 or N occurrences of the preceding text (N > 0)
- <strong><code>+</code></strong> 1 or N occurrences of the preceding text (N > 1)
-
-<strong>Grouping:</strong>
- <strong><code>(</code></strong>text<strong><code>)</code></strong> Grouping of text
- (used either to set the borders of an alternative as above, or
- to make backreferences, where the <strong>N</strong>th group can
- be referred to on the RHS of a RewriteRule as <code>$</code><strong>N</strong>)
-
-<strong>Anchors:</strong>
- <strong><code>^</code></strong> Start-of-line anchor
- <strong><code>$</code></strong> End-of-line anchor
-
-<strong>Escaping:</strong>
- <strong><code>\</code></strong>char escape the given char
- (for instance, to specify the chars "<code>.[]()</code>" <em>etc.</em>)
-</pre></div>
-
- <p>For more information about regular expressions, have a look at the
- perl regular expression manpage ("<a href="http://perldoc.perl.org/perlre.html">perldoc
- perlre</a>"). If you are interested in more detailed
- information about regular expressions and their variants
- (POSIX regex etc.) the following book is dedicated to this topic:</p>
-
- <p class="indent">
- <em>Mastering Regular Expressions, 2nd Edition</em><br />
- Jeffrey E.F. Friedl<br />
- O'Reilly & Associates, Inc. 2002<br />
- ISBN 0-596-00289-0<br />
- </p>
+ <p>For some hints on <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular
+ expressions</a>, see
+ 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
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml?rev=636404&r1=636403&r2=636404&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml Wed Mar 12 09:25:21 2008
@@ -1077,51 +1077,10 @@
<code>%{QUERY_STRING}</code> variables respectively.</p>
</note>
-
-
- <p>Some hints on the syntax of <glossary ref="regex">regular
- expressions</glossary>:</p>
-
-<note><pre>
-<strong>Text:</strong>
- <strong><code>.</code></strong> Any single character
- <strong><code>[</code></strong>chars<strong><code>]</code></strong> Character class: Any character of the class ``chars''
- <strong><code>[^</code></strong>chars<strong><code>]</code></strong> Character class: Not a character of the class ``chars''
- text1<strong><code>|</code></strong>text2 Alternative: text1 or text2
-
-<strong>Quantifiers:</strong>
- <strong><code>?</code></strong> 0 or 1 occurrences of the preceding text
- <strong><code>*</code></strong> 0 or N occurrences of the preceding text (N > 0)
- <strong><code>+</code></strong> 1 or N occurrences of the preceding text (N > 1)
-
-<strong>Grouping:</strong>
- <strong><code>(</code></strong>text<strong><code>)</code></strong> Grouping of text
- (used either to set the borders of an alternative as above, or
- to make backreferences, where the <strong>N</strong>th group can
- be referred to on the RHS of a RewriteRule as <code>$</code><strong>N</strong>)
-
-<strong>Anchors:</strong>
- <strong><code>^</code></strong> Start-of-line anchor
- <strong><code>$</code></strong> End-of-line anchor
-
-<strong>Escaping:</strong>
- <strong><code>\</code></strong>char escape the given char
- (for instance, to specify the chars "<code>.[]()</code>" <em>etc.</em>)
-</pre></note>
-
- <p>For more information about regular expressions, have a look at the
- perl regular expression manpage ("<a
- href="http://perldoc.perl.org/perlre.html">perldoc
- perlre</a>"). If you are interested in more detailed
- information about regular expressions and their variants
- (POSIX regex etc.) the following book is dedicated to this topic:</p>
-
- <p class="indent">
- <em>Mastering Regular Expressions, 2nd Edition</em><br />
- Jeffrey E.F. Friedl<br />
- O'Reilly & Associates, Inc. 2002<br />
- ISBN 0-596-00289-0<br />
- </p>
+ <p>For some hints on <glossary ref="regex">regular
+ expressions</glossary>, see
+ 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
Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en?rev=636404&r1=636403&r2=636404&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.html.en Wed Mar 12 09:25:21 2008
@@ -97,7 +97,7 @@
<th>Example</th>
</tr>
-<tr><td><code>.</code></td><td>Matches any
+<tr><td><code>.</code></td><td>Matches any single
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
@@ -122,10 +122,13 @@
<tr><td><code>[ ]</code></td><td>A character class - matches one of the
characters</td><td><code>c[uoa]t</code> matches <code>cut</code>,
<code>cot</code> or <code>cat</code>.</td></tr>
-<tr><td><code>!</code></td><td>Not</td><td>Negates a match - that is,
-ensures that it does not match.</td></tr>
-
+<tr><td><code>[^ ]</code></td><td>Negative character class - matches any character not specified</td><td><code>c[^/]t</code> matches <code>cat</code> or <code>c=t</code> but not <code>c/t</code></td></tr>
</table>
+
+<p>In <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> the <code>!</code> character can be
+used before a regular expression to negate it. This is, a string will
+be considered to have matched only if it does not match the rest of
+the expression.</p>
Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml?rev=636404&r1=636403&r2=636404&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml Wed Mar 12 09:25:21 2008
@@ -100,7 +100,7 @@
<th>Example</th>
</tr>
-<tr><td><code>.</code></td><td>Matches any
+<tr><td><code>.</code></td><td>Matches any single
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
@@ -125,10 +125,13 @@
<tr><td><code>[ ]</code></td><td>A character class - matches one of the
characters</td><td><code>c[uoa]t</code> matches <code>cut</code>,
<code>cot</code> or <code>cat</code>.</td></tr>
-<tr><td><code>!</code></td><td>Not</td><td>Negates a match - that is,
-ensures that it does not match.</td></tr>
-
+<tr><td><code>[^ ]</code></td><td>Negative character class - matches any character not specified</td><td><code>c[^/]t</code> matches <code>cat</code> or <code>c=t</code> but not <code>c/t</code></td></tr>
</table>
+
+<p>In <module>mod_rewrite</module> the <code>!</code> character can be
+used before a regular expression to negate it. This is, a string will
+be considered to have matched only if it does not match the rest of
+the expression.</p>
</section>