aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/0320_nxagent_configurable-keystrokes.full.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b43247f81..88936b9df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,7 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
- Copy actions documentation from the wiki.
- Add documentation for branding behavior.
+ - Remove accidentally copied Dokuwiki syntax.
* debian/keystrokes.cfg: fix whitespace errors.
Backported from Arctica GH 3.6.x branch.
diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch
index 475b9d0c4..495e00770 100644
--- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch
+++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch
@@ -921,7 +921,7 @@ Description: Make nxagent-specific keyboard bindings configurable
+- in ~/.nx/config/keystrokes.cfg
+- in /etc/nxagent/keystrokes.cfg
+
-+If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches:
++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