From: Luca Toscano <elukey@apache.org>
Date: Thu, 25 Feb 2016 08:49:02 +0000 (+0000)
Subject: Proposal for a new summary of mod_http2's doc
X-Git-Tag: 2.5.0-alpha~2017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e82af17d5b315f1a698adc5e576ed6ebdfa41b48;p=apache

Proposal for a new summary of mod_http2's doc

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

diff --git a/docs/manual/mod/mod_http2.xml b/docs/manual/mod/mod_http2.xml
index 8f8b0a0273..53ec68c5cf 100644
--- a/docs/manual/mod/mod_http2.xml
+++ b/docs/manual/mod/mod_http2.xml
@@ -43,15 +43,24 @@
                 consult the "CHANGES" file for potential updates.</p>
         </note>
         
-        <p>You must enable HTTP/2 via <directive
-            module="core">Protocols</directive> in order to use the
-        functionality described in this document:</p>
+        <p>You must enable HTTP/2 via <directive module="core">Protocols</directive> in order to use the
+        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>
         
+        <note><title>HTTP/2 in a VirtualHost context (TLS only)</title>
         <highlight language="config">
-            Protocols h2 http/1.1
+Protocols h2 http/1.1
         </highlight>
+        <p>Allows HTTP/2 negotiation (h2) via TLS ALPN in a secure <directive>VirtualHost</directive>. HTTP/2 preamble checking (Direct mode, see <directive>H2Direct</directive>) is disabled by default for <code>h2</code>.</p>
+        </note>
 
-        <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 <directive module="mod_http2">H2Direct</directive> directive first.</p>
+        <note><title>HTTP/2 in a Server context (TLS and cleartext)</title>
+        <highlight language="config">
+Protocols h2 h2c http/1.1
+        </highlight>
+        <p>Allows HTTP/2 negotiation (h2) via TLS ALPN for secure <directive>VirtualHost</directive>. Allows HTTP/2 cleartext negotiation (h2c) upgrading from an initial HTTP/1.1 connection or via HTTP/2 preamble checking (Direct mode, see <directive>H2Direct</directive>).</p>
+        </note>
 
         <p>Refer to the official <a href="https://http2.github.io/faq">HTTP/2 FAQ</a> for any doubt about the protocol.</p>