summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-08-11 17:55:07 +0000
committerdd <dd@FreeBSD.org>2001-08-11 17:55:07 +0000
commit284d4841aef1a69a25541e207613ca288db7b777 (patch)
tree392e9177e27eb55af3c3a13c2b13cd3ecb6f9019
parent8295242d6b9fddd0a2e35a8b92ed984131adeda4 (diff)
downloadFreeBSD-src-284d4841aef1a69a25541e207613ca288db7b777.zip
FreeBSD-src-284d4841aef1a69a25541e207613ca288db7b777.tar.gz
Note MFC of all the I4B stuff.
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/article.sgml12
-rw-r--r--release/doc/en_US.ISO8859-1/relnotes/common/new.sgml12
2 files changed, 12 insertions, 12 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index ee3a149..0f6ba04 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -742,28 +742,28 @@
<title>isdn4bsd</title>
<para><application>isdn4bsd</application> has been updated to
- version 1.0.1.</para>
+ version 1.0.1. &merged;</para>
<para>The &man.ihfc.4; driver for supporting Cologne Chip
Designs HFC devices under <application>isdn4bsd</application>
- has been added.</para>
+ has been added. &merged;</para>
<para>The &man.itjc.4; driver for supporting NETjet-S / Teles
PCI-TJ devices under <application>isdn4bsd</application> has
- been added.</para>
+ been added. &merged;</para>
<para>Experimental support for the Eicon.Diehl DIVA 2.0 and
2.02 ISA PnP ISDN cards has been added to the &man.isic.4;
- <application>isdn4bsd</application> driver.</para>
+ <application>isdn4bsd</application> driver. &merged;</para>
<para>Active CAPI-based ISDN cards manufacured by AVM are now
supported using the &man.i4bcapi.4; and the &man.iavc.4; driver. The
supported cards are the AVM B1 PCI and AVM B1 ISA Basic Rate
- cards and the AVM T1 Primary Rate cards.</para>
+ cards and the AVM T1 Primary Rate cards. &merged;</para>
<para>A new <literal>maxconnecttime</literal> keyword is now
accepted in &man.isdnd.rc.5; files to limit the time a
- connection may remain open.</para>
+ connection may remain open. &merged;</para>
</sect4>
<sect4 id="kame-kernel">
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 ee3a149..0f6ba04 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -742,28 +742,28 @@
<title>isdn4bsd</title>
<para><application>isdn4bsd</application> has been updated to
- version 1.0.1.</para>
+ version 1.0.1. &merged;</para>
<para>The &man.ihfc.4; driver for supporting Cologne Chip
Designs HFC devices under <application>isdn4bsd</application>
- has been added.</para>
+ has been added. &merged;</para>
<para>The &man.itjc.4; driver for supporting NETjet-S / Teles
PCI-TJ devices under <application>isdn4bsd</application> has
- been added.</para>
+ been added. &merged;</para>
<para>Experimental support for the Eicon.Diehl DIVA 2.0 and
2.02 ISA PnP ISDN cards has been added to the &man.isic.4;
- <application>isdn4bsd</application> driver.</para>
+ <application>isdn4bsd</application> driver. &merged;</para>
<para>Active CAPI-based ISDN cards manufacured by AVM are now
supported using the &man.i4bcapi.4; and the &man.iavc.4; driver. The
supported cards are the AVM B1 PCI and AVM B1 ISA Basic Rate
- cards and the AVM T1 Primary Rate cards.</para>
+ cards and the AVM T1 Primary Rate cards. &merged;</para>
<para>A new <literal>maxconnecttime</literal> keyword is now
accepted in &man.isdnd.rc.5; files to limit the time a
- connection may remain open.</para>
+ connection may remain open. &merged;</para>
</sect4>
<sect4 id="kame-kernel">
OpenPOWER on IntegriCloud