summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2019-09-04 20:31:15 +0000
committerDamien Miller <djm@mindrot.org>2019-09-05 14:56:51 +1000
commit4f9d75fbafde83d428e291516f8ce98e6b3a7c4b (patch)
treec0011fc5f2daf2eb44e04315391c7708016154db /ssh_config.5
parentdb1e6f60f03641b2d17e0ab062242609f4ed4598 (diff)
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 these semantics. Fix instances missed in first commit. ok jmc@ kn@ OpenBSD-Commit-ID: 7112522430a54fb9f15a7a26d26190ed84d5e417
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.512
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 14d57d77d..14d96beaf 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.299 2019/08/16 11:16:32 kn Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.300 2019/09/04 20:31:15 naddy Exp $
37.Dd $Mdocdate: August 16 2019 $ 37.Dd $Mdocdate: September 4 2019 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -786,11 +786,11 @@ or
786.It Cm HostbasedKeyTypes 786.It Cm HostbasedKeyTypes
787Specifies the key types that will be used for hostbased authentication 787Specifies the key types that will be used for hostbased authentication
788as a comma-separated list of patterns. 788as a comma-separated list of patterns.
789Alternately if the specified value begins with a 789Alternately if the specified list begins with a
790.Sq + 790.Sq +
791character, then the specified key types will be appended to the default set 791character, then the specified key types will be appended to the default set
792instead of replacing them. 792instead of replacing them.
793If the specified value begins with a 793If the specified list begins with a
794.Sq - 794.Sq -
795character, then the specified key types (including wildcards) will be removed 795character, then the specified key types (including wildcards) will be removed
796from the default set instead of replacing them. 796from the default set instead of replacing them.
@@ -814,11 +814,11 @@ may be used to list supported key types.
814.It Cm HostKeyAlgorithms 814.It Cm HostKeyAlgorithms
815Specifies the host key algorithms 815Specifies the host key algorithms
816that the client wants to use in order of preference. 816that the client wants to use in order of preference.
817Alternately if the specified value begins with a 817Alternately if the specified list begins with a
818.Sq + 818.Sq +
819character, then the specified key types will be appended to the default set 819character, then the specified key types will be appended to the default set
820instead of replacing them. 820instead of replacing them.
821If the specified value begins with a 821If the specified list begins with a
822.Sq - 822.Sq -
823character, then the specified key types (including wildcards) will be removed 823character, then the specified key types (including wildcards) will be removed
824from the default set instead of replacing them. 824from the default set instead of replacing them.