Note in ssh_config(5) that the SetupTimeOut option is Debian-specific

(closes: #307069).

2 files changed, 3 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index a4ecb14f4..d6d836f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low
   * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
   * Enable HashKnownHosts by default. This only affects new entries; use
     'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
+  * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
+    (closes: #307069).
   * debconf template translations:
     - Update Czech (thanks, Miroslav Kure; closes: #298744).
     - Update Finnish (thanks, Matti Pöllä; closes: #303787).
diff --git a/ssh_config.5 b/ssh_config.5
index e41b34b15..cf3dfd138 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -779,6 +779,7 @@ The argument must be an integer.
 The default is 0 (disabled), or 300 if
 .Cm BatchMode
 is set.
+This is a Debian-specific option.
 .It Cm SmartcardDevice
 Specifies which smartcard device to use.
 The argument to this keyword is the device