[openssh-commits] [openssh] 01/10: 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 e3cbb06ade83c72b640a53728d362bbefa0008e2
Author: sobrado at openbsd.org <sobrado at openbsd.org>
Date:   Tue Sep 22 08:33:23 2015 +0000

    upstream commit
    
    fix two typos.
    
    Upstream-ID: 424402c0d8863a11b51749bacd7f8d932083b709
---
 ssh_config.5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 6c3c1b2..54c42ab 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.219 2015/09/11 06:51:39 jmc Exp $
-.Dd $Mdocdate: September 11 2015 $
+.\" $OpenBSD: ssh_config.5,v 1.220 2015/09/22 08:33:23 sobrado Exp $
+.Dd $Mdocdate: September 22 2015 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -139,7 +139,7 @@ or
 keyword) to be used only when the conditions following the
 .Cm Match
 keyword are satisfied.
-Match conditions are specified using one or more critera
+Match conditions are specified using one or more criteria
 or the single token
 .Cm all
 which always matches.
@@ -1585,7 +1585,7 @@ Enabling this option allows learning alternate hostkeys for a server
 and supports graceful key rotation by allowing a server to send replacement
 public keys before old ones are removed.
 Additional hostkeys are only accepted if the key used to authenticate the
-host was already trusted or explicity accepted by the user.
+host was already trusted or explicitly accepted by the user.
 If
 .Cm UpdateHostKeys
 is set to

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