summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-09-22 21:33:53 +1000
committerDamien Miller <djm@mindrot.org>2011-09-22 21:33:53 +1000
commitefad7275170c877e5ccb442b6eb99c7d3675622a (patch)
treeb2f360a1810400da46cba2584a5de952c9c44850 /ssh.1
parente128a50e35eb4eabcf234ada07f07b8749b5e49c (diff)
- djm@cvs.openbsd.org 2011/08/26 01:45:15
[ssh.1] Add some missing ssh_config(5) options that can be used in ssh(1)'s -o argument. Patch from duclare AT guu.fi
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.17
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 9c1ca4b16..fbdddc7d1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.320 2011/08/02 01:22:11 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.321 2011/08/26 01:45:15 djm Exp $
37.Dd $Mdocdate: August 2 2011 $ 37.Dd $Mdocdate: August 26 2011 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -419,11 +419,13 @@ For full details of the options listed below, and their possible values, see
419.It ConnectTimeout 419.It ConnectTimeout
420.It ControlMaster 420.It ControlMaster
421.It ControlPath 421.It ControlPath
422.It ControlPersist
422.It DynamicForward 423.It DynamicForward
423.It EscapeChar 424.It EscapeChar
424.It ExitOnForwardFailure 425.It ExitOnForwardFailure
425.It ForwardAgent 426.It ForwardAgent
426.It ForwardX11 427.It ForwardX11
428.It ForwardX11Timeout
427.It ForwardX11Trusted 429.It ForwardX11Trusted
428.It GatewayPorts 430.It GatewayPorts
429.It GlobalKnownHostsFile 431.It GlobalKnownHostsFile
@@ -438,6 +440,7 @@ For full details of the options listed below, and their possible values, see
438.It IdentityFile 440.It IdentityFile
439.It IdentitiesOnly 441.It IdentitiesOnly
440.It IPQoS 442.It IPQoS
443.It KbdInteractiveAuthentication
441.It KbdInteractiveDevices 444.It KbdInteractiveDevices
442.It KexAlgorithms 445.It KexAlgorithms
443.It LocalCommand 446.It LocalCommand