LinuxLists.cc - [PATCH] Change all occurrences of 'flavour' to 'flavor'

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Thu, 7 Aug 2003, Jasper Spaans wrote:

> Hello,
>
> This patch is a followup to changeset 1.1046.1.459,
>
> http://linus.bkbits.net:8080/linux-2.5/user=jasper/[email protected]?nav=!-%7Cindex.html%7Cstats%7C!+%7Cindex.html%7CChangeSet@-3w
>
>
> It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> I've just comiled all affected files (that is, the config resulting from
> make allyesconfig minus already broken stuff) succesfully on i386.

Arrrgh! You can't be serious!

2003-08-08 05:46:13

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor', [email protected]

On Thu, Aug 07, 2003 at 11:37:23PM +0100, Alan Cox wrote:
> > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > I've just comiled all affected files (that is, the config resulting from
> > make allyesconfig minus already broken stuff) succesfully on i386.
>
> The Linux kernel tended to favour european spelling, and favOUr is
> indeed correct English.

Personally, I prefer the european flavour too.

However, a quick count on the original tree shows:

spaans@spaans:~/bk/export$ grep -ir 'flavour' . |wc -l
74
spaans@spaans:~/bk/export$ grep -ir 'flavor' . |wc -l
192

which is why I chose to do it this way.

There's no reason to not do it the other way around, of course.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 06:52:40

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:

> > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > I've just comiled all affected files (that is, the config resulting from
> > make allyesconfig minus already broken stuff) succesfully on i386.
>
> Arrrgh! You can't be serious!

Yes, I am bloody serious; this patch might look purely cosmetic at first
sight.. yet, there's a technical reason for at least one part of it. Grep
and see the horror:

$ egrep -ni 'flavou?r' fs/nfs/inode.c
[snip]
1357: rpc_authflavor_t authflavour;
[snip]

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 07:09:09

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, 8 Aug 2003, Jasper Spaans wrote:

> On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:
>
> > > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > > I've just comiled all affected files (that is, the config resulting from
> > > make allyesconfig minus already broken stuff) succesfully on i386.
> >
> > Arrrgh! You can't be serious!
>
> Yes, I am bloody serious; this patch might look purely cosmetic at first
> sight.. yet, there's a technical reason for at least one part of it. Grep
> and see the horror:
>
> $ egrep -ni 'flavou?r' fs/nfs/inode.c
> [snip]
> 1357: rpc_authflavor_t authflavour;
> [snip]

I know it wasn't purely cosmetic but i just wish we could use the proper
spelling instead of US English. No i'm not trolling.

--
function.linuxpower.ca

2003-08-08 07:16:43

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08 2003, Zwane Mwaikambo wrote:
> I know it wasn't purely cosmetic but i just wish we could use the proper
> spelling instead of US English. No i'm not trolling.

You might want to be, but you are ;)

US English is clearly more optimized.

--
Jens Axboe

2003-08-08 07:11:50

by Tomas Szepe

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

> [[email protected]]
>
> rpc_authflavor_t authflavour;

did anybody say melting pot? :)

2003-08-08 07:07:37

by Alexander Winston

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

Jasper Spaans wrote:

>On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:
>
>
>
>>>It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
>>>I've just comiled all affected files (that is, the config resulting from
>>>make allyesconfig minus already broken stuff) succesfully on i386.
>>>
>>>
>>Arrrgh! You can't be serious!
>>
>>
>
>Yes, I am bloody serious; this patch might look purely cosmetic at first
>sight.. yet, there's a technical reason for at least one part of it. Grep
>and see the horror:
>
>$ egrep -ni 'flavou?r' fs/nfs/inode.c
>[snip]
>1357: rpc_authflavor_t authflavour;
>[snip]
>
>VrGr,
>
I think another important issue is consistency. We should choose a
style, and then stick with it.

2003-08-08 07:13:48

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Thu, Aug 07 2003, Alan Cox wrote:
> On Iau, 2003-08-07 at 19:00, Jasper Spaans wrote:
> > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > I've just comiled all affected files (that is, the config resulting from
> > make allyesconfig minus already broken stuff) succesfully on i386.
>
> The Linux kernel tended to favour european spelling, and favOUr is
> indeed correct English.

Eh? Maybe you did (obviously), but I don't see a general trend there. I
tend to prefer favor/color etc. Oh, and disk obviously.

--
Jens Axboe

2003-08-08 07:33:53

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 02:57:15AM -0400, Zwane Mwaikambo wrote:
> > > > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> I know it wasn't purely cosmetic but i just wish we could use the proper
> spelling instead of US English. No i'm not trolling.

I totally agree with you on that and I do have the diff doing lying around
here. Good fuel for a flamefest. I guess our benevolent dictator needs to
decide on this issue :)

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 07:31:34

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 03:07:32AM -0400, Alexander Winston wrote:
> >>>It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> I think another important issue is consistency. We should choose a
> style, and then stick with it.

Agree; that's why this patch is for the complete tree.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 07:40:16

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08 2003, Jasper Spaans wrote:
> On Fri, Aug 08, 2003 at 02:57:15AM -0400, Zwane Mwaikambo wrote:
> > > > > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > I know it wasn't purely cosmetic but i just wish we could use the proper
> > spelling instead of US English. No i'm not trolling.
>
> I totally agree with you on that and I do have the diff doing lying around
> here. Good fuel for a flamefest. I guess our benevolent dictator needs to
> decide on this issue :)

