On Fri, Oct 16, 2020 at 02:36:39AM +0000, Varik Valefor wrote: > Sir or Madam: > > Included within this message should be some diffs which can be applied to > fix some typographical errors and general wording problems which exist > within the OpenBSD manual pages, as well as some other files. > > These changes are proposed because typographical errors look bad and can > lead to assumptions of incompetence. > > KUTGW, > Varik "NOT A COMPUTER PROGRAMMER!!!" Valefor >
hi. thanks for your mail - typo fixes are always welcome! i have committed fixes for the two instances of "the the". i'm afraid the other parts of the diff are really just questions of preference, and don;t represent enough of a clear improvement to be committed. none of them are errors (at least, not in 2020). thanks, jmc > ----- BEGIN DIFFS ----- > diff --git a/lib/libutil/ober_add_string.3 b/lib/libutil/ober_add_string.3 > index 5eb6bd32ea0..77a13e629a0 100644 > --- a/lib/libutil/ober_add_string.3 > +++ b/lib/libutil/ober_add_string.3 > @@ -134,7 +134,7 @@ creates zero or more > structures. > For each byte in > .Fa fmt , > -arguments of the the types given in the following table are consumed > +arguments of the types given in the following table are consumed > and passed to the listed function, creating one > .Vt ber_element > per byte. > > diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9 > index 528581eedaa..2977813bbe8 100644 > --- a/share/man/man9/physio.9 > +++ b/share/man/man9/physio.9 > @@ -56,7 +56,7 @@ The maximum amount of data to transfer with each call to > is determined by the > .Fa minphys > routine. > -Since > +Because > .Fa uio > normally describes user space addresses, > .Fn physio > @@ -85,7 +85,9 @@ A break-down of the arguments follows: > The device strategy routine to call for each chunk of data to initiate > device I/O. > .It Fa dev > -The device number identifying the device to interact with. > +The device number of the device with which > +.Nm > +should interact. > .It Fa flags > Direction of transfer; the only valid settings are > .Dv B_READ > > diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1 > index 4f4bfd8d5d5..b5683b0d546 100644 > --- a/usr.bin/ftp/ftp.1 > +++ b/usr.bin/ftp/ftp.1 > @@ -316,7 +316,7 @@ slow connection after > The host with which > .Nm > is to communicate may be specified on the command line. > -If this is done, > +If this host is specified, > .Nm > will immediately attempt to establish a connection to an > FTP server on that host; otherwise, > @@ -1675,7 +1675,7 @@ entry cannot be utilized by multiple > .Ic machine > definitions; rather, it must be defined following each > .Ic machine > -it is intended to be used with. > +with which it is to be used. > If a macro named > .Ic init > is defined, it is automatically executed as the last step in the > > diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1 > index 87a5d04aa4a..4d4b0d3660c 100644 > --- a/usr.bin/sed/sed.1 > +++ b/usr.bin/sed/sed.1 > @@ -427,7 +427,7 @@ string for the first instance of the regular expression > in the pattern space. > Any character other than backslash or newline can be used instead of > a slash to delimit the regular expression and the replacement. > -Also see the the section about > +Also see the section about > .Sx SED REGULAR EXPRESSIONS . > .Pp > An ampersand > > diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 > index e364586f5ad..f1f4361c472 100644 > --- a/usr.bin/openssl/openssl.1 > +++ b/usr.bin/openssl/openssl.1 > @@ -408,10 +408,10 @@ are assumed to be the names of files containing > certificate requests. > The > .Fa password > used to encrypt the private key. > -Since on some systems the command line arguments are visible, > +On some systems, the command line arguments are visible; therefore, > this option should be used with caution. > .It Fl keyfile Ar file > -The private key to sign requests with. > +The private key with which requests should be signed. > .It Fl keyform Cm pem | der > Private key file format. > The default is > > diff --git a/usr.bin/x99token/x99token.1 b/usr.bin/x99token/x99token.1 > index 1d004dea440..8a29f22ce99 100644 > --- a/usr.bin/x99token/x99token.1 > +++ b/usr.bin/x99token/x99token.1 > @@ -49,7 +49,7 @@ is not specified, > is in calculator mode. > In this mode you must enter the same PIN as used in the initialization step. > The PIN is used to decode the key read from the keyfile. > -Next you enter the challenge you have been presented with. > +Next, you enter the challenge which has been presented to you. > The > .Nm > program will provide you with a response to the challenge. > > diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 > index e364586f5ad..da4b73aee3c 100644 > --- a/usr.bin/openssl/openssl.1 > +++ b/usr.bin/openssl/openssl.1 > @@ -371,7 +371,7 @@ If reading the serial from the text file as specified in > the > configuration fails, create a new random serial to be used as the > next serial number. > .It Fl days Ar arg > -The number of days to certify the certificate for. > +The number of days for which the certificate should be certified. > .It Fl enddate Ar date > Set the expiry date. > The format of the date is [YY]YYMMDDHHMMSSZ, > @@ -408,10 +408,10 @@ are assumed to be the names of files containing > certificate requests. > The > .Fa password > used to encrypt the private key. > -Since on some systems the command line arguments are visible, > +On some systems, the command-line arguments are visible; therefore, > this option should be used with caution. > .It Fl keyfile Ar file > -The private key to sign requests with. > +The private key with which requests should be signed. > .It Fl keyform Cm pem | der > Private key file format. > The default is > @@ -735,7 +735,7 @@ At least one of these must be present to generate a CRL. > The same as the > .Fl days > option. > -The number of days to certify a certificate for. > +The number of days to for which a certificate should be certified. > .It Cm default_enddate > The same as the > .Fl enddate > @@ -754,7 +754,7 @@ Mandatory. > The same as the > .Fl startdate > option. > -The start date to certify a certificate for. > +The beginning date of the certification of a certificate. > If not set, the current time is used. > .It Cm email_in_dn > The same as > @@ -1812,7 +1812,7 @@ The options are as follows: > .Xc > Encrypt the private key with the AES, DES, or the triple DES > ciphers, respectively, before outputting it. > -A pass phrase is prompted for. > +A pass phrase is requested. > If none of these options are specified, the key is written in plain text. > This means that using the > .Nm dsa > @@ -1824,7 +1824,7 @@ These options can only be used with PEM format output > files. > .It Fl in Ar file > The input file to read from, > or standard input if not specified. > -If the key is encrypted, a pass phrase will be prompted for. > +If the key is encrypted, a pass phrase will be requested. > .It Fl inform Cm der | pem | pvk > The input format. > .It Fl modulus > @@ -1835,7 +1835,7 @@ Do not output the encoded version of the key. > The output file to write to, > or standard output if not specified. > If any encryption options are set then a pass phrase will be > -prompted for. > +requested. > .It Fl outform Cm der | pem | pvk > The output format. > .It Fl passin Ar arg > @@ -1970,7 +1970,7 @@ at compile time. > Encrypt the private key with DES, triple DES, or > any other cipher supported by > .Nm openssl . > -A pass phrase is prompted for. > +A pass phrase is requested. > If none of these options is specified the key is written in plain text. > This means that using the > .Nm ec > @@ -1982,7 +1982,7 @@ These options can only be used with PEM format output > files. > .It Fl in Ar file > The input file to read a key from, > or standard input if not specified. > -If the key is encrypted a pass phrase will be prompted for. > +If the key is encrypted, a pass phrase will be requested. > .It Fl inform Cm der | pem > The input format. > .It Fl noout > @@ -1990,7 +1990,7 @@ Do not output the encoded version of the key. > .It Fl out Ar file > The output filename to write to, > or standard output if not specified. > -If any encryption options are set then a pass phrase will be prompted for. > +If any encryption options are set, then a pass phrase will be requested. > .It Fl outform Cm der | pem > The output format. > .It Fl param_enc Ar arg > @@ -2349,7 +2349,7 @@ The options are as follows: > .Xc > Encrypt the private key with the AES, CAMELLIA, DES, triple DES > or the IDEA ciphers, respectively, before outputting it. > -A pass phrase is prompted for. > +A pass phrase is requested. > If none of these options are specified, no encryption is used. > .It Fl out Ar file > The output file to write to, > @@ -3051,7 +3051,7 @@ The options are as follows: > .It Fl in Ar file > The input file to read from, > or standard input if not specified. > -If the key is encrypted, a pass phrase will be prompted for. > +If the key is encrypted, a pass phrase will be requested. > .It Fl inform Cm der | pem > The input format. > .It Fl nocrypt > @@ -3066,7 +3066,7 @@ section below for a detailed explanation of this option. > .It Fl out Ar file > The output file to write to, > or standard output if none is specified. > -If any encryption options are set, a pass phrase will be prompted for. > +If any encryption options are set, a pass phrase will be requested. > .It Fl outform Cm der | pem > The output format. > .It Fl passin Ar arg > @@ -3356,7 +3356,7 @@ is acceptable, such as > .It Fl in Ar file > The input file to read from, > or standard input if not specified. > -If the key is encrypted a pass phrase will be prompted for. > +If the key is encrypted, a pass phrase will be requested. > .It Fl inform Cm der | pem > The input format. > .It Fl noout > @@ -3364,8 +3364,8 @@ Do not output the encoded version of the key. > .It Fl out Ar file > The output file to write to, > or standard output if not specified. > -If any encryption options are set then a pass phrase > -will be prompted for. > +If any encryption options are set, then a pass phrase > +will be requested. > .It Fl outform Cm der | pem > The output format. > .It Fl passin Ar arg > @@ -3705,7 +3705,7 @@ Non-interactive mode. > .It Fl config Ar file > Specify an alternative configuration file. > .It Fl days Ar n > -Specify the number of days to certify the certificate for. > +Specify the number of days for which the certificate should be certified. > The default is 30 days. > Used with the > .Fl x509 > @@ -4127,7 +4127,7 @@ The options are as follows: > .It Fl aes128 | aes192 | aes256 | des | des3 > Encrypt the private key with the AES, DES, > or the triple DES ciphers, respectively, before outputting it. > -A pass phrase is prompted for. > +A pass phrase is requested. > If none of these options are specified, the key is written in plain text. > This means that using the > .Nm rsa > @@ -4140,7 +4140,7 @@ Check the consistency of an RSA private key. > .It Fl in Ar file > The input file to read from, > or standard input if not specified. > -If the key is encrypted, a pass phrase will be prompted for. > +If the key is encrypted, a pass phrase will be requested. > .It Fl inform Cm der | net | pem | pvk > The input format. > .It Fl noout > @@ -4358,8 +4358,8 @@ Attempt connections using IPv6 only. > .It Fl alpn Ar protocols > Enable the Application-Layer Protocol Negotiation. > .Ar protocols > -is a comma-separated list of protocol names that the client should advertise > -support for. > +is a comma-separated list of protocol names for which the client should > advertise > +support. > .It Fl bugs > Enable various workarounds for buggy implementations. > .It Fl CAfile Ar file > @@ -6799,7 +6799,7 @@ or the > options). > Normally, all extensions are retained. > .It Fl days Ar arg > -The number of days to make a certificate valid for. > +The duration of the validity of the certificate, in days. > The default is 30 days. > .It Fl extensions Ar section > The section to add certificate extensions from. > > diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1 > index 87a5d04aa4a..4d4b0d3660c 100644 > --- a/usr.bin/sed/sed.1 > +++ b/usr.bin/sed/sed.1 > @@ -427,7 +427,7 @@ string for the first instance of the regular expression > in the pattern space. > Any character other than backslash or newline can be used instead of > a slash to delimit the regular expression and the replacement. > -Also see the the section about > +Also see the section about > .Sx SED REGULAR EXPRESSIONS . > .Pp > An ampersand > > diff --git a/usr.bin/x99token/x99token.1 b/usr.bin/x99token/x99token.1 > index 1d004dea440..8a29f22ce99 100644 > --- a/usr.bin/x99token/x99token.1 > +++ b/usr.bin/x99token/x99token.1 > @@ -49,7 +49,7 @@ is not specified, > is in calculator mode. > In this mode you must enter the same PIN as used in the initialization step. > The PIN is used to decode the key read from the keyfile. > -Next you enter the challenge you have been presented with. > +Next, you enter the challenge which has been presented to you. > The > .Nm > program will provide you with a response to the challenge. > > diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 > index af7bd55226d..e5df2cd84bc 100644 > --- a/share/man/man8/rc.subr.8 > +++ b/share/man/man8/rc.subr.8 > @@ -44,7 +44,7 @@ naming policy: > .It > When possible, use the same name as the > .Nm daemon > -it is referring to. > +to which it is referring. > .It > It must follow > .Xr ksh 1 > > diff --git a/sys/dev/pci/drm/i915/display/intel_dpio_phy.c > b/sys/dev/pci/drm/i915/display/intel_dpio_phy.c > index 399a7edb456..cc5a1a3351f 100644 > --- a/sys/dev/pci/drm/i915/display/intel_dpio_phy.c > +++ b/sys/dev/pci/drm/i915/display/intel_dpio_phy.c > @@ -852,7 +852,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder, > } > > /* > - * This a a bit weird since generally CL > + * This is a bit weird; generally, CL > * matches the pipe, but here we need to > * pick the CL based on the port. > */ > diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3 > index 588fc32f234..fd8f9cb9b53 100644 > --- a/bin/csh/USD.doc/csh.3 > +++ b/bin/csh/USD.doc/csh.3 > @@ -45,9 +45,9 @@ scripts. > .NH 2 > Make > .PP > -It is important to first note what shell scripts are > +It is important to first note the things for which shell scripts are > .I not > -useful for. > +useful. > There is a program called > .I make > which is very useful for maintaining a group of related files > > diff --git a/share/man/man4/aps.4 b/share/man/man4/aps.4 > index d6cab32176a..6ba089140fc 100644 > --- a/share/man/man4/aps.4 > +++ b/share/man/man4/aps.4 > @@ -66,5 +66,5 @@ The Y axis on X40 and possibly other models seems to be > inverted. > It is unknown how to distinguish between different versions of the > accelerometer to compensate for this in the driver at this time. > .Pp > -As IBM provides no documentation, it is not known what all the available > -sensors are used for. > +As IBM provides no documentation, the purposes of all sensors are > +not understood. > > diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 > index 36207c39a1e..0d9b690969b 100644 > --- a/usr.sbin/smtpd/smtpd.conf.5 > +++ b/usr.sbin/smtpd/smtpd.conf.5 > @@ -362,7 +362,7 @@ Register a chain of filters > consisting of the filters listed from > .Ar filter-name . > Filters part of a filter chain are executed in order of declaration for > -each phase that they are registered for. > +each phase for which they are registered. > A filter chain may be used in place of a filter for any directive but > filter chains themselves. > .It Ic filter Ar filter-name Ic phase Ar phase-name Ic match Ar conditions > decision > > diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 > index 9873e3968d8..eddc25feb99 100644 > --- a/usr.bin/cvs/cvs.1 > +++ b/usr.bin/cvs/cvs.1 > @@ -1936,11 +1936,13 @@ This is traditionally a line-oriented editor, > such as > .Xr ex 1 . > .It Ev HOME > -Directory where the > +Directory in which > +.Nm > +should search for the > .Pa .cvsignore > and > .Pa .cvsrc > -files are searched for. > +files. > .It Ev TMPDIR > When set, this variable specifies the directory where temporary files > are to be created. > > diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1 > index fb47652444d..7fca7b29e14 100644 > --- a/usr.bin/mail/mail.1 > +++ b/usr.bin/mail/mail.1 > @@ -246,8 +246,7 @@ to print the first few lines of all messages. > You can use the > .Ic reply > command to > -set up a response to a message, sending it back to the > -person who it was from. > +set up a response to a message, sending it back to the sender. > Text you then type in, up to an end-of-file, > defines the contents of the message. > While you are composing a message, > > diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1 > index 8d915b87287..9fca3587b6f 100644 > --- a/usr.bin/patch/patch.1 > +++ b/usr.bin/patch/patch.1 > @@ -653,8 +653,8 @@ worked, but not always. > usually produces the correct results, even when it has to do a lot of > guessing. > However, the results are guaranteed to be correct only when the patch is > -applied to exactly the same version of the file that the patch was > -generated from. > +applied to exactly the same version of the file from which the patch was > +generated. > .Sh BUGS > Could be smarter about partial matches, excessively deviant offsets and > swapped code, but that would take an extra pass. > > diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1 > index 62530d08c59..7b0228d9d88 100644 > --- a/usr.bin/lock/lock.1 > +++ b/usr.bin/lock/lock.1 > @@ -76,7 +76,7 @@ is specified. > A password is not requested, instead the user's current login password > is used. > If the user has an S/Key key, they may also use it to unlock the terminal. > -To do this the user should enter > +To do this, the user should enter > .Qq s/key > at the unlock > .Dq Key: > ----- END DIFFS -----
