From 7477c83e150ace0df91df92bc935ccaebddf8dd8 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 9 Aug 2017 15:20:43 +0200 Subject: [PATCH] Add missing documentation of the default format for commands. Reviewed-by: Andy Polyakov Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4122) --- doc/man1/crl.pod | 4 ++-- doc/man1/crl2pkcs7.pod | 4 ++-- doc/man1/dhparam.pod | 4 ++-- doc/man1/dsa.pod | 4 ++-- doc/man1/dsaparam.pod | 4 ++-- doc/man1/ec.pod | 4 ++-- doc/man1/ecparam.pod | 4 ++-- doc/man1/genpkey.pod | 2 +- doc/man1/pkcs7.pod | 4 ++-- doc/man1/pkcs8.pod | 6 ++++-- doc/man1/pkey.pod | 6 +++--- doc/man1/req.pod | 4 ++-- doc/man1/rsa.pod | 4 ++-- doc/man1/sess_id.pod | 4 ++-- doc/man1/x509.pod | 6 +++--- 15 files changed, 33 insertions(+), 31 deletions(-) diff --git a/doc/man1/crl.pod b/doc/man1/crl.pod index 14150fd943..9d1dcf4909 100644 --- a/doc/man1/crl.pod +++ b/doc/man1/crl.pod @@ -42,8 +42,8 @@ the DER form with header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/crl2pkcs7.pod b/doc/man1/crl2pkcs7.pod index 11d7cc942b..3bf1facfec 100644 --- a/doc/man1/crl2pkcs7.pod +++ b/doc/man1/crl2pkcs7.pod @@ -33,13 +33,13 @@ Print out a usage message. This specifies the CRL input format. B format is DER encoded CRL structure.B (the default) is a base64 encoded version of -the DER form with header and footer lines. +the DER form with header and footer lines. The default format is PEM. =item B<-outform DER|PEM> This specifies the PKCS#7 structure output format. B format is DER encoded PKCS#7 structure.B (the default) is a base64 encoded version of -the DER form with header and footer lines. +the DER form with header and footer lines. The default format is PEM. =item B<-in filename> diff --git a/doc/man1/dhparam.pod b/doc/man1/dhparam.pod index 852469dbbd..2395aa1bb6 100644 --- a/doc/man1/dhparam.pod +++ b/doc/man1/dhparam.pod @@ -45,8 +45,8 @@ additional header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in> I diff --git a/doc/man1/dsa.pod b/doc/man1/dsa.pod index 2f8df0c3eb..523c533a09 100644 --- a/doc/man1/dsa.pod +++ b/doc/man1/dsa.pod @@ -62,8 +62,8 @@ PKCS#8 format is also accepted. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/dsaparam.pod b/doc/man1/dsaparam.pod index 4c07463341..f97a673471 100644 --- a/doc/man1/dsaparam.pod +++ b/doc/man1/dsaparam.pod @@ -42,8 +42,8 @@ of the B format base64 encoded with additional header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/ec.pod b/doc/man1/ec.pod index 99cf9d0fda..f386877b61 100644 --- a/doc/man1/ec.pod +++ b/doc/man1/ec.pod @@ -55,8 +55,8 @@ PKCS#8 format is also accepted. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/ecparam.pod b/doc/man1/ecparam.pod index 3f76dc0a82..ecafedca59 100644 --- a/doc/man1/ecparam.pod +++ b/doc/man1/ecparam.pod @@ -47,8 +47,8 @@ header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/genpkey.pod b/doc/man1/genpkey.pod index 50a7b1bb6d..8e22ab22ee 100644 --- a/doc/man1/genpkey.pod +++ b/doc/man1/genpkey.pod @@ -38,7 +38,7 @@ standard output is used. =item B<-outform DER|PEM> -This specifies the output format DER or PEM. +This specifies the output format DER or PEM. The default format is PEM. =item B<-pass arg> diff --git a/doc/man1/pkcs7.pod b/doc/man1/pkcs7.pod index 184ac142e2..a5f96ace9c 100644 --- a/doc/man1/pkcs7.pod +++ b/doc/man1/pkcs7.pod @@ -37,8 +37,8 @@ the DER form with header and footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/pkcs8.pod b/doc/man1/pkcs8.pod index 42e2468a27..9d1dd3130f 100644 --- a/doc/man1/pkcs8.pod +++ b/doc/man1/pkcs8.pod @@ -52,11 +52,13 @@ reversed: it reads a private key and writes a PKCS#8 format key. =item B<-inform DER|PEM> -This specifies the input format: see L for more details. +This specifies the input format: see L for more details. The default +format is PEM. =item B<-outform DER|PEM> -This specifies the output format: see L for more details. +This specifies the output format: see L for more details. The default +format is PEM. =item B<-traditional> diff --git a/doc/man1/pkey.pod b/doc/man1/pkey.pod index a09736d01e..4d37c92c5b 100644 --- a/doc/man1/pkey.pod +++ b/doc/man1/pkey.pod @@ -38,12 +38,12 @@ Print out a usage message. =item B<-inform DER|PEM> -This specifies the input format DER or PEM. +This specifies the input format DER or PEM. The default format is PEM. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/req.pod b/doc/man1/req.pod index e15434a1bb..aec2ada807 100644 --- a/doc/man1/req.pod +++ b/doc/man1/req.pod @@ -71,8 +71,8 @@ footer lines. =item B<-outform DER|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/rsa.pod b/doc/man1/rsa.pod index 6fce46cb59..ee504e6525 100644 --- a/doc/man1/rsa.pod +++ b/doc/man1/rsa.pod @@ -63,8 +63,8 @@ section. =item B<-outform DER|NET|PEM> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> diff --git a/doc/man1/sess_id.pod b/doc/man1/sess_id.pod index 5084b3f467..ca3dd7ed58 100644 --- a/doc/man1/sess_id.pod +++ b/doc/man1/sess_id.pod @@ -42,8 +42,8 @@ format base64 encoded with additional header and footer lines. =item B<-outform DER|PEM|NSS> This specifies the output format. The B and B options have the same meaning -as the B<-inform> option. The B option outputs the session id and the master key -in NSS keylog format. +and default as the B<-inform> option. The B option outputs the session id and +the master key in NSS keylog format. =item B<-in filename> diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod index 5b2fc0e57f..d31460b5dc 100644 --- a/doc/man1/x509.pod +++ b/doc/man1/x509.pod @@ -92,12 +92,12 @@ certificate but this can change if other options such as B<-req> are present. The DER format is the DER encoding of the certificate and PEM is the base64 encoding of the DER encoding with header and footer lines added. The NET option is an obscure Netscape server format that is now -obsolete. +obsolete. The default format is PEM. =item B<-outform DER|PEM|NET> -This specifies the output format, the options have the same meaning as the -B<-inform> option. +This specifies the output format, the options have the same meaning and default +as the B<-inform> option. =item B<-in filename> -- 2.25.1