httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1308803 - in /httpd/httpd/branches/2.4.x/docs/manual: mod/ programs/ rewrite/
Date Tue, 03 Apr 2012 10:14:29 GMT
Author: igalic
Date: Tue Apr  3 10:14:28 2012
New Revision: 1308803

URL: http://svn.apache.org/viewvc?rev=1308803&view=rev
Log:
rebuild

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.de
    httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.ja
    httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.tr
    httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.ko
    httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.tr
    httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en
    httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.fr
    httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr
    httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en Tue Apr  3 10:14:28 2012
@@ -112,40 +112,40 @@ URLs on the fly</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr>
 </table>
-      <p>The <code class="directive">RewriteBase</code> directive specifies
the
-      URL prefix to be used for per-directory (htaccess) 
-      <code class="directive">RewriteRule</code> directives that substitute a
relative
-      path.</p>
-      <p> This directive is <em>required</em> when you use a relative path
-      in a substitution in per-directory (htaccess) context unless either
-      of the following conditions are true:
-      <ul>
-          <li> The original request, and the substitution, are underneath the 
-               <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-               (as opposed to reachable by other means, such as 
-               <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>).</li>
-          <li> The <em>filesystem</em> path to the directory containing
the
-               <code class="directive">RewriteRule</code>, suffixed by the relative

-               substitution is also valid as a URL path on the server 
-               (this is rare).</li>
-      </ul>
-      </p>
-
-<p> In the example below, <code class="directive">RewriteBase</code> is
necessary
-    to avoid rewriting to http://example.com/opt/myapp-1.2.3/welcome.html
-    since the resource was not relative to the document root.  This 
-    misconfiguration would normally cause the server to look for an "opt"
-    directory under the document root.</p>
+      <p>The <code class="directive">RewriteBase</code> directive explicitly
+      sets the base URL-path (not filesystem directory path!)  for per-directory rewrites
+      that result in the substitution of a relative path.
+      When you use a <code class="directive"><a href="#rewriterule">RewriteRule</a></code>
+      in a <code>.htaccess</code> file, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
strips off
+      the local directory prefix before processing, then rewrites the rest of
+      the URL. When the rewrite is completed, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+      automatically adds the local directory prefix (or the
+      <code class="directive">RewriteBase</code> when set) back on to the substitution
+      before handing it back to the core of the server as if it were the original
+      URL.</p>
+
+      <p>This directive is <em>required</em> for per-directory rewrites
whose context
+      is a directory made available via the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
+      directive, when the substitution uses a relative path.</p>
+
+      <p>If your URL path does not exist verbatim on the filesystem,
+      or isn't directly under your <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>,
+      you must use <code class="directive">RewriteBase</code> in every
+      <code>.htaccess</code> file where you want to use <code class="directive"><a
href="#rewriterule">RewriteRule</a></code> directives.</p>
+
+      <p>The example below demonstrates how to map
+      http://example.com/myapp/index.html to
+      /home/www/example/newsite.html, in a <code>.htaccess</code> file. This
+      assumes that the content available at
+      http://example.com/ is on disk at /home/www/example/</p>
 <div class="example"><pre>
-DocumentRoot /var/www/example.com
-Alias /myapp /opt/myapp-1.2.3
-&lt;Directory /opt/myapp-1.2.3&gt;
 RewriteEngine On
+# The URL-path used to get to this context, not the filesystem path
 RewriteBase /myapp/
-RewriteRule ^index\.html$  welcome.html 
-&lt;/Directory&gt;
+RewriteRule ^index\.html$  newsite.html
 </pre></div>
 
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="RewriteCond" id="RewriteCond">RewriteCond</a>
<a name="rewritecond" id="rewritecond">Directive</a></h2>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.de?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.de (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.de Tue Apr  3 10:14:28 2012
@@ -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: 151408:1299498 (outdated) -->
+<!-- English Revision: 151408:1308407 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.ja?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.ja [utf-8] Tue Apr  3 10:14:28
2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 674934:1299498 (outdated) -->
+<!-- English Revision: 674934:1308407 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.tr?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml.tr [utf-8] Tue Apr  3 10:14:28
2012
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 804678:1299498 (outdated) -->
+<!-- English Revision: 804678:1308407 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.ko?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.ko [euc-kr] Tue Apr  3 10:14:28
2012
@@ -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:1307793 (outdated) -->
+<!-- English Revision: 105989:1308463 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.tr?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/ab.xml.tr [utf-8] Tue Apr  3 10:14:28
2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 811869:1307793 (outdated) -->
+<!-- English Revision: 811869:1308463 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en Tue Apr  3 10:14:28 2012
@@ -272,7 +272,7 @@ an example, not as a recommendation.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="flag_end" id="flag_end">END</a></h2>
-<p>Using the [END] flag terminates not only the current round ot rewrite
+<p>Using the [END] flag terminates not only the current round of rewrite
 processing (like [L]) but also prevents any subsequent rewrite
 processing from occurring in per-directory (htaccess) context.</p>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.fr?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.fr Tue Apr  3 10:14:28 2012
@@ -21,6 +21,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/rewrite/flags.html"
hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/rewrite/flags.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+            anglaise pour les changements récents.</div>
 
 <p>Ce document décrit les drapeaux disponibles dans la directive
 <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>,
en fournissant

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr Tue Apr  3 10:14:28 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1307798 -->
+<!-- English Revision: 1307798:1308781 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta?rev=1308803&r1=1308802&r2=1308803&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta Tue Apr  3 10:14:28 2012
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>



Mime
View raw message