upstream: sync -o option lists with ssh.1; requested jmc@

OpenBSD-Commit-ID: a7ac295b444da7b2ca7a33a52370594f6897f6bb

2 files changed, 98 insertions, 20 deletions

diff --git a/scp.1 b/scp.1
index 54c6fe3d5..aa2e2d8b5 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.112 2022/12/16 07:13:22 djm Exp $
+.\" $OpenBSD: scp.1,v 1.113 2024/12/06 15:12:56 djm Exp $
 .\"
-.Dd $Mdocdate: December 16 2022 $
+.Dd $Mdocdate: December 6 2024 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -162,67 +162,106 @@ For full details of the options listed below, and their possible values, see
 .Xr ssh_config 5 .
 .Pp
 .Bl -tag -width Ds -offset indent -compact
+.It AddKeysToAgent
 .It AddressFamily
 .It BatchMode
 .It BindAddress
 .It BindInterface
+.It CASignatureAlgorithms
 .It CanonicalDomains
 .It CanonicalizeFallbackLocal
 .It CanonicalizeHostname
 .It CanonicalizeMaxDots
 .It CanonicalizePermittedCNAMEs
-.It CASignatureAlgorithms
 .It CertificateFile
+.It ChannelTimeout
 .It CheckHostIP
 .It Ciphers
+.It ClearAllForwardings
 .It Compression
-.It ConnectionAttempts
 .It ConnectTimeout
+.It ConnectionAttempts
 .It ControlMaster
 .It ControlPath
 .It ControlPersist
-.It GlobalKnownHostsFile
+.It DynamicForward
+.It EnableEscapeCommandline
+.It EnableSSHKeysign
+.It EscapeChar
+.It ExitOnForwardFailure
+.It FingerprintHash
+.It ForkAfterAuthentication
+.It ForwardAgent
+.It ForwardX11
+.It ForwardX11Timeout
+.It ForwardX11Trusted
 .It GSSAPIAuthentication
 .It GSSAPIDelegateCredentials
+.It GatewayPorts
+.It GlobalKnownHostsFile
 .It HashKnownHosts
 .It Host
-.It HostbasedAcceptedAlgorithms
-.It HostbasedAuthentication
 .It HostKeyAlgorithms
 .It HostKeyAlias
+.It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
 .It Hostname
+.It IPQoS
 .It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
-.It IPQoS
+.It IgnoreUnknown
+.It Include
 .It KbdInteractiveAuthentication
 .It KbdInteractiveDevices
 .It KexAlgorithms
 .It KnownHostsCommand
+.It LocalCommand
+.It LocalForward
 .It LogLevel
+.It LogVerbose
 .It MACs
 .It NoHostAuthenticationForLocalhost
 .It NumberOfPasswordPrompts
-.It PasswordAuthentication
+.It ObscureKeystrokeTiming
 .It PKCS11Provider
+.It PasswordAuthentication
+.It PermitLocalCommand
+.It PermitRemoteOpen
 .It Port
 .It PreferredAuthentications
 .It ProxyCommand
 .It ProxyJump
+.It ProxyUseFdpass
 .It PubkeyAcceptedAlgorithms
 .It PubkeyAuthentication
 .It RekeyLimit
+.It RemoteCommand
+.It RemoteForward
+.It RequestTTY
 .It RequiredRSASize
+.It RevokedHostKeys
+.It SecurityKeyProvider
 .It SendEnv
-.It ServerAliveInterval
 .It ServerAliveCountMax
+.It ServerAliveInterval
+.It SessionType
 .It SetEnv
+.It StdinNull
+.It StreamLocalBindMask
+.It StreamLocalBindUnlink
 .It StrictHostKeyChecking
+.It SyslogFacility
 .It TCPKeepAlive
+.It Tag
+.It Tunnel
+.It TunnelDevice
 .It UpdateHostKeys
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
+.It VisualHostKey
+.It XAuthLocation
 .El
 .It Fl P Ar port
 Specifies the port to connect to on the remote host.
