diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-03 21:49:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
commit | 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f (patch) | |
tree | d4ba73f06fa74192831fc7b75d172b66b51ebb44 /ssh.1 | |
parent | 768405fddf64ff83aa6ef701ebb3c1f82d98a2f3 (diff) |
upstream commit
restore mistakenly deleted description of the
ConnectionAttempts option ok markus@
Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -33,7 +33,7 @@ | |||
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.1,v 1.379 2017/05/03 06:32:02 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.380 2017/05/03 21:49:18 naddy Exp $ |
37 | .Dd $Mdocdate: May 3 2017 $ | 37 | .Dd $Mdocdate: May 3 2017 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
@@ -469,6 +469,7 @@ For full details of the options listed below, and their possible values, see | |||
469 | .It Ciphers | 469 | .It Ciphers |
470 | .It ClearAllForwardings | 470 | .It ClearAllForwardings |
471 | .It Compression | 471 | .It Compression |
472 | .It ConnectionAttempts | ||
472 | .It ConnectTimeout | 473 | .It ConnectTimeout |
473 | .It ControlMaster | 474 | .It ControlMaster |
474 | .It ControlPath | 475 | .It ControlPath |