[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ed233db7421b98b2058da2a07f6c46b52917b918 (commit)
      from  721f9058b398f05611c1d5ac4ff7cc464695dd1e (commit)


- Log -----------------------------------------------------------------
commit ed233db7421b98b2058da2a07f6c46b52917b918
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Feb 22 10:58:20 2016 -0500

    GH721: Duplicated flags in doc
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/enc.pod | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/doc/apps/enc.pod b/doc/apps/enc.pod
index 8b4c858..62e1383 100644
--- a/doc/apps/enc.pod
+++ b/doc/apps/enc.pod
@@ -60,15 +60,6 @@ the output filename, standard output by default.
 the password source. For more information about the format of B<arg>
 see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
 
-=item B<-salt>
-
-use a salt in the key derivation routines. This is the default.
-
-=item B<-nosalt>
-
-don't use a salt in the key derivation routines. This option B<SHOULD NOT> be
-used except for test purposes or compatibility with ancient versions of OpenSSL.
-
 =item B<-e>
 
 encrypt the input data: this is the default.
@@ -109,7 +100,9 @@ The default algorithm is sha-256.
 
 =item B<-nosalt>
 
-do not use a salt 
+don't use a salt in the key derivation routines. This option B<SHOULD NOT> be
+used except for test purposes or compatibility with ancient versions of
+OpenSSL.
 
 =item B<-salt>