From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jul 2015 19:45:27 +0000 (-0700)
Subject: Merge branch 'tf/gitweb-typofix'
X-Git-Tag: v2.5.0-rc3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c5918ab45034d3ed54404174875b8894a37c1c79?hp=-c

Merge branch 'tf/gitweb-typofix'

* tf/gitweb-typofix:
gitweb: fix typo in man page
---

c5918ab45034d3ed54404174875b8894a37c1c79
diff --combined Documentation/gitweb.conf.txt
index a096e7ddf7,12a0de17e8..8a42270074
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@@ -482,12 -482,12 +482,12 @@@ project config.  Per-repository configu
  composed from `@git_base_url_list` elements and project name.
  +
  You can setup one single value (single entry/item in this list) at build
 -time by setting the `GITWEB_BASE_URL` built-time configuration variable.
 +time by setting the `GITWEB_BASE_URL` build-time configuration variable.
  By default it is set to (), i.e. an empty list.  This means that gitweb
  would not try to create project URL (to fetch) from project name.
  
  $projects_list_group_categories::
- 	Whether to enables the grouping of projects by category on the project
+ 	Whether to enable the grouping of projects by category on the project
  	list page. The category of a project is determined by the
  	`$GIT_DIR/category` file or the `gitweb.category` variable in each
  	repository's configuration.  Disabled by default (set to 0).
@@@ -706,7 -706,7 +706,7 @@@ show-sizes:
  	I/O.  Enabled by default.
  +
  This feature can be configured on a per-repository basis via
 -repository's `gitweb.showsizes` configuration variable (boolean).
 +repository's `gitweb.showSizes` configuration variable (boolean).
  
  patches::
  	Enable and configure "patches" view, which displays list of commits in email
@@@ -904,7 -904,7 +904,7 @@@ the following in your GITWEB_CONFIG fil
  	$feature{'snapshot'}{'override'} = 1;
  
  If you allow overriding for the snapshot feature, you can specify which
 -snapshot formats are globally disabled. You can also add any command line
 +snapshot formats are globally disabled. You can also add any command-line
  options you want (such as setting the compression level). For instance, you
  can disable Zip compressed snapshots and set *gzip*(1) to run at level 6 by
  adding the following lines to your gitweb configuration file: