* [PATCH] Fix overridable written with an extra 'e'
@ 2009-08-28 3:18 Nanako Shiraishi
2009-08-28 3:43 ` Todd Zullinger
0 siblings, 1 reply; 6+ messages in thread
From: Nanako Shiraishi @ 2009-08-28 3:18 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
---
Found during the lunch break by one of my students...
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index b292e98..dcac8c8 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 33ef190..43fa791 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);
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix overridable written with an extra 'e'
2009-08-28 3:18 [PATCH] Fix overridable written with an extra 'e' Nanako Shiraishi
@ 2009-08-28 3:43 ` Todd Zullinger
2009-08-28 4:53 ` Junio C Hamano
2009-08-30 17:58 ` Uri Okrent
0 siblings, 2 replies; 6+ messages in thread
From: Todd Zullinger @ 2009-08-28 3:43 UTC (permalink / raw)
To: Nanako Shiraishi; +Cc: git, Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
Nanako Shiraishi wrote:
> Found during the lunch break by one of my students...
Is overridable a word itself? While English is my native language, I
wouldn't call myself an expert on its proper usage. ;)
However, I can't find 'overridable' in several online dictionaries:
http://dictionary.reference.com/browse/overridable
http://www.merriam-webster.com/dictionary/overridable
http://www.google.com/dictionary?aq=f&langpair=en|en&q=overridable&hl=en
http://dictionary.cambridge.org/results.asp?searchword=overridable&x=0&y=0
Perhaps using overridden would be more accurate?
> 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.
Prune loose objects older than date (default is 2 weeks ago,
- overrideable by the config variable `gc.pruneExpire`). This
+ which can be overridden by the config variable `gc.pruneExpire`). This
option is on by default.
> - warn "feature $name is not overrideable";
> + warn "feature $name is not overridable";
and
- warn "feature $name is not overrideable";
+ warn "feature $name cannot be overridden";
?
--
Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I got stopped by a cop the other day. He said, "Why'd you run that
stop sign?" I said, "Because I don't believe everything I read."
-- Stephen Wright
[-- Attachment #2: Type: application/pgp-signature, Size: 542 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix overridable written with an extra 'e'
2009-08-28 3:43 ` Todd Zullinger
@ 2009-08-28 4:53 ` Junio C Hamano
2009-08-28 15:15 ` Avery Pennarun
2009-08-30 17:58 ` Uri Okrent
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2009-08-28 4:53 UTC (permalink / raw)
To: Todd Zullinger; +Cc: Nanako Shiraishi, git, Junio C Hamano
Hmph, I don't know. Googling "overrideable" suggests "Did you mean
overridable?" which is enough clue for me.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix overridable written with an extra 'e'
2009-08-28 4:53 ` Junio C Hamano
@ 2009-08-28 15:15 ` Avery Pennarun
2009-08-28 15:31 ` Johannes Schindelin
0 siblings, 1 reply; 6+ messages in thread
From: Avery Pennarun @ 2009-08-28 15:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Todd Zullinger, Nanako Shiraishi, git
On Fri, Aug 28, 2009 at 4:53 AM, Junio C Hamano<gitster@pobox.com> wrote:
> Hmph, I don't know. Googling "overrideable" suggests "Did you mean
> overridable?" which is enough clue for me.
Using a similar system, the Google hit count:
overrideable: 26,900
overridable: 339,000
overridden: 2,280,000
Which agrees with my intuition that you can get away with overridable,
but it's much more common to just use overridden.
"override" of course comes from "ride" (181,000,000). A horse can be
ridden (10,500,000) if it's ridable (82,500).
The bad news: rideable (201,000).
http://www.merriam-webster.com/dictionary/ridable shows rideable as
the preferred spelling, but accepts both.
Have fun,
Avery
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix overridable written with an extra 'e'
2009-08-28 15:15 ` Avery Pennarun
@ 2009-08-28 15:31 ` Johannes Schindelin
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Schindelin @ 2009-08-28 15:31 UTC (permalink / raw)
To: Avery Pennarun; +Cc: Junio C Hamano, Todd Zullinger, Nanako Shiraishi, git
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1041 bytes --]
Hi,
On Fri, 28 Aug 2009, Avery Pennarun wrote:
> On Fri, Aug 28, 2009 at 4:53 AM, Junio C Hamano<gitster@pobox.com> wrote:
> > Hmph, I don't know. Googling "overrideable" suggests "Did you mean
> > overridable?" which is enough clue for me.
>
> Using a similar system, the Google hit count:
>
> overrideable: 26,900
> overridable: 339,000
> overridden: 2,280,000
But of course, "overidable" means "able to be overridden", not
"overridden".
> Which agrees with my intuition that you can get away with overridable,
> but it's much more common to just use overridden.
>
> "override" of course comes from "ride" (181,000,000). A horse can be
> ridden (10,500,000) if it's ridable (82,500).
>
> The bad news: rideable (201,000).
>
> http://www.merriam-webster.com/dictionary/ridable shows rideable as
> the preferred spelling, but accepts both.
Actually, I do not trust the bda speling of the many internet content
providers as much as Merriam Webster, so of all your analysis, I find this
the most important finding.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix overridable written with an extra 'e'
2009-08-28 3:43 ` Todd Zullinger
2009-08-28 4:53 ` Junio C Hamano
@ 2009-08-30 17:58 ` Uri Okrent
1 sibling, 0 replies; 6+ messages in thread
From: Uri Okrent @ 2009-08-30 17:58 UTC (permalink / raw)
To: git
Todd Zullinger <tmz <at> pobox.com> writes:
>
> Nanako Shiraishi wrote:
> > Found during the lunch break by one of my students...
>
> Is overridable a word itself? While English is my native language, I
> wouldn't call myself an expert on its proper usage. ;)
No, it's not a word =). But of the two non-words, overridable is probably
preferred.
>
> However, I can't find 'overridable' in several online dictionaries:
>
> http://dictionary.reference.com/browse/overridable
> http://www.merriam-webster.com/dictionary/overridable
> http://www.google.com/dictionary?aq=f&langpair=en|en&q=overridable&hl=en
> http://dictionary.cambridge.org/results.asp?searchword=overridable&x=0&y=0
>
> Perhaps using overridden would be more accurate?
It would be more correct, but also slightly more verbose. Still, as a grammar
nazi, my two cents says it raises git's esteem if the language in the docs is
proper English.
Uri
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-08-30 18:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-28 3:18 [PATCH] Fix overridable written with an extra 'e' Nanako Shiraishi
2009-08-28 3:43 ` Todd Zullinger
2009-08-28 4:53 ` Junio C Hamano
2009-08-28 15:15 ` Avery Pennarun
2009-08-28 15:31 ` Johannes Schindelin
2009-08-30 17:58 ` Uri Okrent
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.