summaryrefslogtreecommitdiff
path: root/doc/ipv6.texi
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2012-03-25 17:10:22 +0100
committerPaul Jakma <paul@quagga.net>2012-03-25 17:10:22 +0100
commit81c3e5006e5d29e305cbc0ab482617d7e570e8c0 (patch)
tree7408dfdeff638ce16273cd7c8c4d9c35a99cfe87 /doc/ipv6.texi
parentfe67e668881b8b8d71b1570575c913cd287fafcf (diff)
parent6881f2698279f3c47a55e8969860eeac59e8c3d7 (diff)
Merge branch 'babeld-merge' into master-copy
Diffstat (limited to 'doc/ipv6.texi')
-rw-r--r--doc/ipv6.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ipv6.texi b/doc/ipv6.texi
index d4ef45a3..b6cc4376 100644
--- a/doc/ipv6.texi
+++ b/doc/ipv6.texi
@@ -2,7 +2,7 @@
@chapter IPv6 Support
Quagga fully supports IPv6 routing. As described so far, Quagga supports
-RIPng, OSPFv3 and BGP-4+. You can give IPv6 addresses to an interface
+RIPng, OSPFv3, Babel and BGP-4+. You can give IPv6 addresses to an interface
and configure static IPv6 routing information. Quagga IPv6 also provides
automatic address configuration via a feature called @code{address
auto configuration}. To do it, the router must send router advertisement