add IPQoS to the various -o lists, and zap some trailing whitespace;

4 files changed, 12 insertions, 9 deletions

diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 24b88b56553..346e5e3114a 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.53 2010/10/28 18:33:28 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.54 2010/11/18 15:01:00 jmc Exp $
 .\"
-.Dd $Mdocdate: October 28 2010 $
+.Dd $Mdocdate: November 18 2010 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -146,6 +146,7 @@ For full details of the options listed below, and their possible values, see
 .It HostName
 .It IdentityFile
 .It IdentitiesOnly
+.It IPQoS
 .It KbdInteractiveDevices
 .It KexAlgorithms
 .It LogLevel
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 0d253cc8f7d..3bb0c06462c 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.86 2010/09/23 13:36:46 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.87 2010/11/18 15:01:00 jmc 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: September 23 2010 $
+.Dd $Mdocdate: November 18 2010 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -201,6 +201,7 @@ For full details of the options listed below, and their possible values, see
 .It HostName
 .It IdentityFile
 .It IdentitiesOnly
+.It IPQoS
 .It KbdInteractiveDevices
 .It KexAlgorithms
 .It LogLevel
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 22564918075..e3a42b5ad7d 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -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.1,v 1.315 2010/10/28 18:33:28 jmc Exp $
-.Dd $Mdocdate: October 28 2010 $
+.\" $OpenBSD: ssh.1,v 1.316 2010/11/18 15:01:00 jmc Exp $
+.Dd $Mdocdate: November 18 2010 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -435,6 +435,7 @@ For full details of the options listed below, and their possible values, see
 .It HostName
 .It IdentityFile
 .It IdentitiesOnly
+.It IPQoS
 .It KbdInteractiveDevices
 .It KexAlgorithms
 .It LocalCommand
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index b074ddc6ba8..f540a957118 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -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: sshd_config.5,v 1.129 2010/11/13 23:27:51 djm Exp $
-.Dd $Mdocdate: November 13 2010 $
+.\" $OpenBSD: sshd_config.5,v 1.130 2010/11/18 15:01:00 jmc Exp $
+.Dd $Mdocdate: November 18 2010 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -582,7 +582,7 @@ The default is
 .Dq ecdh-sha2-nistp256 ,
 .Dq ecdh-sha2-nistp384 ,
 .Dq ecdh-sha2-nistp521 ,
-.Dq diffie-hellman-group-exchange-sha256 , 
+.Dq diffie-hellman-group-exchange-sha256 ,
 .Dq diffie-hellman-group-exchange-sha1 ,
 .Dq diffie-hellman-group14-sha1 ,
 .Dq diffie-hellman-group1-sha1 .