summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-12-26 14:26:45 +1100
committerDamien Miller <djm@mindrot.org>2010-12-26 14:26:45 +1100
commit928362dc0312f5d258da0a98ab48f35bfaa368f1 (patch)
treec4c64dc18a21d6f810c58210f58ee00373a2c7bf
parentbf5fec1bc65ce82cf82b48056680e91208665d6b (diff)
- djm@cvs.openbsd.org 2010/12/08 04:02:47
[ssh_config.5 sshd_config.5] explain that IPQoS arguments are separated by whitespace; iirc requested by jmc@ a while back
-rw-r--r--ChangeLog7
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 825c2f41..16100a05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20101226
+ - (dtucker) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2010/12/08 04:02:47
+ [ssh_config.5 sshd_config.5]
+ explain that IPQoS arguments are separated by whitespace; iirc requested
+ by jmc@ a while back
+
20101205
- (dtucker) openbsd-compat/openssl-compat.c] remove sleep leftover from
debugging. Spotted by djm.
diff --git a/ssh_config.5 b/ssh_config.5
index 5c6673de..50bcae82 100644
--- a/ssh_config.5
+++ b/ssh_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: ssh_config.5,v 1.145 2010/11/29 23:45:51 djm Exp $
-.Dd $Mdocdate: November 29 2010 $
+.\" $OpenBSD: ssh_config.5,v 1.146 2010/12/08 04:02:47 djm Exp $
+.Dd $Mdocdate: December 8 2010 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -657,7 +657,7 @@ Accepted values are
.Dq throughput ,
.Dq reliability ,
or a numeric value.
-This option may take one or two arguments.
+This option may take one or two arguments, separated by whitespace.
If one argument is specified, it is used as the packet class unconditionally.
If two values are specified, the first is automatically selected for
interactive sessions and the second for non-interactive sessions.
diff --git a/sshd_config.5 b/sshd_config.5
index d070a6de..c3d6df30 100644
--- a/sshd_config.5
+++ b/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.130 2010/11/18 15:01:00 jmc Exp $
-.Dd $Mdocdate: November 18 2010 $
+.\" $OpenBSD: sshd_config.5,v 1.131 2010/12/08 04:02:47 djm Exp $
+.Dd $Mdocdate: December 8 2010 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -540,7 +540,7 @@ Accepted values are
.Dq throughput ,
.Dq reliability ,
or a numeric value.
-This option may take one or two arguments.
+This option may take one or two arguments, separated by whitespace.
If one argument is specified, it is used as the packet class unconditionally.
If two values are specified, the first is automatically selected for
interactive sessions and the second for non-interactive sessions.