Return-Path: 
 <cvs-return-56435-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 778B718137
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Thu, 25 Feb 2016 08:54:58 +0000 (UTC)
Received: (qmail 77388 invoked by uid 500); 25 Feb 2016 08:54:24 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 77325 invoked by uid 500); 25 Feb 2016 08:54:24 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 77316 invoked by uid 99); 25 Feb 2016 08:54:24 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO
 spamd4-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2016 08:54:24 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org)
 with ESMTP id 957CBC0476
	for <cvs@httpd.apache.org>; Thu, 25 Feb 2016 08:54:23 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 0.671
X-Spam-Level: 
X-Spam-Status: No, score=0.671 tagged_above=-999 required=6.31
	tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329]
	autolearn=disabled
Received: from mx2-lw-us.apache.org ([10.40.0.8])
	by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new,
 port 10024)
	with ESMTP id NcUTFoasn-GO for <cvs@httpd.apache.org>;
	Thu, 25 Feb 2016 08:54:22 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org
 [209.188.14.139])
	by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP
 id 778BD5F5CD
	for <cvs@httpd.apache.org>; Thu, 25 Feb 2016 08:54:22 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at
 mailrelay1-us-west.apache.org) with ESMTP id 9C8D8E04C4
	for <cvs@httpd.apache.org>; Thu, 25 Feb 2016 08:49:21 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org)
 with ESMTP id 9AF903A0113
	for <cvs@httpd.apache.org>; Thu, 25 Feb 2016 08:49:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1732263 -
 /httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en
Date: Thu, 25 Feb 2016 08:49:21 -0000
To: cvs@httpd.apache.org
From: elukey@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160225084921.9AF903A0113@svn01-us-west.apache.org>

Author: elukey
Date: Thu Feb 25 08:49:21 2016
New Revision: 1732263

URL: http://svn.apache.org/viewvc?rev=1732263&view=rev
Log:
documentation rebuild

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en

Modified: httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en?rev=1732263&r1=1732262&r2=1732263&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_http2.html.en Thu Feb 25 08:49:21 2016
@@ -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>