From 74c85ae85a1427b6332632bce05adfdea29e2cc5 Mon Sep 17 00:00:00 2001
From: Luca Toscano <elukey@apache.org>
Date: Sat, 9 Apr 2016 07:50:41 +0000
Subject: [PATCH] Documentation rebuild and translation updates

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1738332 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/howto/auth.html.en             | 12 ++++++++++++
 docs/manual/mod/mod_access_compat.xml.fr   |  2 +-
 docs/manual/mod/mod_access_compat.xml.ja   |  2 +-
 docs/manual/mod/mod_access_compat.xml.meta |  2 +-
 docs/manual/upgrading.xml.fr               |  2 +-
 docs/manual/upgrading.xml.meta             |  2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 9fb9bfb8e5..6e94424811 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -570,6 +570,18 @@ Require group GroupName</pre>
         <code class="directive"><a href="../mod/mod_access_compat.html#satisfy">Satisfy</a></code> are no longer needed.
         However to provide backwards compatibility for older configurations, these
         directives have been moved to the <code class="module"><a href="../mod/mod_access_compat.html">mod_access_compat</a></code> module.</p>
+
+        <div class="warning"><h3>Note</h3>
+        <p>The directives provided by <code class="module"><a href="../mod/mod_access_compat.html">mod_access_compat</a></code> have
+        been deprecated by <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>.
+        Mixing old directives like <code class="directive"><a href="../mod/mod_access_compat.html#order">Order</a></code>, <code class="directive"><a href="../mod/mod_access_compat.html#allow">Allow</a></code> or <code class="directive"><a href="../mod/mod_access_compat.html#deny">Deny</a></code> with new ones like
+        <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> is technically possible
+        but discouraged. This module was created to support
+        configurations containing only old directives to facilitate the 2.4 upgrade.
+        Please check the <a href="../upgrading.html">upgrading</a> guide for more
+        information.
+        </p>
+        </div>
     
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/mod_access_compat.xml.fr b/docs/manual/mod/mod_access_compat.xml.fr
index 75ef0b8639..c4cc38062f 100644
--- a/docs/manual/mod/mod_access_compat.xml.fr
+++ b/docs/manual/mod/mod_access_compat.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1673945 -->
+<!-- English Revision: 1673945:1738217 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_access_compat.xml.ja b/docs/manual/mod/mod_access_compat.xml.ja
index 7a68ebf638..c909def14d 100644
--- a/docs/manual/mod/mod_access_compat.xml.ja
+++ b/docs/manual/mod/mod_access_compat.xml.ja
@@ -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: 675568:1673945 (outdated) -->
+<!-- English Revision: 675568:1738217 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_access_compat.xml.meta b/docs/manual/mod/mod_access_compat.xml.meta
index 8fdd0493ef..3dd82dd67b 100644
--- a/docs/manual/mod/mod_access_compat.xml.meta
+++ b/docs/manual/mod/mod_access_compat.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index 8edcbe4451..213788543b 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1686712 -->
+<!-- English Revision: 1686712:1738217 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index aba29996bb..1d2a68a225 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>
-- 
2.50.1