diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index b868d4520bb..e73130d9df3 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -571,6 +571,11 @@ high availability and load balancing. For more information, see the &man.carp.4; manual page. &merged; + The &man.if.bridge.4; network bridging implementation, + originally from NetBSD, has been added. It supports the IEEE + 802.1D Spanning Tree Protocol, individual interface devices + for each bridge, and filtering of bridged packets. + The &man.ipfw.4; IPDIVERT option is now available as a kernel loadable module. If this module is not loaded, &man.ipfw.4; will refuse to @@ -1252,7 +1257,7 @@ moused_ums0_port="/dev/ums0" Eelgrass release to the Feterita release. OpenSSH has been updated from 3.8p1 - to 3.9p1. + to 4.1p1. OpenSSL has been updated from 0.9.7d to 0.9.7e. &merged; diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml index b868d4520bb..e73130d9df3 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -571,6 +571,11 @@ high availability and load balancing. For more information, see the &man.carp.4; manual page. &merged; + The &man.if.bridge.4; network bridging implementation, + originally from NetBSD, has been added. It supports the IEEE + 802.1D Spanning Tree Protocol, individual interface devices + for each bridge, and filtering of bridged packets. + The &man.ipfw.4; IPDIVERT option is now available as a kernel loadable module. If this module is not loaded, &man.ipfw.4; will refuse to @@ -1252,7 +1257,7 @@ moused_ums0_port="/dev/ums0" Eelgrass release to the Feterita release. OpenSSH has been updated from 3.8p1 - to 3.9p1. + to 4.1p1. OpenSSL has been updated from 0.9.7d to 0.9.7e. &merged;