summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Sturm <sturm@cvs.openbsd.org>2005-11-05 10:27:34 +0000
committerNikolay Sturm <sturm@cvs.openbsd.org>2005-11-05 10:27:34 +0000
commit73f619041bfc51ae1bec579e58708ce69866925f (patch)
treef55e794feeeb709bec2d1a67bd6ba9fc510a497b
parentbd8ac7f7ee2f73e467a3fc3b6a87e7556c4ffbad (diff)
-F conflicts does not really exist, so don't document it
ok espie@
-rw-r--r--usr.sbin/pkg_add/pkg_add.14
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index fd3a1b6b601..cc3cc139aff 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.54 2005/10/10 09:38:29 espie Exp $
+.\" $OpenBSD: pkg_add.1,v 1.55 2005/11/05 10:27:33 sturm Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -163,8 +163,6 @@ architecture recorded in package may not match.
.It Ar boguslibs
not all shared libraries are marked with @lib.
Inefficiently rescan package lists for non marked libraries.
-.It Ar conflicts
-package may conflict with other packages.
.It Ar installed
in update mode, reinstall an existing package with the same signature.
.It Ar kitchensink