httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r558837 - in /httpd/httpd/trunk/docs/manual: mod/core.xml.de mod/core.xml.ja mod/mod_cgi.xml.ja mod/mod_cgi.xml.ko mod/mod_cgi.xml.meta mod/mod_rewrite.html.en mod/mod_rewrite.xml programs/configure.xml.ko
Date Mon, 23 Jul 2007 19:23:25 GMT
Author: noodl
Date: Mon Jul 23 12:23:24 2007
New Revision: 558837

URL: http://svn.apache.org/viewvc?view=rev&rev=558837
Log:
Address PR42898 by qualifying the value of Pattern for RewriteRule, and later explaining how
to snarf the rest of the request url. (and the usual build detritus).

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ja
    httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
    httpd/httpd/trunk/docs/manual/programs/configure.xml.ko

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Mon Jul 23 12:23:24 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:558651 (outdated) -->
+<!-- English Revision: 167959:558694 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [iso-2022-jp] Mon Jul 23 12:23:24 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:558651 (outdated) -->
+<!-- English Revision: 190982:558694 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ja?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ja [iso-2022-jp] Mon Jul 23 12:23:24 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:558718 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ko?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.ko [euc-kr] Mon Jul 23 12:23:24 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:420990 (outdated) -->
+<!-- English Revision: 105989:558718 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.meta?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cgi.xml.meta Mon Jul 23 12:23:24 2007
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Mon Jul 23 12:23:24 2007
@@ -1063,11 +1063,10 @@
 
       <p><a id="patterns" name="patterns"><em>Pattern</em></a>
is
       a perl compatible <a id="regexp" name="regexp">regular
-      expression</a>, which is applied to the current URL.
-      ``Current'' means the value of the URL when this rule is
-      applied. This may not be the originally requested URL,
-      which may already have matched a previous rule, and have been
-      altered.</p>
+      expression</a>. On the first RewriteRule it is applied to the
+      <a href="./directive-dict.html#Syntax">URL-path</a> of the request;
+      subsequent patterns are applied to the output of the last matched
+      RewriteRule.</p>
 
       <p>Some hints on the syntax of <a class="glossarylink" href="../glossary.html#regex"
title="see glossary">regular 
       expressions</a>:</p>
@@ -1475,13 +1474,16 @@
           <strong>R</strong>-flag.</p>
 </div>
 
-<div class="note"><h3>Note: Query String</h3>
-      <p>The <em>Pattern</em> will not be matched against the query string.
-      To do this, you must use a <code class="directive"><a href="#rewritecond">RewriteCond</a></code>
with the
-      <code>%{QUERY_STRING}</code> variable. You can, however, create
-      URLs in the substitution string, containing a query string
-      part. Simply use a question mark inside the substitution string, to
-      indicate that the following text should be re-injected into the
+<div class="note"><h3>What is matched?</h3>
+      <p>The <em>Pattern</em> will initially be matched against the part
of the
+      URL after the hostname and port, and before the query string. If you wish
+      to match against the hostname, port, or query string, use a
+      <code class="directive"><a href="#rewritecond">RewriteCond</a></code>
with the
+      <code>%{HTTP_HOST}</code>, <code>%{SERVER_PORT}</code>, or
+      <code>%{QUERY_STRING}</code> variables respectively.</p>
+      <p>You can, however, create URLs in the substitution string containing a
+      query string part. Simply use a question mark inside the substitution
+      string, to indicate that the following text should be re-injected into the
       query string. When you want to erase an existing query string,
       end the substitution string with just a question mark. To
       combine new and old query strings, use the

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?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Mon Jul 23 12:23:24 2007
@@ -1076,11 +1076,10 @@
 
       <p><a id="patterns" name="patterns"><em>Pattern</em></a>
is
       a perl compatible <a id="regexp" name="regexp">regular
-      expression</a>, which is applied to the current URL.
-      ``Current'' means the value of the URL when this rule is
-      applied. This may not be the originally requested URL,
-      which may already have matched a previous rule, and have been
-      altered.</p>
+      expression</a>. On the first RewriteRule it is applied to the
+      <a href="./directive-dict.html#Syntax">URL-path</a> of the request;
+      subsequent patterns are applied to the output of the last matched
+      RewriteRule.</p>
 
       <p>Some hints on the syntax of <glossary ref="regex">regular 
       expressions</glossary>:</p>
@@ -1498,14 +1497,16 @@
           <strong>R</strong>-flag.</p>
 </note>
 
-<note><title>Note: Query String</title>
-      <p>The <em>Pattern</em> will not be matched against the query string.
-      To do this, you must use a <directive
-      module="mod_rewrite">RewriteCond</directive> with the
-      <code>%{QUERY_STRING}</code> variable. You can, however, create
-      URLs in the substitution string, containing a query string
-      part. Simply use a question mark inside the substitution string, to
-      indicate that the following text should be re-injected into the
+<note><title>What is matched?</title>
+      <p>The <em>Pattern</em> will initially be matched against the part
of the
+      URL after the hostname and port, and before the query string. If you wish
+      to match against the hostname, port, or query string, use a
+      <directive module="mod_rewrite">RewriteCond</directive> with the
+      <code>%{HTTP_HOST}</code>, <code>%{SERVER_PORT}</code>, or
+      <code>%{QUERY_STRING}</code> variables respectively.</p>
+      <p>You can, however, create URLs in the substitution string containing a
+      query string part. Simply use a question mark inside the substitution
+      string, to indicate that the following text should be re-injected into the
       query string. When you want to erase an existing query string,
       end the substitution string with just a question mark. To
       combine new and old query strings, use the

Modified: httpd/httpd/trunk/docs/manual/programs/configure.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/configure.xml.ko?view=diff&rev=558837&r1=558836&r2=558837
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/configure.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml.ko [euc-kr] Mon Jul 23 12:23:24 2007
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:420993 (outdated) -->
+<!-- English Revision: 105989:558694 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more



Mime
View raw message