Merge 52116083-java-main-args to master

Glyn Normington · Glyn Normington · commit d4b15d92d608 · 2013-07-01T10:49:17.000+01:00
[#52116083]
diff --git a/docs/container-java-main.md b/docs/container-java-main.md
@@ -22,7 +22,7 @@ The container can be configured by modifying the [`config/main.yml`][main_yml] f
 
 | Name | Description
 | ---- | -----------
-| `arguments` | Optional command line arguments to be passed to the Java main class.
+| `arguments` | Optional command line arguments to be passed to the Java main class. The arguments are specified as a single YAML scalar in plain style or enclosed in single or double quotes.
 | `java_main_class` | The Java class name to run. Values containing whitespace are rejected with an error, but all others values appear without modification on the Java command line.  If not specified, the Java Manifest value of `Main-Class` is used.
 
 
diff --git a/docs/framework-java_opts.md b/docs/framework-java_opts.md
@@ -19,4 +19,4 @@ The framework can be configured by modifying the [`config/java_opts.yml`][java_o
 
 | Name | Description
 | ---- | -----------
-| `java_opts` | The Java options to use when running the application.  All values are used without modification when invoking the JVM. The options should be specified as a single string enclosed in double quotes, e.g. "-Xcheck:jni -Xfuture".
+| `java_opts` | The Java options to use when running the application.  All values are used without modification when invoking the JVM. The options are specified as a single YAML scalar in plain style or enclosed in single or double quotes.
