summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config.57
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 27744ad1e..d64ea5ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120100702
2 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2010/06/26 00:57:07
4 [ssh_config.5]
5 tweak previous;
6
120100627 720100627
2 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs 8 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs
3 key.h. 9 key.h.
diff --git a/ssh_config.5 b/ssh_config.5
index 6968a4488..531a60b5e 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.134 2010/06/25 23:15:36 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.135 2010/06/26 00:57:07 jmc Exp $
38.Dd $Mdocdate: June 25 2010 $ 38.Dd $Mdocdate: June 26 2010 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -433,7 +433,8 @@ if the
433.Cm ForwardX11Trusted 433.Cm ForwardX11Trusted
434option is also enabled. 434option is also enabled.
435.It Cm ForwardX11Timeout 435.It Cm ForwardX11Timeout
436Specify a timeout for untrusted X11 forwarding using the format described in 436Specify a timeout for untrusted X11 forwarding
437using the format described in the
437.Sx TIME FORMATS 438.Sx TIME FORMATS
438section of 439section of
439.Xr sshd_config 5 . 440.Xr sshd_config 5 .