From knu@idaemons.org  Sun Nov  5 06:49:28 2000
Return-Path: <knu@idaemons.org>
Received: from mail.rdc1.kt.home.ne.jp (ha1.rdc1.kt.home.ne.jp [203.165.9.242])
	by hub.freebsd.org (Postfix) with ESMTP id C032137B4C5
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  5 Nov 2000 06:49:27 -0800 (PST)
Received: from daemon.local.idaemons.org ([203.165.161.10])
          by mail.rdc1.kt.home.ne.jp (InterMail vM.4.01.02.00 201-229-116)
          with ESMTP
          id <20001105144925.JKRW16129.mail.rdc1.kt.home.ne.jp@daemon.local.idaemons.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sun, 5 Nov 2000 06:49:25 -0800
Received: by daemon.local.idaemons.org (8.11.0/3.7W) id eA5EnOl04493; Sun, 5 Nov 2000 23:49:24 +0900 (JST)
Message-Id: <86zojetqx7.wl@archon.local.idaemons.org>
Date: Sun, 05 Nov 2000 23:49:24 +0900
From: "Akinori MUSHA" <knu@idaemons.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: make.conf includes both "optimisation" and "optimization" spellings

>Number:         22622
>Category:       conf
>Synopsis:       make.conf includes both "optimisation" and "optimization" spellings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 05 06:50:06 PST 2000
>Closed-Date:    Mon Nov 20 21:21:19 PST 2000
>Last-Modified:  Mon Nov 20 21:26:37 PST 2000
>Originator:     "Akinori MUSHA" <knu@idaemons.org>
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Associated I. Daemons
>Environment:

  FreeBSD archon.local.idaemons.org 5.0-CURRENT FreeBSD 5.0-CURRENT #27: Sat Nov  4 21:02:37 JST 2000     root@archon.local.idaemons.org:/usr/local/src/sys/compile/ARCHON  i386

>Description:

  make.conf includes both "optimisation" and "optimization" spellings.
  They should be standardized in American English.

>How-To-Repeat:

>Fix:

For 5-CURRENT:

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.


For 4-STABLE:

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/make.conf,v
retrieving revision 1.97.2.24
diff -u -r1.97.2.24 make.conf
--- make.conf	2000/11/01 10:26:13	1.97.2.24
+++ make.conf	2000/11/05 14:43:03
@@ -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):
 #
 #COPTFLAGS= -O -pipe


For 3-STABLE:

Index: make.conf
===================================================================
RCS file: /home/ncvs/src/etc/Attic/make.conf,v
retrieving revision 1.73.2.12
diff -u -r1.73.2.12 make.conf
--- make.conf	2000/10/24 12:50:23	1.73.2.12
+++ make.conf	2000/11/05 14:43:39
@@ -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.
@@ -44,7 +44,7 @@
 #       (they aren't needed/necessary)
 #OBJLINK=	yes
 #
-# 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):
 #
 #COPTFLAGS= -O -pipe

-- 
                           /
                          /__  __
                         / )  )  ) )  /    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"

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: dougb 
State-Changed-When: Sun Nov 5 09:55:26 PST 2000 
State-Changed-Why:  
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... 



Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Sun Nov 5 09:55:26 PST 2000 
Responsible-Changed-Why:  
I'll take responsibility for this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22622 
State-Changed-From-To: feedback->closed 
State-Changed-By: dougb 
State-Changed-When: Mon Nov 20 21:21:19 PST 2000 
State-Changed-Why:  

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. :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22622 
>Unformatted:
