=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh_config.5,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- src/usr.bin/ssh/ssh_config.5 2020/05/29 05:48:39 1.328 +++ src/usr.bin/ssh/ssh_config.5 2020/07/17 03:23:10 1.329 @@ -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.328 2020/05/29 05:48:39 jmc Exp $ -.Dd $Mdocdate: May 29 2020 $ +.\" $OpenBSD: ssh_config.5,v 1.329 2020/07/17 03:23:10 dtucker Exp $ +.Dd $Mdocdate: July 17 2020 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1739,6 +1739,12 @@ .It Cm UserKnownHostsFile Specifies one or more files to use for the user host key database, separated by whitespace. +Each filename may use tilde notation to refer to the user's home directory, +the tokens described in the +.Sx TOKENS +section and environment variables as described in the +.Sx ENVIRONMENT VARIABLES +section. The default is .Pa ~/.ssh/known_hosts , .Pa ~/.ssh/known_hosts2 . @@ -1875,8 +1881,9 @@ .Cm LocalForward , .Cm Match exec , .Cm RemoteCommand , +.Cm RemoteForward , and -.Cm RemoteForward +.Com UserKnownHostsFile accept the tokens %%, %C, %d, %h, %i, %L, %l, %n, %p, %r, and %u. .Pp .Cm Hostname @@ -1900,9 +1907,10 @@ The keywords .Cm CertificateFile , .Cm ControlPath , -.Cm IdentityAgent -and +.Cm IdentityAgent , .Cm IdentityFile +and +.Cm UserKnownHostsFile support environment variables. The keywords .Cm LocalForward