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

	* quagga.texi: Rejiggle the copyright sections a bit, seems to
	  make makeinfo happier and generates info pages again on FC4.
	* quagga.info: Update this auto-built file.

3 files changed, 189 insertions, 171 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d13826a3..263a2d72 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-11 Paul Jakma <paul@dishone.st>
+
+	* quagga.texi: Rejiggle the copyright sections a bit, seems to
+	  make makeinfo happier and generates info pages again on FC4.
+	* quagga.info: Update this auto-built file.
+	
 2005-04-29 Paul Jakma <paul@dishone.st>
 
 	* defines.texi.in: Add PACKAGE_NAME, PACKAGE_STRING.
diff --git a/doc/quagga.info b/doc/quagga.info
index 2ada2b3e..f3ca189e 100644
--- a/doc/quagga.info
+++ b/doc/quagga.info
@@ -1,4 +1,6 @@
-This is quagga.info, produced by makeinfo version 4.7 from quagga.texi.
+This is quagga.info, produced by makeinfo version 4.8 from quagga.texi.
+
+   Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
      Permission is granted to make and distribute verbatim copies of
      this manual provided the copyright notice and this permission
@@ -22,8 +24,8 @@ END-INFO-DIR-ENTRY
    This file documents the Quagga Software Routing Suite which manages
 common TCP/IP routing protocols.
 
-   This is Edition 0.99.1, last updated 29 April 2005 of `The Quagga
-Manual', for Quagga Version 0.99.1.
+   This is Edition 0.99.1, last updated 10 September 2005 of `The
+Quagga Manual', for Quagga Version 0.99.1.
 
    Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
 
@@ -51,6 +53,22 @@ Quagga is an advanced routing software package that provides a suite of
 TCP/IP based routing protocols.  This is the Manual for Quagga 0.99.1.
 Quagga is a fork of GNU Zebra.
 
+   Copyright (C) 1999-2005 Kunihiro Ishiguro, et al.
+
+     Permission is granted to make and distribute verbatim copies of
+     this manual provided the copyright notice and this permission
+     notice are preserved on all copies.
+
+     Permission is granted to copy and distribute modified versions of
+     this manual under the conditions for verbatim copying, provided
+     that the entire resulting derived work is distributed under the
+     terms of a permission notice identical to this one.
+
+     Permission is granted to copy and distribute translations of this
+     manual into another language, under the above conditions for
+     modified versions, except that this permission notice may be
+     stated in a translation approved by Kunihiro Ishiguro.
+
 * Menu:
 
 * Overview::
