Date: Sat, 10 Mar 2012 17:55:59 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r232787 - in stable/8: sbin/ifconfig sbin/ipfw share/man/man4 sys/conf sys/dev/siba sys/ia64/ia64 Message-ID: <201203101755.q2AHtxSF066874@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Sat Mar 10 17:55:58 2012 New Revision: 232787 URL: http://svn.freebsd.org/changeset/base/232787 Log: Merge r232250 from head: Correct capitalization of "Hz" in user-visible text (manpages, printf(), etc). Modified: stable/8/sbin/ifconfig/ifconfig.8 stable/8/sbin/ipfw/ipfw.8 stable/8/share/man/man4/ath.4 stable/8/share/man/man4/net80211.4 stable/8/sys/conf/NOTES stable/8/sys/dev/siba/siba_core.c stable/8/sys/ia64/ia64/machdep.c Directory Properties: stable/8/sbin/ifconfig/ (props changed) stable/8/sbin/ipfw/ (props changed) stable/8/share/man/man4/ (props changed) stable/8/sys/ (props changed) Modified: stable/8/sbin/ifconfig/ifconfig.8 ============================================================================== --- stable/8/sbin/ifconfig/ifconfig.8 Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/sbin/ifconfig/ifconfig.8 Sat Mar 10 17:55:58 2012 (r232787) @@ -993,7 +993,7 @@ Enable Dynamic Frequency Selection (DFS) DFS embodies several facilities including detection of overlapping radar signals, dynamic transmit power control, and channel selection according to a least-congested criteria. -DFS support is mandatory for some 5Ghz frequencies in certain +DFS support is mandatory for some 5GHz frequencies in certain locales (e.g. ETSI). By default DFS is enabled according to the regulatory definitions specified in /etc/regdomain.xml and the curent country code, regdomain, Modified: stable/8/sbin/ipfw/ipfw.8 ============================================================================== --- stable/8/sbin/ipfw/ipfw.8 Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/sbin/ipfw/ipfw.8 Sat Mar 10 17:55:58 2012 (r232787) @@ -2219,7 +2219,7 @@ specifies the scheduling algorithm to us is just a FIFO scheduler (which means that all packets are stored in the same queue as they arrive to the scheduler). FIFO has O(1) per-packet time complexity, with very low -constants (estimate 60-80ns on a 2Ghz desktop machine) +constants (estimate 60-80ns on a 2GHz desktop machine) but gives no service guarantees. .It Cm wf2qp implements the WF2Q+ algorithm, which is a Weighted Fair Queueing Modified: stable/8/share/man/man4/ath.4 ============================================================================== --- stable/8/share/man/man4/ath.4 Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/share/man/man4/ath.4 Sat Mar 10 17:55:58 2012 (r232787) @@ -80,8 +80,8 @@ with transmit speeds appropriate to each AR5416-class devices are capable of 802.11n operation but are supported only in legacy modes (802.11a, 11b, 11g). Most chips also support an Atheros Turbo Mode (TM) that operates in -the 5Ghz frequency range with 2x the transmit speeds. -Some chips also support Turbo mode in the 2.4Ghz range with 802.11g +the 5GHz frequency range with 2x the transmit speeds. +Some chips also support Turbo mode in the 2.4GHz range with 802.11g though this support is not presently available due to regulatory requirements. (Note that Turbo modes are, however, only interoperable with other Atheros-based devices.) Modified: stable/8/share/man/man4/net80211.4 ============================================================================== --- stable/8/share/man/man4/net80211.4 Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/share/man/man4/net80211.4 Sat Mar 10 17:55:58 2012 (r232787) @@ -280,7 +280,7 @@ Return whether or not Dynamic Frequency DFS embodies several facilities including detection of overlapping radar signals, dynamic transmit power control, and channel selection according to a least-congested criteria. -DFS support is mandatory for some 5Ghz frequencies in certain +DFS support is mandatory for some 5GHz frequencies in certain locales (e.g. ETSI). By default DFS is enabled according to the regulatory definitions and the curent country code, regdomain, and channel. Modified: stable/8/sys/conf/NOTES ============================================================================== --- stable/8/sys/conf/NOTES Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/sys/conf/NOTES Sat Mar 10 17:55:58 2012 (r232787) @@ -2339,11 +2339,11 @@ device cmx # or # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC # Specifies the default video capture mode. -# This is required for Dual Crystal (28&35Mhz) boards where PAL is used +# This is required for Dual Crystal (28&35MHz) boards where PAL is used # to prevent hangs during initialisation, e.g. VideoLogic Captivator PCI. # # options BKTR_USE_PLL -# This is required for PAL or SECAM boards with a 28Mhz crystal and no 35Mhz +# This is required for PAL or SECAM boards with a 28MHz crystal and no 35MHz # crystal, e.g. some new Bt878 cards. # # options BKTR_GPIO_ACCESS Modified: stable/8/sys/dev/siba/siba_core.c ============================================================================== --- stable/8/sys/dev/siba/siba_core.c Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/sys/dev/siba/siba_core.c Sat Mar 10 17:55:58 2012 (r232787) @@ -1215,7 +1215,7 @@ siba_cc_pmu0_pll0_init(struct siba_cc *s if (((pmu & SIBA_CC_PMUCTL_XF) >> 2) == e->xf) return; - DPRINTF(siba, SIBA_DEBUG_PLL, "change PLL value to %u.%03u mhz\n", + DPRINTF(siba, SIBA_DEBUG_PLL, "change PLL value to %u.%03u MHz\n", (xtalfreq / 1000), (xtalfreq % 1000)); KASSERT(siba->siba_chipid == 0x4328 || siba->siba_chipid == 0x5354, Modified: stable/8/sys/ia64/ia64/machdep.c ============================================================================== --- stable/8/sys/ia64/ia64/machdep.c Sat Mar 10 17:47:43 2012 (r232786) +++ stable/8/sys/ia64/ia64/machdep.c Sat Mar 10 17:55:58 2012 (r232787) @@ -242,7 +242,7 @@ identifycpu(void) printf("CPU: %s (", model_name); if (cpu_freq) - printf("%u Mhz ", cpu_freq); + printf("%u MHz ", cpu_freq); printf("%s)\n", family_name); printf(" Origin = \"%s\" Revision = %d\n", vendor, revision); printf(" Features = 0x%b\n", (u_int32_t) features,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203101755.q2AHtxSF066874>