_Who cares_? People going nuts with spelling changes was bad (and
disruptive) enough, being overly pedantic with us vs uk spelling is an
even bigger waste of time imho. It's not like people don't understand
what is there. And it's not like it adds any extra value to the kernel.

--
Jens Axboe

2003-08-08 07:57:48

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, 8 Aug 2003, Jasper Spaans wrote:

> On Fri, Aug 08, 2003 at 02:57:15AM -0400, Zwane Mwaikambo wrote:
> > > > > It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> > I know it wasn't purely cosmetic but i just wish we could use the proper
> > spelling instead of US English. No i'm not trolling.
>
> I totally agree with you on that and I do have the diff doing lying around
> here. Good fuel for a flamefest. I guess our benevolent dictator needs to
> decide on this issue :)

Apparently he decided a while ago. bah, i hope this doesn't mean a barrage
of US spelling patches.

--
function.linuxpower.ca

2003-08-08 08:00:13

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On vrijdag, aug 8, 2003, at 09:40 Europe/Amsterdam, Jens Axboe wrote:
> _Who cares_? People going nuts with spelling changes was bad (and
> disruptive) enough,

Obviously, you don't. What happened to good old Gr?ndlichkeit? ;)

> being overly pedantic with us vs uk spelling is an
> even bigger waste of time imho.

Yep.

> It's not like people don't understand
> what is there. And it's not like it adds any extra value to the
> kernel.

This holds for about 90% of that patch (with which I mean to the use of
flavou?r/ in non-code); the 10% where it does matter (and thus adds
value) is what I'm trying to get some consensus on.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 08:25:35

by Andries E. Brouwer

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

> I don't see a general trend there.
> I tend to prefer favor/color etc. Oh, and disk obviously.

Yes, disk obviously.
Otherwise the score is divided.

% gryp neighbour | wc -l
581
% gryp neighbor | wc -l
389

% gryp colour | wc -l
285
% gryp color | wc -l
1844

% gryp favour | wc -l
33
% gryp favor | wc -l
71

% gryp zeroes | wc -l
206
% gryp zeros | wc -l
391

Hmm. The neighbours win, but otherwise it is mostly American.
Since it is not overwhelmingly but only mostly American
it may be a bad idea to start "fixing" this. The patch
would be too large.

2003-08-08 08:54:16

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08 2003, Jasper Spaans wrote:
> On vrijdag, aug 8, 2003, at 09:40 Europe/Amsterdam, Jens Axboe wrote:
> >_Who cares_? People going nuts with spelling changes was bad (and
> >disruptive) enough,
>
> Obviously, you don't. What happened to good old Gr?ndlichkeit? ;)

I don't know, I'm not german.

> >being overly pedantic with us vs uk spelling is an
> >even bigger waste of time imho.
>
> Yep.
>
> >It's not like people don't understand
> >what is there. And it's not like it adds any extra value to the
> >kernel.
>
> This holds for about 90% of that patch (with which I mean to the use of
> flavou?r/ in non-code); the 10% where it does matter (and thus adds
> value) is what I'm trying to get some consensus on.

My comments _were_ for printed messages, for comments it's 101%
superflous.

--
Jens Axboe

2003-08-08 11:04:18

by Adrian Bunk

[permalink] [raw]

Subject: [OT] Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 09:15:30AM +0200, Jens Axboe wrote:
> On Fri, Aug 08 2003, Zwane Mwaikambo wrote:
> > I know it wasn't purely cosmetic but i just wish we could use the proper
> > spelling instead of US English. No i'm not trolling.
>
> You might want to be, but you are ;)
>
> US English is clearly more optimized.

E.g. you need less than 1/1000 of the money you need for one billion
(UK English) English pounds for one billion (US English) dollars.

OTOH, it sounds funny that the USA are indebted with several trillion
(US English) dollars.

> Jens Axboe

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2003-08-08 15:05:05

by Timothy Miller

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

Jasper Spaans wrote:
> On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:
>
>
>>>It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
>>>I've just comiled all affected files (that is, the config resulting from
>>>make allyesconfig minus already broken stuff) succesfully on i386.
>>
>>Arrrgh! You can't be serious!
>
>
> Yes, I am bloody serious; this patch might look purely cosmetic at first
> sight.. yet, there's a technical reason for at least one part of it. Grep
> and see the horror:
>
> $ egrep -ni 'flavou?r' fs/nfs/inode.c
> [snip]
> 1357: rpc_authflavor_t authflavour;
> [snip]

Ah, for a moment, I was worried that someone was talking about text in
comments.

Yes, when it comes to spelling of words in variable and type names, I
think it would be a good idea to be consistent.

What is Linus's preferred spelling? Let's use that.

2003-08-08 15:35:12

by Richard B. Johnson

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, 8 Aug 2003, Timothy Miller wrote:

>
>
> Jasper Spaans wrote:
> > On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:
> >
> >
> >>>It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> >>>I've just comiled all affected files (that is, the config resulting from
> >>>make allyesconfig minus already broken stuff) succesfully on i386.
> >>
> >>Arrrgh! You can't be serious!
> >
> >
> > Yes, I am bloody serious; this patch might look purely cosmetic at first
> > sight.. yet, there's a technical reason for at least one part of it. Grep
> > and see the horror:
> >
> > $ egrep -ni 'flavou?r' fs/nfs/inode.c
> > [snip]
> > 1357: rpc_authflavor_t authflavour;
> > [snip]
>
>
> Ah, for a moment, I was worried that someone was talking about text in
> comments.
>
> Yes, when it comes to spelling of words in variable and type names, I
> think it would be a good idea to be consistent.
>
> What is Linus's preferred spelling? Let's use that.
>

