diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-27 02:48:10 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-27 02:48:10 +0200 |
| commit | 266d5affbc8339411090db497bfbafdc5e4944b2 (patch) | |
| tree | a6e326a191af4ad74ca3210082e6408187771d3f | |
| parent | 352631a4bad52e884f34a614aa4611e8e9207d2f (diff) | |
| download | nx-libs-266d5affbc8339411090db497bfbafdc5e4944b2.tar.gz nx-libs-266d5affbc8339411090db497bfbafdc5e4944b2.tar.bz2 nx-libs-266d5affbc8339411090db497bfbafdc5e4944b2.zip | |
README.keystrokes: remove accidentally copied Dokuwiki syntax.
Backported from Arctica GH 3.6.x branch.
Affects:
- 0320_nxagent_configurable-keystrokes.full.patch
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/0320_nxagent_configurable-keystrokes.full.patch | 2 |
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 |