httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r889970 - in /httpd/httpd/trunk/docs/manual: ./ mod/ programs/ rewrite/
Date Sat, 12 Dec 2009 20:12:16 GMT
Author: nd
Date: Sat Dec 12 20:12:15 2009
New Revision: 889970

URL: http://svn.apache.org/viewvc?rev=889970&view=rev
Log:
update transformation

Added:
    httpd/httpd/trunk/docs/manual/rewrite/htaccess.html   (with props)
    httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en   (with props)
    httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta   (with props)
Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en
    httpd/httpd/trunk/docs/manual/mod/core.xml.de
    httpd/httpd/trunk/docs/manual/mod/core.xml.ja
    httpd/httpd/trunk/docs/manual/mod/core.xml.tr
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.es
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/trunk/docs/manual/programs/configure.xml.ko
    httpd/httpd/trunk/docs/manual/programs/configure.xml.tr
    httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en
    httpd/httpd/trunk/docs/manual/server-wide.html.fr
    httpd/httpd/trunk/docs/manual/server-wide.xml.meta
    httpd/httpd/trunk/docs/manual/stopping.html.fr
    httpd/httpd/trunk/docs/manual/stopping.xml.meta

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Sat Dec 12 20:12:15 2009
@@ -2249,8 +2249,8 @@
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures
mutex mechanism and lock file directory for all
 or specified mutexes</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Mutex
<var>default|mutex-name</var> <var>mechanism</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Mutex
default default</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Mutex
<var>mechanism</var> [default|<var>mutex-name</var>] ... [OmitPID]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Mutex
default</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server
config</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
@@ -2284,60 +2284,6 @@
     can be configured if this directive is supported.</p>
     </div>
 
-    <p>The following table documents the names of mutexes used by httpd
-    and bundled modules.</p>
-
-    <table class="bordered"><tr class="header">
-            <th>Mutex name</th>
-            <th>Module(s)</th>
-            <th>Protected resource</th>
-	</tr>
-<tr>
-            <td><code>mpm-accept</code></td>
-            <td><code class="module"><a href="../mod/prefork.html">prefork</a></code>
and <code class="module"><a href="../mod/worker.html">worker</a></code>
MPMs</td>
-            <td>incoming connections, to avoid the thundering herd problem;
-            for more information, refer to the
-            <a href="../misc/perf-tuning.html">performance tuning</a>
-            documentation</td>
-	</tr>
-<tr class="odd">
-            <td><code>authdigest-client</code></td>
-            <td><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code></td>
-            <td>client list in shared memory</td>
-	</tr>
-<tr>
-            <td><code>authdigest-opaque</code></td>
-            <td><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code></td>
-            <td>counter in shared memory</td>
-	</tr>
-<tr class="odd">
-            <td><code>ldap-cache</code></td>
-            <td><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code></td>
-            <td>LDAP result cache</td>
-	</tr>
-<tr>
-            <td><code>rewrite-map</code></td>
-            <td><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></td>
-            <td>communication with external mapping programs, to avoid
-            intermixed I/O from multiple requests</td>
-	</tr>
-<tr class="odd">
-            <td><code>ssl-cache</code></td>
-            <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></td>
-            <td>SSL session cache</td>
-	</tr>
-<tr>
-            <td><code>ssl-stapling</code></td>
-            <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></td>
-            <td>OCSP stapling response cache</td>
-	</tr>
-<tr class="odd">
-            <td><code>watchdog-callback</code></td>
-            <td><code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code></td>
-            <td>callback function of a particular client module</td>
-	</tr>
-</table>
-
     <p>The following mutex <em>mechanisms</em> are available:</p>
     <ul>
         <li><code>default | yes</code>
@@ -2433,8 +2379,9 @@
     <code class="directive"><a href="#serverroot">ServerRoot</a></code>.
 Always use a local disk
     filesystem for <code>/path/to/mutex</code> and never a directory residing
     on a NFS- or AFS-filesystem.  The basename of the file will be the mutex
-    type, an optional instance string provided by the module, with the process
-    id of the httpd parent process appended to to make it unique, avoiding
+    type, an optional instance string provided by the module, and unless the
+    <code>OmitPID</code> keyword is specified, the process id of the httpd 
+    parent process will be appended to to make the file name unique, avoiding
     conflicts when multiple httpd instances share a lock file directory.  For
     example, if the mutex name is <code>mpm-accept</code> and the lock file
     directory is <code>/var/httpd/locks</code>, the lock file name for the
@@ -2449,6 +2396,63 @@
     to create.</p>
     </div>
 
