mirror of git://anongit.mindrot.org/openssh.git
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
This commit is contained in:
parent
a1f737d6a9
commit
e8d59fef10
|
@ -33,7 +33,7 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh_config.5,v 1.274 2018/06/01 03:33:53 djm Exp $
|
.\" $OpenBSD: ssh_config.5,v 1.275 2018/06/01 06:23:10 jmc Exp $
|
||||||
.Dd $Mdocdate: June 1 2018 $
|
.Dd $Mdocdate: June 1 2018 $
|
||||||
.Dt SSH_CONFIG 5
|
.Dt SSH_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
|
@ -1746,7 +1746,7 @@ The local username.
|
||||||
accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u.
|
accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm CertificateFile
|
.Cm CertificateFile
|
||||||
accepts the tokens %%, %d, %h, %i %l, %r, and %u.
|
accepts the tokens %%, %d, %h, %i, %l, %r, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm ControlPath
|
.Cm ControlPath
|
||||||
accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u.
|
accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u.
|
||||||
|
@ -1757,10 +1757,10 @@ accepts the tokens %% and %h.
|
||||||
.Cm IdentityAgent
|
.Cm IdentityAgent
|
||||||
and
|
and
|
||||||
.Cm IdentityFile
|
.Cm IdentityFile
|
||||||
accept the tokens %%, %d, %h, %i %l, %r, and %u.
|
accept the tokens %%, %d, %h, %i, %l, %r, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm LocalCommand
|
.Cm LocalCommand
|
||||||
accepts the tokens %%, %C, %d, %h, %i %l, %n, %p, %r, %T, and %u.
|
accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, %T, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm ProxyCommand
|
.Cm ProxyCommand
|
||||||
accepts the tokens %%, %h, %p, and %r.
|
accepts the tokens %%, %h, %p, and %r.
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: sshd_config.5,v 1.269 2018/06/01 05:52:26 jmc Exp $
|
.\" $OpenBSD: sshd_config.5,v 1.270 2018/06/01 06:23:10 jmc Exp $
|
||||||
.Dd $Mdocdate: June 1 2018 $
|
.Dd $Mdocdate: June 1 2018 $
|
||||||
.Dt SSHD_CONFIG 5
|
.Dt SSHD_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
|
@ -1696,19 +1696,19 @@ The username.
|
||||||
.El
|
.El
|
||||||
.Pp
|
.Pp
|
||||||
.Cm AuthorizedKeysCommand
|
.Cm AuthorizedKeysCommand
|
||||||
accepts the tokens %%, %f, %h, %k, %t, %U and %u.
|
accepts the tokens %%, %f, %h, %k, %t, %U, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm AuthorizedKeysFile
|
.Cm AuthorizedKeysFile
|
||||||
accepts the tokens %%, %h, %U and %u.
|
accepts the tokens %%, %h, %U, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm AuthorizedPrincipalsCommand
|
.Cm AuthorizedPrincipalsCommand
|
||||||
accepts the tokens %%, %F, %f, %h, %i, %K, %k, %s, %T, %t, %U and %u.
|
accepts the tokens %%, %F, %f, %h, %i, %K, %k, %s, %T, %t, %U, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm AuthorizedPrincipalsFile
|
.Cm AuthorizedPrincipalsFile
|
||||||
accepts the tokens %%, %h, %U and %u.
|
accepts the tokens %%, %h, %U, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm ChrootDirectory
|
.Cm ChrootDirectory
|
||||||
accepts the tokens %%, %h, %U and %u.
|
accepts the tokens %%, %h, %U, and %u.
|
||||||
.Pp
|
.Pp
|
||||||
.Cm RoutingDomain
|
.Cm RoutingDomain
|
||||||
accepts the token %D.
|
accepts the token %D.
|
||||||
|
|
Loading…
Reference in New Issue