summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d2474f17a..e0978ce76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@
34 - deraadt@cvs.openbsd.org 2011/09/07 02:18:31 34 - deraadt@cvs.openbsd.org 2011/09/07 02:18:31
35 [ssh-keygen.1] 35 [ssh-keygen.1]
36 typo (they vs the) found by Lawrence Teo 36 typo (they vs the) found by Lawrence Teo
37 - djm@cvs.openbsd.org 2011/09/09 00:43:00
38 [ssh_config.5 sshd_config.5]
39 fix typo in IPQoS parsing: there is no "AF14" class, but there is
40 an "AF21" class. Spotted by giesen AT snickers.org; ok markus stevesk
37 41
3820110909 4220110909
39 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From 43 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From
diff --git a/ssh_config.5 b/ssh_config.5
index a782d6f41..78a542dc0 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.153 2011/08/02 01:22:11 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.154 2011/09/09 00:43:00 djm Exp $
37.Dd $Mdocdate: August 2 2011 $ 37.Dd $Mdocdate: September 9 2011 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -658,7 +658,7 @@ Accepted values are
658.Dq af11 , 658.Dq af11 ,
659.Dq af12 , 659.Dq af12 ,
660.Dq af13 , 660.Dq af13 ,
661.Dq af14 , 661.Dq af21 ,
662.Dq af22 , 662.Dq af22 ,
663.Dq af23 , 663.Dq af23 ,
664.Dq af31 , 664.Dq af31 ,
diff --git a/sshd_config.5 b/sshd_config.5
index a6c378792..4ef8b9e6d 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.135 2011/08/02 01:22:11 djm Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.136 2011/09/09 00:43:00 djm Exp $
37.Dd $Mdocdate: August 2 2011 $ 37.Dd $Mdocdate: September 9 2011 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -519,7 +519,7 @@ Accepted values are
519.Dq af11 , 519.Dq af11 ,
520.Dq af12 , 520.Dq af12 ,
521.Dq af13 , 521.Dq af13 ,
522.Dq af14 , 522.Dq af21 ,
523.Dq af22 , 523.Dq af22 ,
524.Dq af23 , 524.Dq af23 ,
525.Dq af31 , 525.Dq af31 ,