diff --git a/header-template-doc.txt b/header-template-doc.txt
new file mode 100644
index 00000000000..d0f88277541
--- /dev/null
+++ b/header-template-doc.txt
@@ -0,0 +1,15 @@
+ ========================================================================
+ Copyright (c) ${copyright-range} Mort Bay Consulting Pty. Ltd.
+ ========================================================================
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ and Apache License v2.0 which accompanies this distribution.
+
+     The Eclipse Public License is available at
+     http://www.eclipse.org/legal/epl-v10.html
+
+     The Apache License v2.0 is available at
+     http://www.opensource.org/licenses/apache2.0.php
+
+ You may elect to redistribute this code under either of these licenses.
+ ========================================================================
\ No newline at end of file
diff --git a/header-template.txt b/header-template-java.txt
similarity index 100%
rename from header-template.txt
rename to header-template-java.txt
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
index f7328cfa3ea..c08d26a924a 100644
--- a/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[alpn]]
 === Introducing ALPN
diff --git a/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc
index 53ab22b7031..e7f7b36aba7 100644
--- a/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/alpn/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[alpn-chapter]]
 == Application Layer Protocol Negotiation (ALPN)
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc
index 583b9ddfddf..b0cbff8e453 100644
--- a/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/annotations/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[annotations]]
 == Annotations
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
index 59baa782981..5eb90f2d4e5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[annotations-quick-setup]]
 === Quick Setup
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
index cb665696e2c..6a166b3c88e 100644
--- a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[using-annotations-embedded]]
 === Using Annotations with Jetty Embedded
diff --git a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
index 28fa503900d..316b17d5fe5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[using-annotations]]
 === Working with Annotations
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc
index 9e07568fcc9..1059cc42ca5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/balancer-servlet.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[balancer-servlet]]
 === Balancer Servlet
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc
index 7c01cf8ec21..2cca30b128a 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/cgi-servlet.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[cgi-servlet]]
 === CGI Servlet
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc
index ebf751375da..9b38a725f4b 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[advanced-extras]]
 == Provided Servlets, Filters, and Handlers
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
index c71c68f84ac..703a3d72032 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[cross-origin-filter]]
 === Cross Origin Filter
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
index b6418661f0e..d2225c8999e 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[debug-handler]]
 === Debug Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
index 11aa448bd07..b15c4e68f86 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[default-handler]]
 === Default Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc
index ab82b6c627d..300b08f7f17 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/default-servlet.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[default-servlet]]
 === Default Servlet
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
index 78fc3199a13..eb96c9badfb 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[dos-filter]]
 === Denial of Service Filter
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc
index 9f167d2d2ac..3b580181139 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/error-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[error-handler]]
 === Error Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
index df3b175bf27..ff4c25256e4 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[gzip-filter]]
 === Gzip Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc
index f8bbde183b7..8de9536b95a 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[header-filter]]
 === Header Filter
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc
index 08bd869352c..8ac09fa6a9f 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/ipaccess-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[ipaccess-handler]]
 === IP Access Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
index 05844ca915e..e4a68f83213 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[moved-context-handler]]
 === Moved Context Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc
index 1ae74bd0874..16486efbdb0 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/proxy-servlet.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[proxy-servlet]]
 === Proxy Servlet
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
index e35d3c0a0d3..93bef25415d 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[qos-filter]]
 === Quality of Service Filter
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
index 426ef4dcb83..d7fdbda3925 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[resource-handler]]
 === Resource Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
index 80b45a66550..6c7e82209e3 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[rewrite-handler]]
 === Rewrite Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
index 294df68c777..4b668cc4f3c 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[shutdown-handler]]
 === Shutdown Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc b/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
index 4bf1186e639..56ee9459f42 100644
--- a/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[statistics-handler]]
 === Statistics Handler
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc
index 100c8c0648c..e33be3aafe5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[fastcgi]]
 == FastCGI Support
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
index 98c7eba243b..b5c693f360c 100644
--- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-fastcgi]]
 === Configuring Jetty for FastCGI
diff --git a/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc b/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc
index add23bb7429..e788fe1af33 100644
--- a/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/fastcgi/fastcgi-intro.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[fastcgi-intro]]
 === FastCGI Introduction
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc
index b7d1dc9176b..d11a39ebc6f 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2]]
 == HTTP/2
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
index 0ca369740ce..bfb4d608601 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2-configuring-haproxy]]
 === Configuring HAProxy and Jetty
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
index ed9e93e0892..874c74a0bd1 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2-configuring]]
 === Configuring HTTP/2
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc
index 70079b21d64..7d7dcd6a489 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2-configuring-push]]
 === Configuring HTTP/2 Push
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc
index a83a756c272..04e387324a9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2-enabling]]
 === Enabling HTTP/2