diff --git a/sftp.1 b/sftp.1
index 68923ae20..651baaf85 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.143 2022/12/16 03:40:03 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.144 2024/12/06 15:12:56 djm Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 16 2022 $
+.Dd $Mdocdate: December 6 2024 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -224,67 +224,106 @@ For full details of the options listed below, and their possible values, see
 .Xr ssh_config 5 .
 .Pp
 .Bl -tag -width Ds -offset indent -compact
+.It AddKeysToAgent
 .It AddressFamily
 .It BatchMode
 .It BindAddress
 .It BindInterface
+.It CASignatureAlgorithms
 .It CanonicalDomains
 .It CanonicalizeFallbackLocal
 .It CanonicalizeHostname
 .It CanonicalizeMaxDots
 .It CanonicalizePermittedCNAMEs
-.It CASignatureAlgorithms
 .It CertificateFile
+.It ChannelTimeout
 .It CheckHostIP
 .It Ciphers
+.It ClearAllForwardings
 .It Compression
-.It ConnectionAttempts
 .It ConnectTimeout
+.It ConnectionAttempts
 .It ControlMaster
 .It ControlPath
 .It ControlPersist
-.It GlobalKnownHostsFile
+.It DynamicForward
+.It EnableEscapeCommandline
+.It EnableSSHKeysign
+.It EscapeChar
+.It ExitOnForwardFailure
+.It FingerprintHash
+.It ForkAfterAuthentication
+.It ForwardAgent
+.It ForwardX11
+.It ForwardX11Timeout
+.It ForwardX11Trusted
 .It GSSAPIAuthentication
 .It GSSAPIDelegateCredentials
+.It GatewayPorts
+.It GlobalKnownHostsFile
 .It HashKnownHosts
 .It Host
-.It HostbasedAcceptedAlgorithms
-.It HostbasedAuthentication
 .It HostKeyAlgorithms
 .It HostKeyAlias
+.It HostbasedAcceptedAlgorithms
+.It HostbasedAuthentication
 .It Hostname
+.It IPQoS
 .It IdentitiesOnly
 .It IdentityAgent
 .It IdentityFile
-.It IPQoS
+.It IgnoreUnknown
+.It Include
 .It KbdInteractiveAuthentication
 .It KbdInteractiveDevices
 .It KexAlgorithms
 .It KnownHostsCommand
+.It LocalCommand
+.It LocalForward
 .It LogLevel
+.It LogVerbose
 .It MACs
 .It NoHostAuthenticationForLocalhost
 .It NumberOfPasswordPrompts
-.It PasswordAuthentication
+.It ObscureKeystrokeTiming
 .It PKCS11Provider
+.It PasswordAuthentication
+.It PermitLocalCommand
+.It PermitRemoteOpen
 .It Port
 .It PreferredAuthentications
 .It ProxyCommand
 .It ProxyJump
+.It ProxyUseFdpass
 .It PubkeyAcceptedAlgorithms
 .It PubkeyAuthentication
 .It RekeyLimit
+.It RemoteCommand
+.It RemoteForward
+.It RequestTTY
 .It RequiredRSASize
+.It RevokedHostKeys
+.It SecurityKeyProvider
 .It SendEnv
-.It ServerAliveInterval
 .It ServerAliveCountMax
+.It ServerAliveInterval
+.It SessionType
 .It SetEnv
+.It StdinNull
+.It StreamLocalBindMask
+.It StreamLocalBindUnlink
 .It StrictHostKeyChecking
+.It SyslogFacility
 .It TCPKeepAlive
+.It Tag
+.It Tunnel
+.It TunnelDevice
 .It UpdateHostKeys
 .It User
 .It UserKnownHostsFile
 .It VerifyHostKeyDNS
+.It VisualHostKey
+.It XAuthLocation
 .El
 .It Fl P Ar port
 Specifies the port to connect to on the remote host.