diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | ssh_config.5 | 1 |
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 | |||
| 28 | * Drop workaround for #242462 on amd64; it's been fixed properly upstream. | 28 | * Drop workaround for #242462 on amd64; it's been fixed properly upstream. |
| 29 | * Enable HashKnownHosts by default. This only affects new entries; use | 29 | * Enable HashKnownHosts by default. This only affects new entries; use |
| 30 | 'ssh-keygen -H' to convert an entire known_hosts file to hashed format. | 30 | 'ssh-keygen -H' to convert an entire known_hosts file to hashed format. |
| 31 | * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific | ||
| 32 | (closes: #307069). | ||
| 31 | * debconf template translations: | 33 | * debconf template translations: |
| 32 | - Update Czech (thanks, Miroslav Kure; closes: #298744). | 34 | - Update Czech (thanks, Miroslav Kure; closes: #298744). |
| 33 | - Update Finnish (thanks, Matti Pöllä; closes: #303787). | 35 | - 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. | |||
| 779 | The default is 0 (disabled), or 300 if | 779 | The default is 0 (disabled), or 300 if |
| 780 | .Cm BatchMode | 780 | .Cm BatchMode |
| 781 | is set. | 781 | is set. |
| 782 | This is a Debian-specific option. | ||
| 782 | .It Cm SmartcardDevice | 783 | .It Cm SmartcardDevice |
| 783 | Specifies which smartcard device to use. | 784 | Specifies which smartcard device to use. |
| 784 | The argument to this keyword is the device | 785 | The argument to this keyword is the device |