diff --git a/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc b/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc
index 77eba2ddb27..98600a256b0 100644
--- a/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http2-introduction]]
 === Introducing HTTP/2
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc
index d1ae17bdfff..4f002238058 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jmx/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jmx-chapter]]
 == Java Management Extensions (JMX)
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc
index 9cc605303bf..d8260067976 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-jconsole]]
 === Managing Jetty with JConsole and JMC
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc
index f37aa461bb4..b0b8139d9ba 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-jmx-annotations]]
 === Jetty JMX Annotations
diff --git a/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc b/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
index 66a10add07d..e4760cf8450 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[using-jmx]]
 === Using JMX with Jetty
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc
index 26da2eac699..da395aaa2a8 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jndi]]
 == Configuring JNDI
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc
index 44b69905f5d..0871ea53f69 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jndi-configuration]]
 === Configuring JNDI
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc
index 028eb4da0cd..569930f7e36 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jndi-datasource-examples]]
 === Datasource Examples
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc
index e683e898430..9332335f068 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jndi-embedded]]
 === Using JNDI with Jetty Embedded
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc
index 24dc34962fb..ec35360fe26 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jndi-quick-setup]]
 === Quick Setup
diff --git a/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc b/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc
index 6fe67e8363e..523fbed7bb9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[using-jetty-jndi]]
 === Working with Jetty JNDI
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc
index 0eba18be567..38b35596c1b 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-logging]]
 == Jetty Logging
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc
index 951cefd0f26..9ca9f00a475 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-jetty-logging]]
 === Configuring Jetty Logging
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc
index 3edc01d7db3..dd452a02efd 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-jetty-request-logs]]
 === Configuring Jetty Request Logs
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc
index a7ad046d921..4179ef67205 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-logging-modules]]
 === Jetty Logging Integrations (SLF4J, Log4j, Logback, JCL, JUL)
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
index b867e199129..755a4e6c740 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[default-logging-with-stderrlog]]
 === Default Logging with Jetty's StdErrLog
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc
index 02632c3b651..5d18b7ff921 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/dump-tool.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-dump-tool]]
 === Jetty Dump Tool
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc
index 7170783e5d8..04c5f6e7ed5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 === Example: Logging with Apache Log4j
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc
index a6c8556a05d..92ff12ceefe 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 === Example: Logging with Java's java.util.logging via JavaUtilLog
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
index ffb4e298f44..82ac20a6a8e 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 === Example: Logging with Java's java.util.logging via Slf4j
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
index 8aa3865dd42..d0aa9aed14b 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[example-logging-logback-centralized]]
 === Centralized Logging using Logback
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc
index b595dc24aa2..b9c0278c498 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[example-logging-logback-sifting]]
 === Example: MDC Based Sifting of Logs with Logback
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
index 37d8fb26d40..f31c129c7df 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 === Example: Logging with Logback
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc b/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
index 6edf5122cbe..d6556b24ee6 100644
--- a/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[example-slf4j-multiple-loggers]]
 === Example: Capturing Multiple Logging Frameworks with Slf4j
diff --git a/jetty-documentation/src/main/asciidoc/administration/part.adoc b/jetty-documentation/src/main/asciidoc/administration/part.adoc
index dae630b7bec..f449e6cdc67 100644
--- a/jetty-documentation/src/main/asciidoc/administration/part.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/part.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,8 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
+
 [[jetty-admin-guide]]
 
 = Jetty Administration Guide
diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc
index 55cdd278cc7..57ae50b075d 100644
--- a/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/runner/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[runner]]
 == Jetty Runner