It's a little past April Fool's day. What are you guys
smoking? Next, you'll want to change all the 'i's to
'y's and add 'ing'.

Certainly one might want to change:

int TheVariableThatWillBeUsedAsACounter;

to..
int i;

However, changing the spelling of a variable name is
absurd no matter how you look at it.

Cheers,
Dick Johnson
Penguin : Linux version 2.4.20 on an i686 machine (797.90 BogoMips).
Note 96.31% of all statistics are fiction.

2003-08-08 15:48:47

by Trond Myklebust

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

>> >>>It changes all occurrences of 'flavour' to 'flavor' in the
>> >>>complete tree; I've just comiled all affected files (that
>> >>>is, the config resulting from make allyesconfig minus
>> >>>already broken stuff) succesfully on i386.
>> >>
>> >>Arrrgh! You can't be serious!
>> >
>> >
>> > Yes, I am bloody serious; this patch might look purely
>> > cosmetic at first sight.. yet, there's a technical reason for
>> > at least one part of it. Grep and see the horror:
>> >
>> > $ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357:
>> > rpc_authflavor_t authflavour; [snip]
>>

Anybody who screws with that spelling is setting himself up for the
red hot poker treatment...

The flavor/flavour thing reflects the fact that the code has been
written and modified by different people with different
backgrounds. Some people have been unfortunate enough to be of the US
persuasion, others have grown up with the British spelling.

Now leave it alone and go do something useful with your lives...

Trond

2003-08-08 15:51:10

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

> > > $ egrep -ni 'flavou?r' fs/nfs/inode.c
> > > 1357: rpc_authflavor_t authflavour;

> However, changing the spelling of a variable name is
> absurd no matter how you look at it.

Read that line of code again please. Next, imagine writing code in there.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

<== The only intuitive interface ever created was a ==>
<== nipple. ==>

2003-08-08 15:59:51

by Richard B. Johnson

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, 8 Aug 2003, Jasper Spaans wrote:

> > > > $ egrep -ni 'flavou?r' fs/nfs/inode.c
> > > > 1357: rpc_authflavor_t authflavour;
>
> > However, changing the spelling of a variable name is
> > absurd no matter how you look at it.
>
> Read that line of code again please. Next, imagine writing code in there.
>
> VrGr,

Yes. It's wonderful. Pure poetry to me! It's probably in line
for the Pulitzer prize for literature. I like it.

That said, there probably is a good reason why not to define
a special type for that variable. But, then again, that's not
a spelling matter.

Cheers,
Dick Johnson
Penguin : Linux version 2.4.20 on an i686 machine (797.90 BogoMips).
Note 96.31% of all statistics are fiction.

2003-08-08 16:42:21

by Gene Heskett

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Friday 08 August 2003 11:48, Trond Myklebust wrote:
> >> >>>It changes all occurrences of 'flavour' to 'flavor' in the
> >> >>>complete tree; I've just comiled all affected files (that
> >> >>>is, the config resulting from make allyesconfig minus
> >> >>>already broken stuff) succesfully on i386.
> >> >>
> >> >>Arrrgh! You can't be serious!
> >> >
> >> > Yes, I am bloody serious; this patch might look purely
> >> > cosmetic at first sight.. yet, there's a technical reason
> >> > for at least one part of it. Grep and see the horror:
> >> >
> >> > $ egrep -ni 'flavou?r' fs/nfs/inode.c [snip] 1357:
> >> > rpc_authflavor_t authflavour; [snip]
>
>Anybody who screws with that spelling is setting himself up for the
>red hot poker treatment...

That and toothpicks under the fingernails comes to mind.

>The flavor/flavour thing reflects the fact that the code has been
>written and modified by different people with different
>backgrounds. Some people have been unfortunate enough to be of the
> US persuasion, others have grown up with the British spelling.
>
>Now leave it alone and go do something useful with your lives...
>
>Trond

What about the scenario where both spellings are used in a header
someplace that winds up being a systemwide reference? I don't know
that it has been, but such a 'correction' has the potential to take
us back to square one and 1993. I have had recurring daytime
nightmares of such possibilities since this subject came up the first
time a week or so ago.

Methinks the proponent here should find another, more productive
outlet for his frustrations. This particular dog won't hunt.

--
Cheers, Gene
AMD K6-III@500mhz 320M
Athlon1600XP@1400mhz 512M
99.27% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attornies please note, additions to this message
by Gene Heskett are:
Copyright 2003 by Maurice Eugene Heskett, all rights reserved.

2003-08-08 17:02:53

by Steven Cole

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Thu, 2003-08-07 at 18:04, Martin J. Bligh wrote:
> --Alan Cox <[email protected]> wrote (on Thursday, August 07, 2003 23:37:23 +0100):
>
> > On Iau, 2003-08-07 at 19:00, Jasper Spaans wrote:
> >> It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> >> I've just comiled all affected files (that is, the config resulting from
> >> make allyesconfig minus already broken stuff) succesfully on i386.
> >
> > The Linux kernel tended to favour european spelling, and favOUr is
> > indeed correct English.
>
> Either way, haven't we stopped piddling around with spelling fixes and
> breaking everyone's patches yet? I thought we had ...
>
> M.

