From: Rich Salz <rsalz@akamai.com>
Date: Mon, 22 Feb 2016 15:58:20 +0000 (-0500)
Subject: GH721: Duplicated flags in doc
X-Git-Tag: OpenSSL_1_1_0-pre4~550
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=ed233db7421b98b2058da2a07f6c46b52917b918

GH721: Duplicated flags in doc

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/doc/apps/enc.pod b/doc/apps/enc.pod
index 8b4c858b0d..62e1383277 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>