From 85d16a0bae1c93c54e33131625e91550497910b7 Mon Sep 17 00:00:00 2001 From: pfg Date: Sun, 15 May 2016 03:15:36 +0000 Subject: [PATCH] MFC r298881, 298882, 298883, 298885: Minor spelling fixes in: tools, share, bluetooth, pmcstat, etc Many of these have user-visible strings. git-svn-id: svn://svn.freebsd.org/base/stable/10@299826 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- etc/ntp/leap-seconds | 2 +- etc/protocols | 2 +- etc/rc.d/sendmail | 4 ++-- etc/rc.initdiskless | 2 +- share/examples/ipfilter/ipf-howto.txt | 6 +++--- share/examples/kld/cdev/test/Makefile | 2 +- tools/regression/sockets/so_setfib/so_setfib.c | 2 +- tools/tools/fixwhite/fixwhite.1 | 2 +- tools/tools/fixwhite/fixwhite.c | 2 +- tools/tools/ipw/ipwstats.c | 4 ++-- tools/tools/nanobsd/dhcpd/common | 2 +- tools/tools/shlib-compat/shlib-compat.py | 2 +- tools/tools/wtap/vis_map/vis_map.c | 2 +- tools/tools/wtap/wtap/wtap.c | 2 +- usr.sbin/bluetooth/btpand/btpand.c | 2 +- usr.sbin/bluetooth/hccontrol/node.c | 2 +- usr.sbin/pmcstat/pmcpl_calltree.c | 2 +- usr.sbin/pmcstat/pmcstat_log.c | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/etc/ntp/leap-seconds b/etc/ntp/leap-seconds index 8fa6225f6..79d8e1581 100644 --- a/etc/ntp/leap-seconds +++ b/etc/ntp/leap-seconds @@ -46,7 +46,7 @@ # by the International Bureau of Weights and Measures # (BIPM). See www.bipm.fr for more information. # -# 3. The current defintion of the relationship between UTC +# 3. The current definition of the relationship between UTC # and TAI dates from 1 January 1972. A number of different # time scales were in use before than epoch, and it can be # quite difficult to compute precise timestamps and time diff --git a/etc/protocols b/etc/protocols index 20dd88985..05702d430 100644 --- a/etc/protocols +++ b/etc/protocols @@ -43,7 +43,7 @@ merit-inp 32 MERIT-INP # MERIT Internodal Protocol dccp 33 DCCP # Datagram Congestion Control Protocol 3pc 34 3PC # Third Party Connect Protocol idpr 35 IDPR # Inter-Domain Policy Routing Protocol -xtp 36 XTP # Xpress Tranfer Protocol +xtp 36 XTP # Xpress Transfer Protocol ddp 37 DDP # Datagram Delivery Protocol idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto tp++ 39 TP++ # TP++ Transport Protocol diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index 824709702..f86038300 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -78,7 +78,7 @@ sendmail_cert_create() crlnumber = \$dir/crlnumber # the current crl number crl = \$dir/crl.pem # The current CRL private_key = \$dir/cakey.pem - x509_extensions = usr_cert # The extentions to add to the cert + x509_extensions = usr_cert # The extensions to add to the cert name_opt = ca_default # Subject Name options cert_opt = ca_default # Certificate field options default_days = 365 # how long to certify for @@ -99,7 +99,7 @@ sendmail_cert_create() default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes - x509_extensions = v3_ca # The extentions to add to the self signed cert + x509_extensions = v3_ca # The extensions to add to the self signed cert string_mask = utf8only prompt = no [ req_distinguished_name ] diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless index cfb9214b5..ae91f2837 100644 --- a/etc/rc.initdiskless +++ b/etc/rc.initdiskless @@ -103,7 +103,7 @@ # will be created. In case of multiple entries for the same # directory M, the last one in the scanning order is used. # NOTE: If you only need to create a memory filesystem but not -# initialize it from a template, it is preferrable to specify +# initialize it from a template, it is preferable to specify # it in fstab e.g. as "md /tmp mfs -s=30m,rw 0 0" # # /conf/T/SUBDIR.cpio.gz diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt index 54187ae1f..95b69dc57 100644 --- a/share/examples/ipfilter/ipf-howto.txt +++ b/share/examples/ipfilter/ipf-howto.txt @@ -1036,11 +1036,11 @@ In this case, the server is running no services. Infact, it's not a server, it's a client. And this client doesn't want unauthorized packets entering its IP stack at all. However, the client wants full access to the internet and -the reply packets that such privledge entails. This simple +the reply packets that such privilege entails. This simple ruleset creates state entries for every new outgoing TCP session. Again, since a state entry is created, these new TCP sessions are free to talk back and forth as they please -without the hinderance or inspection of the firewall rule- +without the hindrance or inspection of the firewall rule- set. We mentioned that this also works for UDP and ICMP: block in quick on tun0 all @@ -1271,7 +1271,7 @@ forgeries and allow fragments: This works because every packet that should be allowed through makes it into the state table before the blocking rules are reached. The only scan this won't detect is a SYN -scan itself. If you're truely worried about that, you might +scan itself. If you're truly worried about that, you might even want to log all initial SYN packets. 3.6. Responding To a Blocked Packet diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile index eebf54d7c..b108a6905 100644 --- a/share/examples/kld/cdev/test/Makefile +++ b/share/examples/kld/cdev/test/Makefile @@ -73,7 +73,7 @@ WARNS?= 5 MODSTAT= /sbin/kldstat load: - @echo "This test program will call the sample kld characer device "; + @echo "This test program will call the sample kld character device "; @echo "driver." @echo @echo "The sample driver will display a message on the" diff --git a/tools/regression/sockets/so_setfib/so_setfib.c b/tools/regression/sockets/so_setfib/so_setfib.c index c56cf5b4b..ab1255bcc 100644 --- a/tools/regression/sockets/so_setfib/so_setfib.c +++ b/tools/regression/sockets/so_setfib/so_setfib.c @@ -175,7 +175,7 @@ main(int argc __unused, char *argv[] __unused) return (0); } - /* Initalize randomness. */ + /* Initialize randomness. */ srandomdev(); /* Get number of FIBs supported by kernel. */ diff --git a/tools/tools/fixwhite/fixwhite.1 b/tools/tools/fixwhite/fixwhite.1 index ccf5ecec0..54dae667a 100644 --- a/tools/tools/fixwhite/fixwhite.1 +++ b/tools/tools/fixwhite/fixwhite.1 @@ -43,6 +43,6 @@ trailing whitespace characters from ever line of text. Multiple successive empty lines are merged together. If the whitespace at the beginning of a sentence is exactly a multiple of eight spaces, the whitespace is replaced by tabs. -Also, spaces preceeding tabs will be merged into the tab character. +Also, spaces preceding tabs will be merged into the tab character. .Sh AUTHORS .An Ed Schouten Aq ed@FreeBSD.org diff --git a/tools/tools/fixwhite/fixwhite.c b/tools/tools/fixwhite/fixwhite.c index 903a5a355..2b1763060 100644 --- a/tools/tools/fixwhite/fixwhite.c +++ b/tools/tools/fixwhite/fixwhite.c @@ -95,7 +95,7 @@ savewhite(char c, bool leading) savebyte(' '); break; case '\t': - /* Convert preceeding spaces to tabs. */ + /* Convert preceding spaces to tabs. */ ncolumn = (column / 8 + 1) * 8; while (peekbyte(1, ' ')) { queuelen--; diff --git a/tools/tools/ipw/ipwstats.c b/tools/tools/ipw/ipwstats.c index 3146d12ad..fe8c5a83a 100644 --- a/tools/tools/ipw/ipwstats.c +++ b/tools/tools/ipw/ipwstats.c @@ -89,7 +89,7 @@ static const struct statistic tbl[] = { { 27, "Number of reassociation requests transmitted", INT }, { 28, "Number of reassociation responses transmitted", INT }, { 29, "Number of probe requests transmitted", INT }, - { 30, "Number of probe reponses transmitted", INT }, + { 30, "Number of probe responses transmitted", INT }, { 31, "Number of beacons transmitted", INT }, { 32, "Number of ATIM frames transmitted", INT }, { 33, "Number of disassociation requests transmitted", INT }, @@ -137,7 +137,7 @@ static const struct statistic tbl[] = { { 89, "Number of reassociation requests received", INT }, { 90, "Number of reassociation responses received", INT }, { 91, "Number of probe requests received", INT }, - { 92, "Number of probe reponses received", INT }, + { 92, "Number of probe responses received", INT }, { 93, "Number of beacons received", INT }, { 94, "Number of ATIM frames received", INT }, { 95, "Number of disassociation requests received", INT }, diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index 2658a8459..c8c7598a1 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -229,7 +229,7 @@ add_port () { local port_path=$1 local port=`echo $1 | sed -e 's/\//_/'` shift - # Check if package allready exist + # Check if package already exist # Need to: # 1. check ARCH of this package! # 2. Add a trap diff --git a/tools/tools/shlib-compat/shlib-compat.py b/tools/tools/shlib-compat/shlib-compat.py index 726c53ffb..f463763bc 100755 --- a/tools/tools/shlib-compat/shlib-compat.py +++ b/tools/tools/shlib-compat/shlib-compat.py @@ -893,7 +893,7 @@ class DwarfdumpParser(Parser): offset = int(tag.args['DW_AT_low_pc'], 16) if self.offsetmap.has_key(offset): raise ValueError("Dwarf dump parse error: " + - "symbol is aleady defined at offset 0x%x" % offset) + "symbol is already defined at offset 0x%x" % offset) self.offsetmap[offset] = tag if len(self.stack) > 0: prev = self.stack.pop() diff --git a/tools/tools/wtap/vis_map/vis_map.c b/tools/tools/wtap/vis_map/vis_map.c index 4a0109e5a..afba7d185 100644 --- a/tools/tools/wtap/vis_map/vis_map.c +++ b/tools/tools/wtap/vis_map/vis_map.c @@ -110,7 +110,7 @@ main(int argc, const char* argv[]) link_op(&l); break; default: - printf("wtap ioctl: unkown command '%c'\n", *argv[1]); + printf("wtap ioctl: unknown command '%c'\n", *argv[1]); exit(1); } exit(0); diff --git a/tools/tools/wtap/wtap/wtap.c b/tools/tools/wtap/wtap/wtap.c index 9e8ce5d0a..0bc9233a7 100644 --- a/tools/tools/wtap/wtap/wtap.c +++ b/tools/tools/wtap/wtap/wtap.c @@ -75,7 +75,7 @@ int main( int argc, const char* argv[]) delete(id); break; default: - printf("wtap ioctl: unkown command '%c'\n", *argv[1]); + printf("wtap ioctl: unknown command '%c'\n", *argv[1]); return -1; } return 0; diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c index 938744448..a23bc32ae 100644 --- a/usr.sbin/bluetooth/btpand/btpand.c +++ b/usr.sbin/bluetooth/btpand/btpand.c @@ -65,7 +65,7 @@ static const struct { const char * desc; } services[] = { { "PANU", SDP_SERVICE_CLASS_PANU, "Personal Area Networking User" }, - { "NAP", SDP_SERVICE_CLASS_NAP, "Network Acess Point" }, + { "NAP", SDP_SERVICE_CLASS_NAP, "Network Access Point" }, { "GN", SDP_SERVICE_CLASS_GN, "Group Network" }, }; diff --git a/usr.sbin/bluetooth/hccontrol/node.c b/usr.sbin/bluetooth/hccontrol/node.c index ede2153b6..d5f12d4c2 100644 --- a/usr.sbin/bluetooth/hccontrol/node.c +++ b/usr.sbin/bluetooth/hccontrol/node.c @@ -591,7 +591,7 @@ struct hci_command node_commands[] = { "Write the value of the Role Switch parameter for the HCI node. By default,\n" \ "if Role Switch is supported, local device will try to perform Role Switch\n" \ "and become Master on incoming connection. Some devices do not support Role\n" \ -"Switch and thus incomming connections from such devices will fail. Setting\n" \ +"Switch and thus incoming connections from such devices will fail. Setting\n" \ "this parameter to zero will prevent Role Switch and thus accepting device\n" \ "will remain Slave", &hci_write_node_role_switch diff --git a/usr.sbin/pmcstat/pmcpl_calltree.c b/usr.sbin/pmcstat/pmcpl_calltree.c index 3d0127d5a..edfe85a57 100644 --- a/usr.sbin/pmcstat/pmcpl_calltree.c +++ b/usr.sbin/pmcstat/pmcpl_calltree.c @@ -830,7 +830,7 @@ pmcpl_ct_node_printchild(struct pmcpl_ct_node *ct, uintfptr_t paddr, /* * Child cost. - * TODO: attach child cost to the real position in the funtion. + * TODO: attach child cost to the real position in the function. * TODO: cfn= / call addr() / addr(call ) */ for (i=0 ; ipct_narc; i++) { diff --git a/usr.sbin/pmcstat/pmcstat_log.c b/usr.sbin/pmcstat/pmcstat_log.c index f7a107d23..14bfc0aba 100644 --- a/usr.sbin/pmcstat/pmcstat_log.c +++ b/usr.sbin/pmcstat/pmcstat_log.c @@ -1361,7 +1361,7 @@ pmcstat_analyze_log(void) assert(args.pa_flags & FLAG_DO_ANALYSIS); if (elf_version(EV_CURRENT) == EV_NONE) - err(EX_UNAVAILABLE, "Elf library intialization failed"); + err(EX_UNAVAILABLE, "Elf library initialization failed"); while (pmclog_read(args.pa_logparser, &ev) == 0) { assert(ev.pl_state == PMCLOG_OK); -- 2.42.0