summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/pax/cpio.16
-rw-r--r--bin/pax/pax.118
-rw-r--r--bin/pax/tar.112
3 files changed, 18 insertions, 18 deletions
diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index eda49c3c0b3..26c9acbac19 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cpio.1,v 1.19 2003/06/04 16:24:45 deraadt Exp $
+.\" $OpenBSD: cpio.1,v 1.20 2003/11/21 20:54:02 jmc Exp $
.\"
.\" Copyright (c) 1997 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: cpio.1,v 1.19 2003/06/04 16:24:45 deraadt Exp $
+.\" $OpenBSD: cpio.1,v 1.20 2003/11/21 20:54:02 jmc Exp $
.\"
.Dd February 16, 1997
.Dt CPIO 1
@@ -275,7 +275,7 @@ be wrong.
If the creation of an archive is prematurely terminated by a signal
or error,
.Nm
-may have only partially created the archive which may violate the
+may have only partially created the archive, which may violate the
specific archive format specification.
.Sh SEE ALSO
.Xr pax 1 ,
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index a8e2165e6b9..cdbf7008171 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pax.1,v 1.41 2003/10/22 20:08:45 jmc Exp $
+.\" $OpenBSD: pax.1,v 1.42 2003/11/21 20:54:02 jmc Exp $
.\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
@@ -523,7 +523,7 @@ Multiple characteristics can be concatenated within the same string
and multiple
.Fl p
options can be specified.
-The meaning of the specification characters are as follows:
+The meanings of the specification characters are as follows:
.Bl -tag -width 2n
.It Cm a
Do not preserve file access times.
@@ -601,7 +601,7 @@ operands according to the substitution expression
using the syntax of the
.Xr ed 1
utility regular expressions.
-The format of these regular expressions are:
+The format of these regular expressions is:
.Dl /old/new/[gp]
As in
.Xr ed 1 ,
@@ -630,7 +630,7 @@ The expressions are applied in the order they are specified on the
command line, terminating with the first successful substitution.
The optional trailing
.Cm g
-continues to apply the substitution expression to the pathname substring
+continues to apply the substitution expression to the pathname substring,
which starts with the first character following the end of the last successful
substitution.
The first unsuccessful substitution stops the operation of the
@@ -703,7 +703,7 @@ The extended cpio interchange format specified in the
standard.
The default blocksize for this format is 5120 bytes.
Inode and device information about a file (used for detecting file hard links
-by this format) which may be truncated by this format is detected by
+by this format), which may be truncated by this format, is detected by
.Nm
and is repaired.
.It Ar bcpio
@@ -712,21 +712,21 @@ The default blocksize for this format is 5120 bytes.
This format is not very portable and should not be used when other formats
are available.
Inode and device information about a file (used for detecting file hard links
-by this format) which may be truncated by this format is detected by
+by this format), which may be truncated by this format, is detected by
.Nm
and is repaired.
.It Ar sv4cpio
The System V release 4 cpio.
The default blocksize for this format is 5120 bytes.
Inode and device information about a file (used for detecting file hard links
-by this format) which may be truncated by this format is detected by
+by this format), which may be truncated by this format, is detected by
.Nm
and is repaired.
.It Ar sv4crc
The System V release 4 cpio with file crc checksums.
The default blocksize for this format is 5120 bytes.
Inode and device information about a file (used for detecting file hard links
-by this format) which may be truncated by this format is detected by
+by this format), which may be truncated by this format, is detected by
.Nm
and is repaired.
.It Ar tar
@@ -1159,7 +1159,7 @@ wrong.
.Pp
If the creation of an archive is prematurely terminated by a signal or error,
.Nm
-may have only partially created the archive which may violate the specific
+may have only partially created the archive, which may violate the specific
archive format specification.
.Pp
If while doing a
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index a9a2a74ae27..d560ec274c2 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tar.1,v 1.44 2003/06/04 16:24:45 deraadt Exp $
+.\" $OpenBSD: tar.1,v 1.45 2003/11/21 20:54:02 jmc Exp $
.\"
.\" Copyright (c) 1996 SigmaSoft, Th. Lockert
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: tar.1,v 1.44 2003/06/04 16:24:45 deraadt Exp $
+.\" $OpenBSD: tar.1,v 1.45 2003/11/21 20:54:02 jmc Exp $
.\"
.Dd February 7, 2001
.Dt TAR 1
@@ -144,7 +144,7 @@ operands according to the substitution expression
using the syntax of the
.Xr ed 1
utility regular expressions.
-The format of these regular expressions are:
+The format of these regular expressions is:
.Dl /old/new/[gp]
As in
.Xr ed 1 ,
@@ -166,7 +166,7 @@ The expressions are applied in the order they are specified on the
command line, terminating with the first successful substitution.
The optional trailing
.Cm g
-continues to apply the substitution expression to the pathname substring
+continues to apply the substitution expression to the pathname substring,
which starts with the first character following the end of the last successful
substitution.
The first unsuccessful substitution stops the operation of the
@@ -266,7 +266,7 @@ function
.Pp
Verbosely lists, but does not extract, all files ending in
.Pa .jpeg
-from an compressed archive named
+from a compressed archive named
.Pa backup.tar.gz .
Note that the glob pattern has been quoted to avoid expansion by the shell.
.Pp
@@ -308,7 +308,7 @@ be wrong.
If the creation of an archive is prematurely terminated by a signal
or error,
.Nm
-may have only partially created the archive which may violate the
+may have only partially created the archive, which may violate the
specific archive format specification.
.Sh SEE ALSO
.Xr cpio 1 ,