aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-02-18 08:47:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-02-18 08:47:40 +0100
commit66315e4f34417a794d3cc5f4145fe2ea35850e68 (patch)
treed5ea4904c74c461ecb4047dba6ba45a316b54bff /nxcomp/src
parenta3dc87d6b45c09a1c8959976b18513635fdca225 (diff)
parentfc29077594fa20fb5243cfa8b5daf073d357b020 (diff)
downloadnx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.tar.gz
nx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.tar.bz2
nx-libs-66315e4f34417a794d3cc5f4145fe2ea35850e68.zip
Merge branch 'uli42-pr/session_types' into 3.6.x
Attributes GH PR #776: https://github.com/ArcticaProject/nx-libs/pull/776
Diffstat (limited to 'nxcomp/src')
-rw-r--r--nxcomp/src/Misc.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index 4f1af0ec4..519489268 100644
--- a/nxcomp/src/Misc.cpp
+++ b/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\