2005-04-10 Paul Jakma <paul@dishone.st>

	* quagga.info: Update to match bgpd.texi addition

2 files changed, 88 insertions, 77 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f07f06de..451373a4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-10 Paul Jakma <paul@dishone.st>
+
+	* quagga.info: Update to match bgpd.texi addition
+
 2005-04-08 Hasso Tepper <hasso at quagga.net>
 
 	* bgpd.texi: Document new "bgp bestpath as-path confed" command.
diff --git a/doc/quagga.info b/doc/quagga.info
index 4e598472..0e9285ce 100644
--- a/doc/quagga.info
+++ b/doc/quagga.info
@@ -2659,6 +2659,11 @@ File: quagga.info,  Node: BGP decision process,  Prev: BGP distance,  Up: BGP ro
 
 6. MED check.
 
+ -- BGP: bgp bestpath as-path confed
+     This command specifies that the length of confederation path sets
+     and sequences should should be taken into account during the BGP
+     best path decision process.
+
 
 File: quagga.info,  Node: BGP network,  Next: BGP Peer,  Prev: BGP router,  Up: BGP
 
@@ -5268,6 +5273,8 @@ Command Index
 * bandwidth <1-10000000>:                Interface Commands.  (line  31)
 * banner motd default:                   Basic Config Commands.
                                                               (line 110)
+* bgp bestpath as-path confed:           BGP decision process.
+                                                              (line  19)
 * bgp cluster-id A.B.C.D:                Route Reflector.     (line   7)
 * bgp config-type cisco:                 Multiple instance.   (line  20)
 * bgp config-type zebra:                 Multiple instance.   (line  49)
@@ -6148,82 +6155,82 @@ Node: Starting BGP89988
 Node: BGP router90565
 Node: BGP distance91809
 Node: BGP decision process92247
