From 5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 1 Sep 2011 15:04:28 -0500
Subject: pacman-key help and documentation cleanup

We were using the mystical [<foobar>] options which is some sort of
cross between a <required> argument and an [optional] one. Remove this
madness and do some other general cleanup/consistency work in the
manpage.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 scripts/pacman-key.sh.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index b469fd3a..9bb8182a 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -55,12 +55,12 @@ usage() {
 	printf "$(gettext "Manage pacman\'s list of trusted keys")\n"
 	echo
 	echo "$(gettext "Options:")"
-	echo "$(gettext "  -a, --add [<file(s)>]     Add the specified keys (empty for stdin)")"
+	echo "$(gettext "  -a, --add [file(s)]       Add the specified keys (empty for stdin)")"
 	echo "$(gettext "  -d, --delete <keyid(s)>   Remove the specified keyids")"
-	echo "$(gettext "  -e, --export [<keyid(s)>] Export the specified or all keyids")"
-	echo "$(gettext "  -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids")"
+	echo "$(gettext "  -e, --export [keyid(s)]   Export the specified or all keyids")"
+	echo "$(gettext "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids")"
 	echo "$(gettext "  -h, --help                Show this help message and exit")"
-	echo "$(gettext "  -l, --list-keys [<keyid(s)>] List the specified or all keys")"
+	echo "$(gettext "  -l, --list-keys [keyid(s)] List the specified or all keys")"
 	echo "$(gettext "  -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids")"
 	echo "$(gettext "  -u, --updatedb            Update the trustdb of pacman")"
 	echo "$(gettext "  -v, --verify <signature>  Verify the file specified by the signature")"
@@ -73,9 +73,9 @@ usage() {
 	echo "$(gettext "  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)")"
 	echo "$(gettext "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")"
 	echo "$(gettext "  --init                    Ensure the keyring is properly initialized")"
-	echo "$(gettext "  --list-sigs [<keyid(s)>]  List keys and their signatures")"
+	echo "$(gettext "  --list-sigs [keyid(s)]    List keys and their signatures")"
 	echo "$(gettext "  --lsign-key <keyid>       Locally sign the specified keyid")"
-	printf "$(gettext "  --populate [<keyring(s)]  Reload the default keys from the (given) keyrings\n\
+	printf "$(gettext "  --populate [keyring(s)] Reload the default keys from the (given) keyrings\n\
                             in '%s'")\n" "@pkgdatadir@/keyrings"
 }
 
-- 
cgit v1.2.3-70-g09d2