aboutsummaryrefslogtreecommitdiff
path: root/README.keystrokes
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-27 02:00:43 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-27 02:00:43 +0200
commita430b4a87a7660ff6b04e187bfa01583e6372cad (patch)
tree9cc8462c71a09a46fb8cd1adf950fd896b364f9b /README.keystrokes
parent1c0f42d30e3720b52667f56a59e20cfb6d264363 (diff)
downloadnx-libs-a430b4a87a7660ff6b04e187bfa01583e6372cad.tar.gz
nx-libs-a430b4a87a7660ff6b04e187bfa01583e6372cad.tar.bz2
nx-libs-a430b4a87a7660ff6b04e187bfa01583e6372cad.zip
README.keystrokes: add documentation for branding behavior.
Diffstat (limited to 'README.keystrokes')
-rw-r--r--README.keystrokes12
1 files changed, 10 insertions, 2 deletions
diff --git a/README.keystrokes b/README.keystrokes
index bba4053ec..b06a82fd8 100644
--- a/README.keystrokes
+++ b/README.keystrokes
@@ -6,13 +6,21 @@ by the user. This is done via a configuration file.
File location
-------------
-nxagent searches for the configuration file in the following order:
+nxagent parses the first available configuration file and ignores all others.
+
+If nxagent is called without branding, it searches:
- in the location given by the '-keystrokefile' command line parameter
- in the location given by the NXAGENT_KEYSTROKEFILE environment variable
- in ~/.nx/config/keystrokes.cfg
- in /etc/nxagent/keystrokes.cfg
-If none of those files is accessible, the default configuration is used which
+If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches:
+- in the location given by the '-keystrokefile' command line parameter
+- in the location given by the NXAGENT_KEYSTROKEFILE environment variable
+- in ~/.x2go/config/keystrokes.cfg
+- in /etc/x2go/keystrokes.cfg
+
+If none of these files are accessible, the default configuration is used which
is the same as the old, traditional nxagent keybindings.
File format