-Node: BGP network92517
-Node: BGP route92707
-Node: Route Aggregation93263
-Node: Redistribute to BGP93832
-Node: BGP Peer94359
-Node: Defining Peer94546
-Node: BGP Peer commands95159
-Node: Peer filtering97563
-Node: BGP Peer Group98071
-Node: BGP Address Family98384
-Node: Autonomous System98538
-Node: AS Path Regular Expression99375
-Node: Display BGP Routes by AS Path100622
-Node: AS Path Access List101062
-Node: Using AS Path in Route Map101529
-Node: Private AS Numbers101810
-Node: BGP Communities Attribute101968
-Node: BGP Community Lists104435
-Node: Numbered BGP Community Lists107089
-Node: BGP Community in Route Map108676
-Node: Display BGP Routes by Community110619
-Node: Using BGP Communities Attribute111788
-Node: BGP Extended Communities Attribute115356
-Node: BGP Extended Community Lists117128
-Node: BGP Extended Communities in Route Map119003
-Node: Displaying BGP routes119462
-Node: Show IP BGP119699
-Node: More Show IP BGP120399
-Node: Capability Negotiation121550
-Node: Route Reflector124854
-Node: Route Server125133
-Node: Multiple instance126199
-Node: BGP instance and view128010
-Node: Routing policy129390
-Node: Viewing the view130158
-Node: How to set up a 6-Bone connection130443
-Node: Dump BGP packets and table131815
-Node: Configuring Quagga as a Route Server132362
-Node: Description of the Route Server model133323
-Ref: fig:normal-processing134900
-Ref: fig:full-mesh135050
-Ref: fig:route-server135146
-Ref: filter-delegation135560
-Ref: Route Server tasks136744
-Ref: Route-server path filter process137115
-Ref: fig:rs-processing139429
-Node: Commands for configuring a Route Server139582
-Node: Example of Route Server Configuration142609
-Node: Configuration of the BGP routers without Route Server143530
-Node: Configuration of the BGP routers with Route Server146413
-Node: Configuration of the Route Server itself147714
-Node: Further considerations about Import and Export route-maps152713
-Node: VTY shell155757
-Node: VTY shell username156426
-Node: VTY shell integrated configuration157058
-Node: Filtering158506
-Node: IP Access List158859
-Node: IP Prefix List159245
-Node: ip prefix-list description162264
-Node: ip prefix-list sequential number control162791
-Node: Showing ip prefix-list163333
-Node: Clear counter of ip prefix-list164441
-Node: Route Map164880
-Node: Route Map Command165385
-Node: Route Map Match Command165582
-Node: Route Map Set Command166206
-Node: IPv6 Support167083
-Node: Router Advertisement167655
-Node: Kernel Interface173271
-Node: SNMP Support175228
-Node: Getting and installing an SNMP agent175800
-Node: SMUX configuration176373
-Node: MIB and command reference178509
-Node: Zebra Protocol179896
-Node: Packet Binary Dump Format181810
-Node: Command Index193420
-Node: VTY Key Index250991
+Node: BGP network92729
+Node: BGP route92919
+Node: Route Aggregation93475
+Node: Redistribute to BGP94044
+Node: BGP Peer94571
+Node: Defining Peer94758
+Node: BGP Peer commands95371
+Node: Peer filtering97775
+Node: BGP Peer Group98283
+Node: BGP Address Family98596
+Node: Autonomous System98750
+Node: AS Path Regular Expression99587
+Node: Display BGP Routes by AS Path100834
+Node: AS Path Access List101274
+Node: Using AS Path in Route Map101741
+Node: Private AS Numbers102022
+Node: BGP Communities Attribute102180
+Node: BGP Community Lists104647
+Node: Numbered BGP Community Lists107301
+Node: BGP Community in Route Map108888
+Node: Display BGP Routes by Community110831
+Node: Using BGP Communities Attribute112000
+Node: BGP Extended Communities Attribute115568
+Node: BGP Extended Community Lists117340
+Node: BGP Extended Communities in Route Map119215
+Node: Displaying BGP routes119674
+Node: Show IP BGP119911
+Node: More Show IP BGP120611
+Node: Capability Negotiation121762
+Node: Route Reflector125066
+Node: Route Server125345
+Node: Multiple instance126411
+Node: BGP instance and view128222
+Node: Routing policy129602
+Node: Viewing the view130370
+Node: How to set up a 6-Bone connection130655
+Node: Dump BGP packets and table132027
+Node: Configuring Quagga as a Route Server132574
+Node: Description of the Route Server model133535
+Ref: fig:normal-processing135112
+Ref: fig:full-mesh135262
+Ref: fig:route-server135358
+Ref: filter-delegation135772
+Ref: Route Server tasks136956
+Ref: Route-server path filter process137327
+Ref: fig:rs-processing139641
+Node: Commands for configuring a Route Server139794
+Node: Example of Route Server Configuration142821
+Node: Configuration of the BGP routers without Route Server143742
+Node: Configuration of the BGP routers with Route Server146625
+Node: Configuration of the Route Server itself147926
+Node: Further considerations about Import and Export route-maps152925
+Node: VTY shell155969
+Node: VTY shell username156638
+Node: VTY shell integrated configuration157270
+Node: Filtering158718
+Node: IP Access List159071
+Node: IP Prefix List159457
+Node: ip prefix-list description162476
+Node: ip prefix-list sequential number control163003
+Node: Showing ip prefix-list163545
+Node: Clear counter of ip prefix-list164653
+Node: Route Map165092
+Node: Route Map Command165597
+Node: Route Map Match Command165794
+Node: Route Map Set Command166418
+Node: IPv6 Support167295
+Node: Router Advertisement167867
+Node: Kernel Interface173483
+Node: SNMP Support175440
+Node: Getting and installing an SNMP agent176012
+Node: SMUX configuration176585
+Node: MIB and command reference178721
+Node: Zebra Protocol180108
+Node: Packet Binary Dump Format182022
+Node: Command Index193632
+Node: VTY Key Index251339
 
 End Tag Table