diff options
| author | Bernd Ahlers <bernd@cvs.openbsd.org> | 2010-01-11 09:43:09 +0000 |
|---|---|---|
| committer | Bernd Ahlers <bernd@cvs.openbsd.org> | 2010-01-11 09:43:09 +0000 |
| commit | 9a3a4a8ba8e962524335bfbbcf65b8672990289b (patch) | |
| tree | ee839c33b98c03af5978c56e370e5d3562cb0067 /usr.sbin/pkg_add | |
| parent | 218050fc1c8872a184201cf171493a3a8847bf4d (diff) | |
It's '-D dontmerge' now.
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 6 |
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 32cfd21690a..7acdebfd4c8 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.93 2010/01/10 22:44:00 espie Exp $ +.\" $OpenBSD: pkg_add.1,v 1.94 2010/01/11 09:43:08 bernd 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: January 10 2010 $ +.Dd $Mdocdate: January 11 2010 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -247,7 +247,7 @@ architecture recorded in package may not match. by default, if dependencies are too strict, .Nm will merge updates together to make sure everything stays in synch. -.Fl F Ar dontmerge +.Fl D Ar dontmerge disables that behavior. .It Ar downgrades don't filter out package versions older than what's currently installed. |