summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2018-06-01 06:23:10 +0000
committerDamien Miller <djm@mindrot.org>2018-06-04 14:54:43 +1000
commite8d59fef1098e24f408248dc64e5c8efa5d01f3c (patch)
tree87d26e43c437ff6545d5b7e68fc282640bfcbffc
parenta1f737d6a99314e291a87856122cb4dbaf64c641 (diff)
upstream: add missing punctuation after %i in ssh_config.5, and
make the grammatical format in sshd_config.5 match that in ssh_config.5; OpenBSD-Commit-ID: e325663b9342f3d556e223e5306e0d5fa1a74fa0
-rw-r--r--ssh_config.58
-rw-r--r--sshd_config.512
2 files changed, 10 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 94c12bdda..f6f36c45f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
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.274 2018/06/01 03:33:53 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.275 2018/06/01 06:23:10 jmc Exp $
37.Dd $Mdocdate: June 1 2018 $ 37.Dd $Mdocdate: June 1 2018 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -1746,7 +1746,7 @@ The local username.
1746accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u. 1746accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u.
1747.Pp 1747.Pp
1748.Cm CertificateFile 1748.Cm CertificateFile
1749accepts the tokens %%, %d, %h, %i %l, %r, and %u. 1749accepts the tokens %%, %d, %h, %i, %l, %r, and %u.
1750.Pp 1750.Pp
1751.Cm ControlPath 1751.Cm ControlPath
1752accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. 1752accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u.
@@ -1757,10 +1757,10 @@ accepts the tokens %% and %h.
1757.Cm IdentityAgent 1757.Cm IdentityAgent
1758and 1758and
1759.Cm IdentityFile 1759.Cm IdentityFile
1760accept the tokens %%, %d, %h, %i %l, %r, and %u. 1760accept the tokens %%, %d, %h, %i, %l, %r, and %u.
1761.Pp 1761.Pp
1762.Cm LocalCommand 1762.Cm LocalCommand
1763accepts the tokens %%, %C, %d, %h, %i %l, %n, %p, %r, %T, and %u. 1763accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, %T, and %u.
1764.Pp 1764.Pp
1765.Cm ProxyCommand 1765.Cm ProxyCommand
1766accepts the tokens %%, %h, %p, and %r. 1766accepts the tokens %%, %h, %p, and %r.
diff --git a/sshd_config.5 b/sshd_config.5
index db347a693..1231f3db8 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
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: sshd_config.5,v 1.269 2018/06/01 05:52:26 jmc Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.270 2018/06/01 06:23:10 jmc Exp $
37.Dd $Mdocdate: June 1 2018 $ 37.Dd $Mdocdate: June 1 2018 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
@@ -1696,19 +1696,19 @@ The username.
1696.El 1696.El
1697.Pp 1697.Pp
1698.Cm AuthorizedKeysCommand 1698.Cm AuthorizedKeysCommand
1699accepts the tokens %%, %f, %h, %k, %t, %U and %u. 1699accepts the tokens %%, %f, %h, %k, %t, %U, and %u.
1700.Pp 1700.Pp
1701.Cm AuthorizedKeysFile 1701.Cm AuthorizedKeysFile
1702accepts the tokens %%, %h, %U and %u. 1702accepts the tokens %%, %h, %U, and %u.
1703.Pp 1703.Pp
1704.Cm AuthorizedPrincipalsCommand 1704.Cm AuthorizedPrincipalsCommand
1705accepts the tokens %%, %F, %f, %h, %i, %K, %k, %s, %T, %t, %U and %u. 1705accepts the tokens %%, %F, %f, %h, %i, %K, %k, %s, %T, %t, %U, and %u.
1706.Pp 1706.Pp
1707.Cm AuthorizedPrincipalsFile 1707.Cm AuthorizedPrincipalsFile
1708accepts the tokens %%, %h, %U and %u. 1708accepts the tokens %%, %h, %U, and %u.
1709.Pp 1709.Pp
1710.Cm ChrootDirectory 1710.Cm ChrootDirectory
1711accepts the tokens %%, %h, %U and %u. 1711accepts the tokens %%, %h, %U, and %u.
1712.Pp 1712.Pp
1713.Cm RoutingDomain 1713.Cm RoutingDomain
1714accepts the token %D. 1714accepts the token %D.