aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-08-31 17:46:55 +0100
committerDavid Howells <dhowells@redhat.com>2011-08-31 17:46:55 +0100
commit3bed09463eb231069c41885da2ffd49ee0039cb9 (patch)
tree54eb73896ed2303893086f38edac3c0b5eb55c44
parentd1d0eeb90b8fc5eb322a53e2c336117cd318bcd0 (diff)
downloadkeyutils-3bed09463eb231069c41885da2ffd49ee0039cb9.tar.gz
DOC: Fix unlink entry in keyctl.1 command list
Fix the unlink entry in the keyctl.1 manual page command list to indicate that the keyring is optional. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--keyctl.12
-rw-r--r--keyutils.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/keyctl.1 b/keyctl.1
index aac69bc..9185167 100644
--- a/keyctl.1
+++ b/keyctl.1
@@ -35,7 +35,7 @@ keyctl - Key management facility control
.br
\fBkeyctl\fR link <key> <keyring>
.br
-\fBkeyctl\fR unlink <key> <keyring>
+\fBkeyctl\fR unlink <key> [<keyring>]
.br
\fBkeyctl\fR search <keyring> <type> <desc> [<dest_keyring>]
.br
diff --git a/keyutils.spec b/keyutils.spec
index 82e6b0d..64c8d22 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Wed Aug 14 2011 David Howells <dhowells@redhat.com>
+- Adjust the manual page for 'keyctl unlink' to show keyring is optional.
+
* Thu Aug 11 2011 David Howells <dhowells@redhat.com> - 1.5.3-1
- Make the keyutils rpm depend on the same keyutils-libs rpm version.