+    <p>The following table documents the names of mutexes used by httpd
+    and bundled modules.</p>
+
+    <table class="bordered"><tr class="header">
+            <th>Mutex name</th>
+            <th>Module(s)</th>
+            <th>Protected resource</th>
+	</tr>
+<tr>
+            <td><code>mpm-accept</code></td>
+            <td><code class="module"><a href="../mod/prefork.html">prefork</a></code>
and <code class="module"><a href="../mod/worker.html">worker</a></code>
MPMs</td>
+            <td>incoming connections, to avoid the thundering herd problem;
+            for more information, refer to the
+            <a href="../misc/perf-tuning.html">performance tuning</a>
+            documentation</td>
+	</tr>
+<tr class="odd">
+            <td><code>authdigest-client</code></td>
+            <td><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code></td>
+            <td>client list in shared memory</td>
+	</tr>
+<tr>
+            <td><code>authdigest-opaque</code></td>
+            <td><code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code></td>
+            <td>counter in shared memory</td>
+	</tr>
+<tr class="odd">
+            <td><code>ldap-cache</code></td>
+            <td><code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code></td>
+            <td>LDAP result cache</td>
+	</tr>
+<tr>
+            <td><code>rewrite-map</code></td>
+            <td><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></td>
+            <td>communication with external mapping programs, to avoid
+            intermixed I/O from multiple requests</td>
+	</tr>
+<tr class="odd">
+            <td><code>ssl-cache</code></td>
+            <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></td>
+            <td>SSL session cache</td>
+	</tr>
+<tr>
+            <td><code>ssl-stapling</code></td>
+            <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></td>
+            <td>OCSP stapling response cache</td>
+	</tr>
+<tr class="odd">
+            <td><code>watchdog-callback</code></td>
+            <td><code class="module"><a href="../mod/mod_watchdog.html">mod_watchdog</a></code></td>
+            <td>callback function of a particular client module</td>
+	</tr>
+</table>
+
+    <p>The <code>OmitPID</code> keyword suppresses the addition of the
httpd
+    parent process id from the lock file name.</p>
+
     <p>In the following example, the mutex mechanism for the MPM accept
     mutex will be changed from the compiled-in default to <code>fcntl</code>,
     with the associated lock file created in directory

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?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Sat Dec 12 20:12:15 2009
@@ -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:885242 (outdated) -->
+<!-- English Revision: 167959:886154 (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?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Sat Dec 12 20:12:15 2009
@@ -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: 669847:885242 (outdated) -->
+<!-- English Revision: 669847:886154 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Sat Dec 12 20:12:15 2009
@@ -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: 813376:885242 (outdated) -->
+<!-- English Revision: 813376:886154 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Sat Dec 12 20:12:15 2009
@@ -518,7 +518,7 @@
 <tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
 [Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td
class="descr" colspan="4">The types of files that will be included when searching for
 a matching file with MultiViews</td></tr>
-<tr class="odd"><td><a href="core.html#mutex">Mutex <var>default|mutex-name</var>
<var>mechanism</var></a></td><td> default default </td><td>s</td><td>C</td></tr><tr
class="odd"><td class="descr" colspan="4">Configures mutex mechanism and lock file
directory for all
+<tr class="odd"><td><a href="core.html#mutex">Mutex <var>mechanism</var>
[default|<var>mutex-name</var>] ... [OmitPID]</a></td><td> default
</td><td>s</td><td>C</td></tr><tr class="odd"><td
class="descr" colspan="4">Configures mutex mechanism and lock file directory for all
 or specified mutexes</td></tr>
 <tr><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost
<var>addr</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>C</td></tr><tr><td
class="descr" colspan="4">Designates an IP address for name-virtual
 hosting</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.es?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.es Sat Dec 12 20:12:15 2009
@@ -525,7 +525,7 @@
 <tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
 [Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td
class="descr" colspan="4">The types of files that will be included when searching for
 a matching file with MultiViews</td></tr>
-<tr class="odd"><td><a href="core.html#mutex">Mutex <var>default|mutex-name</var>
<var>mechanism</var></a></td><td> default default </td><td>s</td><td>C</td></tr><tr
class="odd"><td class="descr" colspan="4">Configures mutex mechanism and lock file
directory for all
+<tr class="odd"><td><a href="core.html#mutex">Mutex <var>mechanism</var>
[default|<var>mutex-name</var>] ... [OmitPID]</a></td><td> default
</td><td>s</td><td>C</td></tr><tr class="odd"><td
class="descr" colspan="4">Configures mutex mechanism and lock file directory for all
 or specified mutexes</td></tr>
 <tr><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost
<var>addr</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>C</td></tr><tr><td
class="descr" colspan="4">Designates an IP address for name-virtual
 hosting</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.ko.euc-kr [euc-kr] Sat Dec 12 20:12:15
2009
@@ -477,7 +477,7 @@
 <tr class="odd"><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch
Any|NegotiatedOnly|Filters|Handlers
 [Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr
class="odd"><td class="descr" colspan="4">The types of files that will be included
when searching for
 a matching file with MultiViews</td></tr>
-<tr><td><a href="core.html#mutex">Mutex <var>default|mutex-name</var>
<var>mechanism</var></a></td><td> default default </td><td>s</td><td>C</td></tr><tr><td
class="descr" colspan="4">Configures mutex mechanism and lock file directory for all
+<tr><td><a href="core.html#mutex">Mutex <var>mechanism</var>
[default|<var>mutex-name</var>] ... [OmitPID]</a></td><td> default
</td><td>s</td><td>C</td></tr><tr><td class="descr"
colspan="4">Configures mutex mechanism and lock file directory for all
 or specified mutexes</td></tr>
 <tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost
<var>addr</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>C</td></tr><tr
class="odd"><td class="descr" colspan="4">Designates an IP address for name-virtual
 hosting</td></tr>

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?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/configure.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml.ko [euc-kr] Sat Dec 12 20:12:15 2009
@@ -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:832859 (outdated) -->
+<!-- English Revision: 105989:886854 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/programs/configure.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/configure.xml.tr?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/configure.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml.tr [utf-8] Sat Dec 12 20:12:15 2009
@@ -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: 804977:832859 (outdated) -->
+<!-- English Revision: 804977:886854 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

Modified: httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en Sat Dec 12 20:12:15 2009
@@ -86,7 +86,7 @@
       <p>thus every URL path need not be valid on every backend physical
       host. The following ruleset does this for us with the help of the map
       files assuming that server0 is a default server which will be used if
-      a user has no entry in the map):</p>
+      a user has no entry in the map:</p>
 
 <div class="example"><pre>
 RewriteEngine on
@@ -396,7 +396,7 @@
     </dd>
 
     <dt>Discussion:</dt>
-    <dd>This technique will of course also work with with other 
+    <dd>This technique will of course also work with other 
     special characters that mod_rewrite, by default, URL-encodes.</dd>
   </dl>
 

Added: httpd/httpd/trunk/docs/manual/rewrite/htaccess.html
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/htaccess.html?rev=889970&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/htaccess.html (added)
+++ httpd/httpd/trunk/docs/manual/rewrite/htaccess.html Sat Dec 12 20:12:15 2009
@@ -0,0 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
+URI: htaccess.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1

Propchange: httpd/httpd/trunk/docs/manual/rewrite/htaccess.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en?rev=889970&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en (added)
+++ httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en Sat Dec 12 20:12:15 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_rewrite and .htaccess files - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main
stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all"
type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css"
/>
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a>
| <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a>
| <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.3</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif"
/></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP
Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a>
&gt; <a href="../">Version 2.3</a> &gt; <a href="./">Rewrite</a></div><div
id="page-content"><div id="preamble"><h1>mod_rewrite and .htaccess files</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/rewrite/htaccess.html"
title="English">&nbsp;en&nbsp;</a></p>
+</div>
+
+
+<p>This document supplements the <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>

+<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>
+
+</div>
+<div id="quickview"><h3>See also</h3><ul class="seealso"><li><a
href="../mod/mod_rewrite.html">Module documentation</a></li><li><a
href="intro.html">mod_rewrite introduction</a></li><li><a href="remapping.html">Redirection
and remapping</a></li><li><a href="vhosts.html">Virtual hosts</a></li><li><a
href="proxy.html">Proxying</a></li><li><a href="advanced.html">Advanced
techniques and tricks</a></li><li><a href="avoid.html">When not to
use mod_rewrite</a></li></ul></div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/rewrite/htaccess.html"
title="English">&nbsp;en&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed
under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
2.0</a>.</p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a>
| <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a>
| <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file

Propchange: httpd/httpd/trunk/docs/manual/rewrite/htaccess.html.en
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta?rev=889970&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta (added)
+++ httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta Sat Dec 12 20:12:15 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- GENERATED FROM XML: DO NOT EDIT -->
+
+<metafile>
+  <basename>htaccess</basename>
+  <path>/rewrite/</path>
+  <relpath>..</relpath>
+
+  <variants>
+    <variant>en</variant>
+  </variants>
+</metafile>

Propchange: httpd/httpd/trunk/docs/manual/rewrite/htaccess.xml.meta
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/docs/manual/server-wide.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/server-wide.html.fr?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/server-wide.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/server-wide.html.fr Sat Dec 12 20:12:15 2009
@@ -24,8 +24,6 @@
 <a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a>
|
 <a href="./tr/server-wide.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&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 explique le fonctionnement de certaines directives du serveur
 de base qui sont utilisées pour configurer les opérations élémentaires du
@@ -34,6 +32,7 @@
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif"
/> <a href="#identification">Identification du serveur</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#locations">Localisation
des fichiers</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#resource">Limitation
de l'utilisation des ressources</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#implementation">Choix
d'implémentation</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
 <div class="section">
@@ -64,7 +63,7 @@
 <h2><a name="locations" id="locations">Localisation des fichiers</a></h2>
     
 
-    <table class="related"><tr><th>Modules Apparentés</th><th>Directives
Apparentées</th></tr><tr><td /><td><ul><li><code
class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code
class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code
class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code
class="directive"><a href="./mod/mpm_common.html#lockfile">LockFile</a></code></li><li><code
class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code
class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code
class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Modules Apparentés</th><th>Directives
Apparentées</th></tr><tr><td /><td><ul><li><code
class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code
class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code
class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code
class="directive"><a href="./mod/core.html#mutex">Mutex</a></code></li><li><code
class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code
class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code
class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
 
     <p>Ces directives contrôlent la localisation des différents fichiers
     nécessaires au bon fonctionnement d'Apache. Quand le chemin utilisé ne
@@ -95,6 +94,17 @@
 
     <p>La directive <code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code>
     permet sur certaines plates-formes de contrôler la taille de la pile.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
+<div class="section">
+<h2><a name="implementation" id="implementation">Choix d'implémentation</a></h2>
+    
+
+    <table class="related"><tr><th>Modules Apparentés</th><th>Directives
Apparentées</th></tr><tr><td /><td><ul><li><code
class="directive"><a href="./mod/core.html#mutex">Mutex</a></code></li></ul></td></tr></table>
+
+    <p>La directive <code class="directive">Mutex</code> permet de modifier
+    l'implémentation sous-jacente des mutex, afin de résoudre les
+    problèmes de fonctionnement ou de performance dus au choix par
+    défaut d'<a class="glossarylink" href="./glossary.html#apr" title="voir glossaire">APR</a>.</p>
   </div></div>
 <div class="bottomlang">
 <p><span>Langues Disponibles: </span><a href="./en/server-wide.html"
hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |

Modified: httpd/httpd/trunk/docs/manual/server-wide.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/server-wide.xml.meta?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/server-wide.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/server-wide.xml.meta Sat Dec 12 20:12:15 2009
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>

Modified: httpd/httpd/trunk/docs/manual/stopping.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/stopping.html.fr?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/stopping.html.fr Sat Dec 12 20:12:15 2009
@@ -26,8 +26,6 @@
 <a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a>
|
 <a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&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 couvre l'arrêt et le redémarrage d'Apache sur
     les systèmes Unix et similaires. Les utilisateurs de Windows NT, 2000
@@ -246,11 +244,10 @@
     avec certaines configurations.</p>
 
     <p>On a pris soin de s'assurer que les fichiers sur disque
-    comme ceux définis par les directives
-    <code class="directive"><a href="./mod/core.html#lockfile">Lockfile</a></code>
et
-    <code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code>
contiennent le PID
-    du serveur,et coexistent sans problème. Cependant, si une directive de
-    configuration , un module tiers ou une CGI résidente utilise un autre
+    comme les fichiers verrou (<code class="directive"><a href="./mod/core.html#mutex">Mutex</a></code>)
et les fichiers socket Unix
+    (<code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code>)
contiennent le PID
+    du serveur, et coexistent sans problème. Cependant, si une directive de
+    configuration, un module tiers ou une CGI résidente utilise un autre
     verrou ou fichier d'état sur disque, il faut prendre soin de s'assurer
     que chaque instance de <code class="program"><a href="./programs/httpd.html">httpd</a></code>
qui s'exécute
     n'écrase pas les fichiers des autres instances.</p>

Modified: httpd/httpd/trunk/docs/manual/stopping.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/stopping.xml.meta?rev=889970&r1=889969&r2=889970&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/stopping.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/stopping.xml.meta Sat Dec 12 20:12:15 2009
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>



Mime
View raw message