summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-08-30 10:22:36 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-08-30 10:22:36 +0000
commit57ec2b488c679f603a31090944ee50de0af3c8bf (patch)
tree7992a259b2f91edcebe4047919caa014fcb32a95 /usr.sbin
parentb19a28611167f41ee6e9b216fd3c517a95c8cb3d (diff)
U[Ss]tar -> ustar, as per posix and our pax docs;
from ross l richardson (pr #5216)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/package.510
-rw-r--r--usr.sbin/pkg_add/pkg_merge.14
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/package.5 b/usr.sbin/pkg_add/package.5
index de7cd697f74..f99f08a9f01 100644
--- a/usr.sbin/pkg_add/package.5
+++ b/usr.sbin/pkg_add/package.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: package.5,v 1.3 2006/01/13 11:50:31 espie Exp $
+.\" $OpenBSD: package.5,v 1.4 2006/08/30 10:22:35 jmc Exp $
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@ and are usually manipulated using
or
.Xr pkg_info 1 .
.Pp
-The basic underlying format is an archive following the UStar specification
+The basic underlying format is an archive following the ustar specification
that can be handled with
.Xr tar 1
and compressed using
@@ -73,7 +73,7 @@ This table of contents is always followed by a few special files, some of
which are optional: the package description (+DESC), an installation script
(+INSTALL), a display message (+MESSAGE), etc.
.Pp
-The Ustar format has some limitations with respect to file names.
+The ustar format has some limitations with respect to file names.
Accordingly, the package tools will replace very long names with
.Pa LongName#n
and long link names with
@@ -84,7 +84,7 @@ will reconstitute the correct names behind the scenes.
The
.Xr pkg_merge 1
command can create fat packages, which coalesce several normal packages in
-a single Ustar archive, by interleaving their contents.
+a single ustar archive, by interleaving their contents.
.Pp
Other tools, such as
.Xr pkg_add 1 ,
@@ -113,7 +113,7 @@ for a file belonging to the second package.
.Xr packages 7 ,
.Xr packages-specs 7
.Sh STANDARDS
-Packages are valid gzip'ed Ustar archives that can be extracted using
+Packages are valid gzip'ed ustar archives that can be extracted using
.Xr tar 1 .
In particular, hardlink names should be valid, and all items will
extract to different names.
diff --git a/usr.sbin/pkg_add/pkg_merge.1 b/usr.sbin/pkg_add/pkg_merge.1
index f3bdb728f0e..42116177a68 100644
--- a/usr.sbin/pkg_add/pkg_merge.1
+++ b/usr.sbin/pkg_add/pkg_merge.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_merge.1,v 1.3 2005/10/10 09:38:29 espie Exp $
+.\" $OpenBSD: pkg_merge.1,v 1.4 2006/08/30 10:22:35 jmc Exp $
.\" Copyright (c) 2005 Marc Espie <espie@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -63,7 +63,7 @@ get shared in the fat package.
.Sh FILE FORMATS
An
.Ox
-package is a tarball conforming to the Ustar specification in
+package is a tarball conforming to the ustar specification in
Single Unix.
Normal packages always start with a
.Pa +CONTENTS