diff --git a/doc/tools/pkcs15-tool.1.xml b/doc/tools/pkcs15-tool.1.xml
index c928eee5..1a3fbd25 100644
--- a/doc/tools/pkcs15-tool.1.xml
+++ b/doc/tools/pkcs15-tool.1.xml
@@ -36,6 +36,39 @@
Options
+
+
+ aid
+
+ Specify in a hexadecimal form the AID of the on-card PKCS#15
+ application to be binded to.
+
+
+
+
+ pin,
+ pin
+
+ Specifies the auth id of the PIN to use for the
+ operation. This is useful with the --change-pin operation.
+
+
+
+
+
+
+ Changes a PIN or PUK stored on the token. User authentication
+ is required for this operation.
+
+
+
+
+ ,
+
+
+ Dump card objects.
+
+
,
@@ -55,14 +88,6 @@
List the on-card PKCS#15 applications
-
-
- cert,
- cert
-
- Reads the certificate with the given id.
-
-
,
@@ -71,23 +96,6 @@
Lists all certificates stored on the token.
-
-
- cert,
- data
-
- Reads data object with OID, applicationName or label.
-
-
-
-
-
-
-
- Verify PIN after card binding and before issuing any command
- (without 'auth-id' the first non-SO, non-Unblock PIN will be verified)
-
-
,
@@ -100,39 +108,6 @@
-
-
-
-
- Lists all PINs stored on the token. General information
- about each PIN is listed (eg. PIN name). Actual PIN values are not shown.
-
-
-
-
- ,
-
-
- Dump card objects.
-
-
-
-
-
-
- Changes a PIN or PUK stored on the token. User authentication
- is required for this operation.
-
-
-
-
- ,
-
-
- Unblocks a PIN stored on the token. Knowledge of the
- Pin Unblock Key (PUK) is required for this operation.
-
-
,
@@ -146,6 +121,14 @@
In such a case the option has to be used.
+
+
+
+
+ Lists all PINs stored on the token. General information
+ about each PIN is listed (eg. PIN name). Actual PIN values are not shown.
+
+
@@ -154,6 +137,40 @@
key name, id, algorithm and length information.
+
+
+
+
+ Disables token data caching.
+
+
+
+
+ filename,
+ filename
+
+ Specifies where key output should be written.
+ If filename already exists, it will be overwritten.
+ If this option is not given, keys will be printed to standard output.
+
+
+
+
+ cert,
+ cert
+
+ Reads the certificate with the given id.
+
+
+
+
+ cert,
+ data
+
+ Reads data object with OID, applicationName or label.
+
+
+
id
@@ -171,40 +188,6 @@
$HOME/.ssh/authorized_keys.
-
-
- filename,
- filename
-
- Specifies where key output should be written.
- If filename already exists, it will be overwritten.
- If this option is not given, keys will be printed to standard output.
-
-
-
-
-
-
- Disables token data caching.
-
-
-
-
- pin,
- pin
-
- Specifies the auth id of the PIN to use for the
- operation. This is useful with the --change-pin operation.
-
-
-
-
- aid
-
- Specify in a hexadecimal form the AID of the on-card PKCS#15
- application to be binded to.
-
-
num
@@ -214,6 +197,15 @@
reader number 0, the first reader in the system.
+
+
+ ,
+
+
+ Unblocks a PIN stored on the token. Knowledge of the
+ Pin Unblock Key (PUK) is required for this operation.
+
+
,
@@ -224,6 +216,14 @@
in the OpenSC library.
+
+
+
+
+ Verify PIN after card binding and before issuing any command
+ (without 'auth-id' the first non-SO, non-Unblock PIN will be verified)
+
+