[X2Go-Commits] [nx-libs] 42/45: README.keystrokes: add documentation for branding behavior.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit a430b4a87a7660ff6b04e187bfa01583e6372cad
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Apr 27 02:00:43 2015 +0200

    README.keystrokes: add documentation for branding behavior.
---
 README.keystrokes |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.keystrokes b/README.keystrokes
index bba4053..b06a82f 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

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git