From njm@njm.me.uk  Sun Jan 10 10:04:46 2010
Return-Path: <njm@njm.me.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84C401065672
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 10:04:46 +0000 (UTC)
	(envelope-from njm@njm.me.uk)
Received: from smtp004.apm-internet.net (smtp004.apm-internet.net [85.119.248.54])
	by mx1.freebsd.org (Postfix) with SMTP id C1A6B8FC15
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 10:04:45 +0000 (UTC)
Received: (qmail 69913 invoked from network); 10 Jan 2010 09:38:03 -0000
Received: from unknown (HELO oberon.njm.me.uk) (86.138.89.30)
  by smtp004.apm-internet.net with SMTP; 10 Jan 2010 09:38:03 -0000
Received: from titania.njm.me.uk (titania.njm.me.uk [192.168.144.130])
	by oberon.njm.me.uk (8.14.3/8.14.3) with ESMTP id o0A9c3av031429
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 09:38:03 GMT
	(envelope-from njm@oberon.njm.me.uk)
Received: from titania.njm.me.uk (localhost [127.0.0.1])
	by titania.njm.me.uk (8.14.3/8.14.3) with ESMTP id o0A9c2YR066173
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 10 Jan 2010 09:38:02 GMT
	(envelope-from njm@titania.njm.me.uk)
Received: (from njm@localhost)
	by titania.njm.me.uk (8.14.3/8.14.3/Submit) id o0A9c29Y066172;
	Sun, 10 Jan 2010 09:38:02 GMT
	(envelope-from njm)
Message-Id: <201001100938.o0A9c29Y066172@titania.njm.me.uk>
Date: Sun, 10 Jan 2010 09:38:02 GMT
From: "N.J. Mann" <njm@njm.me.uk>
Reply-To: "N.J. Mann" <njm@njm.me.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] correct capitalisation of the symbol Hz in user output
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142566
>Category:       bin
>Synopsis:       [PATCH] correct capitalisation of the symbol Hz in user output in various places
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    gavin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 10 10:10:01 UTC 2010
>Closed-Date:    Thu May 06 12:37:57 UTC 2010
>Last-Modified:  Thu May  6 12:40:04 UTC 2010
>Originator:     N.J. Mann
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD titania.njm.me.uk 7.2-STABLE FreeBSD 7.2-STABLE #23 r201635M: Wed Jan 6 10:00:37 GMT 2010 njm@titania.njm.me.uk:/usr/obj/usr/src/sys/titania i386


	
>Description:
	The SI unit of frequency measurement is Hertz.  Symbol is Hz, not hz
or HZ.  The attached patches correct HZ and hz to Hz in user facing output
and manual pages.
>How-To-Repeat:
	
>Fix:

	The first patch is against HEAD and with minimal changes may be MFCed
to both 8-STABLE and 7-STABLE.  The second patch is an addiotnal patch for
7-STABLE since arlcontrol seems to have been removed from HEAD (and 8-STABLE).

--- Hz_patch_1.diff begins here ---
Index: sbin/ifconfig/ifieee80211.c
===================================================================
--- sbin/ifconfig/ifieee80211.c	(revision 201718)
+++ sbin/ifconfig/ifieee80211.c	(working copy)
@@ -3429,9 +3429,9 @@
 	else if (IEEE80211_IS_CHAN_B(c))
 		strlcat(buf, " 11b", bsize);
 	if (IEEE80211_IS_CHAN_HALF(c))
-		strlcat(buf, "/10Mhz", bsize);
+		strlcat(buf, "/10MHz", bsize);
 	if (IEEE80211_IS_CHAN_QUARTER(c))
