summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2011-08-26 01:45:16 +0000
committerDamien Miller <djm@cvs.openbsd.org>2011-08-26 01:45:16 +0000
commit6b4973f4d23373c1f0834a7e54718fe621bc5731 (patch)
tree5da6cba4806e3dc99842a09f05fd3e5c9ef9df30
parent4b556045d0ad5c04f2401304f879af82db506189 (diff)
Add some missing ssh_config(5) options that can be used in ssh(1)'s
-o argument. Patch from duclare AT guu.fi
-rw-r--r--usr.bin/ssh/ssh.17
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 9c1ca4b169a..fbdddc7d101 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -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.1,v 1.320 2011/08/02 01:22:11 djm Exp $
-.Dd $Mdocdate: August 2 2011 $
+.\" $OpenBSD: ssh.1,v 1.321 2011/08/26 01:45:15 djm Exp $
+.Dd $Mdocdate: August 26 2011 $
.Dt SSH 1
.Os
.Sh NAME
@@ -419,11 +419,13 @@ For full details of the options listed below, and their possible values, see
.It ConnectTimeout
.It ControlMaster
.It ControlPath
+.It ControlPersist
.It DynamicForward
.It EscapeChar
.It ExitOnForwardFailure
.It ForwardAgent
.It ForwardX11
+.It ForwardX11Timeout
.It ForwardX11Trusted
.It GatewayPorts
.It GlobalKnownHostsFile
@@ -438,6 +440,7 @@ For full details of the options listed below, and their possible values, see
.It IdentityFile
.It IdentitiesOnly
.It IPQoS
+.It KbdInteractiveAuthentication
.It KbdInteractiveDevices
.It KexAlgorithms
.It LocalCommand