aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/man
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-19 12:38:59 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-12-19 12:38:59 +0100
commit669af5300f904d399edb96d17faf93104e055138 (patch)
tree483d3b752d4771ca8b822574aea6f60e62dccc4d /nx-X11/programs/Xserver/hw/nxagent/man
parenta8c65ab6290d9516b733273098db50721e84bcec (diff)
parent522106e207e7230da5e62fb88f2e47742fdf1b21 (diff)
downloadnx-libs-669af5300f904d399edb96d17faf93104e055138.tar.gz
nx-libs-669af5300f904d399edb96d17faf93104e055138.tar.bz2
nx-libs-669af5300f904d399edb96d17faf93104e055138.zip
Merge branch 'uli42-pr/x2go_bypass' into 3.6.x
Attributes GH PR #744: https://github.com/ArcticaProject/nx-libs/pull/744
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/man')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.13
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index 938c2eb57..737d3609d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -623,7 +623,8 @@ protocol functions and clone them. This is the recommended setting. For
compatibility reasons it is not the default.
.TP 8
.I <model>/<layout>
-use the given model and layout. You can not modify keyboard rules,
+use the given model and layout. A value of \fInull/null\fR is equivalent to
+\fIclone\fR. You can not modify keyboard rules,
variant or options this way. Instead preset values are used. These are
\fIbase\fR for rules and empty strings for variant and options.
.TP 8