1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index e114b1dfe..b10c55492 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.301 2019/09/06 14:45:34 naddy Exp $
+.\" $OpenBSD: ssh_config.5,v 1.302 2019/09/13 04:07:42 djm Exp $
-.Dd $Mdocdate: September 6 2019 $
+.Dd $Mdocdate: September 13 2019 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -489,8 +489,8 @@ The default is 1.
 .It Cm ConnectTimeout
 Specifies the timeout (in seconds) used when connecting to the
 SSH server, instead of using the default system TCP timeout.
-This value is used only when the target is down or really unreachable,
+This timeout is applied both to establishing the connection and to performing
-not when it refuses the connection.
+the initial SSH protocol handshake and key exchange.
 .It Cm ControlMaster
 Enables the sharing of multiple sessions over a single network connection.
 When set to

diff --git a/ssh_config.5 b/ssh_config.5 index e114b1dfe..b10c55492 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.301 2019/09/06 14:45:34 naddy Exp $	36	.\" $OpenBSD: ssh_config.5,v 1.302 2019/09/13 04:07:42 djm Exp $
37	.Dd $Mdocdate: September 6 2019 $	37	.Dd $Mdocdate: September 13 2019 $
38	.Dt SSH_CONFIG 5	38	.Dt SSH_CONFIG 5
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -489,8 +489,8 @@ The default is 1.
489	.It Cm ConnectTimeout	489	.It Cm ConnectTimeout
490	Specifies the timeout (in seconds) used when connecting to the	490	Specifies the timeout (in seconds) used when connecting to the
491	SSH server, instead of using the default system TCP timeout.	491	SSH server, instead of using the default system TCP timeout.
492	This value is used only when the target is down or really unreachable,	492	This timeout is applied both to establishing the connection and to performing
493	not when it refuses the connection.	493	the initial SSH protocol handshake and key exchange.
494	.It Cm ControlMaster	494	.It Cm ControlMaster
495	Enables the sharing of multiple sessions over a single network connection.	495	Enables the sharing of multiple sessions over a single network connection.
496	When set to	496	When set to