From cede1dbc557df3801bd1628c10543b7385ce50f7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 2 Jul 2010 13:33:48 +1000 Subject: - jmc@cvs.openbsd.org 2010/06/26 00:57:07 [ssh_config.5] tweak previous; --- ChangeLog | 6 ++++++ ssh_config.5 | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27744ad1..d64ea5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20100702 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/06/26 00:57:07 + [ssh_config.5] + tweak previous; + 20100627 - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs key.h. diff --git a/ssh_config.5 b/ssh_config.5 index 6968a448..531a60b5 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,8 +34,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.134 2010/06/25 23:15:36 djm Exp $ -.Dd $Mdocdate: June 25 2010 $ +.\" $OpenBSD: ssh_config.5,v 1.135 2010/06/26 00:57:07 jmc Exp $ +.Dd $Mdocdate: June 26 2010 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -433,7 +433,8 @@ if the .Cm ForwardX11Trusted option is also enabled. .It Cm ForwardX11Timeout -Specify a timeout for untrusted X11 forwarding using the format described in +Specify a timeout for untrusted X11 forwarding +using the format described in the .Sx TIME FORMATS section of .Xr sshd_config 5 . -- cgit v1.2.3