remove details and put them as text

This commit is contained in:
Klas Lindfors
2014-02-10 13:48:51 +01:00
parent c7b82cf889
commit 6472b28a1b
2 changed files with 8 additions and 5 deletions
-1
View File
@@ -52,7 +52,6 @@ yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \
$(top_srcdir)/configure.ac $(top_srcdir)/configure.ac
$(HELP2MAN) --no-info \ $(HELP2MAN) --no-info \
--name="Yubico PIV tool" \ --name="Yubico PIV tool" \
--help-option="--detailed-help" \
--output=$@ $(top_builddir)/yubico-piv-tool$(EXEEXT) --output=$@ $(top_builddir)/yubico-piv-tool$(EXEEXT)
# Maintainer rules. # Maintainer rules.
+8 -4
View File
@@ -30,10 +30,12 @@ option "key" k "Authentication key to use" string optional default="010203040506
option "action" a "Action to take" values="version","generate","set-mgm-key", option "action" a "Action to take" values="version","generate","set-mgm-key",
"reset","pin-retries","import-key","import-certificate","set-chuid", "reset","pin-retries","import-key","import-certificate","set-chuid",
"request-certificate","verify-pin","change-pin","change-puk","unblock-pin", "request-certificate","verify-pin","change-pin","change-puk","unblock-pin",
"selfsign-certificate" enum multiple details=" "selfsign-certificate" enum multiple
text "
Multiple actions may be given at once and will be executed in order Multiple actions may be given at once and will be executed in order
for example --action=verify-pin --action=request-certificate\n" for example --action=verify-pin --action=request-certificate\n"
option "slot" s "What key slot to operate on" values="9a","9c","9d","9e" enum optional details=" option "slot" s "What key slot to operate on" values="9a","9c","9d","9e" enum optional
text "
9a is for PIV Authentication 9a is for PIV Authentication
9c is for Digital Signature (PIN always checked) 9c is for Digital Signature (PIN always checked)
9d is for Key Management 9d is for Key Management
@@ -46,7 +48,9 @@ option "input" i "Filename to use as input, - for stdin" string optional default
option "output" o "Filename to use as output, - for stdout" string optional default="-" option "output" o "Filename to use as output, - for stdout" string optional default="-"
option "key-format" K "Format of the key being read/written" values="PEM","PKCS12" enum optional default="PEM" option "key-format" K "Format of the key being read/written" values="PEM","PKCS12" enum optional default="PEM"
option "password" p "Password for decryption of private key file" string optional option "password" p "Password for decryption of private key file" string optional
option "subject" S "The subject to use for certificate request" string optional details=" option "subject" S "The subject to use for certificate request" string optional
The subject must be written as /CN=host.example.com/OU=test/O=example.com/\n" text "
The subject must be written as:
/CN=host.example.com/OU=test/O=example.com/\n"
option "pin" P "Pin/puk code for verification" string optional option "pin" P "Pin/puk code for verification" string optional
option "new-pin" N "New pin/puk code for changing" string optional dependon="pin" option "new-pin" N "New pin/puk code for changing" string optional dependon="pin"