Index: /trunk/FACT++/src/dimctrl.cc
===================================================================
--- /trunk/FACT++/src/dimctrl.cc	(revision 15085)
+++ /trunk/FACT++/src/dimctrl.cc	(revision 15086)
@@ -11,5 +11,5 @@
 int RunShell(Configuration &conf)
 {
-    StateMachineDimControl::fIsServer = conf.Get<bool>("server");
+    StateMachineDimControl::fIsServer = conf.GetName()=="dimserver";
     return Main::execute<T, StateMachineDimControl>(conf);
 }
@@ -17,17 +17,22 @@
 void SetupConfiguration(Configuration &conf)
 {
-    po::options_description control("Dim control options");
+    po::options_description control("Options ("+conf.GetName()+")");
     control.add_options()
-        ("server",       po_bool(false),  "Start dimctrl as a dim server (console mode switched off)")
-        ("force-console",po_switch(),     "Forces console mode in server-mode.")
-        ("debug",        po_bool(false),  "Print the labels for debugging purpose")
-        ("start",        var<string>(),   "Start a java script with the given name on the dimctrl-server")
-        ("batch",        var<string>(),   "Start a batch script with the given name at the given label (script.dim[:N]) on the dimctrl-server")
-        ("stop",         po_switch(),     "Stop a currently running script on the dimctrl-server")
-        ("restart",      var<string>(),   "Send 'EXIT 126' to the given server")
-        ("msg",          var<string>(),   "Send a message to the chat server.")
-        ("user,u",       var<string>(""), "A user name - just for logging purposes (default is ${USER})")
-        ("JavaScript.*", var<string>(""), "Additional arguments which are provided to JavaScripts started in a dimctrl server via the START command")
+        ("force-console", po_switch(),     "Forces console mode in server-mode.")
+        ("debug",         po_bool(false),  "Print the labels for debugging purpose")
+        ("user,u",        var<string>(""), "A user name - just for logging purposes (default is ${USER})")
+        ("JavaScript.*",  var<string>(""), "Additional arguments which are provided to JavaScripts started in a dimctrl server via the START command")
         ;
+
+    if (conf.GetName()!="dimserver")
+    {
+        control.add_options()
+            ("start",   var<string>(), "Start a java script with the given name on the dimctrl-server")
+            ("batch",   var<string>(), "Start a batch script with the given name at the given label (script.dim[:N]) on the dimctrl-server")
+            ("stop",    po_switch(),   "Stop a currently running script on the dimctrl-server")
+            ("restart", var<string>(), "Send 'EXIT 126' to the given server")
+            ("msg",     var<string>(), "Send a message to the chat server.")
+            ;
+    }
 
     conf.AddEnv("user", "USER");
@@ -51,11 +56,12 @@
         "\n"
         "The program can be started as a dim server, so that it is visible "
-        "in the dm network to other clients. If started as a client, it can "
-        "only interact passively with the dim network. The usual case should "
-        "be to have one server running and control it from a dimctrl started "
-        "as client.\n"
+        "in the dim network to other clients. If started as a client (dimctrl), "
+        "it can only interact passively with the dim network. The usual case "
+        "should be to have one server running (dimserver) and control it from "
+        "a dimctrl started.\n"
         "\n"
-        "Usage: dimctrl [--server|-c type] [OPTIONS]\n"
-        "  or:  dimctrl [OPTIONS]\n";
+        "Usage: dimctrl [-c type] [OPTIONS]\n"
+        "  or:  dimctrl [OPTIONS]\n"
+        "  or:  dimserver [OPTIONS]\n";
     cout << endl;
 }
@@ -96,5 +102,5 @@
         throw runtime_error("--force-console must be used with --console/-c");
 
-    if (conf.Get<bool>("server") && !conf.Get<bool>("force-console"))
+    if (conf.GetName()=="dimserver" && !conf.Get<bool>("force-console"))
         conf.Remove("console");