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 c19423e9c62..a9c15ea735d 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
@@ -77,7 +77,7 @@ Otherwise, create a `webapps/myapp.xml` file as follows:
==== Avoiding TLD Scans with precompiled JSPs
Of course precompiling JSPs is an excellent way to improve the start time of a web application.
-Since jetty 9.2.0, the Apache Jasper JSP implementation has been used and has been augmented to allow the TLD scan to be skipped.
+As of Jetty 9.2 the Apache Jasper JSP implementation has been used and has been augmented to allow the TLD scan to be skipped.
This can be done by adding a `context-param` to the `web.xml` file (this is done automatically by the Jetty Maven JSPC plugin):
[source, xml, subs="{sub-order}"]
diff --git a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
index 6e110046c77..f6a24d34586 100644
--- a/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
+++ b/jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
@@ -17,41 +17,21 @@
[[configuring-security-authentication]]
=== Authentication
-There are two aspects to securing a web application(or context) within
-the Jetty server:
+There are two aspects to securing a web application(or context) within the Jetty server:
Authentication::
- The web application can be configured with a mechanism to determine
- the identity of the user. This is configured by a mix of standard
- declarations and jetty specific mechanisms and is covered in this
- section.
+ The web application can be configured with a mechanism to determine the identity of the user.
+ This is configured by a mix of standard declarations and jetty specific mechanisms and is covered in this section.
Authorization::
- Once the identify of the user is known (or not known), the web
- application can be configured via standard descriptors with security
- constraints that declare what resources that user may access.
+ Once the identify of the user is known (or not known), the web application can be configured via standard descriptors with security constraints that declare what resources that user may access.
==== Configuring an Authentication mechanism
-The jetty server supports several standard authentication mechanisms:
-http://en.wikipedia.org/wiki/Basic_access_authentication[BASIC];
-http://en.wikipedia.org/wiki/Digest_authentication[DIGEST];
-http://en.wikipedia.org/wiki/Form-based_authentication[FORM];
-CLIENT-CERT; and other mechanisms can be plugged in using the extensible
-http://docs.oracle.com/cd/E19462-01/819-6717/gcszc/index.html[JASPI] or
-http://en.wikipedia.org/wiki/SPNEGO[SPNEGO] mechanisms.
+The jetty server supports several standard authentication mechanisms: http://en.wikipedia.org/wiki/Basic_access_authentication[BASIC]; http://en.wikipedia.org/wiki/Digest_authentication[DIGEST]; http://en.wikipedia.org/wiki/Form-based_authentication[FORM]; CLIENT-CERT; and other mechanisms can be plugged in using the extensible http://docs.oracle.com/cd/E19462-01/819-6717/gcszc/index.html[JASPI] or http://en.wikipedia.org/wiki/SPNEGO[SPNEGO] mechanisms.
-Internally, configurating an authentication mechanism is done by setting
-an instance of a the
-link:{JDURL}/org/eclipse/jetty/security/Authenticator.html[Authenticator]
-interface onto the
-link:{JDURL}/org/eclipse/jetty/security/SecurityHandler.html[SecurityHandler]
-of the context, but in most cases it is done by declaring a `<
- login-config>` element in the standard web.xml descriptor or via
-annotations.
+Internally, configuring an authentication mechanism is done by setting an instance of a the link:{JDURL}/org/eclipse/jetty/security/Authenticator.html[Authenticator] interface onto the link:{JDURL}/org/eclipse/jetty/security/SecurityHandler.html[SecurityHandler] of the context, but in most cases it is done by declaring a `< login-config>` element in the standard web.xml descriptor or via annotations.
-Below is an example taken from the
-link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml?h=release-9[jetty-test-webapp
-web.xml] that configures BASIC authentication:
+Below is an example taken from the link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml?h=release-9[jetty-test-webapp web.xml] that configures BASIC authentication:
[source, xml, subs="{sub-order}"]
----
@@ -59,13 +39,10 @@ web.xml] that configures BASIC authentication:
BASIC
Test Realm
-
+
----
-The
-link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml?h=release-9[jetty-test-webapp
-web.xml] also includes commented out examples of other DIGEST and FORM
-configuration:
+The link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/WEB-INF/web.xml?h=release-9[jetty-test-webapp web.xml] also includes commented out examples of other DIGEST and FORM configuration:
[source, xml, subs="{sub-order}"]
----
@@ -77,14 +54,11 @@ configuration:
/logonError.html?param=test
-
+
----
-With FORM Authentication, you must also configure URLs of pages to
-generate a login form and handle errors. Below is a simple HTML form
-from the
-link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/logon.html?h=release-9[test
-webapp logon.html]:
+With FORM Authentication, you must also configure URLs of pages to generate a login form and handle errors.
+Below is a simple HTML form from the link:{GITBROWSEURL}/tests/test-webapps/test-jetty-webapp/src/main/webapp/logon.html?h=release-9[test webapp logon.html]:
[source, xml, subs="{sub-order}"]
----
@@ -108,78 +82,49 @@ webapp logon.html]: