summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorLandry Breuil <landry@cvs.openbsd.org>2008-01-26 16:38:53 +0000
committerLandry Breuil <landry@cvs.openbsd.org>2008-01-26 16:38:53 +0000
commit09c9b36ab22e6812cffb6ac2e59f016c1f293966 (patch)
tree96e4692d46c735fc2099dcdcddc95788024d0b94 /usr.sbin
parente713716b0db2e7dffdaaf5ee42c6eb45bcf8e03a (diff)
replace reference to deprecated @pkgcfl keyword by @conflict
ok espie@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/pkg_add.16
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 60baeaa2e1a..907fd843525 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_add.1,v 1.68 2007/11/05 13:09:13 jmc Exp $
+.\" $OpenBSD: pkg_add.1,v 1.69 2008/01/26 16:38:52 landry Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
.\" Jordan K. Hubbard
.\"
.\"
-.Dd $Mdocdate: November 5 2007 $
+.Dd $Mdocdate: January 26 2008 $
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -367,7 +367,7 @@ If it is,
installation is terminated.
.It
A check is made to determine if the package conflicts (from
-.Cm @pkgcfl
+.Cm @conflict
directives; see
.Xr pkg_create 1 )
with a package already recorded as installed.