Merge 4.0p1 to the trunk.

1 files changed, 2 insertions, 0 deletions

diff --git a/scp.0 b/scp.0
index 01736fe24..f9368e71b 100644
--- a/scp.0
+++ b/scp.0
@@ -73,6 +73,7 @@ DESCRIPTION
                    GlobalKnownHostsFile
                    GSSAPIAuthentication
                    GSSAPIDelegateCredentials
+                   HashKnownHosts
                    Host
                    HostbasedAuthentication
                    HostKeyAlgorithms
@@ -80,6 +81,7 @@ DESCRIPTION
                    HostName
                    IdentityFile
                    IdentitiesOnly
+                   KbdInteractiveDevices
                    LogLevel
                    MACs
                    NoHostAuthenticationForLocalhost