syntax-highlighting.sh: Fix command injection.

[ps-cgit] / cgitrc.5.txt

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 78bb9fc802ab56f50cdeb9cd4e3db928bc9931f1..5887cee9a813a8cf7a0e29dc69918198a4023924 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -148,11 +148,11 @@ enable-tree-linenumbers::
 enable-git-config::
        Flag which, when set to "1", will allow cgit to use git config to set
        any repo specific settings. This option is used in conjunction with
 enable-git-config::
        Flag which, when set to "1", will allow cgit to use git config to set
        any repo specific settings. This option is used in conjunction with

-       "scan-path" to augment _repo._ settings. The keys gitweb.owner,
+       "scan-path" to augment repo-specific settings. The keys gitweb.owner,

        gitweb.category, and gitweb.description will map to the cgit keys
        repo.owner, repo.section, and repo.desc, respectivly. All git config
        keys that begin with "cgit." will be mapped to the corresponding "repo."
        gitweb.category, and gitweb.description will map to the cgit keys
        repo.owner, repo.section, and repo.desc, respectivly. All git config
        keys that begin with "cgit." will be mapped to the corresponding "repo."

-       key in cgit. Default value: "0". See also: scan-path section-from-path.
+       key in cgit. Default value: "0". See also: scan-path, section-from-path.

 
 favicon::
        Url used as link to a shortcut icon for cgit. If specified, it is
 
 favicon::
        Url used as link to a shortcut icon for cgit. If specified, it is


@@ -192,6 +192,12 @@ local-time::
        Flag which, if set to "1", makes cgit print commit and tag times in the
        servers timezone. Default value: "0".
 
        Flag which, if set to "1", makes cgit print commit and tag times in the
        servers timezone. Default value: "0".
 

+commit-sort::
+       Flag which, when set to "date", enables strict date ordering in the
+       commit log, and when set to "topo" enables strict topological
+       ordering. If unset, the default ordering of "git log" is used. Default
+       value: unset.
+

 logo::
        Url which specifies the source of an image which will be used as a logo
        on all cgit pages. Default value: "/cgit.png".
 logo::
        Url which specifies the source of an image which will be used as a logo
        on all cgit pages. Default value: "/cgit.png".


@@ -435,6 +441,12 @@ repo.enable-subject-links::
        A flag which can be used to override the global setting
        `enable-subject-links'. Default value: none.
 
        A flag which can be used to override the global setting
        `enable-subject-links'. Default value: none.
 

+repo.commit-sort::
+       Flag which, when set to "date", enables strict date ordering in the
+       commit log, and when set to "topo" enables strict topological
+       ordering. If unset, the default ordering of "git log" is used. Default
+       value: unset.
+

 repo.logo::
        Url which specifies the source of an image which will be used as a logo
        on this repo's pages. Default value: global logo.
 repo.logo::
        Url which specifies the source of an image which will be used as a logo
        on this repo's pages. Default value: global logo.