trafficserver git commit: Update the HTTP/2 docs

[zw...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master 4810f98e7 -> 4f354f0fa


Update the HTTP/2 docs


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4f354f0f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4f354f0f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4f354f0f

Branch: refs/heads/master
Commit: 4f354f0fa37b1eb625c5b387e5870f5f8447ac05
Parents: 4810f98
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sun Apr 5 19:22:33 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Apr 5 19:22:33 2015 -0600

----------------------------------------------------------------------
 doc/reference/configuration/records.config.en.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4f354f0f/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 333e29f..2cf5373 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2492,6 +2492,14 @@ HTTP/2 Configuration
 ====================
 
 
+.. ts:cv:: CONFIG proxy.config.http2.enabled INT 0
+
+   Enable the experimental HTTP/2 feature. This implements most of the
+   specifications, with the one big exception being server PUSH.
+
+   .. note:: This configuration will be eliminated for v6.0.0, where HTTP/2 is
+	     enabled by default and controlled via the ports configuration.
+
 .. ts:cv:: CONFIG proxy.config.http2.max_concurrent_streams_in INT 100
    :reloadable: