diff options
| -rw-r--r-- | Documentation/git-gc.txt | 2 | ||||
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index b292e9843a..dcac8c8e29 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -61,7 +61,7 @@ automatic consolidation of packs. --prune=<date>:: Prune loose objects older than date (default is 2 weeks ago, - overrideable by the config variable `gc.pruneExpire`). This + overridable by the config variable `gc.pruneExpire`). This option is on by default. --no-prune:: diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 33ef190ceb..43fa791de0 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -376,7 +376,7 @@ sub gitweb_get_feature { @{$feature{$name}{'default'}}); if (!$override) { return @defaults; } if (!defined $sub) { - warn "feature $name is not overrideable"; + warn "feature $name is not overridable"; return @defaults; } return $sub->(@defaults); |