summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkn <kn@openbsd.org>2019-08-16 11:16:32 +0000
committerkn <kn@openbsd.org>2019-08-16 11:16:32 +0000
commitb9ac51bbedb58b9ddcc418243b9ed10600d99a9b (patch)
treec007d3b7235dcc28bc518a640ea977b620737585
parentminor cleanup: (diff)
downloadwireguard-openbsd-b9ac51bbedb58b9ddcc418243b9ed10600d99a9b.tar.xz
wireguard-openbsd-b9ac51bbedb58b9ddcc418243b9ed10600d99a9b.zip
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
-rw-r--r--usr.bin/ssh/ssh_config.520
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 186449bdfd8..ad73898f60a 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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.
@@ -1044,11 +1044,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.
@@ -1125,11 +1125,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.
@@ -1282,11 +1282,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.