-		strlcat(buf, "/5Mhz", bsize);
+		strlcat(buf, "/5MHz", bsize);
 	if (IEEE80211_IS_CHAN_TURBO(c))
 		strlcat(buf, " Turbo", bsize);
 	if (precise) {
@@ -3453,7 +3453,7 @@
 {
 	char buf[14];
 
-	printf("Channel %3u : %u%c Mhz%-14.14s",
+	printf("Channel %3u : %u%c MHz%-14.14s",
 		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
 		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
 		get_chaninfo(c, verb, buf, sizeof(buf)));
@@ -3562,7 +3562,7 @@
 static void
 print_txpow(const struct ieee80211_channel *c)
 {
-	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
+	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
 	    c->ic_ieee, c->ic_freq,
 	    c->ic_maxpower/2., c->ic_maxregpower);
 }
@@ -4244,7 +4244,7 @@
 	c = getcurchan(s);
 	if (c->ic_freq != IEEE80211_CHAN_ANY) {
 		char buf[14];
-		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
+		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
 			get_chaninfo(c, 1, buf, sizeof(buf)));
 	} else if (verbose)
 		printf(" channel UNDEF");
Index: tools/tools/ath/athdecode/main.c
===================================================================
--- tools/tools/ath/athdecode/main.c	(revision 201718)
+++ tools/tools/ath/athdecode/main.c	(working copy)
@@ -125,13 +125,13 @@
 			fprintf(fd, "ar%uReset (done), OK", state.chipnum);
 		break;
 	case AH_MARK_CHIPRESET:
-		fprintf(fd, "ar%uChipReset, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uChipReset, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_PERCAL:
-		fprintf(fd, "ar%uPerCalibration, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uPerCalibration, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_SETCHANNEL:
-		fprintf(fd, "ar%uSetChannel, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uSetChannel, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_ANI_RESET:
 		switch (r->val) {
Index: share/man/man4/vge.4
===================================================================
--- share/man/man4/vge.4	(revision 201718)
+++ share/man/man4/vge.4	(working copy)
@@ -58,7 +58,7 @@
 based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
 Family Gigabit Ethernet controller chips.
 .Pp
-The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
+The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
 MAC with an integrated 10/100/1000 copper PHY.
 (Some older cards use an external PHY.)
 The VT6130/VT6132 is the PCI express version of Velocity family.
Index: share/man/man4/cpufreq.4
===================================================================
--- share/man/man4/cpufreq.4	(revision 201718)
+++ share/man/man4/cpufreq.4	(working copy)
@@ -234,7 +234,7 @@
 All the following elements for each setting should be returned:
 .Bd -literal
 struct cf_setting {
-	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
+	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
 	int	volts;	/* Voltage in mV. */
 	int	power;	/* Power consumed in mW. */
 	int	lat;	/* Transition latency in us. */
Index: share/man/man4/ath.4
===================================================================
--- share/man/man4/ath.4	(revision 201718)
+++ share/man/man4/ath.4	(working copy)
@@ -249,7 +249,7 @@
 An invalid transmit rate was specified for an outgoing frame.
 The frame is discarded.
 This should not happen.
-.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
+.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
 The Atheros Hardware Access Layer was unable to reset the hardware
 when switching channels during scanning.
 This should not happen.
Index: sys/dev/mly/mly.c
===================================================================
--- sys/dev/mly/mly.c	(revision 201718)
+++ sys/dev/mly/mly.c	(working copy)
@@ -2528,7 +2528,7 @@
 		   mly_describe_code(mly_table_memorytype, mi->memory_type),
 		   mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
 		   mi->cache_size);
-	mly_printf(sc, "CPU: %s @ %dMHZ\n", 
+	mly_printf(sc, "CPU: %s @ %dMHz\n", 
 		   mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
 	if (mi->l2cache_size != 0)
 	    mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
Index: sys/dev/ct/ct_isa.c
===================================================================
--- sys/dev/ct/ct_isa.c	(revision 201718)
+++ sys/dev/ct/ct_isa.c	(working copy)
@@ -316,7 +316,7 @@
 		break;
 	}
 #if	0
-	printf("%s: chiprev %s chipclk %d Mhz\n", 
+	printf("%s: chiprev %s chipclk %d MHz\n", 
 		slp->sl_dev.dv_xname, s, ct->sc_chipclk);
 #endif
 
Index: sys/dev/aic7xxx/aic79xx_pci.c
===================================================================
--- sys/dev/aic7xxx/aic79xx_pci.c	(revision 201718)
+++ sys/dev/aic7xxx/aic79xx_pci.c	(working copy)
@@ -248,10 +248,10 @@
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
-	"PCI-X 101-133Mhz",
-	"PCI-X 67-100Mhz",
-	"PCI-X 50-66Mhz",
-	"PCI 33 or 66Mhz"
+	"PCI-X 101-133MHz",
+	"PCI-X 67-100MHz",
+	"PCI-X 50-66MHz",
+	"PCI 33 or 66MHz"
 };
 
 #define		TESTMODE	0x00000800ul
Index: sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
===================================================================
--- sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	(revision 201718)
+++ sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	(working copy)
@@ -87,7 +87,7 @@
 
 	if (!IEEE80211_IS_CHAN_5GHZ(chan)) {
 		/* Only 11a mode */
-		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
+		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
 		FAIL(HAL_EINVAL);
 	}
 	/*
Index: sys/dev/ath/if_ath.c
===================================================================
--- sys/dev/ath/if_ath.c	(revision 201718)
+++ sys/dev/ath/if_ath.c	(working copy)
@@ -5351,7 +5351,7 @@
 		ath_stoprecv(sc);		/* turn off frame recv */
 		if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
 			if_printf(ifp, "%s: unable to reset "
-			    "channel %u (%u Mhz, flags 0x%x), hal status %u\n",
+			    "channel %u (%u MHz, flags 0x%x), hal status %u\n",
 			    __func__, ieee80211_chan2ieee(ic, chan),
 			    chan->ic_freq, chan->ic_flags, status);
 			return EIO;
Index: sys/i386/i386/local_apic.c
===================================================================
--- sys/i386/i386/local_apic.c	(revision 201718)
+++ sys/i386/i386/local_apic.c	(working copy)
@@ -450,7 +450,7 @@
 		panic("lapic: Divisor too big");
 	value /= 2;
 	if (bootverbose)
-		printf("lapic: Divisor %lu, Frequency %lu hz\n",
+		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
 		    lapic_timer_divisor, value);
 
 	/*
Index: sys/amd64/amd64/local_apic.c
===================================================================
--- sys/amd64/amd64/local_apic.c	(revision 201718)
+++ sys/amd64/amd64/local_apic.c	(working copy)
@@ -448,7 +448,7 @@
 		panic("lapic: Divisor too big");
 	value /= 2;
 	if (bootverbose)
-		printf("lapic: Divisor %lu, Frequency %lu hz\n",
+		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
 		    lapic_timer_divisor, value);
 
 	/*
--- Hz_patch_1.diff ends here ---

--- Hz_patch_2.diff begins here ---
Index: usr.sbin/arlcontrol/arlcontrol.c
===================================================================
--- usr.sbin/arlcontrol/arlcontrol.c	(revision 201718)
+++ usr.sbin/arlcontrol/arlcontrol.c	(working copy)
@@ -148,21 +148,21 @@
 	int  max_freq;
 } CHSET[] = {
 	 { 0, 0, 0, 0, 0, 0 },
-	 { 1, "900 Mhz",  "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
+	 { 1, "900 MHz",  "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
 	 { 2, 0, 0, 0, 0, 0 },
 	 { 3, 0, 0, 0, 0, 0 },
 	 { 4, 0, 0, 0, 0, 0 },
 	 { 5, 0, 0, 0, 0, 0 },
-	 { 6, "900 Mhz",  "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
+	 { 6, "900 MHz",  "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
 	 { 7, 0, 0, 0, 0, 0 },
 	 { 8, 0, 0, 0, 0, 0 },
-	 { 9, "2400 Mhz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
-	{ 10, "2400 Mhz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
-	{ 11, "2400 Mhz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
-	{ 12, "2400 Mhz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
-	{ 13, "2400 Mhz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
-	{ 14, "2400 Mhz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
-	{ 15, "2400 Mhz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
+	 { 9, "2400 MHz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
+	{ 10, "2400 MHz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
+	{ 11, "2400 MHz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
+	{ 12, "2400 MHz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
+	{ 13, "2400 MHz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
+	{ 14, "2400 MHz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
+	{ 15, "2400 MHz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
 };
 
 char* registrationMode[] = {
@@ -221,7 +221,7 @@
 	    arl_io->channelSet,
 	    CHSET[arl_io->channelSet].fr,
 	    CHSET[arl_io->channelSet].country);
-	printf("\tfrequency %s Mhz, bitrate %s kb/s, priority %s, receive mode %d\n",
+	printf("\tfrequency %s MHz, bitrate %s kb/s, priority %s, receive mode %d\n",
 	    (CHSET[arl_io->channelSet].freq &&
 	        CHSET[arl_io->channelSet].max_freq > arl_io->channelNumber) ?
 		CHSET[arl_io->channelSet].freq[arl_io->channelNumber].name :
--- Hz_patch_2.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->gavin 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Mon Jan 11 14:20:29 UTC 2010 
Responsible-Changed-Why:  
Grab this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142566 
State-Changed-From-To: open->patched 
State-Changed-By: gavin 
State-Changed-When: Tue Jan 12 18:06:46 UTC 2010 
State-Changed-Why:  
Fixed in HEAD, MFC in 2 weeks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142566 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142566: commit references a PR
Date: Tue, 12 Jan 2010 18:00:19 +0000 (UTC)

 Author: gavin
 Date: Tue Jan 12 17:59:58 2010
 New Revision: 202161
 URL: http://svn.freebsd.org/changeset/base/202161
 
 Log:
   Spell "Hz" correctly wherever it is user-visible.
   
   PR:		bin/142566
   Submitted by:	N.J. Mann   njm njm.me.uk
   Approved by:	ed (mentor)
   MFC after:	2 weeks
 
 Modified:
   head/sbin/ifconfig/ifieee80211.c
   head/share/man/man4/ath.4
   head/share/man/man4/cpufreq.4
   head/share/man/man4/vge.4
   head/sys/amd64/amd64/local_apic.c
   head/sys/dev/aic7xxx/aic79xx_pci.c
   head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
   head/sys/dev/ath/if_ath.c
   head/sys/dev/ct/ct_isa.c
   head/sys/dev/mly/mly.c
   head/sys/i386/i386/local_apic.c
   head/tools/tools/ath/athdecode/main.c
 
 Modified: head/sbin/ifconfig/ifieee80211.c
 ==============================================================================
 --- head/sbin/ifconfig/ifieee80211.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sbin/ifconfig/ifieee80211.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -3429,9 +3429,9 @@ get_chaninfo(const struct ieee80211_chan
  	else if (IEEE80211_IS_CHAN_B(c))
  		strlcat(buf, " 11b", bsize);
  	if (IEEE80211_IS_CHAN_HALF(c))
 -		strlcat(buf, "/10Mhz", bsize);
 +		strlcat(buf, "/10MHz", bsize);
  	if (IEEE80211_IS_CHAN_QUARTER(c))
 -		strlcat(buf, "/5Mhz", bsize);
 +		strlcat(buf, "/5MHz", bsize);
  	if (IEEE80211_IS_CHAN_TURBO(c))
  		strlcat(buf, " Turbo", bsize);
  	if (precise) {
 @@ -3453,7 +3453,7 @@ print_chaninfo(const struct ieee80211_ch
  {
  	char buf[14];
  
 -	printf("Channel %3u : %u%c Mhz%-14.14s",
 +	printf("Channel %3u : %u%c MHz%-14.14s",
  		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
  		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
  		get_chaninfo(c, verb, buf, sizeof(buf)));
 @@ -3562,7 +3562,7 @@ list_channels(int s, int allchans)
  static void
  print_txpow(const struct ieee80211_channel *c)
  {
 -	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
 +	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
  	    c->ic_ieee, c->ic_freq,
  	    c->ic_maxpower/2., c->ic_maxregpower);
  }
 @@ -4244,7 +4244,7 @@ ieee80211_status(int s)
  	c = getcurchan(s);
  	if (c->ic_freq != IEEE80211_CHAN_ANY) {
  		char buf[14];
 -		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
 +		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
  			get_chaninfo(c, 1, buf, sizeof(buf)));
  	} else if (verbose)
  		printf(" channel UNDEF");
 
 Modified: head/share/man/man4/ath.4
 ==============================================================================
 --- head/share/man/man4/ath.4	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/share/man/man4/ath.4	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -249,7 +249,7 @@ This should not happen.
  An invalid transmit rate was specified for an outgoing frame.
  The frame is discarded.
  This should not happen.
 -.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
 +.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
  The Atheros Hardware Access Layer was unable to reset the hardware
  when switching channels during scanning.
  This should not happen.
 
 Modified: head/share/man/man4/cpufreq.4
 ==============================================================================
 --- head/share/man/man4/cpufreq.4	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/share/man/man4/cpufreq.4	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -234,7 +234,7 @@ The driver should set unknown or irrelev
  All the following elements for each setting should be returned:
  .Bd -literal
  struct cf_setting {
 -	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
 +	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
  	int	volts;	/* Voltage in mV. */
  	int	power;	/* Power consumed in mW. */
  	int	lat;	/* Transition latency in us. */
 
 Modified: head/share/man/man4/vge.4
 ==============================================================================
 --- head/share/man/man4/vge.4	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/share/man/man4/vge.4	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -58,7 +58,7 @@ driver provides support for various NICs
  based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
  Family Gigabit Ethernet controller chips.
  .Pp
 -The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
 +The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
  MAC with an integrated 10/100/1000 copper PHY.
  (Some older cards use an external PHY.)
  The VT6130/VT6132 is the PCI express version of Velocity family.
 
 Modified: head/sys/amd64/amd64/local_apic.c
 ==============================================================================
 --- head/sys/amd64/amd64/local_apic.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/amd64/amd64/local_apic.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -448,7 +448,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 
 Modified: head/sys/dev/aic7xxx/aic79xx_pci.c
 ==============================================================================
 --- head/sys/dev/aic7xxx/aic79xx_pci.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/dev/aic7xxx/aic79xx_pci.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -248,10 +248,10 @@ static const char *pci_bus_modes[] =
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
 -	"PCI-X 101-133Mhz",
 -	"PCI-X 67-100Mhz",
 -	"PCI-X 50-66Mhz",
 -	"PCI 33 or 66Mhz"
 +	"PCI-X 101-133MHz",
 +	"PCI-X 67-100MHz",
 +	"PCI-X 50-66MHz",
 +	"PCI 33 or 66MHz"
  };
  
  #define		TESTMODE	0x00000800ul
 
 Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
 ==============================================================================
 --- head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -87,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO
  
  	if (!IEEE80211_IS_CHAN_5GHZ(chan)) {
  		/* Only 11a mode */
 -		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
 +		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
  		FAIL(HAL_EINVAL);
  	}
  	/*
 
 Modified: head/sys/dev/ath/if_ath.c
 ==============================================================================
 --- head/sys/dev/ath/if_ath.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/dev/ath/if_ath.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -5351,7 +5351,7 @@ ath_chan_set(struct ath_softc *sc, struc
  		ath_stoprecv(sc);		/* turn off frame recv */
  		if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
  			if_printf(ifp, "%s: unable to reset "
 -			    "channel %u (%u Mhz, flags 0x%x), hal status %u\n",
 +			    "channel %u (%u MHz, flags 0x%x), hal status %u\n",
  			    __func__, ieee80211_chan2ieee(ic, chan),
  			    chan->ic_freq, chan->ic_flags, status);
  			return EIO;
 
 Modified: head/sys/dev/ct/ct_isa.c
 ==============================================================================
 --- head/sys/dev/ct/ct_isa.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/dev/ct/ct_isa.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -316,7 +316,7 @@ ct_isa_attach(device_t dev)
  		break;
  	}
  #if	0
 -	printf("%s: chiprev %s chipclk %d Mhz\n", 
 +	printf("%s: chiprev %s chipclk %d MHz\n", 
  		slp->sl_dev.dv_xname, s, ct->sc_chipclk);
  #endif
  
 
 Modified: head/sys/dev/mly/mly.c
 ==============================================================================
 --- head/sys/dev/mly/mly.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/dev/mly/mly.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc
  		   mly_describe_code(mly_table_memorytype, mi->memory_type),
  		   mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
  		   mi->cache_size);
 -	mly_printf(sc, "CPU: %s @ %dMHZ\n", 
 +	mly_printf(sc, "CPU: %s @ %dMHz\n", 
  		   mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
  	if (mi->l2cache_size != 0)
  	    mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
 
 Modified: head/sys/i386/i386/local_apic.c
 ==============================================================================
 --- head/sys/i386/i386/local_apic.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/sys/i386/i386/local_apic.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -450,7 +450,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 
 Modified: head/tools/tools/ath/athdecode/main.c
 ==============================================================================
 --- head/tools/tools/ath/athdecode/main.c	Tue Jan 12 17:50:26 2010	(r202160)
 +++ head/tools/tools/ath/athdecode/main.c	Tue Jan 12 17:59:58 2010	(r202161)
 @@ -125,13 +125,13 @@ opmark(FILE *fd, int i, const struct ath
  			fprintf(fd, "ar%uReset (done), OK", state.chipnum);
  		break;
  	case AH_MARK_CHIPRESET:
 -		fprintf(fd, "ar%uChipReset, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uChipReset, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_PERCAL:
 -		fprintf(fd, "ar%uPerCalibration, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uPerCalibration, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_SETCHANNEL:
 -		fprintf(fd, "ar%uSetChannel, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uSetChannel, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_ANI_RESET:
  		switch (r->val) {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142566: commit references a PR
Date: Fri,  5 Feb 2010 08:53:02 +0000 (UTC)

 Author: gavin
 Date: Fri Feb  5 08:52:51 2010
 New Revision: 203515
 URL: http://svn.freebsd.org/changeset/base/203515
 
 Log:
   Merge r202161 from head:
   
     Spell "Hz" correctly wherever it is user-visible.
   
   PR:		bin/142566
   Submitted by:	N.J. Mann   njm njm.me.uk
 
 Modified:
   stable/8/sbin/ifconfig/ifieee80211.c
   stable/8/share/man/man4/ath.4
   stable/8/share/man/man4/cpufreq.4
   stable/8/share/man/man4/vge.4
   stable/8/sys/amd64/amd64/local_apic.c
   stable/8/sys/dev/aic7xxx/aic79xx_pci.c
   stable/8/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
   stable/8/sys/dev/ath/if_ath.c
   stable/8/sys/dev/ct/ct_isa.c
   stable/8/sys/dev/mly/mly.c
   stable/8/sys/i386/i386/local_apic.c
   stable/8/tools/tools/ath/athdecode/main.c
 Directory Properties:
   stable/8/sbin/ifconfig/   (props changed)
   stable/8/share/man/man4/   (props changed)
   stable/8/share/man/man4/de.4   (props changed)
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/xen/xenpci/   (props changed)
   stable/8/tools/tools/ath/   (props changed)
   stable/8/tools/tools/ath/common/dumpregs.h   (props changed)
   stable/8/tools/tools/ath/common/dumpregs_5210.c   (props changed)
   stable/8/tools/tools/ath/common/dumpregs_5211.c   (props changed)
   stable/8/tools/tools/ath/common/dumpregs_5212.c   (props changed)
   stable/8/tools/tools/ath/common/dumpregs_5416.c   (props changed)
 
 Modified: stable/8/sbin/ifconfig/ifieee80211.c
 ==============================================================================
 --- stable/8/sbin/ifconfig/ifieee80211.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sbin/ifconfig/ifieee80211.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -3429,9 +3429,9 @@ get_chaninfo(const struct ieee80211_chan
  	else if (IEEE80211_IS_CHAN_B(c))
  		strlcat(buf, " 11b", bsize);
  	if (IEEE80211_IS_CHAN_HALF(c))
 -		strlcat(buf, "/10Mhz", bsize);
 +		strlcat(buf, "/10MHz", bsize);
  	if (IEEE80211_IS_CHAN_QUARTER(c))
 -		strlcat(buf, "/5Mhz", bsize);
 +		strlcat(buf, "/5MHz", bsize);
  	if (IEEE80211_IS_CHAN_TURBO(c))
  		strlcat(buf, " Turbo", bsize);
  	if (precise) {
 @@ -3453,7 +3453,7 @@ print_chaninfo(const struct ieee80211_ch
  {
  	char buf[14];
  
 -	printf("Channel %3u : %u%c Mhz%-14.14s",
 +	printf("Channel %3u : %u%c MHz%-14.14s",
  		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
  		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
  		get_chaninfo(c, verb, buf, sizeof(buf)));
 @@ -3562,7 +3562,7 @@ list_channels(int s, int allchans)
  static void
  print_txpow(const struct ieee80211_channel *c)
  {
 -	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
 +	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
  	    c->ic_ieee, c->ic_freq,
  	    c->ic_maxpower/2., c->ic_maxregpower);
  }
 @@ -4244,7 +4244,7 @@ ieee80211_status(int s)
  	c = getcurchan(s);
  	if (c->ic_freq != IEEE80211_CHAN_ANY) {
  		char buf[14];
 -		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
 +		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
  			get_chaninfo(c, 1, buf, sizeof(buf)));
  	} else if (verbose)
  		printf(" channel UNDEF");
 
 Modified: stable/8/share/man/man4/ath.4
 ==============================================================================
 --- stable/8/share/man/man4/ath.4	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/share/man/man4/ath.4	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -249,7 +249,7 @@ This should not happen.
  An invalid transmit rate was specified for an outgoing frame.
  The frame is discarded.
  This should not happen.
 -.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
 +.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
  The Atheros Hardware Access Layer was unable to reset the hardware
  when switching channels during scanning.
  This should not happen.
 
 Modified: stable/8/share/man/man4/cpufreq.4
 ==============================================================================
 --- stable/8/share/man/man4/cpufreq.4	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/share/man/man4/cpufreq.4	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -234,7 +234,7 @@ The driver should set unknown or irrelev
  All the following elements for each setting should be returned:
  .Bd -literal
  struct cf_setting {
 -	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
 +	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
  	int	volts;	/* Voltage in mV. */
  	int	power;	/* Power consumed in mW. */
  	int	lat;	/* Transition latency in us. */
 
 Modified: stable/8/share/man/man4/vge.4
 ==============================================================================
 --- stable/8/share/man/man4/vge.4	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/share/man/man4/vge.4	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -58,7 +58,7 @@ driver provides support for various NICs
  based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
  Family Gigabit Ethernet controller chips.
  .Pp
 -The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
 +The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
  MAC with an integrated 10/100/1000 copper PHY.
  (Some older cards use an external PHY.)
  The VT6130/VT6132 is the PCI express version of Velocity family.
 
 Modified: stable/8/sys/amd64/amd64/local_apic.c
 ==============================================================================
 --- stable/8/sys/amd64/amd64/local_apic.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/amd64/amd64/local_apic.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -448,7 +448,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 
 Modified: stable/8/sys/dev/aic7xxx/aic79xx_pci.c
 ==============================================================================
 --- stable/8/sys/dev/aic7xxx/aic79xx_pci.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/dev/aic7xxx/aic79xx_pci.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -248,10 +248,10 @@ static const char *pci_bus_modes[] =
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
 -	"PCI-X 101-133Mhz",
 -	"PCI-X 67-100Mhz",
 -	"PCI-X 50-66Mhz",
 -	"PCI 33 or 66Mhz"
 +	"PCI-X 101-133MHz",
 +	"PCI-X 67-100MHz",
 +	"PCI-X 50-66MHz",
 +	"PCI 33 or 66MHz"
  };
  
  #define		TESTMODE	0x00000800ul
 
 Modified: stable/8/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
 ==============================================================================
 --- stable/8/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -87,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO
  
  	if (!IEEE80211_IS_CHAN_5GHZ(chan)) {
  		/* Only 11a mode */
 -		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
 +		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
  		FAIL(HAL_EINVAL);
  	}
  	/*
 
 Modified: stable/8/sys/dev/ath/if_ath.c
 ==============================================================================
 --- stable/8/sys/dev/ath/if_ath.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/dev/ath/if_ath.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -5352,7 +5352,7 @@ ath_chan_set(struct ath_softc *sc, struc
  		ath_stoprecv(sc);		/* turn off frame recv */
  		if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
  			if_printf(ifp, "%s: unable to reset "
 -			    "channel %u (%u Mhz, flags 0x%x), hal status %u\n",
 +			    "channel %u (%u MHz, flags 0x%x), hal status %u\n",
  			    __func__, ieee80211_chan2ieee(ic, chan),
  			    chan->ic_freq, chan->ic_flags, status);
  			return EIO;
 
 Modified: stable/8/sys/dev/ct/ct_isa.c
 ==============================================================================
 --- stable/8/sys/dev/ct/ct_isa.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/dev/ct/ct_isa.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -316,7 +316,7 @@ ct_isa_attach(device_t dev)
  		break;
  	}
  #if	0
 -	printf("%s: chiprev %s chipclk %d Mhz\n", 
 +	printf("%s: chiprev %s chipclk %d MHz\n", 
  		slp->sl_dev.dv_xname, s, ct->sc_chipclk);
  #endif
  
 
 Modified: stable/8/sys/dev/mly/mly.c
 ==============================================================================
 --- stable/8/sys/dev/mly/mly.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/dev/mly/mly.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc
  		   mly_describe_code(mly_table_memorytype, mi->memory_type),
  		   mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
  		   mi->cache_size);
 -	mly_printf(sc, "CPU: %s @ %dMHZ\n", 
 +	mly_printf(sc, "CPU: %s @ %dMHz\n", 
  		   mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
  	if (mi->l2cache_size != 0)
  	    mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
 
 Modified: stable/8/sys/i386/i386/local_apic.c
 ==============================================================================
 --- stable/8/sys/i386/i386/local_apic.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/sys/i386/i386/local_apic.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -450,7 +450,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 
 Modified: stable/8/tools/tools/ath/athdecode/main.c
 ==============================================================================
 --- stable/8/tools/tools/ath/athdecode/main.c	Fri Feb  5 08:48:44 2010	(r203514)
 +++ stable/8/tools/tools/ath/athdecode/main.c	Fri Feb  5 08:52:51 2010	(r203515)
 @@ -125,13 +125,13 @@ opmark(FILE *fd, int i, const struct ath
  			fprintf(fd, "ar%uReset (done), OK", state.chipnum);
  		break;
  	case AH_MARK_CHIPRESET:
 -		fprintf(fd, "ar%uChipReset, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uChipReset, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_PERCAL:
 -		fprintf(fd, "ar%uPerCalibration, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uPerCalibration, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_SETCHANNEL:
 -		fprintf(fd, "ar%uSetChannel, channel %u Mhz", state.chipnum, r->val);
 +		fprintf(fd, "ar%uSetChannel, channel %u MHz", state.chipnum, r->val);
  		break;
  	case AH_MARK_ANI_RESET:
  		switch (r->val) {
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142566: commit references a PR
Date: Wed,  5 May 2010 17:17:28 +0000 (UTC)

 Author: gavin
 Date: Wed May  5 17:17:19 2010
 New Revision: 207668
 URL: http://svn.freebsd.org/changeset/base/207668
 
 Log:
   Spell "Hz" correctly in arlcontrol.
   
   Direct commit to stable/7 as this code no longer exists in head.
   
   PR:		bin/142566
   Submitted by:	N.J. Mann  <njm njm.me.uk>
 
 Modified:
   stable/7/usr.sbin/arlcontrol/arlcontrol.c
 
 Modified: stable/7/usr.sbin/arlcontrol/arlcontrol.c
 ==============================================================================
 --- stable/7/usr.sbin/arlcontrol/arlcontrol.c	Wed May  5 17:13:53 2010	(r207667)
 +++ stable/7/usr.sbin/arlcontrol/arlcontrol.c	Wed May  5 17:17:19 2010	(r207668)
 @@ -148,21 +148,21 @@ static struct ch_list {
  	int  max_freq;
  } CHSET[] = {
  	 { 0, 0, 0, 0, 0, 0 },
 -	 { 1, "900 Mhz",  "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
 +	 { 1, "900 MHz",  "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
  	 { 2, 0, 0, 0, 0, 0 },
  	 { 3, 0, 0, 0, 0, 0 },
  	 { 4, 0, 0, 0, 0, 0 },
  	 { 5, 0, 0, 0, 0, 0 },
 -	 { 6, "900 Mhz",  "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
 +	 { 6, "900 MHz",  "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
  	 { 7, 0, 0, 0, 0, 0 },
  	 { 8, 0, 0, 0, 0, 0 },
 -	 { 9, "2400 Mhz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
 -	{ 10, "2400 Mhz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
 -	{ 11, "2400 Mhz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
 -	{ 12, "2400 Mhz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
 -	{ 13, "2400 Mhz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
 -	{ 14, "2400 Mhz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
 -	{ 15, "2400 Mhz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
 +	 { 9, "2400 MHz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
 +	{ 10, "2400 MHz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
 +	{ 11, "2400 MHz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
 +	{ 12, "2400 MHz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
 +	{ 13, "2400 MHz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
 +	{ 14, "2400 MHz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
 +	{ 15, "2400 MHz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
  };
  
  char* registrationMode[] = {
 @@ -221,7 +221,7 @@ print_al(struct arl_cfg_param *arl_io)
  	    arl_io->channelSet,
  	    CHSET[arl_io->channelSet].fr,
  	    CHSET[arl_io->channelSet].country);
 -	printf("\tfrequency %s Mhz, bitrate %s kb/s, priority %s, receive mode %d\n",
 +	printf("\tfrequency %s MHz, bitrate %s kb/s, priority %s, receive mode %d\n",
  	    (CHSET[arl_io->channelSet].freq &&
  	        CHSET[arl_io->channelSet].max_freq > arl_io->channelNumber) ?
  		CHSET[arl_io->channelSet].freq[arl_io->channelNumber].name :
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: gavin 
State-Changed-When: Thu May 6 12:37:35 UTC 2010 
State-Changed-Why:  
Fixed in head, stable/8 and stable/7.  Thanks for your submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142566 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/142566: commit references a PR
Date: Thu,  6 May 2010 12:37:16 +0000 (UTC)

 Author: gavin
 Date: Thu May  6 12:37:01 2010
 New Revision: 207699
 URL: http://svn.freebsd.org/changeset/base/207699
 
 Log:
   Merge r202161 from head:
   
     Spell "Hz" correctly wherever it is user-visible.
   
   PR:		bin/142566
   Submitted by:	N.J. Mann   njm njm.me.uk
 
 Modified:
   stable/7/sbin/ifconfig/ifieee80211.c
   stable/7/share/man/man4/ath.4
   stable/7/share/man/man4/cpufreq.4
   stable/7/share/man/man4/vge.4
   stable/7/sys/amd64/amd64/local_apic.c
   stable/7/sys/dev/aic7xxx/aic79xx_pci.c
   stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
   stable/7/sys/dev/ath/if_ath.c
   stable/7/sys/dev/ct/ct_isa.c
   stable/7/sys/dev/mly/mly.c
   stable/7/sys/i386/i386/local_apic.c
 Directory Properties:
   stable/7/sbin/ifconfig/   (props changed)
   stable/7/share/man/man4/   (props changed)
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sbin/ifconfig/ifieee80211.c
 ==============================================================================
 --- stable/7/sbin/ifconfig/ifieee80211.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sbin/ifconfig/ifieee80211.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -2259,7 +2259,7 @@ print_chaninfo(const struct ieee80211_ch
  {
  	char buf[14];
  
 -	printf("Channel %3u : %u%c Mhz%-14.14s",
 +	printf("Channel %3u : %u%c MHz%-14.14s",
  		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
  		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
  		get_chaninfo(c, verb, buf, sizeof(buf)));
 @@ -2338,7 +2338,7 @@ list_channels(int s, int allchans)
  static void
  print_txpow(const struct ieee80211_channel *c)
  {
 -	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
 +	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
  	    c->ic_ieee, c->ic_freq,
  	    c->ic_maxpower/2., c->ic_maxregpower);
  }
 @@ -2800,7 +2800,7 @@ ieee80211_status(int s)
  	c = getcurchan(s);
  	if (c->ic_freq != IEEE80211_CHAN_ANY) {
  		char buf[14];
 -		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
 +		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
  			get_chaninfo(c, 1, buf, sizeof(buf)));
  	} else if (verbose)
  		printf(" channel UNDEF");
 
 Modified: stable/7/share/man/man4/ath.4
 ==============================================================================
 --- stable/7/share/man/man4/ath.4	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/share/man/man4/ath.4	Thu May  6 12:37:01 2010	(r207699)
 @@ -224,7 +224,7 @@ This should not happen.
  An invalid transmit rate was specified for an outgoing frame.
  The frame is discarded.
  This should not happen.
 -.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
 +.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
  The Atheros Hardware Access Layer was unable to reset the hardware
  when switching channels during scanning.
  This should not happen.
 
 Modified: stable/7/share/man/man4/cpufreq.4
 ==============================================================================
 --- stable/7/share/man/man4/cpufreq.4	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/share/man/man4/cpufreq.4	Thu May  6 12:37:01 2010	(r207699)
 @@ -234,7 +234,7 @@ The driver should set unknown or irrelev
  All the following elements for each setting should be returned:
  .Bd -literal
  struct cf_setting {
 -	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
 +	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
  	int	volts;	/* Voltage in mV. */
  	int	power;	/* Power consumed in mW. */
  	int	lat;	/* Transition latency in us. */
 
 Modified: stable/7/share/man/man4/vge.4
 ==============================================================================
 --- stable/7/share/man/man4/vge.4	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/share/man/man4/vge.4	Thu May  6 12:37:01 2010	(r207699)
 @@ -58,7 +58,7 @@ driver provides support for various NICs
  based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
  Family Gigabit Ethernet controller chips.
  .Pp
 -The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
 +The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
  MAC with an integrated 10/100/1000 copper PHY.
  (Some older cards use an external PHY.)
  The VT6130/VT6132 is the PCI express version of Velocity family.
 
 Modified: stable/7/sys/amd64/amd64/local_apic.c
 ==============================================================================
 --- stable/7/sys/amd64/amd64/local_apic.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/amd64/amd64/local_apic.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -467,7 +467,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 
 Modified: stable/7/sys/dev/aic7xxx/aic79xx_pci.c
 ==============================================================================
 --- stable/7/sys/dev/aic7xxx/aic79xx_pci.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/dev/aic7xxx/aic79xx_pci.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -248,10 +248,10 @@ static const char *pci_bus_modes[] =
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
  	"PCI bus mode unknown",
 -	"PCI-X 101-133Mhz",
 -	"PCI-X 67-100Mhz",
 -	"PCI-X 50-66Mhz",
 -	"PCI 33 or 66Mhz"
 +	"PCI-X 101-133MHz",
 +	"PCI-X 67-100MHz",
 +	"PCI-X 50-66MHz",
 +	"PCI 33 or 66MHz"
  };
  
  #define		TESTMODE	0x00000800ul
 
 Modified: stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
 ==============================================================================
 --- stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -15,6 +15,7 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   *
   * $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $
 + * $FreeBSD$
   */
  #include "opt_ah.h"
  
 @@ -86,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO
  
  	if ((chan->channelFlags & CHANNEL_5GHZ) == 0) {
  		/* Only 11a mode */
 -		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
 +		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
  		FAIL(HAL_EINVAL);
  	}
  	/*
 
 Modified: stable/7/sys/dev/ath/if_ath.c
 ==============================================================================
 --- stable/7/sys/dev/ath/if_ath.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/dev/ath/if_ath.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -4934,7 +4934,7 @@ ath_chan_set(struct ath_softc *sc, struc
  		ath_stoprecv(sc);		/* turn off frame recv */
  		if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) {
  			if_printf(ic->ic_ifp, "%s: unable to reset "
 -			    "channel %u (%u Mhz, flags 0x%x hal flags 0x%x), "
 +			    "channel %u (%u MHz, flags 0x%x hal flags 0x%x), "
  			    "hal status %u\n", __func__,
  			    ieee80211_chan2ieee(ic, chan), chan->ic_freq,
  			    chan->ic_flags, hchan.channelFlags, status);
 
 Modified: stable/7/sys/dev/ct/ct_isa.c
 ==============================================================================
 --- stable/7/sys/dev/ct/ct_isa.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/dev/ct/ct_isa.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -316,7 +316,7 @@ ct_isa_attach(device_t dev)
  		break;
  	}
  #if	0
 -	printf("%s: chiprev %s chipclk %d Mhz\n", 
 +	printf("%s: chiprev %s chipclk %d MHz\n", 
  		slp->sl_dev.dv_xname, s, ct->sc_chipclk);
  #endif
  
 
 Modified: stable/7/sys/dev/mly/mly.c
 ==============================================================================
 --- stable/7/sys/dev/mly/mly.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/dev/mly/mly.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc
  		   mly_describe_code(mly_table_memorytype, mi->memory_type),
  		   mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
  		   mi->cache_size);
 -	mly_printf(sc, "CPU: %s @ %dMHZ\n", 
 +	mly_printf(sc, "CPU: %s @ %dMHz\n", 
  		   mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
  	if (mi->l2cache_size != 0)
  	    mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
 
 Modified: stable/7/sys/i386/i386/local_apic.c
 ==============================================================================
 --- stable/7/sys/i386/i386/local_apic.c	Thu May  6 09:54:01 2010	(r207698)
 +++ stable/7/sys/i386/i386/local_apic.c	Thu May  6 12:37:01 2010	(r207699)
 @@ -470,7 +470,7 @@ lapic_setup_clock(void)
  		panic("lapic: Divisor too big");
  	value /= 2;
  	if (bootverbose)
 -		printf("lapic: Divisor %lu, Frequency %lu hz\n",
 +		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
  		    lapic_timer_divisor, value);
  
  	/*
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
