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 569a1de5d7884bad2b30e9a2b5280a941ed228cf
 (DIR) parent 1be6fad3ff34d3d6bbd79edaf357eb7875b760b4
 (HTM) Author: Rob King <jking@deadpixi.com>
       Date:   Thu, 20 Oct 2016 09:37:37 -0500
       
       Merge branch 'master' into experimental
       
       Diffstat:
         README.rst                          |       6 +++++-
       
       1 file changed, 5 insertions(+), 1 deletion(-)
       ---
 (DIR) diff --git a/README.rst b/README.rst
       @@ -77,7 +77,11 @@ To isntall the desktop entry for the all users, use:
            make MODE=system install
        
        The `sam` command runs sam.
       -The `B` command adds a new file to a running instance of sam, or starts sam if it's not already running.
       +The `B` command adds a new file to a running instance of sam,
       +or starts sam if it's not already running.
       +To configure sam,
       +create a `.samrc` file in your home directory.
       +The file `doc/samrc <doc/samrc>`_ file serves as a useful example of such a file.
        
        .. _`desktop entry file`: https://specifications.freedesktop.org/desktop-entry-spec/latest/