Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/conf Assorted spelling/capitalization fixes fr...
details: https://anonhg.NetBSD.org/src/rev/91d4904203b2
branches: trunk
changeset: 750490:91d4904203b2
user: dholland <dholland%NetBSD.org@localhost>
date: Sun Jan 03 03:50:38 2010 +0000
description:
Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Merged by yours truly as the set of configs has changed quite a bit since
the PR was filed in 2003, and I may have missed some stuff. These changes
should probably be merged into other arches' configs; I'm not going to do
that now though.
diffstat:
sys/arch/i386/conf/ALL | 30 +++++++++++++++---------------
sys/arch/i386/conf/CARDBUS | 4 ++--
sys/arch/i386/conf/GENERIC | 30 +++++++++++++++---------------
sys/arch/i386/conf/GENERIC_PS2TINY | 6 +++---
sys/arch/i386/conf/GENERIC_TINY | 14 +++++++-------
sys/arch/i386/conf/INSTALL_FLOPPY | 22 +++++++++++-----------
sys/arch/i386/conf/INSTALL_TINY | 14 +++++++-------
sys/arch/i386/conf/NET4501 | 12 ++++++------
sys/arch/i386/conf/XBOX | 6 +++---
sys/arch/i386/conf/XEN3_DOM0 | 12 ++++++------
sys/arch/i386/conf/XEN3_DOMU | 6 +++---
11 files changed, 78 insertions(+), 78 deletions(-)
diffs (truncated from 578 to 300 lines):
diff -r d3afba2e17bf -r 91d4904203b2 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Sun Jan 03 02:47:09 2010 +0000
+++ b/sys/arch/i386/conf/ALL Sun Jan 03 03:50:38 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.223 2009/12/23 01:04:46 pooka Exp $
+# $NetBSD: ALL,v 1.224 2010/01/03 03:50:38 dholland Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.223 $"
+#ident "ALL-$Revision: 1.224 $"
maxusers 64 # estimated number of users
@@ -213,7 +213,7 @@
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
options IPSEC # IP security
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -231,7 +231,7 @@
options IPFILTER_LOOKUP # ippool(8) support
options IPFILTER_DEFAULT_BLOCK # block all packets by default
options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
-options TCP_SIGNATURE # RFC2385 support, used with BGP
+options TCP_SIGNATURE # RFC 2385 support, used with BGP
options ALTQ # Manipulate network interfaces' output queues
options ALTQ_BLUE # Stochastic Fair Blue
@@ -540,7 +540,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -964,7 +964,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -1017,7 +1017,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -1031,7 +1031,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
xi* at xirc?
@@ -1043,10 +1043,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 Ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 Ethernet cards
-ep* at isa? port ? irq ? # 3C509 Ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -1064,14 +1064,14 @@
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g
re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S
@@ -1568,7 +1568,7 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
pseudo-device faith # IPv[46] tcp relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
diff -r d3afba2e17bf -r 91d4904203b2 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sun Jan 03 02:47:09 2010 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sun Jan 03 03:50:38 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.79 2008/09/30 16:45:33 jmcneill Exp $
+# $NetBSD: CARDBUS,v 1.80 2010/01/03 03:50:38 dholland Exp $
#
# CARDBUS: GENERIC + CardBus support
@@ -46,7 +46,7 @@
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
rtk* at cardbus? function ? # Realtek 8129/8139
tlp* at cardbus? function ? # DECchip 21143
diff -r d3afba2e17bf -r 91d4904203b2 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sun Jan 03 02:47:09 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC Sun Jan 03 03:50:38 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.955 2009/12/23 01:04:46 pooka Exp $
+# $NetBSD: GENERIC,v 1.956 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.955 $"
+#ident "GENERIC-$Revision: 1.956 $"
maxusers 64 # estimated number of users
@@ -208,7 +208,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -530,7 +530,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -915,7 +915,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -967,7 +967,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -981,7 +981,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xirc* at pcmcia? function ? # Xircom CreditCard Ethernet
com* at xirc?
xi* at xirc?
@@ -993,10 +993,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 Ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 Ethernet cards
-ep* at isa? port ? irq ? # 3C509 Ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -1014,14 +1014,14 @@
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
-ex* at cardbus? function ? # 3Com 3C575TX
+ex* at cardbus? function ? # 3Com 3c575TX
fxp* at cardbus? function ? # Intel i8255x
ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g
re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S
@@ -1511,8 +1511,8 @@
pseudo-device tap # virtual Ethernet
pseudo-device tun # network tunneling over tty
pseudo-device gre # generic L3 over IP tunnel
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith # IPv[46] tcp relay translation i/f
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith # IPv[46] TCP relay translation i/f
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
diff -r d3afba2e17bf -r 91d4904203b2 sys/arch/i386/conf/GENERIC_PS2TINY
--- a/sys/arch/i386/conf/GENERIC_PS2TINY Sun Jan 03 02:47:09 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY Sun Jan 03 03:50:38 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.57 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.58 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -98,7 +98,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
@@ -163,7 +163,7 @@
#npx0 at isa? port 0xf0 irq 13 # x86 math coprocessor
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
options PCKBCDEBUG
#pcconskbd* at pckbc?
#pms* at pckbc? # PS/2 mouse for wsmouse
diff -r d3afba2e17bf -r 91d4904203b2 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY Sun Jan 03 02:47:09 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY Sun Jan 03 03:50:38 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.120 2009/12/05 20:11:15 pooka Exp $
+# $NetBSD: GENERIC_TINY,v 1.121 2010/01/03 03:50:38 dholland Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -243,7 +243,7 @@
# Console Devices
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -423,10 +423,10 @@
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -438,7 +438,7 @@
le* at nele?
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
Home |
Main Index |
Thread Index |
Old Index