Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779579 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_proxy_http2.html.en b/docs/manual/mod/mod_proxy_http2.html.en
index aa3a1bcab8672caf427b2890fadcdc37bb607980..4beb2f5d406c7c5b14188bc751051dec60a969a7 100644 (file)
--- a/docs/manual/mod/mod_proxy_http2.html.en
+++ b/docs/manual/mod/mod_proxy_http2.html.en
@@ -45,9 +45,14 @@
     have to be present in the server.</p>
 
     <p><code class="module"><a href="../mod/mod_proxy_http2.html">mod_proxy_http2</a></code> works with incoming requests
-    over HTTP/1.1 and HTTP/2 requests. If <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>
-    handles the frontend connection, requests against the same HTTP/2
-    backend are sent over a single connection, whenever possible.</p>
+    over HTTP/1.1 and HTTP/2 requests. In both cases, requests proxied
+    to the same backend are sent over a single connection
+    whenever possible (namely when the connection can be re-used).</p>
+
+    <p><code class="module"><a href="../mod/mod_proxy_http2.html">mod_proxy_http2</a></code> will not use the HTTP/2 protocol
+    when the frontend requests use HTTP/1.1.
+    This means that HTTP/2 will be used to proxy requests to a capable backend
+    only when the frontend requests use the same protocol.</p>
 
     <p>This module relies on <a href="http://nghttp2.org/">libnghttp2</a>
     to provide the core http/2 engine.</p>

diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en
index 98825f23c63d871dbd428e6ac8f309ca3a318089..e2338995f08eecef012aaa8e68c5461e2c155049 100644 (file)
--- a/docs/manual/programs/httpd.html.en
+++ b/docs/manual/programs/httpd.html.en
@@ -51,7 +51,7 @@
      [ -<strong>e</strong> <var>level</var> ] [ -<strong>E</strong>
      <var>file</var> ]
      [ <strong>-k</strong> start|restart|graceful|stop|graceful-stop ]
-     [ -<strong>R</strong> <var>directory</var> ] [ -<strong>h</strong> ]
+     [ -<strong>h</strong> ]
      [ -<strong>l</strong> ] [ -<strong>L</strong> ] [ -<strong>S</strong> ]
      [ -<strong>t</strong> ] [ -<strong>v</strong> ] [ -<strong>V</strong> ]
      [ -<strong>X</strong> ] [ -<strong>M</strong> ] [ -<strong>T</strong> ]

diff --git a/docs/manual/programs/httpd.xml.ko b/docs/manual/programs/httpd.xml.ko
index 5a73a287a6840a4487194918f37c4910dbc97820..835df31591e7a8480ec5424e5146ffd3068bb10f 100644 (file)
--- a/docs/manual/programs/httpd.xml.ko
+++ b/docs/manual/programs/httpd.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:1558775 (outdated) -->
+<!-- English Revision: 105989:1779469 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/programs/httpd.xml.tr b/docs/manual/programs/httpd.xml.tr
index e930af88a1d0ec4cebeb29c98df3ccdbb639fe87..b8d803ac5e52b72830286191d545e30576a27f13 100644 (file)
--- a/docs/manual/programs/httpd.xml.tr
+++ b/docs/manual/programs/httpd.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: 1242483:1558775 (outdated) -->
+<!-- English Revision: 1242483:1779469 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>