diff options
author | hrs <hrs@FreeBSD.org> | 2005-03-21 16:34:34 +0000 |
---|---|---|
committer | hrs <hrs@FreeBSD.org> | 2005-03-21 16:34:34 +0000 |
commit | 273e89f9db7ed2f4f3b76bebcd2a59c85b105366 (patch) | |
tree | b489e5c467c2372210907371d7013a4539cbcd9c | |
parent | b4470372ca452e826631f686b6e651a110e72675 (diff) | |
download | FreeBSD-src-273e89f9db7ed2f4f3b76bebcd2a59c85b105366.zip FreeBSD-src-273e89f9db7ed2f4f3b76bebcd2a59c85b105366.tar.gz |
MFC: CARP (Common Address Redundancy Protocol).
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 2 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 2 |
2 files changed, 2 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 c818432..57e6475 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -440,7 +440,7 @@ been implemented. CARP comes from OpenBSD and allows multiple hosts to share an IP address, providing high availability and load balancing. - For more information, see the &man.carp.4; manual page.</para> + For more information, see the &man.carp.4; manual page. &merged;</para> <para>The &man.ipfw.4; <literal>IPDIVERT</literal> option is now available as a kernel loadable module. 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 c818432..57e6475 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -440,7 +440,7 @@ been implemented. CARP comes from OpenBSD and allows multiple hosts to share an IP address, providing high availability and load balancing. - For more information, see the &man.carp.4; manual page.</para> + For more information, see the &man.carp.4; manual page. &merged;</para> <para>The &man.ipfw.4; <literal>IPDIVERT</literal> option is now available as a kernel loadable module. |