#
#
# patch "README.driver"
#  from [d8f2697860d8b0b256b86d5e8a50f036e615de79]
#    to [243d5b150e818d42ae8b3d4ca55793d10b8b0520]
# 
# patch "src/GuitoneDriver.cpp"
#  from [c2abbc62e7bb776894ccc438b3ac6b44c425bbf3]
#    to [dd5254224a73634ba1cf3f947eaf9d558c5248a7]
#
============================================================
--- src/GuitoneDriver.cpp	c2abbc62e7bb776894ccc438b3ac6b44c425bbf3
+++ src/GuitoneDriver.cpp	dd5254224a73634ba1cf3f947eaf9d558c5248a7
@@ -264,14 +264,20 @@ void GuitoneDriver::help()
     objs.append((new DialogManager(NULL))->metaObject());
     objs.append((new DatabaseDialogManager(NULL))->metaObject());
     objs.append((new WorkspaceDialogManager(NULL))->metaObject());
+    objs.append((new ServerDialogManager(NULL))->metaObject());
 
     QStringList output;
-    output << "Usage: guitone exec <path> <function> [<args> ...]\n\n";
+    output << "Usage: guitone exec <path-or-uri> <function> [<args> ...]\n\n";
     output << "Available functions:\n\n";
 
     foreach (const QMetaObject * obj, objs)
     {
-        output << obj->className() << ":\n";
+        QMetaObject const * parent = obj->superClass();
+        output << obj->className();
+        if (strcmp(parent->className(), "QObject") != 0)
+            output << " (inherits " << parent->className() << ")";
+        output << ":\n";
+
         for (int i=obj->methodOffset(); i < obj->methodCount(); i++)
         {
             QMetaMethod m = obj->method(i);
@@ -287,19 +293,26 @@ void GuitoneDriver::help()
             output << "\t" << sig;
             for (int i=0; i<types.size(); i++)
             {
-                // remove the "Q" in front of the type name and make it lowercase
-                output << " <" << types.at(i).mid(1).toLower();
+                output << " <" << types.at(i);
                 if (names.at(i).size() > 0)
                     output << ":" << names.at(i);
                 output << ">";
             }
             output << "\n";
         }
+        output << "\n";
     }
+    output << "The QString type is a simple, optionally quoted string.\n";
     output << "\n";
-    output << "The stringlist type has to be given as a single argument. "
+    output << "The QStringList type has to be given as a single argument. "
               "Elements are separated with a comma ','; any comma inside "
-              "a string element has to be escaped with a backslash '\\,'.";
+              "a string element has to be escaped with a backslash '\\,'.\n";
+    output << "\n";
+    output << "The MonotoneHandle::type is an integral enum type which can "
+              "be either '2' to denote a workspace, '3' to denote a database "
+              "or '4' to denote a server. The internal empty handle '1' "
+              "should not be used.\n";
+
     msg(output.join(""));
 }
 
============================================================
--- README.driver	d8f2697860d8b0b256b86d5e8a50f036e615de79
+++ README.driver	243d5b150e818d42ae8b3d4ca55793d10b8b0520
@@ -7,31 +7,33 @@ The general calling convention is the fo
 
 The general calling convention is the following:
 
-    $ <binary> exec <path> <function> [<args>]
+    $ <binary> exec <path-or-uri> <function> [<args>]
 
 where
 
-    <binary>    is the path to the guitone binary (on Mac OS X the binary inside
-                the application bundle, in guitone.app/Contents/MacOS)
+    <binary>        is the path to the guitone binary (on Mac OS X the binary inside
+                    the application bundle, in guitone.app/Contents/MacOS)
 
-    <path>      is the database file or workspace path you want guitone operate
-                on (use "-" to denote that you want to call a dialog without a
-                database / workspace affinity, f.e. the preferences dialog)
+    <path-or-uri>   is the database file, workspace path or remote URI you want
+                    guitone to operate on (use "-" to denote that you want to
+                    call a dialog without a database, workspace or server affinity,
+                    f.e. the preferences or key management dialog)
 
-    <function>  is the name of the function you like to call
+    <function>      is the name of the function you like to call
 
-    <args>      are optional arguments to this function
+    <args>          are optional arguments to this function
 
 There is a calling hierarchy which makes it possible to call all dialogs without
 path affinity from a call with database affinity and likewise all dialogs with
-database affinity from a call with workspace affinity. So the following three
-calls lead to the same results, i.e. the preferences dialog is displayed,
-(though for the latter two the given database file or workspace path must be
-valid):
+database affinity from a call with workspace affinity. For the server affinity,
+all dialogs without path affinity are available.
+The following four calls lead to the same results, i.e. the preferences dialog
+is displayed (though for the latter three the given path or uri must be valid):
 
     $ guitone exec - showPreferences
     $ guitone exec database.mtn showPreferences
     $ guitone exec ~/workspace showPreferences
+    $ guitone exec mtn://thomaskeller.biz showPreferences
 
 
 Available Dialogs
@@ -57,4 +59,3 @@ revisions.
 Currently there is no way to find out which signal actually dropped this
 value, which is actually a Qt nuisance. I hope I can fix this in later
 revisions.
-