summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorPaul Janzen <pjanzen@cvs.openbsd.org>1999-03-11 01:35:08 +0000
committerPaul Janzen <pjanzen@cvs.openbsd.org>1999-03-11 01:35:08 +0000
commitb3ede3ba86748e4de8ce13bd3a82cd3fc08d205a (patch)
treecb73e5097f77ad8256469528fecb4358412745ba /share
parent181fc17fd16baad70e16a3715d9aff068f522021 (diff)
fix more comma splices that involve misuse of conjunctive adverbs
Diffstat (limited to 'share')
-rw-r--r--share/man/man4/ipsec.44
-rw-r--r--share/man/man4/mx.44
-rw-r--r--share/man/man4/options.46
-rw-r--r--share/man/man4/pn.44
-rw-r--r--share/man/man4/scsi.44
-rw-r--r--share/man/man4/tp.42
-rw-r--r--share/man/man4/tty.48
-rw-r--r--share/man/man5/fs.513
-rw-r--r--share/man/man5/netgroup.54
-rw-r--r--share/man/man7/mdoc.samples.76
-rw-r--r--share/man/man9/vm_map_inherit.94
11 files changed, 30 insertions, 29 deletions
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 27c01c829f8..d98fdba7113 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.18 1999/03/02 15:40:37 aaron Exp $
+.\" $OpenBSD: ipsec.4,v 1.19 1999/03/11 01:35:04 pjanzen Exp $
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
.\"
@@ -154,7 +154,7 @@ protect the outer
.Tn IP
header but furthermore it encrypts the payload data
with an encryption algorithm using a secret encryption key. Only the ones
-knowing this key can decrypt the data, hence confidentiality is provided. Both
+knowing this key can decrypt the data, thus providing confidentiality. Both
the algorithm and the encryption key are parameters of the SA.
.Pp
In order to identify a SA we need to have a unique name for it. This name is
diff --git a/share/man/man4/mx.4 b/share/man/man4/mx.4
index 0a35ca5e018..c5a97104b93 100644
--- a/share/man/man4/mx.4
+++ b/share/man/man4/mx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mx.4,v 1.2 1999/03/10 23:17:34 jason Exp $
+.\" $OpenBSD: mx.4,v 1.3 1999/03/11 01:35:04 pjanzen Exp $
.\"
.\" Copyright (c) 1997, 1998
.\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -52,7 +52,7 @@ fast ethernet card, and various other adapters.
.Pp
The Macronix chips use bus master DMA and are designed to be
DEC 'tulip' workalikes. The original 98713 had an MII bus for
-controlling an external PHY, however the 98713A and up use an
+controlling an external PHY; however, the 98713A and up use an
internal transceiver with NWAY support. The Macronix parts are
advertised as being register compatible with the DEC 21x4x
controllers. All of the Macronix controllers support both
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index a6bca8d8096..cd3535a2de4 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: options.4,v 1.26 1998/11/29 20:43:31 deraadt Exp $
+.\" $OpenBSD: options.4,v 1.27 1999/03/11 01:35:04 pjanzen Exp $
.\" $NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
.\"
.\" Copyright (c) 1998 Theo de Raadt
@@ -605,9 +605,9 @@ addresses are allowed to proceed. Connections from other addresses
trigger a mechanism for determining whether those are "friendly". The
list of friendly addresses is controlled by the
.Em TCK_NFRIENDS
-option, which is by default set to 16. Unfortunately, hosts behind a
+option, which is by default set to 16. Unfortunately, hosts behind
some stateful packet-filtering firewalls are unverifiable due to the
-nature of the mechanism and the filtering process, thus connections
+nature of the mechanism and the filtering process, so connections
from such hosts are not allowed to proceed.
.It Cd option TCP_SACK
Turns on selective acknowledgements. Additional information about
diff --git a/share/man/man4/pn.4 b/share/man/man4/pn.4
index 5e7952a2e22..e0a16e1fe69 100644
--- a/share/man/man4/pn.4
+++ b/share/man/man4/pn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pn.4,v 1.3 1999/03/10 23:17:34 jason Exp $
+.\" $OpenBSD: pn.4,v 1.4 1999/03/11 01:35:04 pjanzen Exp $
.\"
.\" Copyright (c) 1997, 1998
.\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -57,7 +57,7 @@ designs around the DEC 21x4x devices are now using the PNIC
instead. The chips support both an internal transceiver
and external transceivers via an MII bus. The Lite-On parts are
advertised as being register compatible with the DEC 21x4x
-controllers, however there are some differences in the way the
+controllers; however, there are some differences in the way the
EEPROM and MII access is done. The PNIC controllers support both
10 and 100Mbps speeds in either full or half duplex.
.Pp
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 1e98ae5b70f..405a68e0467 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: scsi.4,v 1.3 1998/11/17 23:29:35 aaron Exp $
+.\" $OpenBSD: scsi.4,v 1.4 1999/03/11 01:35:04 pjanzen Exp $
.\"
.Dd August 4, 1996
.Dt SD 4
@@ -115,7 +115,7 @@ types of adapters. The adapters take requests from the upper layers and do
all IO between the
.Em SCSI
bus and the system. The maximum size of a transfer is governed by the
-adapter. Most adapters can transfer 64KB in a single operation, however
+adapter. Most adapters can transfer 64KB in a single operation, and
many can transfer larger amounts.
.Sh TARGET MODE
Some adapters support
diff --git a/share/man/man4/tp.4 b/share/man/man4/tp.4
index 77e8ee12e43..30589cb98f3 100644
--- a/share/man/man4/tp.4
+++ b/share/man/man4/tp.4
@@ -693,7 +693,7 @@ do not use transport expedited data.
The problem is this:
the expedited data acknowledgment TPDU
has no field for conveying
-credit, thus it is not possible for a
+credit, so it is not possible for a
.Tn TP
entity to inform its peer
that "I received your expedited data but have no room to receive more."
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index d5edb7c40ee..316641b5418 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tty.4,v 1.9 1998/09/06 22:23:20 aaron Exp $
+.\" $OpenBSD: tty.4,v 1.10 1999/03/11 01:35:04 pjanzen Exp $
.\" $NetBSD: tty.4,v 1.4 1996/03/19 04:26:01 paulus Exp $
.\"
.\" Copyright (c) 1991, 1992, 1993
@@ -151,7 +151,7 @@ The operations described here
generally represent features common
across all
.Em "line disciplines" ,
-however some of these calls may not
+although some of these calls may not
make sense in conjunction with a line discipline other than
.Dv termios ,
and some may not be supported by the underlying
@@ -415,12 +415,12 @@ above in the integer pointed to by
.It Dv TIOCMBIS Fa int *state
The bits in the integer pointed to by
.Fa state
-represent modem state as described above, however the state is OR-ed
+represent modem state as described above; however, the state is OR-ed
in with the current state.
.It Dv TIOCMBIC Fa int *state
The bits in the integer pointed to by
.Fa state
-represent modem state as described above, however each bit which is on
+represent modem state as described above; however, each bit which is on
in
.Fa state
is cleared in the terminal.
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index fde8eac456b..a7c8e280471 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fs.5,v 1.4 1998/11/26 04:25:58 aaron Exp $
+.\" $OpenBSD: fs.5,v 1.5 1999/03/11 01:35:05 pjanzen Exp $
.\" $NetBSD: fs.5,v 1.3 1994/11/30 19:31:17 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -200,10 +200,11 @@ to determine block availability, aligned fragments are examined.
.Pp
The root inode is the root of the file system.
Inode 0 can't be used for normal purposes and
-historically bad blocks were linked to inode 1,
-thus the root inode is 2 (inode 1 is no longer used for
-this purpose, however numerous dump tapes make this
+historically bad blocks were linked to inode 1
+(inode 1 is no longer used for
+this purpose; however, numerous dump tapes make this
assumption, so we are stuck with it).
+Thus the root inode is 2.
.Pp
The
.Fa fs_minfree
@@ -214,7 +215,7 @@ The
.Fa fs_minfree
element
may be set to 0 if no reserve of free blocks is deemed necessary,
-however severe performance degradations will be observed if the
+although severe performance degradations will be observed if the
file system is run at greater than 95% full; thus the default
value of
.Fa fs_minfree
@@ -222,7 +223,7 @@ is 5%.
.Pp
Empirically the best trade-off between block fragmentation and
overall disk utilization at a loading of 95% comes with a
-fragmentation of 8, thus the default fragment size is an eighth
+fragmentation of 8; thus the default fragment size is an eighth
of the block size.
.Pp
The element
diff --git a/share/man/man5/netgroup.5 b/share/man/man5/netgroup.5
index 71b221b2cd6..4a1b2ef2118 100644
--- a/share/man/man5/netgroup.5
+++ b/share/man/man5/netgroup.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netgroup.5,v 1.5 1998/12/15 01:20:51 aaron Exp $
+.\" $OpenBSD: netgroup.5,v 1.6 1999/03/11 01:35:05 pjanzen Exp $
.\" $NetBSD: netgroup.5,v 1.3 1995/03/18 14:58:34 cgd Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -109,7 +109,7 @@ netgroup database
.Xr exports 5 ,
.Xr netgroup_mkdb 8
.Sh COMPATIBILITY
-The file format is compatible with that of various vendors, however it
+The file format is compatible with that of various vendors, although it
appears that not all vendors use an identical format.
.Sh BUGS
The interpretation of access restrictions based on the member tuples of a
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 9fbc35097f6..9242dc0f237 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mdoc.samples.7,v 1.8 1998/04/25 13:08:56 d Exp $
+.\" $OpenBSD: mdoc.samples.7,v 1.9 1999/03/11 01:35:05 pjanzen Exp $
.\" $NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -694,8 +694,8 @@ or discuss the optional
file
operand
.Ar target .
-In the verbal context, such detail can prevent confusion,
-however the
+In the verbal context, such detail can prevent confusion;
+however, the
.Nm \-mdoc
package
does not have a macro for an argument
diff --git a/share/man/man9/vm_map_inherit.9 b/share/man/man9/vm_map_inherit.9
index 5172ec3af06..c992edbeb82 100644
--- a/share/man/man9/vm_map_inherit.9
+++ b/share/man/man9/vm_map_inherit.9
@@ -1,5 +1,5 @@
.\"
-.\" $OpenBSD: vm_map_inherit.9,v 1.1 1996/03/11 13:04:52 mickey Exp $
+.\" $OpenBSD: vm_map_inherit.9,v 1.2 1999/03/11 01:35:06 pjanzen Exp $
.\"
.\" Mach Operating System
.\" Copyright (c) 1991,1990 Carnegie Mellon University
@@ -82,7 +82,7 @@ This region will be absent from child maps.
.B vm_map_inherit
specifies how a region of a virtual address space
is to be passed to child maps at the time of map creation.
-Inheritance is an attribute of virtual pages, thus the addresses
+Inheritance is an attribute of virtual pages; thus the addresses
and size of memory to be set will be rounded out to refer to
whole pages.