summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-07-06 09:44:59 +1000
committerDamien Miller <djm@mindrot.org>2005-07-06 09:44:59 +1000
commitfd94fbaf563d2d9a0c512e59085fe91d7e693576 (patch)
tree2b7792689ef694f411a2ee33aa398d296b356ab1
parent1339002e8b05d89b10767849d9ee9be55e460f4c (diff)
- jmc@cvs.openbsd.org 2005/07/04 11:29:51
[ssh_config.5] fix Xr and a little grammar;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.56
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 58607022a..b391c6727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding 10 the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding
11 their own. 11 their own.
12 ok dtucker@ "put it in" deraadt@ 12 ok dtucker@ "put it in" deraadt@
13 - jmc@cvs.openbsd.org 2005/07/04 11:29:51
14 [ssh_config.5]
15 fix Xr and a little grammar;
13 16
1420050626 1720050626
15 - (djm) OpenBSD CVS Sync 18 - (djm) OpenBSD CVS Sync
@@ -2776,4 +2779,4 @@
2776 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2779 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2777 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2780 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2778 2781
2779$Id: ChangeLog,v 1.3833 2005/07/05 23:44:19 djm Exp $ 2782$Id: ChangeLog,v 1.3834 2005/07/05 23:44:59 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 40774297c..2b2b14364 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.58 2005/07/04 00:58:43 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.59 2005/07/04 11:29:51 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
@@ -280,10 +280,10 @@ can not be opened,
280will continue without connecting to a master instance. 280will continue without connecting to a master instance.
281.Pp 281.Pp
282X11 and 282X11 and
283.Xr ssh-agent 4 283.Xr ssh-agent 1
284forwarding is supported over these multiplexed connections, however the 284forwarding is supported over these multiplexed connections, however the
285display and agent fowarded will be the one belonging to the master 285display and agent fowarded will be the one belonging to the master
286connection. I.e. it is not possible to forward multiple displays or agents. 286connection i.e. it is not possible to forward multiple displays or agents.
287.Pp 287.Pp
288Two additional options allow for opportunistic multiplexing: try to use a 288Two additional options allow for opportunistic multiplexing: try to use a
289master connection but fall back to creating a new one if one does not already 289master connection but fall back to creating a new one if one does not already