summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 825c2f41a..16100a052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120101226
2 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/12/08 04:02:47
4 [ssh_config.5 sshd_config.5]
5 explain that IPQoS arguments are separated by whitespace; iirc requested
6 by jmc@ a while back
7
120101205 820101205
2 - (dtucker) openbsd-compat/openssl-compat.c] remove sleep leftover from 9 - (dtucker) openbsd-compat/openssl-compat.c] remove sleep leftover from
3 debugging. Spotted by djm. 10 debugging. Spotted by djm.
diff --git a/ssh_config.5 b/ssh_config.5
index 5c6673de3..50bcae82f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.145 2010/11/29 23:45:51 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.146 2010/12/08 04:02:47 djm Exp $
37.Dd $Mdocdate: November 29 2010 $ 37.Dd $Mdocdate: December 8 2010 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -657,7 +657,7 @@ Accepted values are
657.Dq throughput , 657.Dq throughput ,
658.Dq reliability , 658.Dq reliability ,
659or a numeric value. 659or a numeric value.
660This option may take one or two arguments. 660This option may take one or two arguments, separated by whitespace.
661If one argument is specified, it is used as the packet class unconditionally. 661If one argument is specified, it is used as the packet class unconditionally.
662If two values are specified, the first is automatically selected for 662If two values are specified, the first is automatically selected for
663interactive sessions and the second for non-interactive sessions. 663interactive sessions and the second for non-interactive sessions.
diff --git a/sshd_config.5 b/sshd_config.5
index d070a6de0..c3d6df30a 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.130 2010/11/18 15:01:00 jmc Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.131 2010/12/08 04:02:47 djm Exp $
37.Dd $Mdocdate: November 18 2010 $ 37.Dd $Mdocdate: December 8 2010 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -540,7 +540,7 @@ Accepted values are
540.Dq throughput , 540.Dq throughput ,
541.Dq reliability , 541.Dq reliability ,
542or a numeric value. 542or a numeric value.
543This option may take one or two arguments. 543This option may take one or two arguments, separated by whitespace.
544If one argument is specified, it is used as the packet class unconditionally. 544If one argument is specified, it is used as the packet class unconditionally.
545If two values are specified, the first is automatically selected for 545If two values are specified, the first is automatically selected for
546interactive sessions and the second for non-interactive sessions. 546interactive sessions and the second for non-interactive sessions.