Well, I for one have stopped with the spelling patches since the
cost/benefit ratio was too high for many key folks. When the spelling
patches were being generated, we were quite careful not to "fix" English
spellings.

I won't begin the next round of spelling fixes until 2.7.40, for those
who want to plan ahead that far. And next time, I'll send the patches
through the maintainers. But we can still argue about spelling fixes if
that makes people happier.

Cheers,
Steven (off-duty spelling cop)

2003-08-08 17:04:23

by Svein Ove Aas

[permalink] [raw]

Subject: Re: [OT] Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

fredag 8. august 2003, 13:04, skrev Adrian Bunk:
> On Fri, Aug 08, 2003 at 09:15:30AM +0200, Jens Axboe wrote:
> > On Fri, Aug 08 2003, Zwane Mwaikambo wrote:
> > > I know it wasn't purely cosmetic but i just wish we could use the
> > > proper spelling instead of US English. No i'm not trolling.
> >
> > You might want to be, but you are ;)
> >
> > US English is clearly more optimized.
>
> E.g. you need less than 1/1000 of the money you need for one billion
> (UK English) English pounds for one billion (US English) dollars.
>
> OTOH, it sounds funny that the USA are indebted with several trillion
> (US English) dollars.

How so?

In Norwegian you'd be right; we have "Million - Milliard - Billion - Billiard"
and so forth.

But UK English? How does that work?
I'm having difficulties imagining you saying "one milliard pounds".

- - Svein Ove Aas
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQE/M9a+9OlFkai3rMARAtCSAJ9W7VU3QAgu7gRaJGzq7tJujDsqswCdHsDX
6Fpxi808OjdFCW18MQ+L4K8=
=buHC
-----END PGP SIGNATURE-----

2003-08-08 17:03:44

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

> What about the scenario where both spellings are used in a header
> someplace that winds up being a systemwide reference? I don't know
> that it has been, but such a 'correction' has the potential to take
> us back to square one and 1993. I have had recurring daytime
> nightmares of such possibilities since this subject came up the first
> time a week or so ago.

Wow. My FUD-o-meter just went berserk.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

<== The only intuitive interface ever created was a ==>
<== nipple. ==>

2003-08-08 17:19:07

by Linus Torvalds

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, 8 Aug 2003, Timothy Miller wrote:
>
> > 1357: rpc_authflavor_t authflavour;

This one I think is valid. Considering how many people seem to care, I
think we should keep it as the only valid case for now.

> Yes, when it comes to spelling of words in variable and type names, I
> think it would be a good idea to be consistent.
>
> What is Linus's preferred spelling? Let's use that.

I don't much care. I was taught English spelling in school, and I've
gotten used to US spelling here.

I think you guys who care should have a huge free-for-all, an electronic
mud-wrestling thing if you will. But not on linux-kernel.

I can see it now:

".. Alan Cox gets up, and tackles Zwane, who goes down in the mud.
Oops. They were on the same side. I guess Alan got caught up in the
rush. Jasper tries to take advantage of the situation, but slips in
the mud, and goes down in a heap with Alexander..."

Tell me when it's over.

Linus

2003-08-08 17:37:52

by Alan

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Gwe, 2003-08-08 at 18:03, Jasper Spaans wrote:
> > What about the scenario where both spellings are used in a header
> > someplace that winds up being a systemwide reference? I don't know
> > that it has been, but such a 'correction' has the potential to take
> > us back to square one and 1993. I have had recurring daytime
> > nightmares of such possibilities since this subject came up the first
> > time a week or so ago.
>
> Wow. My FUD-o-meter just went berserk.

Well we expose both Color and Colour in various application level
interfaces. As far as I am concerned English<->English changes are just
noise. Fixing real typos can be a big help especially to non first
language speakers who are wondering just wtf that word is..

2003-08-08 17:33:30

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 10:18:41AM -0700, Linus Torvalds wrote:

> > > 1357: rpc_authflavor_t authflavour;
> This one I think is valid. Considering how many people seem to care, I
> think we should keep it as the only valid case for now.

Right. I'll whip up a patch that is somewhat more subtle... minimizing the
damage done to other files.

> I think you guys who care should have a huge free-for-all, an electronic
> mud-wrestling thing if you will. But not on linux-kernel.
> ...

:D

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-08 18:02:29

by Gene Heskett

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Friday 08 August 2003 13:34, Alan Cox wrote:
>On Gwe, 2003-08-08 at 18:03, Jasper Spaans wrote:
>> > What about the scenario where both spellings are used in a
>> > header someplace that winds up being a systemwide reference? I
>> > don't know that it has been, but such a 'correction' has the
>> > potential to take us back to square one and 1993. I have had
>> > recurring daytime nightmares of such possibilities since this
>> > subject came up the first time a week or so ago.
>>
>> Wow. My FUD-o-meter just went berserk.
>
>Well we expose both Color and Colour in various application level
>interfaces. As far as I am concerned English<->English changes are
> just noise. Fixing real typos can be a big help especially to non
> first language speakers who are wondering just wtf that word is..