@@ -3825,17 +3843,11 @@ fig:normal-processing::, it consists of three steps:
      its attributes modified. Those routes which are accepted by the
      `Out' filters of a peer are announced to that peer.
 
-
-
-Figure 10.1: Announcement processing inside a "normal" BGP speaker
-
-
+ Figure 10.1: Announcement processing inside a "normal" BGP speaker
 
-Figure 10.2: Full Mesh
+ Figure 10.2: Full Mesh
 
-
-
-Figure 10.3: Route Server and clients
+ Figure 10.3: Route Server and clients
 
    Of course we want that the routing tables obtained in each of the
 routers are the same when using the route server than when not. But as
@@ -3920,9 +3932,8 @@ additional comments:
      not to remove them as they do not hurt anybody (they can always be
      left empty).
 
-
-
-Figure 10.4: Announcement processing model implemented by the Route Server
+ Figure 10.4: Announcement processing model implemented by the Route
+Server
 
 
 File: quagga.info,  Node: Commands for configuring a Route Server,  Next: Example of Route Server Configuration,  Prev: Description of the Route Server model,  Up: Configuring Quagga as a Route Server
@@ -6080,157 +6091,157 @@ VTY Key Index
 
 
 Tag Table:
-Node: Top1887
-Node: Overview2482
-Node: About Quagga3883
-Node: System Architecture6136
-Node: Supported Platforms8826
-Node: Supported RFC9967
-Node: How to get Quagga11931
-Node: Mailing List12685
-Node: Bug Reports13132
-Node: Installation14010
-Node: Configure the Software14444
-Node: The Configure script and its options14692
-Node: Least-Privilege support17880
-Node: Linux notes19616
-Ref: Linux notes-Footnote-121474
-Node: Build the Software21540
-Node: Install the Software22088
-Node: Basic commands23548
-Node: Config Commands24323
-Node: Basic Config Commands25216
-Node: Sample Config File30706
-Node: Terminal Mode Commands31476
-Node: Common Invocation Options32573
-Node: Virtual Terminal Interfaces33980
-Node: VTY Overview34491
-Node: VTY Modes35742
-Node: VTY View Mode36192
-Node: VTY Enable Mode36442
-Node: VTY Other Modes36720
-Node: VTY CLI Commands36896
-Node: CLI Movement Commands37356
-Node: CLI Editing Commands37879
-Node: CLI Advanced Commands38467
-Node: Zebra39233
-Node: Invoking zebra39742
-Node: Interface Commands40321
-Node: Static Route Commands41853
-Node: zebra Terminal Mode Commands45126
-Node: RIP46091
-Node: Starting and Stopping ripd47028
-Node: RIP netmask48441
-Node: RIP Configuration49540
-Node: How to Announce RIP route53805
-Node: Filtering RIP Routes56368
-Node: RIP Metric Manipulation57835
-Node: RIP distance58748
-Node: RIP route-map59563
-Node: RIP Authentication62079
-Node: RIP Timers63186
-Node: Show RIP Information64472
-Node: RIP Debug Commands65845
-Node: RIPng66841
-Node: Invoking ripngd67161
-Node: ripngd Configuration67410
-Node: ripngd Terminal Mode Commands68161
-Node: ripngd Filtering Commands68525
-Node: OSPFv269034
-Node: Configuring ospfd69593
-Node: OSPF router70061
-Node: OSPF area73217
-Node: OSPF interface78399
-Node: Redistribute routes to OSPF81782
-Node: Showing OSPF information83945
-Node: Debugging OSPF85191
-Node: OSPFv386230
-Node: OSPF6 router86550
-Node: OSPF6 area86904
-Node: OSPF6 interface87082
-Node: Redistribute routes to OSPF687959
-Node: Showing OSPF6 information88275
-Node: BGP89095
-Node: Starting BGP89985
-Node: BGP router90562
-Node: BGP distance91806
-Node: BGP decision process92244
-Node: BGP network92726
-Node: BGP route92916
-Node: Route Aggregation93472
-Node: Redistribute to BGP94041
-Node: BGP Peer94568
-Node: Defining Peer94755
-Node: BGP Peer commands95368
-Node: Peer filtering97772
-Node: BGP Peer Group98280
-Node: BGP Address Family98593
-Node: Autonomous System98747
-Node: AS Path Regular Expression99584
-Node: Display BGP Routes by AS Path100831
-Node: AS Path Access List101271
-Node: Using AS Path in Route Map101738
-Node: Private AS Numbers102019
-Node: BGP Communities Attribute102177
-Node: BGP Community Lists104644
-Node: Numbered BGP Community Lists107298
-Node: BGP Community in Route Map108885
-Node: Display BGP Routes by Community110828
-Node: Using BGP Communities Attribute111997
-Node: BGP Extended Communities Attribute115565
-Node: BGP Extended Community Lists117337
-Node: BGP Extended Communities in Route Map119212
-Node: Displaying BGP routes119671
-Node: Show IP BGP119908
-Node: More Show IP BGP120608
-Node: Capability Negotiation121759
-Node: Route Reflector125063
-Node: Route Server125342
-Node: Multiple instance126408
-Node: BGP instance and view128219
-Node: Routing policy129599
-Node: Viewing the view130367
-Node: How to set up a 6-Bone connection130652
-Node: Dump BGP packets and table132024
-Node: Configuring Quagga as a Route Server132571
-Node: Description of the Route Server model133532
-Ref: fig:normal-processing135109
-Ref: fig:full-mesh135259
-Ref: fig:route-server135355
-Ref: filter-delegation135769
-Ref: Route Server tasks136953
-Ref: Route-server path filter process137324
-Ref: fig:rs-processing139638
-Node: Commands for configuring a Route Server139791
-Node: Example of Route Server Configuration142818
-Node: Configuration of the BGP routers without Route Server143739
-Node: Configuration of the BGP routers with Route Server146622
-Node: Configuration of the Route Server itself147923
-Node: Further considerations about Import and Export route-maps152922
-Node: VTY shell155966
-Node: VTY shell username156635
-Node: VTY shell integrated configuration157267
-Node: Filtering158715
-Node: IP Access List159068
-Node: IP Prefix List159454
-Node: ip prefix-list description162473
-Node: ip prefix-list sequential number control163000
-Node: Showing ip prefix-list163542
-Node: Clear counter of ip prefix-list164650
-Node: Route Map165089
-Node: Route Map Command165594
-Node: Route Map Match Command165791
-Node: Route Map Set Command166415
-Node: IPv6 Support167292
-Node: Router Advertisement167864
-Node: Kernel Interface173480
-Node: SNMP Support175437
-Node: Getting and installing an SNMP agent176009
-Node: SMUX configuration176582
-Node: MIB and command reference178718
-Node: Zebra Protocol180105
-Node: Packet Binary Dump Format182019
-Node: Command Index193629
-Node: VTY Key Index251336
+Node: Top1971
+Node: Overview3329
+Node: About Quagga4730
+Node: System Architecture6983
+Node: Supported Platforms9673
+Node: Supported RFC10814
+Node: How to get Quagga12778
+Node: Mailing List13532
+Node: Bug Reports13979
+Node: Installation14857
+Node: Configure the Software15291
+Node: The Configure script and its options15539
+Node: Least-Privilege support18727
+Node: Linux notes20463
+Ref: Linux notes-Footnote-122321
+Node: Build the Software22387
+Node: Install the Software22935
+Node: Basic commands24395
+Node: Config Commands25170
+Node: Basic Config Commands26063
+Node: Sample Config File31553
+Node: Terminal Mode Commands32323
+Node: Common Invocation Options33420
+Node: Virtual Terminal Interfaces34827
+Node: VTY Overview35338
+Node: VTY Modes36589
+Node: VTY View Mode37039
+Node: VTY Enable Mode37289
+Node: VTY Other Modes37567
+Node: VTY CLI Commands37743
+Node: CLI Movement Commands38203
+Node: CLI Editing Commands38726
+Node: CLI Advanced Commands39314
+Node: Zebra40080
+Node: Invoking zebra40589
+Node: Interface Commands41168
+Node: Static Route Commands42700
+Node: zebra Terminal Mode Commands45973
+Node: RIP46938
+Node: Starting and Stopping ripd47875
+Node: RIP netmask49288
+Node: RIP Configuration50387
+Node: How to Announce RIP route54652
+Node: Filtering RIP Routes57215
+Node: RIP Metric Manipulation58682
+Node: RIP distance59595
+Node: RIP route-map60410
+Node: RIP Authentication62926
+Node: RIP Timers64033
+Node: Show RIP Information65319
+Node: RIP Debug Commands66692
+Node: RIPng67688
+Node: Invoking ripngd68008
+Node: ripngd Configuration68257
+Node: ripngd Terminal Mode Commands69008
+Node: ripngd Filtering Commands69372
+Node: OSPFv269881
+Node: Configuring ospfd70440
+Node: OSPF router70908
+Node: OSPF area74064
+Node: OSPF interface79246
+Node: Redistribute routes to OSPF82629
+Node: Showing OSPF information84792
+Node: Debugging OSPF86038
+Node: OSPFv387077
+Node: OSPF6 router87397
+Node: OSPF6 area87751
+Node: OSPF6 interface87929
+Node: Redistribute routes to OSPF688806
+Node: Showing OSPF6 information89122
+Node: BGP89942
+Node: Starting BGP90832
+Node: BGP router91409
+Node: BGP distance92653
+Node: BGP decision process93091
+Node: BGP network93573
+Node: BGP route93763
+Node: Route Aggregation94319
+Node: Redistribute to BGP94888
+Node: BGP Peer95415
+Node: Defining Peer95602
+Node: BGP Peer commands96215
+Node: Peer filtering98619
+Node: BGP Peer Group99127
+Node: BGP Address Family99440
+Node: Autonomous System99594
+Node: AS Path Regular Expression100431
+Node: Display BGP Routes by AS Path101678
+Node: AS Path Access List102118
+Node: Using AS Path in Route Map102585
+Node: Private AS Numbers102866
+Node: BGP Communities Attribute103024
+Node: BGP Community Lists105491
+Node: Numbered BGP Community Lists108145
+Node: BGP Community in Route Map109732
+Node: Display BGP Routes by Community111675
+Node: Using BGP Communities Attribute112844
+Node: BGP Extended Communities Attribute116412
+Node: BGP Extended Community Lists118184
+Node: BGP Extended Communities in Route Map120059
+Node: Displaying BGP routes120518
+Node: Show IP BGP120755
+Node: More Show IP BGP121455
+Node: Capability Negotiation122606
+Node: Route Reflector125910
+Node: Route Server126189
+Node: Multiple instance127255
+Node: BGP instance and view129066
+Node: Routing policy130446
+Node: Viewing the view131214
+Node: How to set up a 6-Bone connection131499
+Node: Dump BGP packets and table132871
+Node: Configuring Quagga as a Route Server133418
+Node: Description of the Route Server model134379
+Ref: fig:normal-processing135956
+Ref: fig:full-mesh136025
+Ref: fig:route-server136050
+Ref: filter-delegation136392
+Ref: Route Server tasks137576
+Ref: Route-server path filter process137947
+Ref: fig:rs-processing140261
+Node: Commands for configuring a Route Server140338
+Node: Example of Route Server Configuration143365
+Node: Configuration of the BGP routers without Route Server144286
+Node: Configuration of the BGP routers with Route Server147169
+Node: Configuration of the Route Server itself148470
+Node: Further considerations about Import and Export route-maps153469
+Node: VTY shell156513
+Node: VTY shell username157182
+Node: VTY shell integrated configuration157814
+Node: Filtering159262
+Node: IP Access List159615
+Node: IP Prefix List160001
+Node: ip prefix-list description163020
+Node: ip prefix-list sequential number control163547
+Node: Showing ip prefix-list164089
+Node: Clear counter of ip prefix-list165197
+Node: Route Map165636
+Node: Route Map Command166141
+Node: Route Map Match Command166338
+Node: Route Map Set Command166962
+Node: IPv6 Support167839
+Node: Router Advertisement168411
+Node: Kernel Interface174027
+Node: SNMP Support175984
+Node: Getting and installing an SNMP agent176556
+Node: SMUX configuration177129
+Node: MIB and command reference179265
+Node: Zebra Protocol180652
+Node: Packet Binary Dump Format182566
+Node: Command Index194176
+Node: VTY Key Index251883
 
 End Tag Table
diff --git a/doc/quagga.texi b/doc/quagga.texi
index 226c9f14..6e7ac1c7 100644
--- a/doc/quagga.texi
+++ b/doc/quagga.texi
@@ -15,7 +15,9 @@
 @include version.texi
 
 @copying
+@value{COPYRIGHT_STR}
 @quotation
+
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.
@@ -35,7 +37,7 @@ approved by Kunihiro Ishiguro.
 @c Info entry
 @dircategory Routing Software:
 @direntry
-* Quagga: (quagga).		The Quagga Software Routing Suite
+* @value{PACKAGE_NAME}: (quagga).		The Quagga Software Routing Suite
 @end direntry
 
 @c @smallbook
@@ -48,8 +50,6 @@ This is Edition @value{EDITION}, last updated @value{UPDATED} of
 @cite{The Quagga Manual}, for @uref{http://www.quagga.net/,,@value{PACKAGE_NAME}}
 Version @value{VERSION}.
 
-@value{COPYRIGHT_STR}
-
 @insertcopying
 @end ifinfo
 
@@ -62,7 +62,6 @@ Version @value{VERSION}.
 
 @page
 @vskip 0pt plus 1filll
-@value{COPYRIGHT_STR}
 
 @insertcopying
 @end titlepage
@@ -76,6 +75,8 @@ Version @value{VERSION}.
 that provides a suite of TCP/IP based routing protocols.  This is the Manual
 for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of 
 @uref{http://www.zebra.org,,GNU Zebra}.
+
+@insertcopying
 @end ifnottex
 
 @menu