diff options
author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
---|---|---|
committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /doc/ospfd.texi | |
parent | 01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff) | |
parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'doc/ospfd.texi')
-rw-r--r-- | doc/ospfd.texi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/ospfd.texi b/doc/ospfd.texi index f879a986..856a2ba0 100644 --- a/doc/ospfd.texi +++ b/doc/ospfd.texi @@ -99,7 +99,7 @@ behaviors implemented in Cisco and IBM routers." to section G.2 (changes) in section 16.4 a change to the path preference algorithm that prevents possible routing loops that were possible in the old version of OSPFv2. More specifically it demands -that inter-area paths and intra-area path are now of equal preference +that inter-area paths and intra-area backbone path are now of equal preference but still both preferred to external paths. This command should NOT be set normally. @@ -568,10 +568,6 @@ redistributed into OSPF (@pxref{OSPF redistribute}). @deffnx {OSPF Command} {no distance ospf} {} @end deffn -@deffn {Command} {router zebra} {} -@deffnx {Command} {no router zebra} {} -@end deffn - @node Showing OSPF information @section Showing OSPF information |