Merge branch 'fp/linenumbers'

diff --combined cgitrc.5.txt
index 0d1829069c7a4465ea02525eb9844ff33a86f2ef,ac5c58c539d074f29f3ae742d03a8a1566d2556e..3b16db96c0c2808d2a7d291c76defcf9142f5a3b
--- 1/cgitrc.5.txt
--- 2/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@@ -99,6 -99,10 +99,10 @@@ enable-log-linecount:
        and removed lines for each commit on the repository log page. Default
        value: "0".
  
+ enable-tree-linenumbers::
+       Flag which, when set to "1", will make cgit generate linenumber links
+       for plaintext blobs printed in the tree view. Default value: "1".
+ 
  favicon::
        Url used as link to a shortcut icon for cgit. If specified, it is
        suggested to use the value "/favicon.ico" since certain browsers will
@@@ -217,9 -221,14 +221,9 @@@ root-title:
        "Git Repository Browser".
  
  snapshots::
 -      Text which specifies the default (and allowed) set of snapshot formats
 -      supported by cgit. The value is a space-separated list of zero or more
 -      of the following values:
 -              "tar"           uncompressed tar-file
 -              "tar.gz"        gzip-compressed tar-file
 -              "tar.bz2"       bzip-compressed tar-file
 -              "zip"           zip-file
 -      Default value: none.
 +      Text which specifies the default set of snapshot formats generated by
 +      cgit. The value is a space-separated list of zero or more of the
 +      values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none.
  
  source-filter::
        Specifies a command which will be invoked to format plaintext blobs