diff options
| author | brueffer <brueffer@FreeBSD.org> | 2007-04-07 14:45:36 +0000 |
|---|---|---|
| committer | brueffer <brueffer@FreeBSD.org> | 2007-04-07 14:45:36 +0000 |
| commit | a8db5cc8074488959ba1cd72c9f0621357de58f3 (patch) | |
| tree | fa2a5af3f1d55c7aa5e1f17908d35266733f49e1 | |
| parent | 83cc973253ecdc77d7b844e73746981f5c1dc5b8 (diff) | |
| download | FreeBSD-src-a8db5cc8074488959ba1cd72c9f0621357de58f3.zip FreeBSD-src-a8db5cc8074488959ba1cd72c9f0621357de58f3.tar.gz | |
The net.link.tap.up_on_open sysctl was MFCed. While here, fix a minor
whitespace problem in the previous commit.
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index a89aa00..955cd57 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -1082,7 +1082,8 @@ pipe tablearg ip from table(1) to any</programlisting> <para>The <varname>net.link.tap.up_on_open</varname> sysctl variable has been added to the &man.tap.4; driver. If enabled, new tap - devices will marked <literal>up</literal> upon creation.</para> + devices will marked <literal>up</literal> upon creation. &merged; + </para> <para>Support for &man.kqueue.2; operations has been added to the &man.tun.4; driver. &merged;</para> @@ -1275,7 +1276,7 @@ geli_da1s3a_keyfile0_name="/boot/keys/da1s3a.key"</programlisting> layer of unions. More information can be found in the &man.mount.unionfs.8; manual page. &merged;</para> - <para>[&arch.amd64;, &arch.i386;]Support for Sun's ZFS has been + <para>[&arch.amd64;, &arch.i386;] Support for Sun's ZFS has been added. More information about this file system can be found on the <ulink url="http://www.opensolaris.org/os/community/zfs/"> OpenSolaris ZFS page</ulink>.</para> |
