More changes. Still embryonic.

[u/mdw/catacomb] / keyring.5

diff --git a/keyring.5 b/keyring.5
index a2eb7ae..02cae53 100644 (file)
--- a/keyring.5
+++ b/keyring.5
@@ -5,7 +5,7 @@ keyring \- description of Catacomb keyring files
 .SH DESCRIPTION
 Keyring files are line-oriented text files.  It is recommended that
 programs use only the provided interface for reading and modifying
 .SH DESCRIPTION
 Keyring files are line-oriented text files.  It is recommended that
 programs use only the provided interface for reading and modifying

-keyring files, for consistency of locking and representation: this
+keyring files for consistency of locking and representation: this

 description is provided for the benefit of administrators attempting to
 understand or repair keyring files.
 .PP
 description is provided for the benefit of administrators attempting to
 understand or repair keyring files.
 .PP


@@ -15,9 +15,9 @@ character is
 are ignored, but are not written back to the file.  Thus, the comment
 facility is not particularly useful.
 .PP
 are ignored, but are not written back to the file.  Thus, the comment
 facility is not particularly useful.
 .PP

-Each other line describes a key.  Key descriptions consist of between 4
-and six whitespace-separated fields.  The final comment field may
-contain whitespace characters.  The fields are, in order:
+Each remaining line describes a key.  Key descriptions consist of
+between 4 and six whitespace-separated fields.  The final comment field
+may contain whitespace characters.  The fields are, in order:

 .TP
 .B type
 The key's type string, set when the key was created.
 .TP
 .B type
 The key's type string, set when the key was created.


@@ -26,9 +26,10 @@ The key's type string, set when the key was created.
 The actual key, Base64 encoded, as described in RFC2045.
 .TP
 .B "expiry time"
 The actual key, Base64 encoded, as described in RFC2045.
 .TP
 .B "expiry time"

-The time at which this key expires, represented as an integer number of
-seconds since 1970-01-01 00:00:00 UTC, not counting leap seconds.  The
-special value \-1 signifies that this key never expires.
+The time at which this key expires, represented as an integer, in the
+format returned by the
+.BR time (2)
+system call.

 .TP
 .B "deletion time"
 The time at which this key should be deleted, using the same
 .TP
 .B "deletion time"
 The time at which this key should be deleted, using the same