summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_merge.1
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pkg_add/pkg_merge.1')
-rw-r--r--usr.sbin/pkg_add/pkg_merge.17
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg_merge.1 b/usr.sbin/pkg_add/pkg_merge.1
index 6964cea6f3b..ec0265241d9 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.5 2007/05/31 19:20:26 jmc Exp $
+.\" $OpenBSD: pkg_merge.1,v 1.6 2009/10/22 12:35:53 sobrado Exp $
.\" Copyright (c) 2005 Marc Espie <espie@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 22 2009 $
.Dt PKG_MERGE 1
.Os
.Sh NAME
@@ -64,7 +64,8 @@ get shared in the fat package.
An
.Ox
package is a tarball conforming to the ustar specification in
-Single Unix.
+Single
+.Ux .
Normal packages always start with a
.Pa +CONTENTS
file (packing-list).