From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Fri, 28 Aug 2009 03:18:49 +0000 (+0900)
Subject: Fix overridable written with an extra 'e'
X-Git-Tag: v1.6.4.2~4^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=93197898041fcaf84d8ac84df764cca7bf86b226;p=git.git

Fix overridable written with an extra 'e'

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b292e9843..dcac8c8e2 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 33ef190ce..43fa791de 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);