diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2024-07-10 21:19:07 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2024-07-10 21:19:07 +0200 |
| commit | c71b157c8f983118126832ffbc1675a325a47f15 (patch) | |
| tree | e554edf4045e73efe230cffdbfc4364b7078e6cc /nx-X11/programs/Xserver | |
| parent | beeceb7e7c3e209c6041ed9b51c597e12523fae5 (diff) | |
| parent | 986a4ce8d102f0390c444f6abe7d67f3b6db5374 (diff) | |
| download | nx-libs-c71b157c8f983118126832ffbc1675a325a47f15.tar.gz nx-libs-c71b157c8f983118126832ffbc1675a325a47f15.tar.bz2 nx-libs-c71b157c8f983118126832ffbc1675a325a47f15.zip | |
Merge branch 'sunweaver-pr/nxagent-manpage-error' into 3.6.x
Attributes GH PR #1064: https://github.com/ArcticaProject/nx-libs/pull/1064
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 | 2 |
1 files changed, 1 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 4f53a1df9..3b3efe6eb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -575,7 +575,7 @@ file is taken). If \fBnxagent\fR is run as \fBx2goagent\fR the defaults are .IR ~/.x2go/keystrokes.cfg and .IR /etc/x2go/keystrokes.cfg -. Any keystrokes +Any keystrokes \fBnxagent\fR knows about that are not defined in this file are ignored. (Only) if no file is found built-in defaults are used. The keystroke file can be re-read by a keystroke (ctrl-alt-k by default). |