As I relied to Jasper privately, the chances are slim but not
non-existant. However I also commented that a spell checker able to
note that there is only one or two characters difference in the words
being compared, or only the order had been changed, would be a huge
help in running down typo's.

--
Cheers, Gene
AMD K6-III@500mhz 320M
Athlon1600XP@1400mhz 512M
99.27% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attornies please note, additions to this message
by Gene Heskett are:
Copyright 2003 by Maurice Eugene Heskett, all rights reserved.

2003-08-08 21:51:38

by Ian Hastie

[permalink] [raw]

Subject: Re: [OT] Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Friday 08 Aug 2003 17:58, Svein Ove Aas wrote:
> fredag 8. august 2003, 13:04, skrev Adrian Bunk:
> > E.g. you need less than 1/1000 of the money you need for one billion
> > (UK English) English pounds for one billion (US English) dollars.
> >
> > OTOH, it sounds funny that the USA are indebted with several trillion
> > (US English) dollars.
>
> How so?
>
> In Norwegian you'd be right; we have "Million - Milliard - Billion -
> Billiard" and so forth.
>
> But UK English? How does that work?
> I'm having difficulties imagining you saying "one milliard pounds".

One British billion is one million million. An American billion is one
thousand million. The American billion seems to be more widely used than the
British one these days, even in Britain. Of course there is the exchange
rate to take account of too.

--
Ian.

2003-08-09 00:24:32

by Trond Myklebust

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

>>>>> " " == Linus Torvalds <[email protected]> writes:

> On Fri, 8 Aug 2003, Timothy Miller wrote:
>>
>> > 1357: rpc_authflavor_t authflavour;

> This one I think is valid. Considering how many people seem to
> care, I think we should keep it as the only valid case for now.

Since we appear to be in the silly season...

diff -u --recursive --new-file linux-2.6.0-test2/fs/nfs/inode.c gnurr/fs/nfs/inode.c
--- linux-2.6.0-test2/fs/nfs/inode.c 2003-07-17 19:40:29.000000000 +0200
+++ gnurr/fs/nfs/inode.c 2003-08-09 02:22:12.000000000 +0200
@@ -1354,7 +1354,7 @@
struct rpc_xprt *xprt = NULL;
struct rpc_clnt *clnt = NULL;
struct rpc_timeout timeparms;
- rpc_authflavor_t authflavour;
+ rpc_authflavour_t authflavour;
int proto, err = -EIO;

sb->s_blocksize_bits = 0;
diff -u --recursive --new-file linux-2.6.0-test2/include/linux/sunrpc/auth.h gnurr/include/linux/sunrpc/auth.h
--- linux-2.6.0-test2/include/linux/sunrpc/auth.h 2003-06-12 04:22:40.000000000 +0200
+++ gnurr/include/linux/sunrpc/auth.h 2003-08-09 02:21:37.000000000 +0200
@@ -138,5 +138,7 @@
return cred;
}

+#define rpc_authflavour_t rpc_authflavor_t
+
#endif /* __KERNEL__ */
#endif /* _LINUX_SUNRPC_AUTH_H */

2003-08-09 00:43:11

by Linus Torvalds

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On 9 Aug 2003, Trond Myklebust wrote:
>
> Since we appear to be in the silly season...

No, your patch isn't silly, it's EVIL. It fundamentally breaks the notion
of "grep for usage" by introducing two names to the same thing, without
having even a good reason (ie no "nice abstraction" thing or anything).

So that's just bad.

In contrast, switching "authflavour" to "authflavor" (to match the type)
ahs the advantage of _improving_ greppability.

Linus

2003-08-09 00:48:33

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 05:41:18PM -0700, Linus Torvalds wrote:
> > Since we appear to be in the silly season...
> So that's just bad.
>
> In contrast, switching "authflavour" to "authflavor" (to match the type)
> ahs the advantage of _improving_ greppability.

As I stated before, I'll whip up a patch. However, it's 2:45 localtime here
right now, and I need to catch some sleep.

VrGr,
--
Jasper Spaans http://jsp.vs19.net/contact/

2003-08-09 01:05:02

by Trond Myklebust

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

>>>>> " " == Linus Torvalds <[email protected]> writes:

> On 9 Aug 2003, Trond Myklebust wrote:
>>
>> Since we appear to be in the silly season...

