[openssh-commits] [openssh] 02/02: upstream: Call comma-separated lists as such to clarify semantics

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit dc2ca588144f088a54febebfde3414568dc73d5f
Author: kn at openbsd.org <kn at openbsd.org>
Date:   Fri Aug 16 11:16:32 2019 +0000

    upstream: Call comma-separated lists as such to clarify semantics
    
    Options such as Ciphers take values that may be a list of ciphers;  the
    complete list, not indiviual elements, may be prefixed with a dash or plus
    character to remove from or append to the default list respectively.
    
    Users might read the current text as if each elment took an optional prefix,
    so tweak the wording from "values" to "list" to prevent such ambiguity for
    all options supporting this semantics (those that provide a list of
    available elements via "ssh -Q ...").
    
    Input and OK jmc
    
    OpenBSD-Commit-ID: 4fdd175b0e5f5cb10ab3f26ccc38a93bb6515d57
---
 ssh_config.5 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 53cb5abf..14d57d77 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.298 2019/08/09 04:24:03 dtucker Exp $
-.Dd $Mdocdate: August 9 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.299 2019/08/16 11:16:32 kn Exp $
+.Dd $Mdocdate: August 16 2019 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -422,11 +422,11 @@ the check will not be executed.
 .It Cm Ciphers
 Specifies the ciphers allowed and their order of preference.
 Multiple ciphers must be comma-separated.
-If the specified value begins with a
+If the specified list begins with a
 .Sq +
 character, then the specified ciphers will be appended to the default set
 instead of replacing them.
-If the specified value begins with a
+If the specified list begins with a
 .Sq -
 character, then the specified ciphers (including wildcards) will be removed
 from the default set instead of replacing them.
@@ -1043,11 +1043,11 @@ and
 .It Cm KexAlgorithms
 Specifies the available KEX (Key Exchange) algorithms.
 Multiple algorithms must be comma-separated.
-Alternately if the specified value begins with a
+If the specified list begins with a
 .Sq +
 character, then the specified methods will be appended to the default set
 instead of replacing them.
-If the specified value begins with a
+If the specified list begins with a
 .Sq -
 character, then the specified methods (including wildcards) will be removed
 from the default set instead of replacing them.
@@ -1124,11 +1124,11 @@ Specifies the MAC (message authentication code) algorithms
 in order of preference.
 The MAC algorithm is used for data integrity protection.
 Multiple algorithms must be comma-separated.
-If the specified value begins with a
+If the specified list begins with a
 .Sq +
 character, then the specified algorithms will be appended to the default set
 instead of replacing them.
-If the specified value begins with a
+If the specified list begins with a
 .Sq -
 character, then the specified algorithms (including wildcards) will be removed
 from the default set instead of replacing them.
@@ -1281,11 +1281,11 @@ The default is
 .It Cm PubkeyAcceptedKeyTypes
 Specifies the key types that will be used for public key authentication
 as a comma-separated list of patterns.
-Alternately if the specified value begins with a
+If the specified list begins with a
 .Sq +
 character, then the key types after it will be appended to the default
 instead of replacing it.
-If the specified value begins with a
+If the specified list begins with a
 .Sq -
 character, then the specified key types (including wildcards) will be removed
 from the default set instead of replacing them.

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.