Merge branch 'fh/mimetypes'

[ps-cgit] / cgitrc.5.txt

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 22a0dc3beedcad637f7f71ad7bbe2bfd459eaa55..a72241ff6b38a1952884bbfcea1a686cad338b33 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -241,7 +241,7 @@ module-link::
        Text which will be used as the formatstring for a hyperlink when a
        submodule is printed in a directory listing. The arguments for the
        formatstring are the path and SHA1 of the submodule commit. Default
        Text which will be used as the formatstring for a hyperlink when a
        submodule is printed in a directory listing. The arguments for the
        formatstring are the path and SHA1 of the submodule commit. Default

-       value: "./?repo=%s&page=commit&id=%s"
+       value: none.

 
 nocache::
        If set to the value "1" caching will be disabled. This settings is
 
 nocache::
        If set to the value "1" caching will be disabled. This settings is


@@ -388,7 +388,8 @@ repo.commit-filter::
 repo.defbranch::
        The name of the default branch for this repository. If no such branch
        exists in the repository, the first branch name (when sorted) is used
 repo.defbranch::
        The name of the default branch for this repository. If no such branch
        exists in the repository, the first branch name (when sorted) is used

-       as default instead. Default value: "master".
+       as default instead. Default value: branch pointed to by HEAD, or
+       "master" if there is no suitable HEAD.

 
 repo.desc::
        The value to show as repository description. Default value: none.
 
 repo.desc::
        The value to show as repository description. Default value: none.


@@ -428,6 +429,12 @@ repo.module-link::
        formatstring are the path and SHA1 of the submodule commit. Default
        value: <module-link>
 
        formatstring are the path and SHA1 of the submodule commit. Default
        value: <module-link>
 

+repo.module-link.<path>::
+       Text which will be used as the formatstring for a hyperlink when a
+       submodule with the specified subdirectory path is printed in a
+       directory listing. The only argument for the formatstring is the SHA1
+       of the submodule commit. Default value: none.
+

 repo.max-stats::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default
 repo.max-stats::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default


@@ -511,7 +518,7 @@ Also, all filters are handed the following environment variables:
 
 If a setting is not defined for a repository and the corresponding global
 setting is also not defined (if applicable), then the corresponding
 
 If a setting is not defined for a repository and the corresponding global
 setting is also not defined (if applicable), then the corresponding

-environment variable will be an empty string.
+environment variable will be unset.

 
 
 MACRO EXPANSION
 
 
 MACRO EXPANSION