From: naddy@openbsd.org <naddy@openbsd.org>
Date: Tue, 21 Jan 2020 12:40:04 +0000 (+0000)
Subject: upstream: document the default value of the ControlPersist option;
X-Git-Tag: V_8_2_P1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a78c66d5d2144bd49779bc80a647346bd3d7233d;p=thirdparty%2Fopenssh-portable.git

upstream: document the default value of the ControlPersist option;

ok dtucker@ djm@

OpenBSD-Commit-ID: 0788e7f2b5a9d4e36d3d2ab378f73329320fef66
---

diff --git a/ssh_config.5 b/ssh_config.5
index d3d45b53a..9d758361c 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (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.313 2019/12/21 20:22:34 naddy Exp $
-.Dd $Mdocdate: December 21 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.314 2020/01/21 12:40:04 naddy Exp $
+.Dd $Mdocdate: January 21 2020 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -566,7 +566,8 @@ specifies that the master connection should remain open
 in the background (waiting for future client connections)
 after the initial client connection has been closed.
 If set to
-.Cm no ,
+.Cm no
+(the default),
 then the master connection will not be placed into the background,
 and will close as soon as the initial client connection is closed.
 If set to