diff options
| author | Jan Bartel | 2012-01-10 05:08:59 +0000 |
|---|---|---|
| committer | Jan Bartel | 2012-01-10 05:08:59 +0000 |
| commit | 1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a (patch) | |
| tree | b3d5e8c42d12751b6372d31ad5c18416c8551b48 /jetty-start/src/main/resources/org/eclipse/jetty | |
| parent | 6e3c8094f197bea369fc07d92e7be4ddd80cd326 (diff) | |
| parent | 083c793b1c7f251fc67d464e9a2449530782e9d9 (diff) | |
| download | org.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.tar.gz org.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.tar.xz org.eclipse.jetty.project-1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a.zip | |
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-start/src/main/resources/org/eclipse/jetty')
| -rw-r--r-- | jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt index c4c85c4523..41b0107580 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt +++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt @@ -20,7 +20,7 @@ Command Line Options: when the start.ini includes -X or -D arguments. --exec Run the generated command line (see --dry-run) in - a sub processes. This can be used when start.ini + a sub process. This can be used when start.ini contains -X or -D arguments, but creates an extra JVM instance. @@ -36,8 +36,10 @@ Command Line Options: --ini=<file> Load command line arguments from a file. If no --ini options are specified, then the - start.ini file will be read if it exists. - A --ini option with no file indicates that + start.ini file will be read if it exists in + jetty.home. If specified jetty.home/start.ini + and additional .ini files in jetty.home/start.d/ + will NOT be read. A --ini option with no file indicates that start.ini should not be read. --pre=<file> Specify a configuration file that is to be processed @@ -116,10 +118,10 @@ Available Configurations: Defaults: A start.ini file may be used to specify default arguments to start.jar, which are used if no command line arguments are provided and override - the defaults in the start.config file. If the directory start.d exists, - then multiple *.ini files will be read from that directory in alphabetical - order. If --ini options are provided on the command line, then start.ini - and start.d will not be read. + the defaults in the start.config file. If the directory jetty.home/start.d + exists, then multiple *.ini files will be read from that directory in + alphabetical order. If --ini options are provided on the command line, + then start.ini and start.d will NOT be read. The current start.ini arguments are: |