summaryrefslogtreecommitdiffstats
path: root/doc/main.texi
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-03-29 14:22:37 +0100
committerChris Hall <chris.hall@highwayman.com>2011-03-29 14:22:37 +0100
commit7e666be965b3ac61b05ccdeca2b61902bc26e172 (patch)
treedc4c1b7985b1aa3dfd16b59c70567f62ab535fd6 /doc/main.texi
parentf9956b9524ddafdb9d0cec042213eaa8229aad8c (diff)
parente20f7ccd9e110fcd5deb945f8d23922efd8b0822 (diff)
downloadquagga-ex16p.tar.bz2
quagga-ex16p.tar.xz
Merge branch 'master' of /git/quagga.euro-ix into pipeworkex16p
This ensures that the two branches are consistent after the merging of the old-Quagga 0.99.18 changes. Release: 0.99.18ex16p. Eliminated some whitespace differences ! Collected RESTRICTED_NODE show_bgp_ipv6_safi_route_cmd and show_bgp_ipv6_safi_prefix_cmd, and one HAVE_IPV6 skip. Also releasing filename in closezlog(). Removed strlen() from lib/qfstring.c for async-signal-safe purposes.
Diffstat (limited to 'doc/main.texi')
-rw-r--r--doc/main.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/main.texi b/doc/main.texi
index 9966b356..a5759137 100644
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -49,9 +49,9 @@ Up or down the current interface.
@end deffn
@deffn {Interface Command} {ip address @var{address/prefix}} {}
-@deffnx {Interface Command} {ip6 address @var{address/prefix}} {}
+@deffnx {Interface Command} {ipv6 address @var{address/prefix}} {}
@deffnx {Interface Command} {no ip address @var{address/prefix}} {}
-@deffnx {Interface Command} {no ip6 address @var{address/prefix}} {}
+@deffnx {Interface Command} {no ipv6 address @var{address/prefix}} {}
Set the IPv4 or IPv6 address/prefix for the interface.
@end deffn