Merge branch 'uli42-pr/session_types' into 3.6.x

nx-X11/programs/Xserver/hw/nxagent/Keyboard.c

@@ -870,8 +870,7 @@ XkbError:
              * when cloning we do not want X2Go to set the keyboard
              * via a keyboard file generated by nxagent. The defined
              * method for switching that off is the creation of a dir
-             * instead of a file. Which is achieved by passing NULL to
-             * nxagentWriteKeyboardFile.
+             * instead of a file.
              */
             if (nxagentX2go == 1)
               nxagentWriteKeyboardDir();

nxcomp/src/Misc.cpp

@@ -163,8 +163,11 @@ static const char UsageInfo[] =
                'wan', 'lan', 'local' or a bandwidth specification,\n\
                like for example '56k', '1m', '100m', etc.\n\
 \n\
-  type=s       Type of session, for example 'windows', 'unix-kde'.\n\
-               'unix-application', etc.\n\
+  type=s       Type of session. Known types are: 'agent', 'proxy' and\n\
+               'shadow'. The following types are also allowed and will\n\
+               map to one of the three mentioned before: 'desktop',\n\								\
+               'rootless', 'console', 'default', 'gnome', 'kde',\n\
+               'cde', 'xdm', 'win', 'vnc', 'application', 'raw'\n\
 \n\
   display=s    Specify the real display where X connections have\n\
                to be forwarded by the proxy running on the client.\n\