Merge branch 'master' into experimental - sam - An updated version of the sam text editor.
 (HTM) git clone git://vernunftzentrum.de/sam.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit f50f2310f82b0664d2797e3240d075f350ecf45d
 (DIR) parent 5666724ace16eff488a35cfef095252ee3fa73df
 (HTM) Author: Rob King <jking@deadpixi.com>
       Date:   Wed,  7 Dec 2016 13:13:20 -0600
       
       Merge branch 'master' into experimental
       
       Diffstat:
         doc/samrc.5                         |       2 ++
       
       1 file changed, 2 insertions(+), 0 deletions(-)
       ---
 (DIR) diff --git a/doc/samrc.5 b/doc/samrc.5
       @@ -216,6 +216,8 @@ directive expects a string describing the state of modifier keys.
        This string consists of one or more of
        .Dq "*"
        meaning any set of modifiers,
       +.Dq "a"
       +meaning Alt (Mod1),
        .Dq "c"
        meaning Control, or
        .Dq "s"