various cleanup, including a fix from Daniel Dickman;

ok espie

4 files changed, 21 insertions, 20 deletions

diff --git a/usr.sbin/pkg_add/package.5 b/usr.sbin/pkg_add/package.5
index 9db2c72fd43..19796325432 100644
--- a/usr.sbin/pkg_add/package.5
+++ b/usr.sbin/pkg_add/package.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: package.5,v 1.8 2009/04/14 17:53:58 espie Exp $
+.\"	$OpenBSD: package.5,v 1.9 2010/01/11 10:16:20 jmc Exp $
 .\" Copyright (c) 2005-2006 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -12,7 +12,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: April 14 2009 $
+.Dd $Mdocdate: January 11 2010 $
 .Dt PACKAGE 5
 .Os
 .Sh NAME
@@ -87,14 +87,15 @@ will reconstitute the correct names behind the scenes.
 .Sh PACKAGE SIGNATURES
 All information within a package is checksummed, using SHA256 since
 .Ox 4.4 .
-During creation and creation, meta-information, such as file owners and
-permissions, are also checked: any important stuff that isn't recorded 
+During creation and installation, meta-information, such as file owners and
+permissions, are also checked: any important stuff that isn't recorded
 in the packing-list is an error.
 .Pp
-Packing-lists can be signed. If a signature is found, then it will be checked
+Packing-lists can be signed.
+If a signature is found, then it will be checked
 during installation, and failure to verify will prevent the package from
 installing correctly.
-Currently, only x509-style signatures are supported. 
+Currently, only x509-style signatures are supported.
 They rely on a certificate authority file being present as
 .Pa /etc/ssl/pkgca.pem
 and all signatures will be checked against it.
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 7acdebfd4c8..bdd9c347269 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.94 2010/01/11 09:43:08 bernd Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.95 2010/01/11 10:16:20 jmc Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -347,7 +347,7 @@ will refuse to replace packages as soon as it needs to run scripts that
 might fail
 .Po
 use
-.Fl F Ar update
+.Fl D Ar update
 to force the replacement
 .Pc ;
 .Nm
@@ -355,7 +355,7 @@ will also refuse to replace packages when the dependencies don't quite
 match
 .Po
 use
-.Fl F Ar updatedepends
+.Fl D Ar updatedepends
 to force the replacement
 .Pc .
 .It Fl s
@@ -557,7 +557,7 @@ When replacing packages, the procedure is slightly different.
 .It
 A check is made to determine if a similar package is already installed.
 If its signature is identical to that of the new package, no replacement
-is performed (unless -F installed is specified).
+is performed (unless -D installed is specified).
 .It
 A check is made to determine what old package(s) the new package(s) should
 replace, using conflicts.
@@ -573,8 +573,8 @@ update to those packages.
 .It
 A check is made to determine whether the old packages will be deleted without
 issue, and whether the new packages will install correctly.
-This includes refusing to run any code (unless -F update), and verifying
-that the new package still matches dependencies (unless -F updatedepends).
+This includes refusing to run any code (unless -D update), and verifying
+that the new package still matches dependencies (unless -D updatedepends).
 .It
 Shared libraries deserve special treatment: each shared library from the old
 packages that does no longer exist in the new packages, but that is required
@@ -621,7 +621,7 @@ package first, which may contain exceptions to these rules.
 This special package contains global information, such as packages that
 can be deleted because they're now part of base, or stem changes.
 .It
-Version matching occurs: unless -F downgrade, only packages with newer
+Version matching occurs: unless -D downgrade, only packages with newer
 versions will be considered as update candidates.
 Note that version matching is costly, thus
 .Ev PKG_PATH
diff --git a/usr.sbin/pkg_add/pkg_info b/usr.sbin/pkg_add/pkg_info
index 4a06772b756..9927bfb1d01 100644
--- a/usr.sbin/pkg_add/pkg_info
+++ b/usr.sbin/pkg_add/pkg_info
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_info,v 1.92 2010/01/10 21:27:59 espie Exp $
+# $OpenBSD: pkg_info,v 1.93 2010/01/11 10:16:20 jmc Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -407,7 +407,7 @@ sub print_info
 	}
 }
 
-set_usage('pkg_info [-AacCdfIKLMmPqRSstUv] [-F opt] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
+set_usage('pkg_info [-AaCcdfIKLMmPqRSstUv] [-E filename] [-e pkg-name] [-l str] [-Q query] [pkg-name] [...]');
 
 my %defines;
 my $locked;
diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1
index a5f877fa698..a3a7d4e2edd 100644
--- a/usr.sbin/pkg_add/pkg_info.1
+++ b/usr.sbin/pkg_add/pkg_info.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_info.1,v 1.36 2010/01/10 21:27:59 espie Exp $
+.\"	$OpenBSD: pkg_info.1,v 1.37 2010/01/11 10:16:20 jmc 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_INFO 1
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Sh SYNOPSIS
 .Nm pkg_info
 .Bk -words
-.Op Fl AacCdfIKLMmPqRSstUv
+.Op Fl AaCcdfIKLMmPqRSstUv
 .Op Fl E Ar filename
 .Op Fl e Ar pkg-name
 .Op Fl l Ar str
@@ -68,10 +68,10 @@ Show information for all currently installed packages,
 including internal packages.
 .It Fl a
 Show information for all currently installed packages.
-.It Fl c
-Show the one-line comment field for each package.
 .It Fl C
 Show certificate information for signed packages.
+.It Fl c
+Show the one-line comment field for each package.
 .It Fl d
 Show the long-description field for each package.
 .It Fl E Ar filename