Bug 22622

Summary: make.conf includes both "optimisation" and "optimization" spellings
Product: Base System Reporter: Akinori MUSHA <knu>
Component: confAssignee: Doug Barton <dougb>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 5.0-CURRENT   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
file.diff none

Description Akinori MUSHA 2000-11-05 14:50:06 UTC
  make.conf includes both "optimisation" and "optimization" spellings.
  They should be standardized in American English.

Fix: For 5-CURRENT:

For 4-STABLE:

For 3-STABLE:



-- 
                           /
                          /__  __
                         / )  )  ) )  /    and.or.jp / ruby-lang.org
Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org

"We're only at home when we're on the run, on the wing, on the fly"--82PpJnGvm8de6LbN2UVgWpMiqudFMMLL6RTEcGJKAIU9NJbG
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.129
diff -u -r1.129 make.conf
--- make.conf	2000/11/04 08:43:13	1.129
+++ make.conf	2000/11/05 14:41:53
@@ -10,9 +10,9 @@
 # documentation of the source tree.
 #
 # CFLAGS controls the compiler settings used when compiling C code.
-# Note that optimisation settings above -O (-O2, ...) are not recommended
+# Note that optimization settings above -O (-O2, ...) are not recommended
 # or supported for compiling the world or the kernel - please revert any
-# nonstandard optimisation settings to "-O" before submitting bug reports
+# nonstandard optimization settings to "-O" before submitting bug reports
 # to the developers.
 # Note also that at this time the -O2 setting is known to produce BROKEN
 # CODE on the Alpha platform.
@@ -35,7 +35,7 @@
 		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
 		-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 #
-# To compile just the kernel with special optimisations, you should use
+# To compile just the kernel with special optimizations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway).
 # There is very little to gain by using higher optimization levels, and doing
 # so can cause problems.
Comment 1 Doug Barton freebsd_committer freebsd_triage 2000-11-05 17:55:26 UTC
State Changed
From-To: open->feedback

Historically the jury on spelling standardization always 
comes back hung. In the past we've used either of 
A) author's preference 
B) majority rule 
C) just Americanize and to heck with objections 

A) doesn't really apply here, B) would swing towards 
changing the one instance of optimiZation to the s 
spelling. Personally I've always felt that having one 
standard is better, but I'm open to suggestions... 



Comment 2 Doug Barton freebsd_committer freebsd_triage 2000-11-05 17:55:26 UTC
Responsible Changed
From-To: freebsd-bugs->dougb

I'll take responsibility for this
Comment 3 Doug Barton freebsd_committer freebsd_triage 2000-11-21 05:21:19 UTC
State Changed
From-To: feedback->closed


The change has been committed to HEAD and RELENG_4. I don't 
think this is the kind of fix that should go back to 
RELENG_3, since it really doesn't fall into the "crucial 
bugfix" category. However, the originator has it within 
his power to make a different decision. :)