From: jmc@openbsd.org <jmc@openbsd.org>
Date: Fri, 11 Sep 2015 06:51:39 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95923e0520a8647417ee6dcdff44694703dfeef0;p=thirdparty%2Fopenssh-portable.git

upstream commit

tweak previous;

Upstream-ID: f29b3cfcfd9aa31fa140c393e7bd48c1c74139d6
---

diff --git a/ssh_config.5 b/ssh_config.5
index a4c85217a..6c3c1b287 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
 .\" (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.218 2015/09/11 03:47:28 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.219 2015/09/11 06:51:39 jmc Exp $
 .Dd $Mdocdate: September 11 2015 $
 .Dt SSH_CONFIG 5
 .Os
@@ -540,8 +540,9 @@ by the remote login username,
 .Ql %u
 by the username and
 .Ql %i
-by the numeric user id (uid) of the user running
-.Xr ssh 1 , and
+by the numeric user ID (uid) of the user running
+.Xr ssh 1 ,
+and
 .Ql \&%C
 by a hash of the concatenation: %l%h%p%r.
 It is recommended that any