From 97899a14a376b47c8e42a84ae9d807465c91dfaa Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@apache.org>
Date: Wed, 16 Jan 2013 00:37:06 +0000
Subject: [PATCH] rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433770 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/howto/auth.html.fr | 11 ++++++-----
 docs/manual/howto/auth.xml.ja  |  2 +-
 docs/manual/howto/auth.xml.ko  |  2 +-
 docs/manual/howto/auth.xml.tr  |  2 +-
 docs/manual/howto/ssi.html.en  | 18 ++++++++++++++----
 docs/manual/howto/ssi.html.fr  |  2 ++
 docs/manual/howto/ssi.xml.fr   |  2 +-
 docs/manual/howto/ssi.xml.ja   |  2 +-
 docs/manual/howto/ssi.xml.ko   |  2 +-
 docs/manual/howto/ssi.xml.meta |  2 +-
 10 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/docs/manual/howto/auth.html.fr b/docs/manual/howto/auth.html.fr
index a778c6d408..26250a388d 100644
--- a/docs/manual/howto/auth.html.fr
+++ b/docs/manual/howto/auth.html.fr
@@ -599,11 +599,12 @@ autorisation</a></h2>
         </pre>
 
 
-        <p>Dans l'exemple ci-dessus, on utilise la directive du
-	conteneur <code class="directive"><a href="../mod/mod_authz_core.html#requirenone">&lt;RequireNone&gt;</a></code> afin de s'assurer
-	qu'aucune des directives <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> qu'il contient ne
-	fasse correspondre ses paramètres avant d'accorder
-	l'autorisation.</p>
+        <p>L'utilisation de la directive <code class="directive"><a href="../mod/mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></code>
+	avec de multiples directives <code class="directive"><a href="../mod/mod_authz_core.html#require">&lt;Require&gt;</a></code>, toutes avec la négation
+	<code>not</code>, n'accordera l'accès que si toutes les
+	conditions négatives sont vérifiées. En d'autres termes, l'accès
+	sera refusé si au moins une des conditions négatives n'est pas
+	vérifiée.</p>
 
     
 
diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index 7b68853733..5eaf77e092 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -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.ja.xsl"?>
-<!-- English Revision: 479777:1420149 (outdated) -->
+<!-- English Revision: 479777:1430814 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index a4b5c471c1..9147b8c43c 100644
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -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:1420149 (outdated) -->
+<!-- English Revision: 105989:1430814 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/auth.xml.tr b/docs/manual/howto/auth.xml.tr
index c67925f5ce..e33a576541 100644
--- a/docs/manual/howto/auth.xml.tr
+++ b/docs/manual/howto/auth.xml.tr
@@ -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: 1070891:1420149 (outdated) -->
+<!-- English Revision: 1070891:1430814 (outdated) -->
 <!-- =====================================================
  Translated by: Umut Samuk <umut belgeler.org>
    Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>
diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en
index 2ce2ae67d5..c81558e5db 100644
--- a/docs/manual/howto/ssi.html.en
+++ b/docs/manual/howto/ssi.html.en
@@ -64,14 +64,24 @@ existing HTML documents.</p>
     an existing HTML page, without having to serve the entire page
     via a CGI program, or other dynamic technology.</p>
 
+    <p>For example, you might place a directive into an existing HTML
+    page, such as:</p>
+
+    <div class="example" />
+
+    <p>And, when the page is served, this fragment will be evaluated and replaced with its value:</p>
+
+    <div class="example"><p><code>
+    Tuesday, 15-Jan-2013 19:28:54 EST
+    </code></p></div>
+
     <p>The decision of when to use SSI, and when to have your page
     entirely generated by some program, is usually a matter of how
     much of the page is static, and how much needs to be
     recalculated every time the page is served. SSI is a great way
-    to add small pieces of information, such as the current time.
-    But if a majority of your page is being generated at the time
-    that it is served, you need to look for some other
-    solution.</p>
+    to add small pieces of information, such as the current time - shown
+    above.  But if a majority of your page is being generated at the time
+    that it is served, you need to look for some other solution.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="configuring" id="configuring">Configuring your server to permit SSI</a></h2>
diff --git a/docs/manual/howto/ssi.html.fr b/docs/manual/howto/ssi.html.fr
index be2569e55e..2879890c9c 100644
--- a/docs/manual/howto/ssi.html.fr
+++ b/docs/manual/howto/ssi.html.fr
@@ -28,6 +28,8 @@
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&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>Les SSI permettent d'ajouter du contenu dynamique à des documents
 HTML préexistants.</p>
diff --git a/docs/manual/howto/ssi.xml.fr b/docs/manual/howto/ssi.xml.fr
index 4a8ab8fed6..7e1720b2cc 100644
--- a/docs/manual/howto/ssi.xml.fr
+++ b/docs/manual/howto/ssi.xml.fr
@@ -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 : 1331486 -->
+<!-- English Revision: 1331486:1433768 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja
index 4fd04cc595..3a74db34a9 100644
--- a/docs/manual/howto/ssi.xml.ja
+++ b/docs/manual/howto/ssi.xml.ja
@@ -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.ja.xsl"?>
-<!-- English Revision: 659902:1331486 (outdated) -->
+<!-- English Revision: 659902:1433768 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/ssi.xml.ko b/docs/manual/howto/ssi.xml.ko
index 101c608350..e92b9ddc7c 100644
--- a/docs/manual/howto/ssi.xml.ko
+++ b/docs/manual/howto/ssi.xml.ko
@@ -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: 659902:1331486 (outdated) -->
+<!-- English Revision: 659902:1433768 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/ssi.xml.meta b/docs/manual/howto/ssi.xml.meta
index 0d8deb802c..1c020635eb 100644
--- a/docs/manual/howto/ssi.xml.meta
+++ b/docs/manual/howto/ssi.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
-- 
2.49.0