Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint

diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
index a096e7ddf7e7ebb73f630d023159abd395e7a512..8a42270074e3875c2919346f6c059e428aefa1ce 100644 (file)
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -487,7 +487,7 @@ 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).