Merge pull request #769 from WalkerWatch/jetty-9.3.x

Fixing doc rendering issue.
This commit is contained in:
Jesse McConnell 2016-07-26 07:51:46 -05:00 committed by GitHub
commit 0adee58367
3 changed files with 3 additions and 2 deletions

View File

@ -21,4 +21,4 @@ include::introduction.adoc[]
include::enabling-http2.adoc[]
include::configuring-http2.adoc[]
include::configuring-push.adoc[]
include::configuring-haproxy.adoc[]
include::configuring-haproxy.adoc[]

View File

@ -51,6 +51,7 @@ $ java -jar $JETTY_HOME/start.jar --list-config
The common properties associated with connectors (host,port, timeouts, etc.) can be set in the module ini files (or `start.ini` if `--add-to-start` was used): `${jetty.base}/start.d/http.ini` and `${jetty.base}/start.d/ssl.ini`.
These properties are instantiated in the associated XML files: `${jetty.home}/etc/jetty-http.xml`; `${jetty.home}/etc/jetty-ssl.xml`, plus the SSL keystore is instantiated in `${jetty.home}/etc/jetty-ssl-context.xml`.
____
[NOTE]
If you are planning to edit XML files, make sure to copy them to your `{$jetty.base}/etc/` directory before doing so.
The XML files that come with the Jetty distribution should *not* be modified directly.

View File

@ -30,7 +30,7 @@ This is done automatically when using the Jetty distribution's start.jar link:#s
____
[[http2-modules]]
=== Jetty HTTP/2 Sub Projects
==== Jetty HTTP/2 Sub Projects
The Jetty HTTP/2 implementation consists of the following sub-projects (each producing a jar file):