Change DH parameters to generate the order q subgroup instead of 2q

[openssl.git] / doc / man1 / pkcs7.pod

diff --git a/doc/man1/pkcs7.pod b/doc/man1/pkcs7.pod
index d238946b34f9b3e6473cafa92bec1d2afb376172..3c6d971c53cc6081b348b1526a7026c86dbd0078 100644 (file)
--- a/doc/man1/pkcs7.pod
+++ b/doc/man1/pkcs7.pod
@@ -2,6 +2,7 @@
 
 =head1 NAME
 
+openssl-pkcs7,
 pkcs7 - PKCS#7 utility
 
 =head1 SYNOPSIS
@@ -37,8 +38,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>
 
@@ -47,27 +48,27 @@ option is not specified.
 
 =item B<-out filename>
 
-specifies the output filename to write to or standard output by
+Specifies the output filename to write to or standard output by
 default.
 
 =item B<-print_certs>
 
-prints out any certificates or CRLs contained in the file. They are
+Prints out any certificates or CRLs contained in the file. They are
 preceded by their subject and issuer names in one line format.
 
 =item B<-text>
 
-prints out certificates details in full rather than just subject and
+Prints out certificates details in full rather than just subject and
 issuer names.
 
 =item B<-noout>
 
-don't output the encoded version of the PKCS#7 structure (or certificates
+Don't output the encoded version of the PKCS#7 structure (or certificates
 is B<-print_certs> is set).
 
 =item B<-engine id>
 
-specifying an engine (by its unique B<id> string) will cause B<pkcs7>
+Specifying an engine (by its unique B<id> string) will cause B<pkcs7>
 to attempt to obtain a functional reference to the specified engine,
 thus initialising it if needed. The engine will then be set as the default
 for all available algorithms.
@@ -109,9 +110,9 @@ L<crl2pkcs7(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
 
-Licensed under the OpenSSL license (the "License").  You may not use
+Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
 in the file LICENSE in the source distribution or at
 L<https://www.openssl.org/source/license.html>.