diff --git a/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc b/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc
index c4c8c802273..4f71f91c496 100644
--- a/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-runner]]
 === Use Jetty Without an Installed Distribution
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc
index 41c17c5ae07..f7a5657d0e9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-management]]
 == Session Management
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
index 489af840836..f382cdb5a12 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-clustering-gcloud-datastore]]
 === Session Clustering with Google Cloud Datastore
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc
index a6a998c240e..c782941eaf1 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-clustering-infinispan]]
 === Session Clustering with Infinispan
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc
index ca0136d6275..8470fab0a64 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-clustering-jdbc]]
 === Session Clustering with a Database
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc
index 4a53413c08f..d817d3b62f9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-clustering-mongodb]]
 === Session Clustering with MongoDB
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc
index 8439fd3eba9..b50c9dcc543 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[setting-session-characteristics]]
 === Setting Session Characteristics
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc
index 0fa47bd64af..0ae44005dae 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[using-persistent-sessions]]
 === Using Persistent Sessions
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc
index 3c3e96e9b14..e88f173f9cf 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-file-system]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc
index 611e11163a0..619093b80a2 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-gcloud]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc
index d4cc04ca083..2eb619ef572 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-hazelcast]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc
index b5a1cda40d1..4470b2eae13 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-housekeeper.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-configuration-housekeeper]]
 === The SessionIdManager and the Housekeeper
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc
index 5148a45fe04..4787a69bba9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-infinispan]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc
index 989ee0dd10f..d56d7c335fd 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-jdbc]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
index 4113aa4bb30..7e5772db601 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-configuration-memcachedsessiondatastore]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc
index 5917f0d4868..7d59cb57790 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memory.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-memory]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc
index 8491e7ed3b7..f486b0ac941 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-sessions-mongo]]
 
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc
index 477b53f1b9b..b9775a258af 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[session-configuration-sessioncache]]
 === The L1 Session Cache
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc
index b3eac641a9e..4734dc90301 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-sessions-architecture]]
 === Session Architecture
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc
index 7d303376144..e87f382f7bb 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-details.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[sessions-details]]
 === Session Components
diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc
index 98668e3d054..87cb3ba6e65 100644
--- a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[sessions-usecases]]
 === Session Use Cases
@@ -88,6 +90,6 @@ The example above functions in either a `jetty-web.xml` file or a link:#using-ba
 
 ____
 [NOTE]
-If you explicitly configure the `SessionCache` and `SessionDataStore` for a `SessionHandler` in a context xml file or `jetty-web.xml` file, any session modules you already have enabled are ignored. 
+If you explicitly configure the `SessionCache` and `SessionDataStore` for a `SessionHandler` in a context xml file or `jetty-web.xml` file, any session modules you already have enabled are ignored.
 So, for example, if you had enabled the `session-store-gcloud module` for your sever, you could force a particular webapp to use the `FileSessionDataStore` by explicitly configuring it in either a context xml file or a `jetty-web.xml` file as shown above.
 ____
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc
index 0fec3d5e037..441d8d47d87 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup]]
 == Starting Jetty
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc
index df3b528e80f..0985657c1a3 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[custom-modules]]
 === Custom Modules
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
index d747dd73c89..113f785ded3 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc
index 4f07e9b14cf..260c86a487b 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
index 3f1fa7faf92..4b38f264772 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc
index 02b3b46b55c..7698aada319 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc
index 3d1d2e97455..e4cc6d88542 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
index 474f05b0799..1576f45a5c9 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [source, screen, subs="{sub-order}"]
 ....
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
index 67185217b20..b58bf3a8814 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[start-jar]]
 === Using start.jar
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc
index a8e3063c4ed..051749fba36 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/start-matrix.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[advanced-start-matrix]]
 === Start Option Matrix [deprecated]
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
index 8d15cfdef82..e5c347a8a00 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-base-and-home]]
 === Managing Jetty Base and Jetty Home
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
index 97327d79035..4a51bc158bb 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-classpath]]
 === Managing Server Classpath
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc
index 36ecc246442..e198222ee56 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-modules]]
 === Managing Startup Modules
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
index ce20e7876d7..6193508a076 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-overview]]
 === Startup Overview
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc
index 8e532175e32..72058630181 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-troubleshooting.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-troubleshooting]]
 === Startup Troubleshooting
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
index ed18cf0df6a..3e1895a66d5 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-unix-service]]
 === Startup a Unix Service using jetty.sh
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc
index 15f5f894ea3..aceb9a325ff 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-windows-service]]
 === Startup via Windows Service
diff --git a/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc b/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc
index c61be2ab31b..f8bc6dfda0a 100644
--- a/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/startup/startup-xml-config.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[startup-xml-config]]
 === Managing XML Based Startup Configuration
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc
index 272b94cb093..d534a8a1692 100644
--- a/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/tuning/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[optimizing]]
 == Optimizing Jetty
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc
index adc9458c4d5..cd34d0a8761 100644
--- a/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[garbage-collection]]
 === Garbage Collection
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc
index 6e1b88c9dad..8e536c0077f 100644
--- a/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[high-load]]
 === High Load
diff --git a/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc b/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc
index 0acb75804ad..537e0bfe1e4 100644
--- a/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc
+++ b/jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[limit-load]]
 === Limiting Load
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc
index 13ad7a7cc54..e1b48a8f6a9 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-connectors]]
 == Configuring Jetty Connectors
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc
index bdc47a4283a..14a5b89fd60 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-connectors]]
 === Connector Configuration Overview
