[openssh-commits] [openssh] 01/05: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 149a8cd24ce9dd47c36f571738681df5f31a326c
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Mon Sep 4 06:34:43 2017 +0000

    upstream commit
    
    tweak previous;
    
    Upstream-ID: bb8cc40b61b15f6a13d81da465ac5bfc65cbfc4b
---
 ssh_config.5 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 3823da6f..ca5a4110 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.254 2017/09/03 23:33:13 djm Exp $
-.Dd $Mdocdate: September 3 2017 $
+.\" $OpenBSD: ssh_config.5,v 1.255 2017/09/04 06:34:43 jmc Exp $
+.Dd $Mdocdate: September 4 2017 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1458,18 +1458,19 @@ file is poorly maintained or when connections to new hosts are
 frequently made.
 This option forces the user to manually
 add all new hosts.
+.Pp
 If this flag is set to
 .Dq accept-new
-then ssh will automatically add new new host keys to the user
+then ssh will automatically add new host keys to the user
 known hosts files, but will not permit connections to hosts with
 changed host keys.
 If this flag is set to
 .Dq no
 or
 .Dq off ,
-ssh will automatically add new host keys to the user known hosts files,
-and allow connections to hosts with changed hostkeys to proceed subject
-to some restrictions.
+ssh will automatically add new host keys to the user known hosts files
+and allow connections to hosts with changed hostkeys to proceed,
+subject to some restrictions.
 If this flag is set to
 .Cm ask
 (the default),

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.