summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.56
1 files changed, 3 insertions, 3 deletions
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