- jmc@cvs.openbsd.org 2005/07/04 11:29:51
[ssh_config.5]
fix Xr and a little grammar;
diff --git a/ChangeLog b/ChangeLog
index 5860702..b391c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding
their own.
ok dtucker@ "put it in" deraadt@
+ - jmc@cvs.openbsd.org 2005/07/04 11:29:51
+ [ssh_config.5]
+ fix Xr and a little grammar;
20050626
- (djm) OpenBSD CVS Sync
@@ -2776,4 +2779,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3833 2005/07/05 23:44:19 djm Exp $
+$Id: ChangeLog,v 1.3834 2005/07/05 23:44:59 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 4077429..2b2b143 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
.\" (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.58 2005/07/04 00:58:43 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.59 2005/07/04 11:29:51 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -280,10 +280,10 @@
will continue without connecting to a master instance.
.Pp
X11 and
-.Xr ssh-agent 4
+.Xr ssh-agent 1
forwarding is supported over these multiplexed connections, however the
display and agent fowarded will be the one belonging to the master
-connection. I.e. it is not possible to forward multiple displays or agents.
+connection i.e. it is not possible to forward multiple displays or agents.
.Pp
Two additional options allow for opportunistic multiplexing: try to use a
master connection but fall back to creating a new one if one does not already