@@ -305,7 +307,7 @@ link:{GITBROWSEURL}/jetty-server/src/main/config/etc/jetty-https.xml[`jetty-http
 link:{GITBROWSEURL}/jetty-server/src/main/config/etc/jetty-http-forwarded.xml[`jetty-http-forwarded.xml`]::
   Adds a link:{JDURL}/org/eclipse/jetty/server/ForwardedRequestCustomizer.html[`ForwardedRequestCustomizer`]to the HTTP Connector to process forwarded-for style headers from a proxy.
 link:{GITBROWSEURL}/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml[`jetty-http2.xml`]::
-  Adds a link:{JDURL}/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.html[`Http2ServerConnectionFactory`] to the  link:{JDURL}/org/eclipse/jetty/server/ServerConnector.html[`ServerConnector`] configured by `jetty-ssl.xml` to support the http2 protocol. 
+  Adds a link:{JDURL}/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.html[`Http2ServerConnectionFactory`] to the  link:{JDURL}/org/eclipse/jetty/server/ServerConnector.html[`ServerConnector`] configured by `jetty-ssl.xml` to support the http2 protocol.
 link:{GITBROWSEURL}/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml[`jetty-alpn.xml`]::
   Adds an link:{JDURL}/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.html[`ALPNServerConnectionFactory`] to the link:{JDURL}/org/eclipse/jetty/server/ServerConnector.html[`ServerConnector`] configured by `jetty-ssl.xml` which allows the one SSL connector to support multiple protocols with the ALPN extension used to select the protocol to be used for each connection.
 
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc
index aff324539ac..971cb823f6c 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-ssl-distribution]]
 === SSL in the Jetty Distribution
diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
index 6607120ea35..14534ce8886 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-ssl]]
 === Configuring SSL/TLS
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc
index 602a364dc6a..3c12094eb8a 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-contexts]]
 == Configuring Contexts
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc
index 15ba26b28eb..b6f4456692e 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-virtual-hosts]]
 === Configuring Virtual Hosts
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc
index 20b15866414..a41bb03fe73 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[custom-error-pages]]
 === Creating Custom Error Pages
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc
index 0c6acf7bff4..c826102e639 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[serving-webapp-from-particular-port]]
 === Serving a WebApp from a Particular Port/Connector
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc
index aa99dc3a292..0a51afeee41 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[setting-context-path]]
 === Setting a Context Path
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc
index a2df60e9fad..0304e9d0d72 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[setting-form-size]]
 === Setting Max Form Size
diff --git a/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc b/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc
index 30e3631b292..a81304b31e5 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[ref-temporary-directories]]
 === Temporary Directories
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc
index 4c83857dedb..4c9e2ab7dd2 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/anatomy-of-a-webapp.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[anatomy-of-a-webapp]]
 === Anatomy of a Web Application
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc
index 4592ff1e96d..0ea7ad79ca4 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/automatic-webapp-deployment.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[automatic-webapp-deployment]]
 === Automatic Web Application Deployment
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
index 1e424b55c75..a466727a51e 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-deployment]]
 == Deploying to Jetty
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc
index fc6b710ec99..a4491b2554b 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-specific-webapp-deployment]]
 === Configuring a Specific Web Application Deployment
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc
index e6c0b1c45bc..bc58be3c299 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[deployment-architecture]]
 === Deployment Architecture
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc
index 1283dc58d88..9b43ef3a998 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-webapps]]
 === Deployment Processing of WebAppContexts
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc
index ec9e98a8a25..406a3a1b821 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[hot-deployment]]
 === Hot Deployment
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc
index 7396abe19e5..5f5fea6c485 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/overlay-deployer.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[overlay-deployer]]
 === Overlay WebApp Deployer
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
index dbfbef3b8b6..f01eeab6d58 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-webapp]]
 === Quickstart Webapps
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc
index 7e0bfc00bae..6dc961b3530 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/setting-deployment-bindings.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[setting-deployment-bindings]]
 === Setting Deployment Bindings
diff --git a/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc b/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc
index 3eb06f78266..dfe2fbcf72e 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[static-content-deployment]]
 === Configuring Static Content Deployment
diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc
index 56d88984bff..5ed19c2d1d6 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/jsp/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-jsp]]
 == Configuring JSP Support
diff --git a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc
index 96eaf9f70b0..068e3404831 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jsp-support]]
 === Configuring JSP
diff --git a/jetty-documentation/src/main/asciidoc/configuring/part.adoc b/jetty-documentation/src/main/asciidoc/configuring/part.adoc
index 9500fcdf3d6..cc36301813b 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/part.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/part.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,8 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
+
 [[jetty-config-guide]]
 
 = Jetty Configuration Guide
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
index ef253f26209..84a85cd7cd0 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-security-authentication]]
 === Authentication and Authorization
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc
index b0e4416db98..6aa4fd54653 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-security]]
 == Configuring Security
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
index 50f391f09ed..aabda82c15b 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-form-size]]
 === Limiting Form Content
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
index 1d4068e51e9..8ab698fe6c9 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jaas-support]]
 === JAAS Support
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc
index 2583774b68e..2aeb1174b03 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-home-and-jetty-base]]
 === Using the $\{jetty.home} and $\{jetty.base} Concepts to Configure
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc
index 3cbc489785a..b44c0d7d0ac 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[configuring-security-secure-passwords]]
 === Secure Password Obfuscation
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc
index 5c5587362cb..85e0fe0c43c 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[serving-aliased-files]]
 === Aliased Files and Symbolic links
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc
index df0a6c4ccee..9a17614cf04 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[setting-port80-access]]
 === Setting Port 80 Access for a Non-Root User
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc
index b867dd1bda0..fd2cfb3d2c0 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[spnego-support]]
 === Spnego Support
diff --git a/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc
index 9b900bb913f..edc282ab98c 100644
--- a/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/ant/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[ant-and-jetty]]
 == Ant and Jetty
diff --git a/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc b/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc
index f695f785600..ce8ad8f2c2f 100644
--- a/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-ant]]
 === Ant Jetty Plugin
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc
index c081ef31676..0915e901061 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client]]
 == HTTP Client
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc
index 155e03a87e5..ec07707ba05 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-api]]
 === API Usage
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc
index 505cb83a303..52c7b224bf4 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-authentication]]
 === Authentication Support
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc
index 34886a8bb08..3cfd92f5601 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-cookie]]
 === Cookies Support
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc
index 03dd51a8cc9..8ff722ff739 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-intro]]
 === Introduction
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc
index 45b3b2349af..808a6d277c0 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-proxy]]
 === Proxy Support
diff --git a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc
index 10cc6cd65e6..62cea88312f 100644
--- a/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[http-client-transport]]
 === Pluggable Transports
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc
index 969c3ff1ad7..8eafe8a67d6 100644
--- a/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/continuations/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[continuations]]
 == Continuations
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc
index f6e901e4fdb..af982ac8617 100644
--- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-intro.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[continuations-intro]]
 === Introduction
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc
index f0924fa0d3d..e0ebcaf1389 100644
--- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[continuations-patterns]]
 === Common Continuation Patterns
diff --git a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc
index 4641e7eecef..7e806c7ab0c 100644
--- a/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[continuations-using]]
 === Using Continuations
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc
index b1fe3331e08..c316fa9b8d2 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[advanced-embedding]]
 == Embedding
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc
index db0b6590761..42e6e6ab061 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-examples]]
 === Embedded Examples
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc
index 11010c1395c..3d973562ce8 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedding-jetty]]
 === Embedding Jetty
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc
index 06ee5b3190d..bee9783e6ef 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-file-server]]
 ==== Simple File Server
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc
index 4f581e9a56a..7fdbd1b13d9 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-many-connectors]]
 ==== Multiple Connectors
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc
index a398bff58d7..a965701ac79 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-minimal-servlet]]
 ==== Minimal Servlet
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc
index d2fe0fda763..3c0e6a6f90e 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-one-webapp]]
 ==== Web Application
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc
index 837e84580a4..be663c1b4e6 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-secured-hello-handler]]
 ==== Secured Hello Handler
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc
index 5f8eda2aa56..615b45d09be 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[embedded-split-file-server]]
 ==== Split File Server
diff --git a/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc b/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc
index 7e10fb571b6..f5088057bb4 100644
--- a/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-helloworld]]
 === Jetty Embedded HelloWorld
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc
index 2bae0934911..7ed447e189e 100644
--- a/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/frameworks/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[frameworks]]
 == Frameworks
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc
index 5436e186542..8dcd06fedf4 100644
--- a/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[framework-metro]]
 === Metro
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc
index cf32d92fd7a..66053995632 100644
--- a/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[framework-jetty-osgi]]
 === OSGI
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc
index c389d46bf23..c2e5c0c994b 100644
--- a/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[framework-jetty-spring]]
 === Spring Setup
diff --git a/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc b/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
index 9d3718fb651..fa98f604664 100644
--- a/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[framework-weld]]
 === Weld
diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc
index 7dfc818e17a..d47427effe7 100644
--- a/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/handlers/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-handlers]]
 == Handlers
diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc
index 49f53249999..a8bfd46b9af 100644
--- a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[writing-custom-handlers]]
 === Writing Custom Handlers
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc
index d56efdbe321..34b458ce2b4 100644
--- a/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/maven/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[maven-and-jetty]]
 == Maven and Jetty
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc
index 623bf23e3db..9e1a3134bfb 100644
--- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-jspc-maven-plugin]]
 === Jetty Jspc Maven Plugin
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc
index 34f1c7ec01b..7430704d3e5 100644
--- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-maven-helloworld]]
 === Using Maven
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc
index 31a1d71cf57..57a3269fe81 100644
--- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-maven-plugin]]
 === Configuring the Jetty Maven Plugin
diff --git a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc
index dc31128074f..27e068b24de 100644
--- a/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-scanning.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-maven-scanning]]
 === Files Scanned by the Jetty Maven Plugin
diff --git a/jetty-documentation/src/main/asciidoc/development/part.adoc b/jetty-documentation/src/main/asciidoc/development/part.adoc
index 6ec17073d11..c97a3bf6ff1 100644
--- a/jetty-documentation/src/main/asciidoc/development/part.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/part.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,8 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
+
 [[jetty-dev-guide]]
 
 = Jetty Development Guide
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc
index a6d844887f3..fab182278a7 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[websocket-intro]]
 == WebSocket Introduction
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc
index fa021efa1d6..cb625b6a1d0 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[websocket-java]]
 == Java Websocket API
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc
index 89e15ccafc9..fa9dca17c21 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-client-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[java-websocket-client-api]]
 = Java WebSocket Client API Usage
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc
index 2e932d078f4..9ed83f02571 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/java/java-websocket-server-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[java-websocket-server-api]]
 = Java WebSocket Server API
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc
index 1265e027454..56ce1cb9b37 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[websocket-jetty]]
 == Jetty Websocket API
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc
index ec29d81948d..f845dc3e3a3 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-adapter]]
 === Using the WebSocketAdapter
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc
index 73b00751c4b..55c161745bb 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-annotations]]
 === Using WebSocket Annotations
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc
index ecce0322b67..319c7bf2d5c 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-events.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-events]]
 === WebSocket Events
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc
index 953846d0e0b..25bcb8f799a 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-listener]]
 === Using WebSocketListener
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc
index 7dc4d9ee4ec..f9dcbae27fb 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-send-message]]
 === Send Messages to Remote Endpoint
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc
index 0ead9602451..83b8227ec23 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api-session]]
 === WebSocket Session
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc
index f01ff02ddb7..63f5235a5ed 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-api]]
 === Jetty WebSocket API Usage
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc
index 46a5e0a7726..0f69d81cfef 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-client-api]]
 === Jetty WebSocket Client API
diff --git a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc
index e8b16bf61e9..99d582a8883 100644
--- a/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc
+++ b/jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-websocket-server-api]]
 === Jetty WebSocket Server API
diff --git a/jetty-documentation/src/main/asciidoc/index.adoc b/jetty-documentation/src/main/asciidoc/index.adoc
index 4b5846b4d38..9595398c802 100644
--- a/jetty-documentation/src/main/asciidoc/index.adoc
+++ b/jetty-documentation/src/main/asciidoc/index.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 Jetty : The Definitive Reference
 ================================
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc
index 4260bca3497..4650b2ee173 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quick-start-configure]]
 == An Introduction to Jetty Configuration
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc
index 1e93096eb5d..5f1edff6c34 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-config-how]]
 === How to Configure Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc
index 54681b06d19..2eb0cb90038 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-config-what]]
 === What to Configure in Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc
index 8f9c022de70..b5358ba24a1 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quick-start-getting-started]]
 == Using Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-common-configuration.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-common-configuration.adoc
index e49ec9d7f41..258ac14e972 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-common-configuration.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-common-configuration.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-common-config]]
 
@@ -184,4 +186,4 @@ The `start.jar` mechanism has many options which are documented in the xref:star
 [source, screen, subs="{sub-order}"]
 ----
 > java -jar $JETTY_HOME/start.jar --help
-----
\ No newline at end of file
+----
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc
index 7493d3a54eb..598954ef9c4 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-deploying-webapps]]
 === Deploying Web Applications
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc
index dbea7fb51a0..399c7c9e1c2 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-downloading]]
 === Downloading Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
index 6097efb0299..e8fdab28f49 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-running-jetty]]
 === Running Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc
index 4e3ef6c87b4..542be3715c9 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[introduction]]
 == Introducing Jetty
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc
index c0efb18cff7..a1fd059b4c8 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[quickstart-jetty-coordinates]]
 === Finding Jetty in Maven
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc
index 673f7e1f1d3..5a52e3c20df 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-javaee.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-javaee]]
 === Jetty and Java EE Web Profile
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc
index 68a5ec6a173..55bd747a6f1 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-is-jetty.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[what-is-jetty]]
 === What is Jetty?
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc
index 14975a46fb2..9d54ce8a082 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[what-jetty-version]]
 === What Version Do I Use?
diff --git a/jetty-documentation/src/main/asciidoc/quick-start/part.adoc b/jetty-documentation/src/main/asciidoc/quick-start/part.adoc
index 7e3e18afaed..c577d4afafd 100644
--- a/jetty-documentation/src/main/asciidoc/quick-start/part.adoc
+++ b/jetty-documentation/src/main/asciidoc/quick-start/part.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,8 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
+
 [[quick-start]]
 
 = Getting Started With Jetty
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc
index 9af3d946bfc..7b00a2194f0 100644
--- a/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/architecture/1xx-responses.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-1xx-responses]]
 === Managing 1xx Responses
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc
index 47f10540c51..5416bb089fb 100644
--- a/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[basic-architecture]]
 === Jetty Architecture
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc
index 8f88288671d..a0795fa490f 100644
--- a/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/architecture/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[architecture]]
 == Architecture
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc
index 8aaf913d5e4..641053800ee 100644
--- a/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-classloading]]
 === Jetty Classloading
diff --git a/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc b/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc
index 247f99ca43d..9550b35fb1e 100644
--- a/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[creating-custom-protocol]]
 === Creating a Custom Protocol
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc
index 44e748aba75..86e743f74d0 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/bugs.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[bugs]]
 === Issues, Features, and Bugs
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc
index c805c8eaca8..797d59b5411 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[advanced-contributing]]
 == Contributing to Jetty
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc
index 1bba348150e..59007e0b9bb 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[coding-standards]]
 === Coding Standards
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc
index b1a47d807ad..58fde530cde 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/community.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[community]]
 === Community
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc
index 38a1723b165..33f780e4550 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[contributing-documentation]]
 === Documentation
@@ -189,6 +191,7 @@ license blocks::
   Each adoc file should contain the license block that exists in the index.adoc file and a copy has been added to the bottom of this page as well for reference.
 
 ....
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -204,6 +207,7 @@ license blocks::
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 ....
 
 Some admonition examples:
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc
index 3e9e16f115d..b32cf4e78ae 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[contributing-patches]]
 === Contributing Patches
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc
index c3a6f3bea83..61a5ff93e86 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[release-testing]]
 === Testing a Jetty Release
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc
index b56b8495c97..495629798cb 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[releasing-jetty]]
 === Releasing Jetty
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc
index 46a8e798043..6760f809eeb 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/security.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[security-reporting]]
 === Reporting Security Issues
diff --git a/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc b/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc
index 78abc7bc9a2..c3707f2ab55 100644
--- a/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[contributing-source-build]]
 === Source Control and Building
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc
index 6d295327d4f..a501c7ce0ab 100644
--- a/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/debugging/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[advanced-debugging]]
 == Debugging
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc
index b46596ed71a..6ce95ae1df8 100644
--- a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[debugging-with-eclipse]]
 === Debugging With Eclipse
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc
index 98b1ddb458e..b5519dc92d6 100644
--- a/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[debugging-with-intellij]]
 === Debugging With IntelliJ
diff --git a/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc b/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc
index 0d18f16c38f..f153874f51a 100644
--- a/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[enable-remote-debugging]]
 === Enable remote debugging
diff --git a/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc
index a746da38c4b..1fcdd2cdc54 100644
--- a/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/faq/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[faq]]
 == Frequently Asked Questions
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc
index 63347283e06..156c820f515 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[reference-section]]
 == Jetty XML Reference
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc
index 078a55d9f10..f9a042c624a 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-env-xml]]
 === jetty-env.xml
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc
index 5f481cae416..7f785edc17d 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-web-xml-config]]
 === jetty-web.xml
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc
index d69650899fa..36f7041ee99 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-xml-config]]
 === jetty.xml
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc
index 10a4771732a..b0b646bf7e1 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-xml-syntax]]
 === Jetty XML Syntax
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc
index ead3c27f1ea..1bbaaf0eec9 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jetty-xml-usage]]
 === Jetty XML Usage
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc
index 006826a14ad..f4909a7b8c4 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[override-web-xml]]
 === Jetty override-web.xml
diff --git a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc
index 5d64fbaec35..59ed488bae3 100644
--- a/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[webdefault-xml]]
 === webdefault.xml
diff --git a/jetty-documentation/src/main/asciidoc/reference/part.adoc b/jetty-documentation/src/main/asciidoc/reference/part.adoc
index 45a31c2cf51..7d3d8e4331e 100644
--- a/jetty-documentation/src/main/asciidoc/reference/part.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/part.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,7 +14,8 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
-// #TODO Remove chapter in Jetty 10
+//
+
 [[jetty-ref-guide]]
 
 = Jetty Reference Guide
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc
index cf99877ce9f..e36e6ac5662 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[platforms]]
 == Platforms, Stacks and Alternative Distributions
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc
index e24386b0616..5f7827a8c2a 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[cloudfoundry]]
 === CloudFoundry
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc
index f1e36ffcf17..fed2d082f51 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[elastic-beanstalk]]
 === Amazon Elastic Beanstalk
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc
index ba8e4a91557..f307b1f8127 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/fedora.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[fedora]]
 === Fedora
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc
index 5155f05ac89..52f7a5e245e 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/jelastic.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[jelastic]]
 === Jelastic
diff --git a/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc b/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc
index fbada6592fc..42d04b03ed2 100644
--- a/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/platforms/ubuntu.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[ubuntu]]
 === Ubuntu
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc
index ffa7b8c02ff..bf865bbabd2 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[troubleshooting]]
 == Troubleshooting
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc
index f5c1525bd42..5c4d643d81d 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[preventing-memory-leaks]]
 === Preventing Memory Leaks
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc
index 7bb7aea913d..1c12f5ff1d5 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/security-reports.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[security-reports]]
 === Jetty Security Reports
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc
index 8ba0c2e454a..11e935d422a 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/slow-deployment.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[troubleshooting-slow-deployment]]
 === Troubleshooting Slow Deployment
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc
index 088509c2f02..14b8fadbcb1 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[troubleshooting-locked-files-on-windows]]
 === Troubleshooting Locked Files on Windows
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
index 5ed71b4feb3..925ada439fe 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-zip-exceptions.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[troubleshooting-zip-exceptions]]
 === Troubleshooting Zip Exceptions
diff --git a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc
index 65ccb6cff7d..45720a81ad0 100644
--- a/jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/troubleshooting/watchservice.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[watchservice]]
 === Java WatchService
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc
index 007688fd259..99ece4508ec 100644
--- a/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/chapter.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 [[upgrading-jetty]]
 == Upgrading Jetty
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc
index ede33a961fa..247897b7ea0 100644
--- a/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/sample.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 = Sample Title
 
diff --git a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc
index 3c6a0a9fd47..9a02b58bcb6 100644
--- a/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc
+++ b/jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc
@@ -1,3 +1,4 @@
+//
 //  ========================================================================
 //  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
 //  ========================================================================
@@ -13,6 +14,7 @@
 //
 //  You may elect to redistribute this code under either of these licenses.
 //  ========================================================================
+//
 
 === Upgrading from Jetty 9.3.x to Jetty 9.4.0
 
diff --git a/pom.xml b/pom.xml
index 6fad6a085d5..f21f8fc6863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,36 +290,55 @@
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
         <inherited>false</inherited>
+        <version>3.0</version>
         <configuration>
-          <header>header-template.txt</header>
           <failIfMissing>true</failIfMissing>
           <aggregate>true</aggregate>
           <strictCheck>true</strictCheck>
           <properties>
             <copyright-range>${project.inceptionYear}-2018</copyright-range>
           </properties>
-          <mapping>
-            <java>DOUBLESLASH_STYLE</java>
-          </mapping>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-          <excludes>
-            <exclude>jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java</exclude>
-            <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/DefaultPolicyLoader.java</exclude>
-            <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/PolicyFileScanner.java</exclude>
-            <exclude>jetty-ant/**</exclude>
-            <exclude>jetty-infinispan/**</exclude>
-            <exclude>tests/test-sessions/test-infinispan-sessions/**</exclude>
-          </excludes>
         </configuration>
         <executions>
           <execution>
-            <id>check-headers</id>
+            <id>check-java-headers</id>
             <phase>verify</phase>
             <goals>
               <goal>check</goal>
             </goals>
+            <configuration>
+              <header>header-template-java.txt</header>
+              <mapping>
+                <java>DOUBLESLASH_STYLE</java>
+              </mapping>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+              <excludes>
+                <exclude>jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java</exclude>
+                <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/DefaultPolicyLoader.java</exclude>
+                <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/PolicyFileScanner.java</exclude>
+                <exclude>jetty-ant/**</exclude>
+                <exclude>jetty-infinispan/**</exclude>
+                <exclude>tests/test-sessions/test-infinispan-sessions/**</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>check-doc-headers</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <header>header-template-doc.txt</header>
+              <mapping>
+                <adoc>DOUBLESLASH_STYLE</adoc>
+              </mapping>
+              <includes>
+                <include>**/*.adoc</include>
+              </includes>
+            </configuration>
           </execution>
         </executions>
       </plugin>