Merge branch 'master' into V7_5_BR

diff --git a/bin/appliskel/.salome-completion.sh b/bin/appliskel/.salome-completion.sh
index b3be2c4dd4f9b4b9697bc7ccbe67d70312a17872..0aec9952394da7c14cde160530b2cc3ca59ebe0e 100644 (file)
--- a/bin/appliskel/.salome-completion.sh
+++ b/bin/appliskel/.salome-completion.sh
@@ -71,7 +71,7 @@ _salome()
         if [[ "$cur" == -* ]]; then
             case $command in
                 start)
-                    options='-t --terminal -g --gui -d --show-desktop= -o --hide-desktop -b --batch -l --logger -f --log-file= -r --resources= -x --xterm -m --modules= -e --embedded= -s --standalone= -p --portkill -k --killall -i --interp= -z --splash= -c --catch-exceptions= --print-port --nosave-config --pinter --ns-port-log= --test= --play= --gdb-session --ddd-session --valgrind-session --shutdown-servers= --foreground= --wake-up-session --server-launch-mode= --port= --siman --siman-study= --siman-scenario= --siman-user= --version -h --help'
+                    options='-t --terminal -g --gui -d --show-desktop= -o --hide-desktop -b --batch -l --logger -f --log-file= -r --resources= -x --xterm -m --modules= -e --embedded= -s --standalone= -p --portkill -k --killall -i --interp= -z --splash= -c --catch-exceptions= --print-port --nosave-config --pinter --ns-port-log= --test= --play= --gdb-session --ddd-session --valgrind-session -w --shutdown-servers= --foreground= --wake-up-session --server-launch-mode= --port= --siman --siman-study= --siman-scenario= --siman-user= --version -h --help'
                     ;;
                 shell)
                     options='-h --help -p --port= -m --machine='

diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py
index aa7c0f60ef15d9de21339723e7cfbf24f8858c34..9c4c39e0abf8a934140a3b50d962286f902245a2 100755 (executable)
--- a/bin/launchConfigureParser.py
+++ b/bin/launchConfigureParser.py
@@ -730,7 +730,8 @@ def CreateOptionParser (theAdditionalOptions=None):
     help_str += "0 to keep the standalone servers as daemon [default]. "
     help_str += "This option is only useful in batchmode "
     help_str += "(terminal mode or without showing desktop)."
-    o_shutdown = optparse.Option("--shutdown-servers",
+    o_shutdown = optparse.Option("-w",
+                                 "--shutdown-servers",
                                  metavar="<1/0>",
                                  #type="choice", choices=boolean_choices,
                                  type="string",