summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh_config.511
1 files changed, 7 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 9677ef079..d8f980b68 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.194 2014/10/09 06:21:31 jmc Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.195 2014/11/10 22:25:49 djm Exp $
37.Dd $Mdocdate: October 9 2014 $ 37.Dd $Mdocdate: November 10 2014 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -537,7 +537,8 @@ by a hash of the concatenation: %l%h%p%r.
537It is recommended that any 537It is recommended that any
538.Cm ControlPath 538.Cm ControlPath
539used for opportunistic connection sharing include 539used for opportunistic connection sharing include
540at least %h, %p, and %r (or alternatively %C). 540at least %h, %p, and %r (or alternatively %C) and be placed in a directory
541that is not writable by other users.
541This ensures that shared connections are uniquely identified. 542This ensures that shared connections are uniquely identified.
542.It Cm ControlPersist 543.It Cm ControlPersist
543When used in conjunction with 544When used in conjunction with
@@ -550,7 +551,9 @@ If set to
550then the master connection will not be placed into the background, 551then the master connection will not be placed into the background,
551and will close as soon as the initial client connection is closed. 552and will close as soon as the initial client connection is closed.
552If set to 553If set to
553.Dq yes , 554.Dq yes
555or
556.Dq 0 ,
554then the master connection will remain in the background indefinitely 557then the master connection will remain in the background indefinitely
555(until killed or closed via a mechanism such as the 558(until killed or closed via a mechanism such as the
556.Xr ssh 1 559.Xr ssh 1