summaryrefslogtreecommitdiff
path: root/Documentation/gitweb.conf.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-07 19:55:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-02-07 19:55:12 (GMT)
commitefe5f1d25d198ae8796b6f095c2cffae270bb9b6 (patch)
tree9b851ba1b50793afd5384d77a72b1d254a0ee9c7 /Documentation/gitweb.conf.txt
parentc256661bbe09c842f7b6fe24986294d611f25200 (diff)
parent5fe8f49b6d59cf143a5898ddbb161444a95fa871 (diff)
downloadgit-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.zip
git-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.tar.gz
git-efe5f1d25d198ae8796b6f095c2cffae270bb9b6.tar.bz2
Merge branch 'ow/manpages-typofix'
Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages
Diffstat (limited to 'Documentation/gitweb.conf.txt')
-rw-r--r--Documentation/gitweb.conf.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index db4154f..952f503 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -630,13 +630,13 @@ need to set this element to empty list i.e. `[]`.
override::
If this field has a true value then the given feature is
- overriddable, which means that it can be configured
+ overridable, which means that it can be configured
(or enabled/disabled) on a per-repository basis.
+
Usually given "<feature>" is configurable via the `gitweb.<feature>`
config variable in the per-repository Git configuration file.
+
-*Note* that no feature is overriddable by default.
+*Note* that no feature is overridable by default.
sub::
Internal detail of implementation. What is important is that