From: Luca Toscano <elukey@apache.org>
Date: Thu, 25 Feb 2016 08:49:21 +0000 (+0000)
Subject: documentation rebuild
X-Git-Tag: 2.5.0-alpha~2016
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf3559ecc57a807efb1e13189f734ab07171630c;p=thirdparty%2Fapache%2Fhttpd.git

documentation rebuild

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

diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en
index b8dae84afb4..097f42c364a 100644
--- a/docs/manual/mod/mod_http2.html.en
+++ b/docs/manual/mod/mod_http2.html.en
@@ -49,12 +49,21 @@
         </div>
         
         <p>You must enable HTTP/2 via <code class="directive"><a href="../mod/core.html#protocols">Protocols</a></code> in order to use the
-        functionality described in this document:</p>
+        functionality described in this document. The HTTP/2 protocol <a href="https://http2.github.io/faq/#does-http2-require-encryption">does not require</a> the use of encryption so two schemes are available: <code>h2</code> (HTTP/2 over TLS) and <code>h2c</code> (HTTP/2 over TCP).</p>
+
+        <p>Two useful configuration schemes are:</p>
         
+        <div class="note"><h3>HTTP/2 in a VirtualHost context (TLS only)</h3>
         <pre class="prettyprint lang-config">Protocols h2 http/1.1</pre>
 
+        <p>Allows HTTP/2 negotiation (h2) via TLS ALPN in a secure <code class="directive">VirtualHost</code>. HTTP/2 preamble checking (Direct mode, see <code class="directive">H2Direct</code>) is disabled by default for <code>h2</code>.</p>
+        </div>
+
+        <div class="note"><h3>HTTP/2 in a Server context (TLS and cleartext)</h3>
+        <pre class="prettyprint lang-config">Protocols h2 h2c http/1.1</pre>
 
-        <p><code>h2</code> (HTTP/2 over TLS) is the preferred connection scheme chosen by browsers up to now, but the HTTP/2 protocol <a href="https://http2.github.io/faq/#does-http2-require-encryption">does not require</a> the use of encryption. To enable <code>h2c</code> (HTTP/2 over TCP) please check the <code class="directive"><a href="#h2direct">H2Direct</a></code> directive first.</p>
+        <p>Allows HTTP/2 negotiation (h2) via TLS ALPN for secure <code class="directive">VirtualHost</code>. Allows HTTP/2 cleartext negotiation (h2c) upgrading from an initial HTTP/1.1 connection or via HTTP/2 preamble checking (Direct mode, see <code class="directive">H2Direct</code>).</p>
+        </div>
 
         <p>Refer to the official <a href="https://http2.github.io/faq">HTTP/2 FAQ</a> for any doubt about the protocol.</p>