diff --git a/doc/tools/openpgp-tool.1.xml b/doc/tools/openpgp-tool.1.xml
index 380cac6b..ca59b89c 100644
--- a/doc/tools/openpgp-tool.1.xml
+++ b/doc/tools/openpgp-tool.1.xml
@@ -38,13 +38,66 @@
Options
+
+
+ arg
+
+
+ Delete key indicated by arg.
+ arg can be 1,
+ 2, 3, or
+ all.
+
+
+
+
+
+ arg,
+ arg
+
+
+ Dump private data object (DO)
+ indicated by arg.
+ arg can be in the form
+ x,
+ 10x, or
+ 010x
+ to access DO 010x,
+ where x is 1,
+ 2, 3, or
+ 4.
+
+
+
+
+
+ ,
+
+
+
+ Erase (i.e. reset) the card.
+
+
+
prog,
prog
- Execute the given program with data in environment variables.
+ Execute the given program with data in environment variables.
+
+
+
+
+
+ arg,
+ arg
+
+
+ Generate key with the ID given as arg.
+ arg can be one of 1,
+ 2, or 3.
@@ -54,16 +107,30 @@
- Print help message on screen.
+ Print help message on screen.
-
+ bitlength,
+ bitlength
- Print values in raw format, as they are stored on the card.
+ Specify the length of the key to be generated.
+ If not given, it defaults to 2048 bit.
+
+
+
+
+
+ string
+
+
+ The PIN text to verify. If set to
+ env:VARIABLE, the value of
+ the environment variable
+ VARIABLE is used.
@@ -72,7 +139,29 @@
- Print values in pretty format.
+ Print values in pretty format.
+
+
+
+
+
+
+
+
+ Print values in raw format, as they are stored on the card.
+
+
+
+
+
+ num,
+ num
+
+
+ Specify the reader to use. By default, the first
+ reader with a present card is used. If
+ num is an ATR, the
+ reader with a matching card will be chosen.
@@ -82,72 +171,17 @@
- Show card holder information.
+ Show card holder information.
-
-
- num,
- num
-
-
-
- Specify the reader to use. By default, the first
- reader with a present card is used. If
- num is an ATR, the
- reader with a matching card will be chosen.
-
-
-
-
pintype
-
-
+
Verify PIN (CHV1, CHV2 or CHV3).
-
-
-
-
-
-
- string
-
-
-
- The PIN text to verify. If set to
- env:VARIABLE, the value of
- the environment variable
- VARIABLE is used.
-
-
-
-
-
-
- ID,
- ID
-
-
-
- Generate key. Specify key ID (1, 2 or 3) to generate.
-
-
-
-
-
-
- bitlength,
- bitlength
-
-
-
- Length (default 2048 bit) of the key to be generated.
-
-
+
@@ -156,7 +190,7 @@
- Print the version of the utility and exit.
+ Print the version of the utility and exit.
@@ -166,7 +200,7 @@
- Verbose operation. Use several times to enable debug output.
+ Verbose operation. Use several times to enable debug output.
@@ -176,10 +210,9 @@
- Wait for a card to be inserted.
+ Wait for a card to be inserted.
-