diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini
index 46becebd90b..33bd90d7434 100644
--- a/jetty-distribution/src/main/resources/start.ini
+++ b/jetty-distribution/src/main/resources/start.ini
@@ -22,13 +22,25 @@
 #  + A JVM option like: -Xmx2000m 
 #  + A System Property like: -Dcom.sun.management.jmxremote
 #
+#-----------------------------------------------------------
+#
+# NOTE: The lines in this file may be uncommented to activate
+# features. Alternately, the lines may be copied to a ini file
+# in the start.d directory to enabled configuration without
+# editing this file.  See start.d/900-demo.ini for an example.
+#
+# Future releases will switch start.d style configuration for 
+# all features.
 #===========================================================
 
-#===========================================================
 
+
+#===========================================================
 # Configure JVM arguments.
-# If JVM args are uncommented here then --exec is needed
-# to start a new JVM from start.jar with the extra args
+# If JVM args are include in an ini file then --exec is needed
+# to start a new JVM from start.jar with the extra args.
+# If you wish to avoid an extra JVM running, place JVM args
+# on the normal command line and do not use --exec
 #-----------------------------------------------------------
 # --exec
 # -Xmx2000m
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/start.d/900-demo.ini b/tests/test-webapps/test-jetty-webapp/src/main/config/start.d/900-demo.ini
index 95e58b53ae5..59ea3a6e8ca 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/start.d/900-demo.ini
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/start.d/900-demo.ini
@@ -1,4 +1,26 @@
-# Enabled services and configuration needed by the test webapp
-OPTIONS=client
-etc/test-realm.xml
+
+# ===========================================================
+# Enable the demonstration web applications
+#
+# To disable the demos, either delete this file, move it out of 
+# the start.d directory or rename it to not end with ".ini"
+# ===========================================================
+
+
+# ===========================================================
+# Add a deploy app provider to scan the webapps.demo directory
+# -----------------------------------------------------------
 etc/jetty-demo.xml
+
+
+# ===========================================================
+# Enable the Jetty HTTP client APIs for use by demo webapps
+# -----------------------------------------------------------
+OPTIONS=client
+
+
+# ===========================================================
+# Enable the test-realm login service for use by authentication
+# demonstrations
+# -----------------------------------------------------------
+etc/test-realm.xml