From: Luca Toscano <elukey@apache.org>
Date: Tue, 13 Sep 2016 06:27:20 +0000 (+0000)
Subject: Documentation rebuild + variants (proxy_html and dbd)
X-Git-Tag: 2.4.24~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea9e6f03f384ecaaa2f51e013bf12ccdf395ef15;p=thirdparty%2Fapache%2Fhttpd.git

Documentation rebuild + variants (proxy_html and dbd)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1760480 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_dbd.xml.fr b/docs/manual/mod/mod_dbd.xml.fr
index a76ac9ea656..0bcc073ae51 100644
--- a/docs/manual/mod/mod_dbd.xml.fr
+++ b/docs/manual/mod/mod_dbd.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 : 1378507 -->
+<!-- English Revision: 1378507:1760182 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_dbd.xml.meta b/docs/manual/mod/mod_dbd.xml.meta
index bf4a2e0a235..9131911db28 100644
--- a/docs/manual/mod/mod_dbd.xml.meta
+++ b/docs/manual/mod/mod_dbd.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_proxy_html.html.en b/docs/manual/mod/mod_proxy_html.html.en
index 298c43945c4..28bea40bfb7 100644
--- a/docs/manual/mod/mod_proxy_html.html.en
+++ b/docs/manual/mod/mod_proxy_html.html.en
@@ -278,13 +278,29 @@ for earlier 2.x versions</td></tr>
 for earlier 2.x versions</td></tr>
 </table>
 <p>Specifies elements that have URL attributes that should be rewritten
-using standard <code class="directive">ProxyHTMLURLMap</code>s.  You will need one
-ProxyHTMLLinks directive per element, but it can have any number of attributes.</p>
+using standard <code class="directive"><a href="#proxyhtmlurlmap">ProxyHTMLURLMap</a></code>s.
+You will need one ProxyHTMLLinks directive per element,
+but it can have any number of attributes.</p>
 <p>Normally you'll set this globally.  If you set ProxyHTMLLinks in more than
 one scope so that one overrides the other, you'll need to specify a complete
 set in each of those scopes.</p>
 <p>A default configuration is supplied in <var>proxy-html.conf</var>
 and defines the HTML links for standard HTML 4 and XHTML 1.</p>
+<div class="example"><h3>Examples from proxy-html.conf</h3><pre class="prettyprint lang-config">ProxyHTMLLinks  a          href
+ProxyHTMLLinks  area       href
+ProxyHTMLLinks  link       href
+ProxyHTMLLinks  img        src longdesc usemap
+ProxyHTMLLinks  object     classid codebase data usemap
+ProxyHTMLLinks  q          cite
+ProxyHTMLLinks  blockquote cite
+ProxyHTMLLinks  ins        cite
+ProxyHTMLLinks  del        cite
+ProxyHTMLLinks  form       action
+ProxyHTMLLinks  input      src usemap
+ProxyHTMLLinks  head       profile
+ProxyHTMLLinks  base       href
+ProxyHTMLLinks  script     src for</pre>
+</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -355,11 +371,14 @@ filter chain if stripping comments!</p>
 <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.4 and later; available as a third-party
 module for earlier 2.x versions.</td></tr>
 </table>
-<p>This is the key directive for rewriting HTML links.  When parsing a document,
+<p>This is the key directive for rewriting HTML links. When parsing a document,
 whenever a link target matches <var>from-pattern</var>, the matching
 portion will be rewritten to <var>to-pattern</var>, as modified by any
-flags supplied and by the <code class="directive">ProxyHTMLExtended</code>
-directive.</p>
+flags supplied and by the 
+<code class="directive"><a href="#proxyhtmlextended">ProxyHTMLExtended</a></code> directive.
+Only the elements specified using
+the <code class="directive"><a href="#proxyhtmllinks">ProxyHTMLLinks</a></code> directive
+will be considered as HTML links.</p>
 
 <p>The optional third argument may define any of the following
 <strong>Flags</strong>.  Flags are case-sensitive.</p>
diff --git a/docs/manual/mod/mod_proxy_html.xml.fr b/docs/manual/mod/mod_proxy_html.xml.fr
index 0adef146f71..e65e0cdee2a 100644
--- a/docs/manual/mod/mod_proxy_html.xml.fr
+++ b/docs/manual/mod/mod_proxy_html.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 : 1530513 -->
+<!-- English Revision: 1530513:1760479 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_proxy_html.xml.meta b/docs/manual/mod/mod_proxy_html.xml.meta
index cd380113ea6..6bfed94b357 100644
--- a/docs/manual/mod/mod_proxy_html.xml.meta
+++ b/docs/manual/mod/mod_proxy_html.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>