summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2011-08-26 13:00:42 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2011-08-26 13:00:42 +0000
commitd3b9e364296e721cf0570a292d215d2300780ff0 (patch)
tree4857bd12b448041cbea679fbf11506e1fdf48b63 /usr.sbin/pkg_add
parent7d0c27e57c5433127a6b066490225462a0ca43ef (diff)
remove one more reference to pkg_merge; ok espie
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/package.54
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/package.5 b/usr.sbin/pkg_add/package.5
index 7231d01666b..141ac8f13ac 100644
--- a/usr.sbin/pkg_add/package.5
+++ b/usr.sbin/pkg_add/package.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: package.5,v 1.10 2011/08/26 08:46:09 espie Exp $
+.\" $OpenBSD: package.5,v 1.11 2011/08/26 13:00:41 jmc Exp $
.\" Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
@@ -25,8 +25,6 @@ Binary packages for
.Ox
can be created using
.Xr pkg_create 1
-and
-.Xr pkg_merge 1 ,
and are usually manipulated using
.Xr pkg_add 1 ,
.Xr pkg_mklocatedb 1 ,