> No, your patch isn't silly, it's EVIL. It fundamentally breaks
> the notion of "grep for usage" by introducing two names to the
> same thing, without having even a good reason (ie no "nice
> abstraction" thing or anything).

Right! I fully agree that having 2 names for the same type is bad,
although "find -type f | grep flavou?r" would be a quite adequate way
of matching both spellings.

The point is, though, that I could have written

rpc_authflavor_t f;

and nobody would have cared or complained about grepability.

Anybody who claims that they have problems reading the code due to the
difference between US and British spelling of the same variable is in
reality engaged in a completely different type of crusade. One that
doesn't deserve attention...

Cheers,
Trond

2003-08-09 01:20:05

by Ian Hastie

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Saturday 09 Aug 2003 01:41, Linus Torvalds wrote:
> On 9 Aug 2003, Trond Myklebust wrote:
> > Since we appear to be in the silly season...
>
> No, your patch isn't silly, it's EVIL. It fundamentally breaks the notion
> of "grep for usage" by introducing two names to the same thing, without
> having even a good reason (ie no "nice abstraction" thing or anything).
>
> So that's just bad.
>
> In contrast, switching "authflavour" to "authflavor" (to match the type)
> ahs the advantage of _improving_ greppability.

... as long as you remember to misspell the word.

--
Ian.

2003-08-09 07:23:16

by jw schultz

[permalink] [raw]

Subject: Re: [PATCH] Change all occurrences of 'flavour' to 'flavor'

On Fri, Aug 08, 2003 at 11:18:11AM -0400, Timothy Miller wrote:
>
>
> Jasper Spaans wrote:
> >On Thu, Aug 07, 2003 at 09:42:37PM -0400, Zwane Mwaikambo wrote:
> >
> >
> >>>It changes all occurrences of 'flavour' to 'flavor' in the complete tree;
> >>>I've just comiled all affected files (that is, the config resulting from
> >>>make allyesconfig minus already broken stuff) succesfully on i386.
> >>
> >>Arrrgh! You can't be serious!
> >
> >
> >Yes, I am bloody serious; this patch might look purely cosmetic at first
> >sight.. yet, there's a technical reason for at least one part of it. Grep
> >and see the horror:
> >
> >$ egrep -ni 'flavou?r' fs/nfs/inode.c
> >[snip]
> >1357: rpc_authflavor_t authflavour;
> >[snip]
>
>
> Ah, for a moment, I was worried that someone was talking about text in
> comments.
>
> Yes, when it comes to spelling of words in variable and type names, I
> think it would be a good idea to be consistent.
>
> What is Linus's preferred spelling? Let's use that.

Or look at history. I picked the two samples easiest for
me: 2.4.18 and 2.2.10. In neither does fs/nfs/inode.c have
"flavour" in comment or symbol. A search of the entire
kernel tree shows "flavour" only appearing in comments in
2.2.10 but 2.4.18 has some variables and macros named
"flavour" or "flavours" but they seem to be in the minority.

$ cd /usr/src/linux-2.4.18.SuSE
$ find . -name '*.[ch]' | xargs grep -li 'flavour' |wc -l
18
$ find . -name '*.[ch]' | xargs grep -li 'flavor' |wc -l
36

Hardly scientific it lumps comments (which nobody should
care about) with variables, functions and macros, and there
will be an overlap between the two sets of files.

I'd say flavour has crept in. While i think that "flavour"
has more panache than "flavor" i'd suggest regularising it
in the way that makes the least change.

I'm also inclined to suggest that a preferred spelling be
specified in the CodingStyle document. Inconsistency in
this doesn't much affect readability but it does impact
maintainability.

--
________________________________________________________________
J.W. Schultz Pegasystems Technologies
email address: [email protected]

Remember Cernan and Schmitt

2003-08-09 20:03:08

[permalink] [raw]

Subject: Re: [PATCH] Fix up fs/nfs/inode.c wrt flavo[u]r

On Sat, 9 Aug 2003, Jasper Spaans wrote:

> On Sat, Aug 09, 2003 at 02:45:59AM +0200, Jasper Spaans wrote:
> > As I stated before, I'll whip up a patch. However, it's 2:45 localtime here
> > right now, and I need to catch some sleep.
>
> Here goes; this is the least intrusive version I could make which still
> makes sense.
>
>
> fs/nfs/inode.c | 16 ++++++++--------
> include/linux/nfs4_mount.h | 4 ++--
> include/linux/nfs_mount.h | 2 +-
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> For those who want to look at this without using bitkeeper, a plaintext
> patch is available at
>
> http://jsp.vs19.net/tmp/flavour.txt
>

<whine> *sigh* why not just attach it inline into your email? </whine>

> This BitKeeper patch contains the following changesets:
> 1.1150
> ## Wrapped with uu ##

uu *mumble*

Zwane

2003-08-09 19:56:15

[permalink] [raw]

Subject: [PATCH] Fix up fs/nfs/inode.c wrt flavo[u]r

On Sat, Aug 09, 2003 at 02:45:59AM +0200, Jasper Spaans wrote:
> As I stated before, I'll whip up a patch. However, it's 2:45 localtime here
> right now, and I need to catch some sleep.

Here goes; this is the least intrusive version I could make which still
makes sense.

fs/nfs/inode.c | 16 ++++++++--------
include/linux/nfs4_mount.h | 4 ++--
include/linux/nfs_mount.h | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)

For those who want to look at this without using bitkeeper, a plaintext
patch is available at

http://jsp.vs19.net/tmp/flavour.txt

This BitKeeper patch contains the following changesets:
1.1150
## Wrapped with uu ##

