summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 45facb1f1..4d5643a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - jmc@cvs.openbsd.org 2004/05/04 18:36:07 6 - jmc@cvs.openbsd.org 2004/05/04 18:36:07
7 [scp.1] 7 [scp.1]
8 SendEnv here too; 8 SendEnv here too;
9 - jmc@cvs.openbsd.org 2004/05/06 11:24:23
10 [ssh_config.5]
11 typo from John Cosimano (PR 3770);
9 12
1020040502 1320040502
11 - (dtucker) OpenBSD CVS Sync 14 - (dtucker) OpenBSD CVS Sync
@@ -1082,4 +1085,4 @@
1082 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1085 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1083 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1086 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1084 1087
1085$Id: ChangeLog,v 1.3343 2004/05/13 03:03:04 dtucker Exp $ 1088$Id: ChangeLog,v 1.3344 2004/05/13 03:03:56 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 5915c98d0..97fcdd80e 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
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.33 2004/04/28 05:17:10 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.34 2004/05/06 11:24:23 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -313,7 +313,7 @@ if the
313.Cm ForwardX11Trusted 313.Cm ForwardX11Trusted
314option is also enabled. 314option is also enabled.
315.It Cm ForwardX11Trusted 315.It Cm ForwardX11Trusted
316If the this option is set to 316If this option is set to
317.Dq yes 317.Dq yes
318then remote X11 clients will have full access to the original X11 display. 318then remote X11 clients will have full access to the original X11 display.
319If this option is set to 319If this option is set to