diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:31:05 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:31:05 +0100 |
commit | ab3e1485010ecb549bb09c4321d24b391eac82a1 (patch) | |
tree | fdf511f26aff06042430a518029875b0d27b3477 /nx-X11/programs/Xserver/hw/nxagent/man | |
parent | 70cb1926ca433736830c42250e049203262560e4 (diff) | |
parent | 26b033b84e682bfe098711204418319f753a34dc (diff) | |
download | nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.tar.gz nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.tar.bz2 nx-libs-ab3e1485010ecb549bb09c4321d24b391eac82a1.zip |
Merge branch 'uli42-pr/keyboard_cleanup' into 3.6.x
Attributes GH PR #742: https://github.com/ArcticaProject/nx-libs/pull/742
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/man')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 3b616272a..892248d60 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -620,12 +620,12 @@ settings. .I <model>/<layout> use the given model and layout. You can not modify keyboard rules, variant or options. Instead preset values are used. These are -\fIxfree86\fR for rules and empty strings for variant and options. +\fIbase\fR for rules and empty strings for variant and options. .RE .TP 8 .PP -If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR will be used (rules: \fIxfree86\fR, layout: \fIus\fR, model: \fIpc102\fR, empty variant and options). +If \fIkeyboard\fR is omitted the internal defaults of \fBnxagent\fR will be used (rules: \fIbase\fR, layout: \fIus\fR, model: \fIpc102\fR, empty variant and options). .TP 8 .B keyconv=<string> |