From: Sascha Wildner Date: Tue, 28 Apr 2020 15:40:46 +0000 (+0200) Subject: Fix various grammatical issues in our messages, documentation etc. X-Git-Tag: v6.0.0rc1~1223 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/dda92f98020e9cd136912ad977693f0344d79049 Fix various grammatical issues in our messages, documentation etc. --- diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index 679cb0b0a1..eee0af03d0 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -513,7 +513,7 @@ utility recognizes the following commands. The commands are shown together with the default address or address range supplied if none is -specified (in parenthesis). +specified (in parentheses). .Bl -tag -width indent .It (.)a Append text to the buffer after the addressed line. diff --git a/games/atc/atc.6 b/games/atc/atc.6 index 68c4203188..89f3cd50f2 100644 --- a/games/atc/atc.6 +++ b/games/atc/atc.6 @@ -30,7 +30,6 @@ .\" .\" @(#)atc.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD: src/games/atc/atc.6,v 1.6.2.1 2001/07/22 11:32:34 dd Exp $ -.\" $DragonFly: src/games/atc/atc.6,v 1.5 2008/05/02 02:05:03 swildner Exp $ .\" .\" Copyright (c) 1986 Ed James. All rights reserved. .\" @@ -424,7 +423,7 @@ The syntax is as follows: .El .Ed .Pp -For beacons, a simple x, y coordinate pair is used (enclosed in parenthesis). +For beacons, a simple x, y coordinate pair is used (enclosed in parentheses). Airports and exits require a third value, which is one of the directions .Em wedcxzaq . For airports, this is the direction that planes must be going to take diff --git a/games/backgammon/backgammon/backgammon.6 b/games/backgammon/backgammon/backgammon.6 index c7616af692..b7f0ce16aa 100644 --- a/games/backgammon/backgammon/backgammon.6 +++ b/games/backgammon/backgammon/backgammon.6 @@ -27,7 +27,6 @@ .\" .\" @(#)backgammon.6 8.1 (Berkeley) 5/31/93 .\" $FreeBSD: src/games/backgammon/backgammon/backgammon.6,v 1.7.2.1 2001/07/22 11:01:21 dd Exp $ -.\" $DragonFly: src/games/backgammon/backgammon/backgammon.6,v 1.4 2007/10/20 17:56:46 swildner Exp $ .\" .Dd May 31, 1993 .Dt BACKGAMMON 6 @@ -80,7 +79,7 @@ print the board before red's turn .It Fl pw print the board before white's turn .It Fl pb -print the board before both player's turn +print the board before both players' turn .It Fl t Ar term terminal is type .Ar term , diff --git a/games/backgammon/common_source/subs.c b/games/backgammon/common_source/subs.c index cc7392babc..b9d390b830 100644 --- a/games/backgammon/common_source/subs.c +++ b/games/backgammon/common_source/subs.c @@ -49,7 +49,7 @@ const char *const descr[] = { "\t-b\ttwo players, red and white (implies -n)", "\t-pr\tprint the board before red's turn", "\t-pw\tprint the board before white's turn", - "\t-pb\tprint the board before both player's turn", + "\t-pb\tprint the board before both players' turn", "\t-tterm\tterminal is a term", "\t-sfile\trecover saved game from file", 0 diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes index 124bd4896a..707affae0c 100644 --- a/games/fortune/datfiles/fortunes +++ b/games/fortune/datfiles/fortunes @@ -51435,7 +51435,7 @@ and you must pay thousands of dollars if you want to fly back out. % This is an unauthorized cybernetic announcement. % -This is Betty Frenel. I don't know who to call but I can't reach my +This is Betty Frenel. I don't know whom to call but I can't reach my Food-a-holics partner. I'm at Vido's on my second pizza with sausage and mushroom. Jim, come and get me! % diff --git a/games/sail/sail.6 b/games/sail/sail.6 index e7d92f90cd..5f85cff57d 100644 --- a/games/sail/sail.6 +++ b/games/sail/sail.6 @@ -445,7 +445,7 @@ just off the stern. The direction rose on the side of the screen gives the possible movements for your ship at all positions to the wind. Battle -sail speeds are given first, and full sail speeds are given in parenthesis. +sail speeds are given first, and full sail speeds are given in parentheses. .Bd -literal 0 1(2) diff --git a/lib/libc/tre-regex/re_format.7 b/lib/libc/tre-regex/re_format.7 index fc05cc79c7..ee48f58849 100644 --- a/lib/libc/tre-regex/re_format.7 +++ b/lib/libc/tre-regex/re_format.7 @@ -728,14 +728,14 @@ If .Dv REG_ICASE was specified to .Fn regcomp , -this option can be use to turn that off. +this option can be used to turn that off. .It Sy \&n Turn on or off special handling of the newline character. If .Dv REG_NEWLINE was specified to .Fn regcomp , -this option can be use to turn that off. +this option can be used to turn that off. .It Sy \&U Turning on this option will make ungreedy repetitions the default, while turning off will make greedy repetitions the default. @@ -743,7 +743,7 @@ If .Dv REG_UNGREEDY was specified to .Fn regcomp , -this option can be use to turn that off. +this option can be used to turn that off. .El .Pp The scope of the option change begins immediately following the right diff --git a/lib/libposix1e/acl_set.3 b/lib/libposix1e/acl_set.3 index 3f7c756e30..47431424e3 100644 --- a/lib/libposix1e/acl_set.3 +++ b/lib/libposix1e/acl_set.3 @@ -24,7 +24,6 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/lib/libposix1e/acl_set.3,v 1.2.2.5 2002/01/09 13:34:56 ru Exp $ -.\" $DragonFly: src/lib/libposix1e/acl_set.3,v 1.3 2004/03/11 12:28:52 hmp Exp $ .\" .Dd January 28, 2000 .Dt ACL_SET 3 @@ -60,7 +59,7 @@ All except are POSIX.1e calls-- .Fn acl_set_fd allows only the setting of ACLs of type ACL_TYPE_ACCESS -where as +whereas .Fn acl_set_fd_np allows the setting of ACLs of any type. .Sh IMPLEMENTATION NOTES diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5 index 20d5c705b6..54f8e0448a 100644 --- a/libexec/getty/gettytab.5 +++ b/libexec/getty/gettytab.5 @@ -509,7 +509,7 @@ cases, '#' or '^H' typed in a login name will be treated as an erase character, and '@' will be treated as a kill character. .Pp The delay stuff is a real crock. -Apart form its general lack of flexibility, some +Apart from its general lack of flexibility, some of the delay algorithms are not implemented. The terminal driver should support sane delay settings. .Pp diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index 3eb3cba482..029b030332 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -27,7 +27,6 @@ .\" .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.6.2.6 2003/04/06 19:42:56 dwmalone Exp $ -.\" $DragonFly: src/libexec/tftpd/tftpd.8,v 1.3 2007/11/23 23:16:36 swildner Exp $ .\" .Dd September 14, 2000 .Dt TFTPD 8 @@ -83,7 +82,7 @@ with a list of directories by including up to 20 pathnames as server program arguments in .Pa /etc/inetd.conf . In this case access is restricted to files whose -names are prefixed by the one of the given directories. +names are prefixed by one of the given directories. The given directories are also treated as a search path for relative filename requests. .Pp diff --git a/nrelease/root/etc/disklabel.ad0s1 b/nrelease/root/etc/disklabel.ad0s1 index 3a4f24bf01..240bba1644 100644 --- a/nrelease/root/etc/disklabel.ad0s1 +++ b/nrelease/root/etc/disklabel.ad0s1 @@ -1,4 +1,3 @@ -# $DragonFly: src/nrelease/root/etc/disklabel.ad0s1,v 1.2 2004/01/23 00:36:23 dillon Exp $ # Example disklabel for ad0s1. Once initialized via the instructions in # the README you can edit the label and create partitions for your # filesystems. The top of the disklabel should already contain reasonable @@ -22,10 +21,10 @@ # and g back in. # # ad0s1a: / -# ad0s1b: swap (suggest no less then 256m and at least 1xmain-memory) +# ad0s1b: swap (suggest no less than 256m and at least 1xmain-memory) # ad0s1c: (represents the whole-disk, generally leave this one alone) # ad0s1d: /var # ad0s1e: /tmp -# ad0s1f: /usr (suggest no less then 4096m but 1024m ok in a crunch) +# ad0s1f: /usr (suggest no less than 4096m but 1024m ok in a crunch) # ad0s1g: /home (all remaining disk space) # ad0s1h: (unused) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index dc5df9c141..3a2daa90d1 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1334,7 +1334,7 @@ they choose. Set the rate for transmitting multicast/broadcast frames. Rates are specified as megabits/second in decimal; e.g.\& 5.5 for 5.5 Mb/s. This rate should be valid for the current operating conditions; -if an invalid rate is specified drivers are free to chose an +if an invalid rate is specified drivers are free to choose an appropriate rate. .It Cm mgtrate Ar rate Set the rate for transmitting management and/or control frames. @@ -1625,7 +1625,7 @@ Not all adapters support changing the transmit power. Set a fixed rate for transmitting unicast frames. Rates are specified as megabits/second in decimal; e.g.\& 5.5 for 5.5 Mb/s. This rate should be valid for the current operating conditions; -if an invalid rate is specified drivers are free to chose an +if an invalid rate is specified drivers are free to choose an appropriate rate. .It Cm wepmode Ar mode Set the desired WEP mode. @@ -1656,7 +1656,7 @@ If an .Ar index is not given, key 1 is set. A WEP key will be either 5 or 13 -characters (40 or 104 bits) depending of the local network and the +characters (40 or 104 bits) depending on the local network and the capabilities of the adaptor. It may be specified either as a plain string or as a string of hexadecimal digits preceded by diff --git a/share/examples/diskless/ME b/share/examples/diskless/ME index f13d41b3fb..1b052b7ad6 100644 --- a/share/examples/diskless/ME +++ b/share/examples/diskless/ME @@ -12,7 +12,6 @@ and the /usr/share/examples/diskless/clone_root script which can be useful to set up clients and server for diskless boot. --- $FreeBSD: src/share/examples/diskless/ME,v 1.3.4.1 2002/03/15 06:52:38 luigi Exp $ --- ---- $DragonFly: src/share/examples/diskless/ME,v 1.3 2008/07/08 12:08:29 thomas Exp $ --- ------------------------------------------------------------------------ When templating, /conf/ME is typically a softlink to @@ -45,7 +44,7 @@ use another. Configuration files can be categorized fairly easily through /conf/HT. directories. You put the actual configuration file in /conf/HT. and make a softlink from /conf/ME//config-file to "../HT.ip_len); /* length checks already done in ip_hashfn() */ KASSERT(iplen >= sizeof(struct ip), - ("total length less then header length")); + ("total length less than header length")); KASSERT(m->m_pkthdr.len >= iplen, ("mbuf too short")); /* diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index eb79636728..c1c80af5bc 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -567,7 +567,7 @@ ip_input(struct mbuf *m) ip->ip_off = ntohs(ip->ip_off); /* length checks already done in ip_hashfn() */ - KASSERT(ip->ip_len >= hlen, ("total length less then header length")); + KASSERT(ip->ip_len >= hlen, ("total length less than header length")); KASSERT(m->m_pkthdr.len >= ip->ip_len, ("mbuf too short")); /* diff --git a/sys/vfs/ufs/ffs_alloc.c b/sys/vfs/ufs/ffs_alloc.c index 42aaf6e405..91c62fd7d6 100644 --- a/sys/vfs/ufs/ffs_alloc.c +++ b/sys/vfs/ufs/ffs_alloc.c @@ -444,7 +444,7 @@ ffs_reallocblks(struct vop_reallocblks_args *ap) * in the first blockmap (from soff). */ if (ssize > slen) { - panic("ffs_reallocblks: range spans more then two blockmaps!" + panic("ffs_reallocblks: range spans more than two blockmaps!" " start_lbn %ld len %d (%d/%d)", (long)start_lbn, len, slen, ssize); } diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1 index 649845f8ce..4cc16892bc 100644 --- a/usr.bin/telnet/telnet.1 +++ b/usr.bin/telnet/telnet.1 @@ -1232,7 +1232,7 @@ then carriage returns will be sent as .Li . If this is .Dv FALSE , -then carriage returns will be send as +then carriage returns will be sent as .Li . The initial value for this toggle is .Dv FALSE . diff --git a/usr.sbin/lpr/lpr/printcap.5 b/usr.sbin/lpr/lpr/printcap.5 index 5263248efc..7a2f98f719 100644 --- a/usr.sbin/lpr/lpr/printcap.5 +++ b/usr.sbin/lpr/lpr/printcap.5 @@ -351,7 +351,7 @@ is specified as .Em port Ns No @ Ns Em machine (and .Cm rm -is not in use), printing will be send directly to the given +is not in use), printing will be sent directly to the given .Em port on the given .Em machine . diff --git a/usr.sbin/pfctl/parse.y b/usr.sbin/pfctl/parse.y index c369c955c5..8f11b6e7f8 100644 --- a/usr.sbin/pfctl/parse.y +++ b/usr.sbin/pfctl/parse.y @@ -3050,7 +3050,7 @@ port_item : portrange { } | unaryop portrange { if ($2.t) { - yyerror("':' cannot be used with an other " + yyerror("':' cannot be used with another " "port operator"); YYERROR; } @@ -3065,7 +3065,7 @@ port_item : portrange { } | portrange PORTBINARY portrange { if ($1.t || $3.t) { - yyerror("':' cannot be used with an other " + yyerror("':' cannot be used with another " "port operator"); YYERROR; } diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4 index 460852e988..94468d334a 100644 --- a/usr.sbin/ppp/ppp.8.m4 +++ b/usr.sbin/ppp/ppp.8.m4 @@ -5227,7 +5227,7 @@ The peer IP address is set to the given value. The tun interface netmask is set to the given value. .It RAD_FRAMED_MTU If the given MTU is less than the peers MRU as agreed during LCP -negotiation, *and* it is less that any configured MTU (see the +negotiation, *and* it is less than any configured MTU (see the .Dq set mru command), the tun interface MTU is set to the given value. .It RAD_FRAMED_COMPRESSION diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8 index 9e59801220..bb8712a95a 100644 --- a/usr.sbin/sa/sa.8 +++ b/usr.sbin/sa/sa.8 @@ -225,7 +225,7 @@ option now understands more options than it used to. .Pp The formats of the summary files created by this version of .Nm -are very different from the those used by the original version. +are very different from those used by the original version. This is not considered a problem, however, because the accounting record format has changed as well (since user ids are now 32 bits). .Sh BUGS