Issue #5254 List/Show modules (#5257)

* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>

apache-jsp/src/main/config/modules/apache-jsp.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables use of the apache implementation of JSP
+Enables use of the apache implementation of JSP.
 
 [lib]
 lib/apache-jsp/*.jar

apache-jstl/src/main/config/modules/apache-jstl.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the apache version of JSTL
+Enables the apache version of JSTL for all webapps.
 
 [lib]
 lib/apache-jstl/*.jar

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod

@@ -3,6 +3,11 @@
 [description]
 Enables the ALPN (Application Layer Protocol Negotiation) TLS extension.
 
+[tag]
+connector
+ssl
+internal
+
 [depend]
 ssl
 alpn-impl/alpn-${java.version.platform}

jetty-cdi/src/main/config/modules/cdi-decorate.mod

@@ -1,9 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configures Jetty to use the "CdiDecoratingListener" as the default
+Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.
-CDI integration mode that allows a webapp to register it's own CDI
+This mode that allows a webapp to register it's own CDI decorator.
-decorator.
 
 [tag]
 cdi

jetty-cdi/src/main/config/modules/cdi-spi.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configures Jetty to use the "CdiSpiDecorator" that calls the CDI SPI
+Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.
-as the default CDI integration mode.
+This mode uses the CDI SPI to integrate an arbitrary CDI implementation.
 
 [tag]
 cdi

jetty-cdi/src/main/config/modules/cdi.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Support for CDI inside the webapp.
+Integration of CDI within webapp to Jetty container object lifecycles.
 This module does not provide CDI, but configures jetty to support various
 integration modes with a CDI implementation on the webapp classpath.
 CDI integration modes can be selected per webapp with the "org.eclipse.jetty.cdi"
@@ -26,4 +26,4 @@ deploy
 etc/cdi/jetty-cdi.xml
 
 [lib]
-lib/jetty-cdi-${jetty.version}.jar
+lib/jetty-cdi-${jetty.version}.jar

jetty-deploy/src/main/config/modules/global-webapp-common.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables Deployer to apply common configuration to all webapp deployments
+Enables Deployer to apply common configuration to all webapp deployments.
 
 [depend]
 deploy

jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables GCloud Datastore API and implementation
+Enables GCloud Datastore API and implementation.
 
 [tags]
 3rdparty

jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Control GCloud API classpath
+Control GCloud API classpath.
 
 [tags]
 3rdparty

jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables session data store in an embedded Hazelcast Map
+Enables session data store in an embedded Hazelcast Map.
 
 [tags]
 session

jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables session data store in a remote Hazelcast Map
+Enables session data store in a remote Hazelcast Map.
 
 [tags]
 session

jetty-home/src/main/resources/modules/conscrypt.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Installs the Conscrypt JSSE provider
+Installs the Conscrypt JSSE provider.
 
 [tags]
 3rdparty

jetty-home/src/main/resources/modules/jamon.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Deploys the JAMon webapplication
+Deploys the JAMon webapplication.
 
 [tags]
 3rdparty

jetty-home/src/main/resources/modules/jminix.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Deploys the Jminix JMX Console within the server
+Deploys the Jminix JMX Console within the server.
 
 [tags]
 3rdparty

jetty-home/src/main/resources/modules/jstl.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables JSTL for all webapplications deployed on the server
+Enables JSTL for all webapplications deployed on the server.
 
 [depend]
 jsp

jetty-home/src/main/resources/modules/logging-jcl-capture.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Capture jakarta-commons-logging events and bridge them to org.slf4j
+Capture jakarta-commons-logging events and bridge them to SLF4J.
 
 [tags]
 logging

jetty-home/src/main/resources/modules/logging-jetty.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure jetty logging mechanism.
+Base configuration for the jetty logging mechanism.
 Provides a ${jetty.base}/resources/jetty-logging.properties.
 
 [tags]

jetty-home/src/main/resources/modules/logging-jul-capture.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Capture java.util.logging events and bridge them to org.slf4j
+Capture java.util.logging events and bridge them to slf4j.
 
 [tags]
 logging

jetty-home/src/main/resources/modules/logging-jul.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure jetty logging to use Java Util Logging (jul)
+Configure jetty logging to use Java Util Logging (jul).
 SLF4J is used as the core logging mechanism.
 
 [tags]

jetty-home/src/main/resources/modules/logging-log4j1-capture.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Capture Apache log4j events and bridge them to org.slf4j
+Capture Apache log4j events and bridge them to SLF4J.
 
 [tags]
 logging

jetty-home/src/main/resources/modules/logging-log4j1.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure jetty logging to use Log4j Logging
+Configure jetty logging to use Log4j.
 SLF4J is used as the core logging mechanism.
 
 [tags]
@@ -55,4 +55,4 @@ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jetty-home/src/main/resources/modules/logging-log4j2.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure jetty logging to use log4j version 2
+Configure jetty logging to use log4j version 2.
 SLF4J is used as the core logging mechanism.
 
 [tags]

jetty-home/src/main/resources/modules/logging-noop.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure logging to use SLF4J No-Op Implementation
+Configure logging to use SLF4J No-Op Implementation.
 
 [tags]
 logging

jetty-home/src/main/resources/modules/logging/slf4j.mod

@@ -1,8 +1,9 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Configure logging to use slf4j with no impl
+Configure logging to use SLF4J.
-(If you don't select an impl, then NOP will be used by slf4j)
+A specific implementation of SLF4J is not enabled. 
+If one is not selected then NOP implementation will be used.
 
 [tags]
 logging

jetty-home/src/main/resources/modules/setuid.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the unix setUID configuration so that the server
+Enables the unix setUID configuration.
-may be started as root to open privileged ports/files before
+The server may be started as root to open privileged ports/files before
 changing to a restricted user (eg jetty).
 
 [depend]

jetty-home/src/main/resources/modules/stop.mod

@@ -1,7 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-This module causes jetty to stop immediately after starting. This is good for testing configuration and/or precompiling quickstart webapps
+This module causes jetty to stop immediately after starting. 
+This is good for testing configuration and/or precompiling quickstart webapps
 
 [xml]
 etc/jetty-stop.xml

jetty-http2/http2-server/src/main/config/modules/http2.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables HTTP2 protocol support on the TLS(SSL) Connector,
+Enables HTTP2 protocol support on the TLS(SSL) Connector with ALPN.
-using the ALPN extension to select which protocol to use.
+Uses the ALPN extension to select which protocol to use.
 
 [tags]
 connector

jetty-http2/http2-server/src/main/config/modules/http2c.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the HTTP2C protocol on the HTTP Connector
+Enables the HTTP2C protocol on the HTTP Connector.
 The connector will accept both HTTP/1 and HTTP/2 connections.
 
 [tags]

jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod

@@ -1,8 +1,9 @@
 [description]
-Common to all infinispan modules
+Common to all infinispan modules.
 
 [tags]
 session
+internal
 
 [depend]
 sessions

jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/infinispan-embedded-query.mod

@@ -1,5 +1,5 @@
 [description]
-Enables querying with the Infinispan cache
+Enables querying with the Infinispan session cache.
 
 [tags]
 session

jetty-infinispan/infinispan-embedded-query/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod

@@ -1,5 +1,5 @@
 [description]
-The Infinispan query libraries
+The Infinispan query libraries.
 
 [tags]
 3rdparty

jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod

@@ -1,5 +1,5 @@
 [description]
-Setup infinispan embedded without querying
+Setup infinispan embedded without querying.
 
 [tags]
 session

jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod

@@ -1,5 +1,5 @@
 [description]
-Enables session data store in a local Infinispan cache
+Enables session data store in a local Infinispan cache.
 
 [tags]
 session

jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod

@@ -1,9 +1,10 @@
 [description]
-The Infinispan embedded libraries
+The Infinispan embedded libraries.
 
 [tags]
 3rdparty
 infinispan
+internal
 
 [depends]
 sessions/infinispan/embedded/infinispan-embedded-serverclasses

jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod

@@ -5,6 +5,7 @@ Hides Infinispan classes from webapp.
 session
 3rdparty
 infinispan
+internal
 
 
 [ini]

jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/infinispan-remote-query.mod

@@ -1,5 +1,5 @@
 [description]
-Enables querying with a remote Infinispan cache
+Enables querying with a remote Infinispan cache.
 
 [tags]
 session

jetty-infinispan/infinispan-remote-query/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod

@@ -1,9 +1,10 @@
 [description]
-The Infinispan remote query libraries
+The Infinispan remote query libraries.
 
 [tags]
 3rdparty
 infinispan
+internal
 
 [license]
 Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.

jetty-infinispan/infinispan-remote/src/main/config-template/modules/infinispan-remote.mod

@@ -1,5 +1,5 @@
 [description]
-Default setup for the remote infinispan cache without queries
+Default setup for the remote infinispan cache without queries.
 
 [tags]
 session

jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod

@@ -1,5 +1,5 @@
 [description]
-Enables session data store in a remote Infinispan cache
+Enables session data store in a remote Infinispan cache.
 
 [tags]
 session

jetty-infinispan/infinispan-remote/src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod

@@ -1,9 +1,10 @@
 [description]
-The Infinispan remote libs
+The Infinispan remote libs.
 
 [tags]
 3rdparty
 infinispan
+internal
 
 [depends]
 sessions/infinispan/remote/infinispan-remote-serverclasses

jetty-jmx/src/main/config/modules/jmx-remote.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables remote RMI access to JMX
+Enables remote RMI access to JMX.
 
 [depend]
 jmx

jetty-jmx/src/main/config/modules/jmx.mod

@@ -1,8 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables JMX instrumentation for server beans and 
+Enables JMX instrumentation for server beans and enables JMX agent.
-enables JMX agent.
 
 [depend]
 server

jetty-maven-plugin/src/main/resources/maven.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables an unassembled maven webapp to run in a jetty distro
+Enables an unassembled maven webapp to run in a jetty distro.
 
 [depends]
 server

jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Memcache cache for SessionData
+Memcache cache for SessionData.
 
 [tags]
 session

jetty-nosql/src/main/config/modules/sessions/mongo/address.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Server/port address connections for session storage
+Server/port connections for Mongo session storage.
 
 [xml]
 etc/sessions/mongo/session-store-by-address.xml

jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-MongoURI connections for session storage
+MongoURI connections for Mongo session storage
 
 [xml]
 etc/sessions/mongo/session-store-by-uri.xml

jetty-openid/src/main/config/modules/openid.mod

@@ -41,4 +41,4 @@ etc/jetty-openid.xml
 # jetty.openid.authenticateNewUsers=false
 
 ## True if all certificates should be trusted by the default SslContextFactory
-# jetty.openid.sslContextFactory.trustAll=false
+# jetty.openid.sslContextFactory.trustAll=false

jetty-plus/src/main/config/modules/plus.mod

@@ -1,6 +1,5 @@
 [description]
-Enables resource injection and other servlet 3.x 
+Enables Servlet 3.1 resource injection. 
-features not supported in the core jetty webapps module.
 
 [depend]
 server

jetty-proxy/src/main/config/modules/proxy.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable the Jetty Proxy, that allows the server to act
+Enable the Jetty Proxy.
-as a non-transparent proxy for browsers.
+Allows the server to act as a non-transparent proxy for browsers.
 
 [depend]
 servlet

jetty-quickstart/src/main/config/modules/quickstart.mod

@@ -1,8 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the Jetty Quickstart module for rapid
+Enables the Jetty Quickstart module for rapid deployment of preconfigured webapplications.
-deployment of preconfigured webapplications.
 
 [depend]
 server

jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Add a rule to the rewrite module to compact paths so that double slashes
+Add a rule to the rewrite module to compact paths.
-in the path are treated as a single slash.
+Double slashes in the path are treated as a single slash.
 
 [depends]
 rewrite

jetty-rewrite/src/main/config/modules/rewrite-customizer.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables a rewrite Rules container as a request customizer on
+Enables a rewrite Rules container as a request customizer.
-the servers default HttpConfiguration instance
+Enabled on the servers default HttpConfiguration instance
 
 [provides]
 rewrite

jetty-rewrite/src/main/config/modules/rewrite.mod

@@ -1,8 +1,11 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the jetty-rewrite handler.  Specific rewrite
+Enables the jetty-rewrite handler.  
-rules must be added to either to etc/jetty-rewrite.xml or a custom xml/module
+Specific rewrite rules must be added to either to etc/jetty-rewrite.xml or a custom xml/module
+
+[tags]
+server
 
 [provides]
 rewrite|default

jetty-server/src/main/config/modules/acceptratelimit.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable a server wide accept rate limit
+Enable a server wide accept rate limit.
 
 [tags]
 connector

jetty-server/src/main/config/modules/connectionlimit.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable a server wide connection limit
+Enable a server wide connection limit.
 
 [tags]
 connector

jetty-server/src/main/config/modules/customrequestlog.mod

@@ -1,10 +1,11 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Deprecated name for requestlog using custom request logger
+Deprecated name for requestlog using custom request logger.
 
 [tags]
 requestlog
+internal
 
 [depends]
 requestlog

jetty-server/src/main/config/modules/debug.mod

@@ -1,11 +1,12 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the DebugListener to generate additional 
+Enables the DebugListener.
-logging regarding detailed request handling events.
+Generates additional logging regarding detailed request handling events.
 Renames threads to include request URI.
 
 [tags]
+server
 debug
 
 [depend]

jetty-server/src/main/config/modules/debuglog.mod

@@ -5,7 +5,9 @@ Deprecated Debug Log using the DebugHandle.
 Replaced with the debug module.
 
 [tags]
+server
 debug
+internal
 
 [depend]
 server

jetty-server/src/main/config/modules/ext.mod

@@ -1,8 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds all jar files discovered in $JETTY_HOME/lib/ext
+Adds jar from $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the servers classpath.
-and $JETTY_BASE/lib/ext to the servers classpath.
 
 [tags]
 classpath

jetty-server/src/main/config/modules/flight-recorder.mod

@@ -1,4 +1,5 @@
-# Enables Java Mission Control's Flight Recorder for low overhead profiling.
+[description]
+Enables Java Mission Control's Flight Recorder for low overhead profiling.
 
 [depend]
 server

jetty-server/src/main/config/modules/gzip.mod

@@ -5,6 +5,7 @@ Enable GzipHandler for dynamic gzip compression for the entire server.
 If MSIE prior to version 7 are to be handled, also enable the msie module.
 
 [tags]
+server
 handler
 
 [depend]

jetty-server/src/main/config/modules/home-base-warning.mod

@@ -1,8 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Generates a warning that server has been run from $JETTY_HOME
+Generates a warning that server has been run from $JETTY_HOME rather than from a $JETTY_BASE.
-rather than from a $JETTY_BASE.
 
 [xml]
 etc/home-base-warning.xml

jetty-server/src/main/config/modules/http-forwarded.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds a forwarded request customizer to the HTTP Connector
+Adds a forwarded request customizer to the HTTP Connector.
-to process forwarded-for style headers from a proxy.
+Processes forwarded-for style headers from a proxy.
 
 [tags]
 connector

jetty-server/src/main/config/modules/https.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds HTTPS protocol support to the TLS(SSL) Connector
+Adds HTTPS protocol support to the TLS(SSL) Connector.
 
 [tags]
 connector

jetty-server/src/main/config/modules/inetaccess.mod

@@ -1,11 +1,11 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable the InetAccessHandler to apply a include/exclude
+Enable the InetAccessHandler.
-control of the remote IP of requests.
+Applies a include/exclude control of the remote IP of requests.
 
 [tags]
-handler
+connector
 
 [depend]
 server

jetty-server/src/main/config/modules/jdbc.mod

@@ -1,4 +1,10 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
+[description]
+Enable java.sql JPMS module.
+
+[tags]
+jpms
+
 [jpms]
 add-modules: java.sql

jetty-server/src/main/config/modules/jvm.mod

@@ -1,8 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-A noop module that creates an ini template useful for
+A module that creates an ini template for setting JVM arguments (eg -Xmx ).
-setting JVM arguments (eg -Xmx )
 
 [ini-template]
 ## JVM Configuration

jetty-server/src/main/config/modules/lowresources.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables a low resource monitor on the server
+Enables a low resource monitor on the server.
-that can take actions if threads and/or connections
+Can take actions if threads and/or connections
 cross configured threshholds.
 
 [depend]

jetty-server/src/main/config/modules/requestlog.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Log requests using CustomRequestLog and AsyncRequestLogWriter
+Log requests using CustomRequestLog and AsyncRequestLogWriter.
 
 [tags]
 requestlog

jetty-server/src/main/config/modules/resources.mod

@@ -1,9 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds the $JETTY_HOME/resources and/or $JETTY_BASE/resources
+Adds the $JETTY_HOME/resources and/or $JETTY_BASE/resources directory to the server classpath. 
-directory to the server classpath. Useful for configuration
+Useful for configuration property files (eg jetty-logging.properties)
-property files (eg jetty-logging.properties)
 
 [tags]
 classpath

jetty-server/src/main/config/modules/session-cache-hash.mod

@@ -1,7 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable first level session cache. If this module is not enabled, sessions will
+Enable first level session cache. 
+If this module is not enabled, sessions will
 use the DefaultSessionCache by default, so enabling via this module is only needed
 if the configuration properties need to be changed from their defaults.
 

jetty-server/src/main/config/modules/session-cache-null.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-A trivial SessionCache that does not actually cache sessions.
+A SessionCache that does not actually cache sessions.
 
 [tags]
 session
@@ -18,4 +18,4 @@ etc/sessions/session-cache-null.xml
 [ini-template]
 #jetty.session.saveOnCreate=false
 #jetty.session.removeUnloadableSessions=false
-#jetty.session.flushOnResponseCommit=false
+#jetty.session.flushOnResponseCommit=false

jetty-server/src/main/config/modules/sessions.mod

@@ -1,11 +1,10 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-The session management. By enabling this module, it allows 
+Enable session management. 
-session management to be configured via the ini templates
+By enabling this module, it allows session management to be configured via the ini templates
-created or by enabling other session-cache or session-store
+created or by enabling other session-cache or session-store modules.  Without this module enabled, 
-modules.  Without this module enabled, the server may still
+the server may still use sessions, but their management cannot be configured.
-use sessions, but their management cannot be configured.
 
 [tags]
 session

jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-JDBC Datasource connections for session storage
+JDBC Datasource connections for session storage.
 
 [depends]
 jdbc

jetty-server/src/main/config/modules/sessions/jdbc/driver.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-JDBC Driver connections for session storage
+JDBC Driver connections for session storage.
 
 [depend]
 jdbc

jetty-server/src/main/config/modules/ssl-reload.mod

@@ -15,4 +15,4 @@ etc/jetty-ssl-context-reload.xml
 
 [ini-template]
 # Monitored directory scan period (seconds)
-# jetty.sslContext.reload.scanInterval=1
+# jetty.sslContext.reload.scanInterval=1

jetty-server/src/main/config/modules/ssl.mod

@@ -8,6 +8,7 @@ the associated support modules.
 [tags]
 connector
 ssl
+internal
 
 [depend]
 server

jetty-server/src/main/config/modules/stats.mod

@@ -1,11 +1,10 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable detailed statistics collection for the server,
+Enable detailed statistics collection for the server.
-available via JMX.
 
 [tags]
-handler
+server
 
 [depend]
 server

jetty-server/src/main/config/modules/test-keystore.mod

@@ -3,6 +3,7 @@ Test keystore with test SSL Certificate.
 DO NOT USE IN PRODUCTION!!!
 
 [tags]
+demo
 ssl
 
 [depend]

jetty-server/src/main/config/modules/threadlimit.mod

@@ -4,7 +4,10 @@
 #
 
 [tags]
-handler
+server
+
+[description]
+Limit the threads per IP address for DOS protection.
 
 [depend]
 server

jetty-server/src/main/config/modules/threadpool.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the Server thread pool.
+Enables and configures the Server thread pool.
 
 [depends]
 logging

jetty-servlets/src/main/config/modules/servlets.mod

@@ -1,10 +1,9 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Puts a collection of jetty utility servlets and filters
+Jetty utility servlets and filters available to a webapp.
-on the server classpath (CGI, CrossOriginFilter, DosFilter,
+Puts org.eclipse.jetty.servlets on the server classpath (CGI, CrossOriginFilter, DosFilter,
-MultiPartFilter, PushCacheFilter, QoSFilter, etc.) for
+MultiPartFilter, PushCacheFilter, QoSFilter, etc.) for use by all webapplications.
-use by all webapplications.
 
 [depend]
 servlet

jetty-spring/src/main/config/modules/spring.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable spring configuration processing so all jetty style 
+Enable spring configuration processing of jetty XML files.
-xml files can optionally be written as spring beans
+All jetty style xml files can optionally be written as spring beans
 
 [depend]
 server

jetty-start/src/main/java/org/eclipse/jetty/start/Main.java

@@ -221,6 +221,10 @@ public class Main
     public void listConfig(StartArgs args)
     {
         StartLog.endStartLog();
+        Modules modules = args.getAllModules();
+
+        // Dump Enabled Modules
+        modules.listEnabled();
 
         // Dump Jetty Home / Base
         args.dumpEnvironment();
@@ -244,20 +248,17 @@ public class Main
     public void listModules(StartArgs args)
     {
         final List<String> tags = args.getListModules();
-
         StartLog.endStartLog();
-        System.out.println();
+        String t = tags.toString();
-        System.out.println("Available Modules:");
+        System.out.printf("%nModules %s:%n", t);
-        System.out.println("==================");
+        System.out.printf("=========%s%n", "=".repeat(t.length()));
-        System.out.println("tags: " + tags);
+        args.getAllModules().listModules(tags);
-        args.getAllModules().dump(tags);
+    }
 
-        // Dump Enabled Modules
+    public void showModules(StartArgs args)
-        System.out.println();
+    {
-        System.out.println("Enabled Modules:");
+        StartLog.endStartLog();
-        System.out.println("================");
+        args.getAllModules().showModules(args.getShowModules());
-        Modules modules = args.getAllModules();
-        modules.dumpEnabled();
     }
 
     /**
@@ -388,12 +389,18 @@ public class Main
             listConfig(args);
         }
 
-        // Show modules
+        // List modules
         if (args.getListModules() != null)
         {
             listModules(args);
         }
 
+        // Show modules
+        if (args.getShowModules() != null)
+        {
+            showModules(args);
+        }
+
         // Generate Module Graph File
         if (args.getModuleGraphFilename() != null)
         {

jetty-start/src/main/java/org/eclipse/jetty/start/Module.java

@@ -529,7 +529,7 @@ public class Module implements Comparable<Module>
 
     public String getPrimaryTag()
     {
-        return _tags.isEmpty() ? "*" : _tags.get(0);
+        return _tags.isEmpty() ? "untagged" : _tags.get(0);
     }
 
     public boolean isEnabled()

jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java

@@ -24,6 +24,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -35,6 +36,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -82,104 +84,130 @@ public class Modules implements Iterable<Module>
         }
     }
 
-    public void dump(List<String> tags)
+    public void showModules(List<String> modules)
     {
-        Set<String> exclude = tags.stream().filter(t -> t.startsWith("-")).map(t -> t.substring(1)).collect(Collectors.toSet());
+        Stream<Module> stream = (modules.contains("*") || modules.isEmpty())
-        Set<String> include = tags.stream().filter(t -> !t.startsWith("-")).collect(Collectors.toSet());
+            ? _modules.stream().sorted()
-        boolean all = include.contains("*") || include.isEmpty();
+            : modules.stream().map(this::get);
-        AtomicReference<String> tag = new AtomicReference<>();
 
-        _modules.stream()
+        stream.forEach(module ->
-            .filter(m ->
+        {
-            {
+            if (module == null)
-                boolean included = all || m.getTags().stream().anyMatch(include::contains);
+                return;
-                boolean excluded = m.getTags().stream().anyMatch(exclude::contains);
-                return included && !excluded;
-            })
-            .sorted()
-            .forEach(module ->
-            {
-                if (!module.getPrimaryTag().equals(tag.get()))
-                {
-                    tag.set(module.getPrimaryTag());
-                    System.out.printf("%nModules for tag '%s':%n", module.getPrimaryTag());
-                    System.out.print("-------------------");
-                    for (int i = module.getPrimaryTag().length(); i-- > 0; )
-                    {
-                        System.out.print("-");
-                    }
-                    System.out.println();
-                }
 
-                String label;
+            String label;
-                Set<String> provides = module.getProvides();
+            Set<String> provides = module.getProvides();
-                provides.remove(module.getName());
+            provides.remove(module.getName());
-                System.out.printf("%n     Module: %s %s%n", module.getName(), provides.size() > 0 ? provides : "");
+            System.out.printf("%n     Module: %s %s%n", module.getName(), provides.size() > 0 ? provides : "");
-                for (String description : module.getDescription())
+            for (String description : module.getDescription())
+            {
+                System.out.printf("           : %s%n", description);
+            }
+            if (!module.getTags().isEmpty())
+            {
+                label = "       Tags: %s";
+                for (String t : module.getTags())
                 {
-                    System.out.printf("           : %s%n", description);
+                    System.out.printf(label, t);
+                    label = ", %s";
                 }
-                if (!module.getTags().isEmpty())
+                System.out.println();
+            }
+            if (!module.getDepends().isEmpty())
+            {
+                label = "     Depend: %s";
+                for (String parent : module.getDepends())
                 {
-                    label = "       Tags: %s";
+                    parent = Module.normalizeModuleName(parent);
-                    for (String t : module.getTags())
+                    System.out.printf(label, parent);
-                    {
+                    if (Module.isConditionalDependency(parent))
-                        System.out.printf(label, t);
+                        System.out.print(" [conditional]");
-                        label = ", %s";
+                    label = ", %s";
-                    }
-                    System.out.println();
                 }
-                if (!module.getDepends().isEmpty())
+                System.out.println();
+            }
+            if (!module.getOptional().isEmpty())
+            {
+                label = "   Optional: %s";
+                for (String parent : module.getOptional())
                 {
-                    label = "     Depend: %s";
+                    System.out.printf(label, parent);
-                    for (String parent : module.getDepends())
+                    label = ", %s";
-                    {
-                        parent = Module.normalizeModuleName(parent);
-                        System.out.printf(label, parent);
-                        if (Module.isConditionalDependency(parent))
-                            System.out.print(" [conditional]");
-                        label = ", %s";
-                    }
-                    System.out.println();
                 }
-                if (!module.getOptional().isEmpty())
+                System.out.println();
+            }
+            for (String lib : module.getLibs())
+            {
+                System.out.printf("        LIB: %s%n", lib);
+            }
+            for (String xml : module.getXmls())
+            {
+                System.out.printf("        XML: %s%n", xml);
+            }
+            for (String jpms : module.getJPMS())
+            {
+                System.out.printf("        JPMS: %s%n", jpms);
+            }
+            for (String jvm : module.getJvmArgs())
+            {
+                System.out.printf("        JVM: %s%n", jvm);
+            }
+            if (module.isEnabled())
+            {
+                for (String selection : module.getEnableSources())
                 {
-                    label = "   Optional: %s";
+                    System.out.printf("    Enabled: %s%n", selection);
-                    for (String parent : module.getOptional())
-                    {
-                        System.out.printf(label, parent);
-                        label = ", %s";
-                    }
-                    System.out.println();
                 }
-                for (String lib : module.getLibs())
+            }
-                {
+        });
-                    System.out.printf("        LIB: %s%n", lib);
-                }
-                for (String xml : module.getXmls())
-                {
-                    System.out.printf("        XML: %s%n", xml);
-                }
-                for (String jpms : module.getJPMS())
-                {
-                    System.out.printf("        JPMS: %s%n", jpms);
-                }
-                for (String jvm : module.getJvmArgs())
-                {
-                    System.out.printf("        JVM: %s%n", jvm);
-                }
-                if (module.isEnabled())
-                {
-                    for (String selection : module.getEnableSources())
-                    {
-                        System.out.printf("    Enabled: %s%n", selection);
-                    }
-                }
-            });
     }
 
-    public void dumpEnabled()
+    public void listModules(List<String> tags)
     {
+        if (tags.contains("-*"))
+            return;
+
+        boolean wild = tags.contains("*");
+        Set<String> included = new HashSet<>();
+        if (wild)
+            tags.remove("*");
+        else
+            tags.stream().filter(t -> !t.startsWith("-")).forEach(included::add);
+        Set<String> excluded = new HashSet<>();
+        tags.stream().filter(t -> t.startsWith("-")).map(t -> t.substring(1)).forEach(excluded::add);
+        if (!included.contains("internal"))
+            excluded.add("internal");
+
+        Predicate<Module> filter = m -> (included.isEmpty() || m.getTags().stream().anyMatch(included::contains)) &&
+            !m.getTags().stream().anyMatch(excluded::contains);
+
+        Optional<Integer> max = _modules.stream().filter(filter).map(Module::getName).map(String::length).max(Integer::compareTo);
+        if (max.isEmpty())
+            return;
+        String format = "%" + max.get() + "s - %s%n";
+
+        Comparator<Module> comparator = wild ? Comparator.comparing(Module::getName) : Module::compareTo;
+        AtomicReference<String> tag = new AtomicReference<>();
+        _modules.stream().filter(filter).sorted(comparator).forEach(module ->
+        {
+            if (!wild && !module.getPrimaryTag().equals(tag.get()))
+            {
+                tag.set(module.getPrimaryTag());
+                System.out.printf("%n%s modules:", module.getPrimaryTag());
+                System.out.printf("%n%s---------%n", "-".repeat(module.getPrimaryTag().length()));
+            }
+
+            List<String> description = module.getDescription();
+            System.out.printf(format, module.getName(), description != null && description.size() > 0 ? description.get(0) : "");
+        });
+    }
+
+    public void listEnabled()
+    {
+        System.out.println();
+        System.out.println("Enabled Modules:");
+        System.out.println("----------------");
+
         int i = 0;
         List<Module> enabled = getEnabled();
         for (Module module : enabled)

jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java

@@ -223,6 +223,7 @@ public class StartArgs
     private boolean help = false;
     private boolean stopCommand = false;
     private List<String> listModules = null;
+    private List<String> showModules = null;
     private boolean listClasspath = false;
     private boolean listConfig = false;
     private boolean version = false;
@@ -346,7 +347,6 @@ public class StartArgs
             System.out.println();
         }
 
-        // Jetty Se
         System.out.println();
     }
 
@@ -999,6 +999,11 @@ public class StartArgs
         return listModules;
     }
 
+    public List<String> getShowModules()
+    {
+        return showModules;
+    }
+
     public boolean isRun()
     {
         return run;
@@ -1245,20 +1250,35 @@ public class StartArgs
         }
 
         // Module Management
-        if ("--list-modules".equals(arg))
+        if ("--list-module".equals(arg) || "--list-modules".equals(arg))
         {
             listModules = Collections.singletonList("-internal");
             run = false;
             return;
         }
 
-        if (arg.startsWith("--list-modules="))
+        if (arg.startsWith("--list-module=") || arg.startsWith("--list-modules="))
         {
             listModules = Props.getValues(arg);
             run = false;
             return;
         }
 
+        // Module Management
+        if ("--show-module".equals(arg) || "--show-modules".equals(arg))
+        {
+            showModules = Collections.emptyList();
+            run = false;
+            return;
+        }
+
+        if (arg.startsWith("--show-module=") || arg.startsWith("--show-modules="))
+        {
+            showModules = Props.getValues(arg);
+            run = false;
+            return;
+        }
+
         // jetty.base build-out : add to ${jetty.base}/start.ini
         if ("--create-startd".equals(arg))
         {

jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt

@@ -82,18 +82,12 @@ Debug and Start Logging:
                    issues where the jetty specific logger has not yet kicked
                    in due to startup configuration errors.
 
-Module Management:
+Jetty Module Management:
-------------------
+------------------------
 
-  --list-modules   List non verbose modules defined by the system.
+  --list-modules   List Jetty modules defined in ${jetty.base}/modules/*.mod and
-                   Looking for module files in ${jetty.base}/modules/*.mod and
                    then ${jetty.home}/modules/*.mod
-                   Will also list enabled state based on information
+
-                   present on ..
-                    o  The command line
-                    o  The ${jetty.base}/start.ini
-                    o  The ${jetty.base}/start.d/*.ini files
-  
   --list-modules=<tag>(,<tag>)*
                    List modules by tag. Use '*' for all tags. Prefix a tag 
                    with '-' to exclude the tag.  The special tag "internal"
@@ -102,6 +96,10 @@ Module Management:
   --list-all-modules
                    List all modules.
 
+  --show-modules=<module>(,<module>)*
+                   Show the detail of the listed modules, including
+                   dependencies, tags, libraries and XMLs
+
   --module=<modulename>(,<modulename>)*
                    Temporarily enable a module from the command line.
                    Note: this can also be used in the ${jetty.base}/start.ini
@@ -191,7 +189,6 @@ Advanced Commands:
                   Default is https://repo1.maven.org/maven2/.
 
 
-
 Properties:
 -----------
   Properties are used to parameterize:

jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket-forwarded.mod

@@ -1,10 +1,9 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds a forwarded request customizer to the HTTP configuration used
+Adds a forwarded request customizer for the  Unix Domain Socket connector.
-by the Unix Domain Socket connector, for use when behind a proxy operating
+For use when behind a proxy operating in HTTP mode that adds forwarded-for style HTTP headers. 
-in HTTP mode that adds forwarded-for style HTTP headers. Typically this
+Typically this is an alternate to the Proxy Protocol used mostly for TCP mode.
-is an alternate to the Proxy Protocol used mostly for TCP mode.
 
 [tags]
 connector

jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket-http2c.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds an HTTP2C connetion factory to the Unix Domain Socket Connector
+Adds an HTTP2C connetion factory to the Unix Domain Socket Connector.
 It can be used when either the proxy forwards direct
 HTTP/2C (unecrypted) or decrypted HTTP/2 traffic.
 

jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket-proxy-protocol.mod

@@ -1,7 +1,7 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables the proxy protocol on the Unix Domain Socket Connector 
+Enables the proxy protocol on the Unix Domain Socket Connector.
 http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
 This allows information about the proxied connection to be 
 efficiently forwarded as the connection is accepted.

jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket-secure.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enable a secure request customizer on the HTTP Configuration
+Enable a secure request customizer on the HTTP Configuration.
-used by the Unix Domain Socket Connector.
+Used by the Unix Domain Socket Connector.
 This looks for a secure scheme transported either by the
 unixsocket-forwarded, unixsocket-proxy-protocol or in a
 HTTP2 request.

jetty-unixsocket/jetty-unixsocket-server/src/main/config/modules/unixsocket.mod

@@ -1,11 +1,10 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables a Unix Domain Socket Connector that can receive
+Enables a Unix Domain Socket Connector.
-requests from a local proxy and/or SSL offloader (eg haproxy) in either
+The connector can receive requests from a local proxy and/or SSL offloader (eg haproxy) in either
-HTTP or TCP mode.  Unix Domain Sockets are more efficient than 
+HTTP or TCP mode.  Unix Domain Sockets are more efficient than localhost TCP/IP connections  
-localhost TCP/IP connections  as they reduce data copies, avoid 
+as they reduce data copies, avoid needless fragmentation and have better dispatch behaviours. 
-needless fragmentation and have better dispatch behaviours. 
 When enabled with corresponding support modules, the connector can 
 accept HTTP, HTTPS or HTTP2C traffic.
 

jetty-unixsocket/src/main/config/modules/unixsocket.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Enables a Unix Domain Socket Connector that can receive
+Enables a Unix Domain Socket Connector.
-requests from a local proxy and/or SSL offloader (eg haproxy) in either
+The connector can receive requests from a local proxy and/or SSL offloader (eg haproxy) in either
 HTTP or TCP mode.  Unix Domain Sockets are more efficient than 
 localhost TCP/IP connections  as they reduce data copies, avoid 
 needless fragmentation and have better dispatch behaviours. 

jetty-util/src/main/config/modules/console-capture.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Redirects JVMs console stderr and stdout to a log file,
+Redirects JVMs console stderr and stdout to a log file.
-including output from Jetty's default StdErrLog logging.
+includes output from Jetty's default StdErrLog logging.
 
 [tags]
 logging

jetty-webapp/src/main/config/modules/webapp.mod

@@ -1,8 +1,8 @@
 # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
 
 [description]
-Adds support for servlet specification webapplication to the server
+Adds support for servlet specification webapplication to the server classpath.  
-classpath.  Without this, only Jetty specific handlers may be deployed.
+Without this, only Jetty specific handlers may be deployed.
 
 [depend]
 servlet

tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.mod

@@ -4,11 +4,16 @@
 # Additional ini files are in demo-base/start.d
 # 
 
+[description]
+Configure the Jetty Demo base.
+
 [depends]
 rewrite
 jaas
 test-keystore
 
+[tags]
+demo
 
 [xml]
 # Enable rewrite examples