M(R!5<V5R.@EJ87-P97(*(R!(;W-T.@EV<S$Y+FYE= HC(%)O;W0Z"2]H;VUE
M+W-P86%N<R]B:R]L:6YU>"TR+C8*"B,@4&%T8V@@=F5R<SH),2XS"B,@4&%T
M8V@@='EP93H)4D5'54Q!4@H*/3T@0VAA;F=E4V5T(#T]"G1O<G9A;&1S0&%T
M:&QO;BYT<F%N<VUE=&$N8V]M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ
M-C T-WQC,60Q,6$T,65D,#(T.#8T"G1M;VQI;F% 8V%B;&5S<&5E9"YC;VU\
M0VAA;F=E4V5T?#(P,#,P.# Y,38T,#$W?#,R.#8V"D0@,2XQ,34P(# S+S X
M+S Y(#(Q.C,W.C(P*S R.C P(&IA<W!E<D!V<S$Y+FYE=" K-" M, I"('1O
M<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?$-H86YG95-E='PR,# R,#(P
M-3$W,S U-GPQ-C T-WQC,60Q,6$T,65D,#(T.#8T"D,*8R!#:&%N9V4@<W!E
M;&QI;F<@;V8@9FQA=F]U<B!T;R!F;&%V;W(@:6X@9G,O;F9S+VEN;V1E+F,@
M86YD('1H92!H96%D97)S('1H:7,@9FEL92!I;F-L=61E<PIC( IC(%1H:7,@
M<')E=F5N=',@86YY(&-O;F9U<VEO;B!T:&%T(&UI9VAT(&%R:7-E(&)E8V%U
M<V4@8F]T:"!S<&5L;&EN9W,@87)E('5S960@:6X@=&AE('-A;64@<V]U<F-E
M(&9I;&4N"DL@,C<Q.34*4"!#:&%N9V53970*+2TM+2TM+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@HP83 */B!T;W)V86QD
M<T!A=&AL;VXN=')A;G-M971A+F-O;7Q":71+965P97(O971C+VEG;F]R97PR
M,# R,#(P-3$W,S U-GPQ-S<U,7QF83<Q8S5E9#,P,&$S8V9C(&IA<W!E<D!V
M<S$Y+FYE='Q":71+965P97(O971C+VEG;F]R97PR,# S,#@P.3$Y,S8P,7PV
M,S U-0H^('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?&EN8VQU9&4O
M;&EN=7@O;F9S7VUO=6YT+FA\,C P,C R,#4Q-S,Y-#!\,C8V,C!\-SED,3<Q
M-#1A,C=C-#%E92!J87-P97) =G,Q.2YN971\:6YC;'5D92]L:6YU>"]N9G-?
M;6]U;G0N:'PR,# S,#@P.3$Y,S8P,7PV-#,S-PH^('1R;VYD+FUY:VQE8G5S
M=$!F>7,N=6EO+FYO6W1O<G9A;&1S77QI;F-L=61E+VQI;G5X+VYF<S1?;6]U
M;G0N:'PR,# R,3 Q-C R,S T-7PV-#4Q.7QC8F-A8SEF8C%B9C-E,C9D(&IA
M<W!E<D!V<S$Y+FYE='QI;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:'PR,# S
M,#@P.3$Y,S8P,7PP.3 R-@H^('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N
M8V]M?&9S+VYF<R]I;F]D92YC?#(P,#(P,C U,3<S.3,X?# Y,S8S?#-F,#,Y
M,C=A8V9D8F0T82!J87-P97) =G,Q.2YN971\9G,O;F9S+VEN;V1E+F-\,C P
M,S X,#DQ.3,V,#%\-C(X,#$*"CT]($)I=$ME97!E<B]E=&,O:6=N;W)E(#T]
M"G1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M?$)I=$ME97!E<B]E=&,O
M:6=N;W)E?#(P,#(P,C U,3<S,#4V?#$W-S4Q?&9A-S%C-65D,S P83-C9F,*
M=&]R=F%L9'- :&]M92YO<V1L+F]R9WQ":71+965P97(O971C+VEG;F]R97PR
M,# S,#@P,C$W,S0U,7PU-C(R-PI$(#$N-C4@,#,O,#@O,#D@,C$Z,S8Z,#$K
M,#(Z,# @:F%S<&5R0'9S,3DN;F5T("LS("TP"D(@=&]R=F%L9'- 871H;&]N
M+G1R86YS;65T82YC;VU\0VAA;F=E4V5T?#(P,#(P,C U,3<S,#4V?#$V,#0W
M?&,Q9#$Q830Q960P,C0X-C0*0PIC($%D9&5D(&9S+VYF<R]I;F]D92YC?B!I
M;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:'X@:6YC;'5D92]L:6YU>"]N9G-?
M;6]U;G0N:'X@=&\@=&AE(&EG;F]R92!L:7-T"DL@-C,P-34*3R M<G<M<G<M
M<BTM"E @0FET2V5E<&5R+V5T8R]I9VYO<F4*+2TM+2TM+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@I),3,Y(#,*9G,O;F9S
M+VEN;V1E+F-^"FEN8VQU9&4O;&EN=7@O;F9S-%]M;W5N="YH?@II;F-L=61E
M+VQI;G5X+VYF<U]M;W5N="YH?@H*/3T@9G,O;F9S+VEN;V1E+F,@/3T*=&]R
M=F%L9'- 871H;&]N+G1R86YS;65T82YC;VU\9G,O;F9S+VEN;V1E+F-\,C P
M,C R,#4Q-S,Y,SA\,#DS-C-\,V8P,SDR-V%C9F1B9#1A"FIA<W!E<D!V<S$Y
M+FYE=%MT;W)V86QD<UU\9G,O;F9S+VEN;V1E+F-\,C P,S W,3<Q.3$P,S9\
M-C,Y,#<*1" Q+C@U(# S+S X+S Y(#(Q.C,V.C Q*S R.C P(&IA<W!E<D!V
M<S$Y+FYE=" K." M. I"('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE=&$N8V]M
M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ-C T-WQC,60Q,6$T,65D,#(T
M.#8T"D,*8R!#:&%N9V4@<W!E;&QI;F<@;V8@9FQA=F]U<B!T;R!F;&%V;W(@
M:6X@9G,O;F9S+VEN;V1E+F,*2R V,C@P,0I/("UR=RUR=RUR+2T*4"!F<R]N
M9G,O:6YO9&4N8PHM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2T*"D0T.#$@,0I)-#@Q(#$*"6EF("@A*&1A=&$M/F9L
M86=S("8@3D937TU/54Y47U-%0T9,059/4BDI"D0Q,CDY(#$*23$R.3D@,0H)
M"0ED871A+3YF;&%G<R F/2!^3D937TU/54Y47U-%0T9,059/4CL*1#$S-3<@
M,0I),3,U-R Q"@ER<&-?875T:&9L879O<E]T(&%U=&AF;&%V;W(["D0Q-#$P
M(#,*23$T,3(@,PH)875T:&9L879O<B ](%)00U]!551(7U5.25@["@EI9B H
M9&%T82T^875T:%]F;&%V;W)L96X@(3T@,"D@>PH)"6EF("AD871A+3YA=71H
M7V9L879O<FQE;B ^(#$I"D0Q-#$T(#$*23$T,30@,0H)"6EF("AC;W!Y7V9R
M;VU?=7-E<B@F875T:&9L879O<BP@9&%T82T^875T:%]F;&%V;W)S+"!S:7IE
M;V8H875T:&9L879O<BDI*2!["D0Q-#(P(#$*23$T,C @,0H)"0D)('-E<G9E
M<BT^<G!C7V]P<RT^=F5R<VEO;BP@875T:&9L879O<BD["@H]/2!I;F-L=61E
M+VQI;G5X+VYF<U]M;W5N="YH(#T]"G1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE
M=&$N8V]M?&EN8VQU9&4O;&EN=7@O;F9S7VUO=6YT+FA\,C P,C R,#4Q-S,Y
M-#!\,C8V,C!\-SED,3<Q-#1A,C=C-#%E90IF8W5S86-K0&9C=7-A8VLN8V]M
M6W1O<G9A;&1S77QI;F-L=61E+VQI;G5X+VYF<U]M;W5N="YH?#(P,#,P-S$W
M,3<R.#$U?#8T-#(R"D0@,2XU(# S+S X+S Y(#(Q.C,V.C Q*S R.C P(&IA
M<W!E<D!V<S$Y+FYE=" K,2 M,0I"('1O<G9A;&1S0&%T:&QO;BYT<F%N<VUE
M=&$N8V]M?$-H86YG95-E='PR,# R,#(P-3$W,S U-GPQ-C T-WQC,60Q,6$T
M,65D,#(T.#8T"D,*8R!#:&%N9V4@<W!E;&QI;F<@;V8@9FQA=F]U<B!T;R!F
M;&%V;W(@:6X@9G,O;F9S+VEN;V1E+F,@86YD(&AE861E<G,*2R V-#,S-PI/
M("UR=RUR=RUR+2T*4"!I;F-L=61E+VQI;G5X+VYF<U]M;W5N="YH"BTM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+0H*
M1#8P(#$*238P(#$*(V1E9FEN92!.1E-?34]53E1?4T5#1DQ!5D]2"3!X,C P
M, DO*B U("HO"@H]/2!I;F-L=61E+VQI;G5X+VYF<S1?;6]U;G0N:" ]/0IT
M<F]N9"YM>6ML96)U<W1 9GES+G5I;RYN;UMT;W)V86QD<UU\:6YC;'5D92]L
M:6YU>"]N9G,T7VUO=6YT+FA\,C P,C$P,38P,C,P-#5\-C0U,3E\8V)C86,Y
M9F(Q8F8S93(V9 IT<F]N9"YM>6ML96)U<W1 9GES+G5I;RYN;UMT;W)V86QD
M<UU\:6YC;'5D92]L:6YU>"]N9G,T7VUO=6YT+FA\,C P,C$P,38P,C,P-#9\
M,#DR-C *1" Q+C(@,#,O,#@O,#D@,C$Z,S8Z,#$K,#(Z,# @:F%S<&5R0'9S
M,3DN;F5T("LR("TR"D(@=&]R=F%L9'- 871H;&]N+G1R86YS;65T82YC;VU\
M0VAA;F=E4V5T?#(P,#(P,C U,3<S,#4V?#$V,#0W?&,Q9#$Q830Q960P,C0X
M-C0*0PIC($-H86YG92!S<&5L;&EN9R!O9B!F;&%V;W5R('1O(&9L879O<B!I
M;B!F<R]N9G,O:6YO9&4N8R!A;F0@:&5A9&5R<PI+(#DP,C8*3R M<G<M<G<M
M<BTM"E @:6YC;'5D92]L:6YU>"]N9G,T7VUO=6YT+F@*+2TM+2TM+2TM+2TM
M+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM+2TM"@I$-30@,@I)
M-34@,@H):6YT(&%U=&A?9FQA=F]R;&5N.PD)"2\J(#$@*B\*"6EN=" J875T
M:%]F;&%V;W)S.PD)"2\J(#$@*B\*"B,@4&%T8V@@8VAE8VMS=6T]9C@S,SDW
#,S0*
--
Jasper Spaans http://jsp.vs19.net/contact/

<== Het bedrijf van de appelcomputer is niet ==>
<== verantwoordelijk voor de omzettingsprecisie. ==>

2003-08-09 21:41:24