Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x

jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc

@@ -45,6 +45,8 @@ The default configuration for logging output will create a file `${jetty.logs}/y
 
 For more advanced logging configurations, please consider use of a separate logging library.
 
+[[stderr-properties]]
+==== The jetty-logging.properties File
 The recommended way to configure `StdErrLog` is to create a `${jetty.home}/resources/jetty-logging.properties` file, specify the log implementation to `StdErrLog` and then setup logging levels.
 
 [source,properties]
@@ -82,9 +84,9 @@ There are a number of properties that can be defined in the configuration that w
   When true, outputs logging events to `STDERR` using long form, fully qualified class names.
   When false, uses abbreviated package names.
   Default is false.
-  +
++
   * Example when set to false:
-  +
++
 [source, screen, subs="{sub-order}"]
 ....
 2014-06-03 14:36:16.013:INFO:oejs.Server:main: jetty-9.2.0.v20140526
@@ -93,9 +95,9 @@ There are a number of properties that can be defined in the configuration that w
 2014-06-03 14:36:17.880:INFO:oejs.ServerConnector:main: Started ServerConnector@34f2d11a{HTTP/1.1}{0.0.0.0:8080}
 2014-06-03 14:36:17.888:INFO:oejs.Server:main: Started @257ms
 ....
-  +
++
   * Example when set to true:
-  +
++
 [source, screen, subs="{sub-order}"]
 ....
 2014-06-03 14:38:19.019:INFO:org.eclipse.jetty.server.Server:main: jetty-9.2.0.v20140526

jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc

@@ -52,7 +52,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.

jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc

@@ -81,7 +81,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by mybase only.
 .  The `start.jar --add-to-start=logging,webapp-logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  Several entries are added to the `${jetty.base}/start.ini` configuration.

jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc

@@ -48,7 +48,7 @@ DOWNLOAD: https://raw.githubusercontent.com/jetty-project/logging-modules/master
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.

jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc

@@ -118,7 +118,7 @@ INFO: resources       enabled in     ${jetty.base}/start.ini
 The replacement `logging.mod` performs a number of tasks.
 
 .  `mybase` is a `${jetty.base}` directory.
-.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/ `and becomes the `${jetty.home}` directory for this demonstration.
+.  The jetty-distribution is unpacked (and untouched) into `/opt/jetty-dist/` and becomes the `${jetty.home}` directory for this demonstration.
 .  The `curl` command downloads the replacement `logging.mod` and puts it into the `${jetty.base}/modules/` directory for use by `mybase` only.
 .  The `start.jar --add-to-start=logging` command performs a number of steps to make the logging module available to the `${jetty.base}` configuration.
 ..  The `--module=logging` command is added to the `${jetty.base}/start.ini` configuration.

jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SlowClientsTest.java

@@ -44,8 +44,10 @@ import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class SlowClientsTest
 {
     private Logger logger = Log.getLogger(getClass());