From: jmc <jmc@openbsd.org>
Date: Wed, 7 Oct 2015 17:52:38 +0000 (+0000)
Subject: "..." implies optional, so no need for []; from michael reed
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fd86ef36c9a48fce73d01f22fb1628fdb192b9d0;p=openbsd

"..." implies optional, so no need for []; from michael reed
---

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index dd314880ab8..e18f1a14d67 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.87 2015/06/30 19:20:08 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.88 2015/10/07 17:52:38 jmc Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -107,7 +107,7 @@ sub handle_options
 	my $state = shift;
 	$state->SUPER::handle_options('ruUzl:A:P:',
 	    '[-acinqrsUuvxz] [-A arch] [-B pkg-destdir] [-D name[=value]]',
-	    '[-L localbase] [-l file] [-P type] pkg-name [...]');
+	    '[-L localbase] [-l file] [-P type] pkg-name ...');
 
 	$state->{arch} = $state->opt('A');
 
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
index 96b778ea9bd..0ff537eaae9 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgDelete.pm,v 1.34 2014/11/29 10:42:51 espie Exp $
+# $OpenBSD: PkgDelete.pm,v 1.35 2015/10/07 17:52:38 jmc Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -101,7 +101,7 @@ sub handle_options
 {
 	my $state = shift;
 	$state->SUPER::handle_options('X',
-	    '[-acimnqsvXx] [-B pkg-destdir] [-D name[=value]] pkg-name [...]');
+	    '[-acimnqsvXx] [-B pkg-destdir] [-D name[=value]] [pkg-name ...]');
 
 	my $base = $state->opt('B') // $ENV{'PKG_DESTDIR'} // '';
 	if ($base ne '') {
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
index 7fa35ae6870..8540592c3a1 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgInfo.pm,v 1.35 2015/04/06 12:19:35 espie Exp $
+# $OpenBSD: PkgInfo.pm,v 1.36 2015/10/07 17:52:38 jmc Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -559,7 +559,7 @@ sub parse_and_run
 	$state->{no_exports} = 1;
 	$state->handle_options('cCdfF:hIKLmPQ:qr:RsSUe:E:Ml:aAt',
 	    '[-AaCcdfIKLMmPqRSstUv] [-D nolock][-E filename] [-e pkg-name] ',
-	    '[-l str] [-Q query] [-r pkgspec] [pkg-name] [...]');
+	    '[-l str] [-Q query] [-r pkgspec] [pkg-name ...]');
 
 	if ($state->opt('r')) {
 
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 58d2bfcb27a..5f71bf8cce5 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.132 2015/04/16 20:01:39 jmc Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.133 2015/10/07 17:52:38 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: April 16 2015 $
+.Dd $Mdocdate: October 7 2015 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -31,7 +31,7 @@
 .Op Fl L Ar localbase
 .Op Fl l Ar file
 .Op Fl P Ar type
-.Ar pkg-name Op Ar ...
+.Ar pkg-name ...
 .Ek
 .Sh DESCRIPTION
 The
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index 2569e299018..c3e52765f5d 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.50 2015/04/08 17:25:58 millert Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.51 2015/10/07 17:52:38 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: April 8 2015 $
+.Dd $Mdocdate: October 7 2015 $
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@
 .Op Fl acIimnqsvXx
 .Op Fl B Ar pkg-destdir
 .Op Fl D Ar name Ns Op = Ns Ar value
-.Ar pkg-name Op Ar ...
+.Op Ar pkg-name ...
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1
index 0f343be136d..3a111eb9d42 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.50 2014/09/08 01:27:55 schwarze Exp $
+.\"	$OpenBSD: pkg_info.1,v 1.51 2015/10/07 17:52:38 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: September 8 2014 $
+.Dd $Mdocdate: October 7 2015 $
 .Dt PKG_INFO 1
 .Os
 .Sh NAME
@@ -30,8 +30,7 @@
 .Op Fl l Ar str
 .Op Fl Q Ar query
 .Op Fl r Ar pkgspec
-.Op Ar pkg-name
-.Op Ar ...
+.Op Ar pkg-name ...
 .Ek
 .Sh DESCRIPTION
 The