From d07dfe80efdb7969c7a4c2b3a22629836bd2c87e Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Wed, 21 Feb 2001 20:02:29 +0000
Subject: [PATCH] Change manpage style slightly.

---
 hashsum.1 |  2 +-
 key.1     | 23 ++++++++++++++++-------
 keyring.5 |  2 +-
 pixie.1   |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/hashsum.1 b/hashsum.1
index d7598a9..96e19ae 100644
--- a/hashsum.1
+++ b/hashsum.1
@@ -7,7 +7,7 @@
 ..
 .ie t .ds o \(bu
 .el .ds o o
-.TH hashsum 1 "29 July 2000" Catacomb
+.TH hashsum 1 "29 July 2000" "Straylight/Edgeware" "Catacomb cryptographic library"
 .SH NAME
 hashsum \- compute and verify cryptographic checksums of files
 .SH SYNOPSIS
diff --git a/key.1 b/key.1
index 9b0a843..b4252df 100644
--- a/key.1
+++ b/key.1
@@ -11,7 +11,7 @@
 .  ds us _
 .  ds se
 .\}
-.TH key 1 "5 June 1999" Catacomb
+.TH key 1 "5 June 1999" "Straylight/Edgeware" "Catacomb cryptographic library"
 .SH NAME
 key \- simple key management system
 .SH SYNOPSIS
@@ -25,14 +25,14 @@ where
 is one of:
 .PP
 .B add
-.RB [ \-lqLS ]
+.RB [ \-lqrLS ]
 .RB [ \-a
 .IR alg ]
 .RB [ \-b | \-B
 .IR bits ]
 .RB [ \-p
 .IR param ]
-.RB [ \-r
+.RB [ \-R
 .IR tag ]
 .br
 \h'8n'
@@ -101,11 +101,12 @@ Before the command name,
 .I "global options"
 may be given.  The following global options are supported:
 .TP
-.B "\-h, \-\-help"
+.BR "\-h, \-\-help " [ \fIcommand ]
 Writes a brief summary of
 .BR key 's
 various options to standard output, and
-returns a successful exit status.
+returns a successful exit status.  With a command name, gives help on
+that command.
 .TP
 .B "\-v, \-\-version"
 Writes the program's version number to standard output, and returns a
@@ -272,7 +273,12 @@ Sets a comment for the key.  The default is not to attach a comment.
 Selects a tag string for the key.  The default is not to set a tag.  It
 is an error to select a tag which already exists.
 .TP
-.BI "\-r, \-\-rand-id " tag
+.BI "\-r, \-\-retag"
+If a
+.B \-t
+option is given, remove this tag from any key which already has it.
+.TP
+.BI "\-R, \-\-rand-id " tag
 Selects the key to use for the random number generator.  Catacomb's
 random number generator can be
 .IR keyed ,
@@ -544,7 +550,10 @@ to expire keys rather than deleting them.
 Sets, deletes or changes the tag attached to a key.  The first tag or
 keyid names the key to be modified; the second, if present specifies the
 new tag to be set.  If no second argument is given, the existing tag, if
-any, is removed and no new tag is set.
+any, is removed and no new tag is set.  It is an error to set a tag
+which already exists on another key, unless you give the
+.B \-r
+option, which removes the tag first.
 .SS "setattr"
 Attaches attributes to a key.  The key to which the attributes should be
 attached is given by its
diff --git a/keyring.5 b/keyring.5
index 02cae53..1e99c2e 100644
--- a/keyring.5
+++ b/keyring.5
@@ -1,5 +1,5 @@
 .\" -*-nroff-*-
-.TH keyring 5 "5 June 1999" Catacomb
+.TH keyring 5 "5 June 1999" "Straylight/Edgeware" "Catacomb cryptographic library"
 .SH NAME
 keyring \- description of Catacomb keyring files
 .SH DESCRIPTION
diff --git a/pixie.1 b/pixie.1
index 38f542c..1b73db9 100644
--- a/pixie.1
+++ b/pixie.1
@@ -8,7 +8,7 @@
 .ie t .ds o \(bu
 .el .ds o o
 .
-.TH pixie 1 "14 October 1999" Catacomb
+.TH pixie 1 "14 October 1999" "Straylight/Edgeware" "Catacomb cryptographic library"
 .SH "NAME"
 pixie \- Catacomb passphrase pixie
 .SH "SYNOPSIS"
-- 
2.11.0