update usage info

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/appliskel/runSalomeScript b/bin/appliskel/runSalomeScript
index 5b005d587b77d4277503e35e49708facae129bca..bba7beda0be3adb61672f4ce5c6ad2bfa63e1dab 100755 (executable)
--- a/bin/appliskel/runSalomeScript
+++ b/bin/appliskel/runSalomeScript
@@ -22,6 +22,13 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+###############################################
+############### IMPORTANT NOTE ################
+###############################################
+# The runSalomeScript script is obsolete.     #
+# Please consider the new salome launcher.    #
+###############################################
+
 import os,sys,optparse
 import socket,shutil
 import re

diff --git a/bin/salomeContext.py b/bin/salomeContext.py
index cb580069388fa384bca46f1365d67b9dade68733..51e0c51a90340118b34bc7b86878071c1a245790 100644 (file)
--- a/bin/salomeContext.py
+++ b/bin/salomeContext.py
@@ -36,19 +36,31 @@ def usage():
   #exeName = os.path.splitext(os.path.basename(__file__))[0]
 
   msg = '''\
-Usage: salome [command] [options] [--config=file1,...,filen]
+Usage: salome [command] [options] [--config=<file,folder,...>]
 
 Commands:
-    start         Launches SALOME virtual application [DEFAULT]
-    shell         Executes a script under SALOME application environment
+=========
+    start         Starts a SALOME session (through virtual application)
+    shell         Initializes SALOME environment, and executes scripts passed
+                  as command arguments
     connect       Connects a Python console to the active SALOME session
-    killall       Kill all SALOME running sessions
+    killall       Kill all SALOME running sessions for current user
     info          Display some information about SALOME
     help          Show this message
-    coffee        Yes! SALOME can also make coffee!!"
+    coffee        Yes! SALOME can also make coffee!!
 
-Use salome start --help or salome shell --help
-to show help on start and shell commands.
+If no command is given, default to start.
+
+Command options:
+================
+    Use salome <command> --help to show help on command ; available for start
+    and shell commands.
+
+--config=<file,folder,...>
+==========================
+    Initialize SALOME environment from a list of context files and/or a list
+    of folders containing context files. The list is comma-separated, whithout
+    any blank characters.
 '''
 
   print msg