Deprecate SYSerr, add new FUNCerr macro

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

diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod
index 3389e595fed7567cc8a3c836f9ca597acfd80a8e..b1b688449e9a847df665f8d07f605f6305fa01cd 100644 (file)
--- a/doc/man1/pkcs12.pod
+++ b/doc/man1/pkcs12.pod
@@ -154,7 +154,8 @@ Don't attempt to verify the integrity MAC before reading the file.
 
 Prompt for separate integrity and encryption passwords: most software
 always assumes these are the same so this option will render such
-PKCS#12 files unreadable.
+PKCS#12 files unreadable. Cannot be used in combination with the options
+-password, -passin (if importing) or -passout (if exporting).
 
 =back
 
@@ -383,7 +384,7 @@ L<pkcs8(1)>
 
 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>.