upstream commit

correct description of UpdateHostKeys in ssh_config.5 and
 add it to -o lists for ssh, scp and sftp; pointed out by jmc@
diff --git a/scp.1 b/scp.1
index 62287eb..dbf14fd 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.63 2015/01/16 16:20:23 schwarze Exp $
+.\" $OpenBSD: scp.1,v 1.64 2015/01/26 12:16:36 djm Exp $
 .\"
-.Dd $Mdocdate: January 16 2015 $
+.Dd $Mdocdate: January 26 2015 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -179,6 +179,7 @@
 .It StrictHostKeyChecking
 .It TCPKeepAlive
 .It UsePrivilegedPort
+.It UpdateHostKeys
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS