Browse Source

2004-11-06 Paul Jakma <paul@dishone.st>

	* defines.texi.in: New file, texi variables should be set here,
          autoconf substitution is available. Define common AUTHORS,
          COPYRIGHT_YEAR and COPYRIGHT_STR vars.
	* (global): Make use of makeinfo node pointer auto-creation
          to avoid having to fully specify links for nodes, so we only have
          to specify current node name - simplifies text slightly.
          Remove extraneous newlines which appear to cause extra blank pages
          to be added in output.
          Update copyright strings which appear in various places to
          use the new COPYRIGHT_STR texinfo variable.
	  Change url to uref, the former need not output an actual
	  hyperlink depending on version of texinfo, the latter should if
	  supported by the format (eg PDF).
	* texinfo.tex: Update to a more recent version. previous file
	  was many many years old. This file should possibly be removed
          altogether, and allowed to be installed by automake.
        * quagga.texi: Make use of automake's version.texi feature to
          have VERSION and some other vars auto-defined. include
          defines.texi. Change copyright strings to use the COPYRIGHT_STR
          variable.
	* install.texi: Make the privs section an actual section. Ditto for
	  the Linux notes.
	* overview.texi: Supply URL for Quagga, where format allows. Tidy up
          one or two paragraphs slightly.
	  Update the section on supported platforms.
	  Remove the ZNOG list stuff, direct reader to the website for
          further information on email lists.
	* vtysh.texi: Update the integrated config file section. Make the
	  commands sections so correct PDF indexes are built.
paul 15 years ago
parent
commit
76b89b4a9c
23 changed files with 4557 additions and 3353 deletions
  1. 4 0
      doc/.cvsignore
  2. 32 0
      doc/ChangeLog
  3. 4 1
      doc/Makefile.am
  4. 1 2
      doc/appendix.texi
  5. 21 56
      doc/basic.texi
  6. 43 85
      doc/bgpd.texi
  7. 13 0
      doc/defines.texi.in
  8. 14 24
      doc/filter.texi
  9. 56 51
      doc/install.texi
  10. 2 4
      doc/ipv6.texi
  11. 1 2
      doc/kernel.texi
  12. 4 9
      doc/main.texi
  13. 6 12
      doc/ospf6d.texi
  14. 8 16
      doc/ospfd.texi
  15. 104 139
      doc/overview.texi
  16. 1 2
      doc/protocol.texi
  17. 20 25
      doc/quagga.texi
  18. 14 27
      doc/ripd.texi
  19. 5 10
      doc/ripngd.texi
  20. 7 11
      doc/routemap.texi
  21. 5 15
      doc/snmp.texi
  22. 4162 2840
      doc/texinfo.tex
  23. 30 22
      doc/vtysh.texi

+ 4 - 0
doc/.cvsignore

@@ -1,13 +1,17 @@
 Makefile
 Makefile.in
+mdate-sh
 draft-zebra-00.txt
 zebra.info-*
 zebra.html
+defines.texi
+version.texi
 quagga.info*
 quagga.html
 quagga.pdf
 quagga.ps
 quagga.dvi
+stamp-vti
 .nfs*
 *.aux
 *.cp

+ 32 - 0
doc/ChangeLog

@@ -1,3 +1,35 @@
+2004-11-06 Paul Jakma <paul@dishone.st>
+
+	* defines.texi.in: New file, texi variables should be set here,
+          autoconf substitution is available. Define common AUTHORS,
+          COPYRIGHT_YEAR and COPYRIGHT_STR vars.
+	* (global): Make use of makeinfo node pointer auto-creation
+          to avoid having to fully specify links for nodes, so we only have
+          to specify current node name - simplifies text slightly.
+          Remove extraneous newlines which appear to cause extra blank pages
+          to be added in output.
+          Update copyright strings which appear in various places to
+          use the new COPYRIGHT_STR texinfo variable.
+	  Change url to uref, the former need not output an actual
+	  hyperlink depending on version of texinfo, the latter should if
+	  supported by the format (eg PDF).
+	* texinfo.tex: Update to a more recent version. previous file
+	  was many many years old. This file should possibly be removed
+          altogether, and allowed to be installed by automake.
+        * quagga.texi: Make use of automake's version.texi feature to
+          have VERSION and some other vars auto-defined. include
+          defines.texi. Change copyright strings to use the COPYRIGHT_STR
+          variable.
+	* install.texi: Make the privs section an actual section. Ditto for
+	  the Linux notes.
+	* overview.texi: Supply URL for Quagga, where format allows. Tidy up
+          one or two paragraphs slightly.
+	  Update the section on supported platforms.
+	  Remove the ZNOG list stuff, direct reader to the website for
+          further information on email lists.
+	* vtysh.texi: Update the integrated config file section. Make the
+	  commands sections so correct PDF indexes are built.
+
 2004-10-12 Hasso Tepper <hasso at quagga.net>
 
 	* snmp.texi: ospf6d supports SNMP as well now.

+ 4 - 1
doc/Makefile.am

@@ -2,9 +2,12 @@
 
 info_TEXINFOS = quagga.texi
 
+BUILT_SOURCES = defines.texi
+
 quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi filter.texi install.texi \
 	ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \
-	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi vtysh.texi
+	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi vtysh.texi \
+	defines.texi
 
 man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 

+ 1 - 2
doc/appendix.texi

@@ -1,5 +1,4 @@
-@node  Packet Binary Dump Format, , Zebra Protocol, Top
-@comment  node-name,  next,  previous,  up
+@node  Packet Binary Dump Format
 @appendix Packet Binary Dump Format
 
   Quagga can dump routing protocol packet into file with a binary format

+ 21 - 56
doc/basic.texi

@@ -1,5 +1,4 @@
 @node Basic commands
-@comment  node-name,  next,  previous,  up
 @chapter Basic commands
 
 There are five routing daemons in use, and there is one manager daemon.
@@ -23,8 +22,7 @@ daemons.
 
 
 
-@node Config Commands, Common Invocation Options, Basic commands, Basic commands
-@comment  node-name,  next,  previous,  up
+@node Config Commands
 @section Config Commands
 
 @cindex Configuration files for running the software
@@ -64,8 +62,7 @@ options when starting the daemon.
 
 
 
-@node Basic Config Commands, Sample Config File, Config Commands, Config Commands
-@comment  node-name,  next,  previous,  up
+@node Basic Config Commands
 @subsection Basic Config Commands
 
 @deffn Command {hostname @var{hostname}} {}
@@ -138,7 +135,7 @@ to all VTY interfaces.
 @end deffn
 
 @deffn Command {show version} {}
-Show the current version of the Quagga and its build host information.
+Show the current version of @value{PACKAGE_NAME} and its build host information.
 @end deffn
 
 @deffn Command {line vty} {}
@@ -172,8 +169,7 @@ Restrict vty connections with an access list.
 
 
 
-@node   Sample Config File,  , Basic Config Commands, Config Commands
-@comment  node-name,  next,  previous,  up
+@node Sample Config File
 @subsection Sample Config File
 
 
@@ -208,13 +204,12 @@ comment and the password is set to 'zebra!password'.
 
 
 
-@node Common Invocation Options, Virtual Terminal Interfaces, Config Commands, Basic commands
-@comment  node-name,  next,  previous,  up
+@node Common Invocation Options
 @section Common Invocation Options
 @c COMMON_OPTIONS
 @c OPTIONS section of the man page
 
-These options apply to all Quagga daemons.
+These options apply to all @value{PACKAGE_NAME} daemons.
 
 @table @samp
 
@@ -241,7 +236,7 @@ stop}.
 
 The file name is an run-time option rather than a configure-time option
 so that multiple routing daemons can be run simultaneously.  This is
-useful when using Quagga to implement a routing looking glass.  One
+useful when using @value{PACKAGE_NAME} to implement a routing looking glass.  One
 machine can be used to collect differing routing views from differing
 points in the network.
 
@@ -267,8 +262,7 @@ Print program version.
 
 
 
-@node  Virtual Terminal Interfaces,  , Common Invocation Options, Basic commands
-@comment  node-name,  next,  previous,  up
+@node Virtual Terminal Interfaces
 @section Virtual Terminal Interfaces
 
 VTY -- Virtual Terminal [aka TeletYpe] Interface is a command line
@@ -282,8 +276,7 @@ interface (CLI) for user interaction with the routing daemon.
 
 
 
-@node  VTY Overview, VTY Modes, Virtual Terminal Interfaces, Virtual Terminal Interfaces
-@comment  node-name,  next,  previous,  up
+@node VTY Overview
 @subsection VTY Overview
 
 
@@ -300,9 +293,8 @@ Trying 127.0.0.1...
 Connected to localhost.
 Escape character is '^]'.
 
-Hello, this is zebra (version @value{VERSION})
-Copyright 1997-2000 Kunihiro Ishiguro
-
+Hello, this is @value{PACKAGE_NAME} (version @value{VERSION})
+@value{COPYRIGHT_STR}
 
 User Access Verification
 
@@ -326,13 +318,9 @@ Router#
 
 '?' is very useful for looking up commands.
 
-
-
-@node  VTY Modes, VTY CLI Commands, VTY Overview, Virtual Terminal Interfaces
-@comment  node-name,  next,  previous,  up
+@node VTY Modes
 @subsection VTY Modes
 
-
 There are three basic VTY modes:
 
 @menu
@@ -343,10 +331,7 @@ There are three basic VTY modes:
 
 There are commands that may be restricted to specific VTY modes. 
 
-
-
-@node VTY View Mode, VTY Enable Mode, VTY Modes, VTY Modes
-@comment  node-name,  next,  previous,  up
+@node VTY View Mode
 @subsubsection VTY View Mode
 @c to be written (gpoul)
 
@@ -354,33 +339,25 @@ There are commands that may be restricted to specific VTY modes.
 This mode is for read-only access to the CLI. One may exit the mode by
 leaving the system, or by entering @code{enable} mode.
 
-
-
-@node VTY Enable Mode, VTY Other Modes, VTY View Mode, VTY Modes
-@comment  node-name,  next,  previous,  up
+@node VTY Enable Mode
 @subsubsection VTY Enable Mode
 
-
 @c to be written (gpoul)
 This mode is for read-write access to the CLI. One may exit the mode by
 leaving the system, or by escaping to view mode.
 
-
-
-@node VTY Other Modes,  , VTY Enable Mode, VTY Modes
-@comment  node-name,  next,  previous,  up
+@node VTY Other Modes
 @subsubsection VTY Other Modes
 
 
 @c to be written (gpoul)
 This page is for describing other modes.
 
-@node VTY CLI Commands,  , VTY Modes, Virtual Terminal Interfaces
-@comment  node-name,  next,  previous,  up
+@node VTY CLI Commands
 @subsection VTY CLI Commands
 
-
-Commands that you may use at the command-line are described in the following three subsubsections.
+Commands that you may use at the command-line are described in the following
+three subsubsections.
 
 @menu
 * CLI Movement Commands::       Commands for moving the cursor about
@@ -388,13 +365,9 @@ Commands that you may use at the command-line are described in the following thr
 * CLI Advanced Commands::       Other commands, session management and so on
 @end menu
 
-
-
-@node CLI Movement Commands, CLI Editing Commands, VTY CLI Commands, VTY CLI Commands
-@comment  node-name,  next,  previous,  up
+@node CLI Movement Commands
 @subsubsection CLI Movement Commands
 
-
 These commands are used for moving the CLI cursor. The @key{C} character
 means press the Control Key.
 
@@ -430,13 +403,9 @@ Move to the end of the line.
 
 @end table
 
-
-
-@node CLI Editing Commands, CLI Advanced Commands, CLI Movement Commands, VTY CLI Commands
-@comment  node-name,  next,  previous,  up
+@node CLI Editing Commands
 @subsubsection CLI Editing Commands
 
-
 These commands are used for editing text on a line. The @key{C}
 character means press the Control Key.
 
@@ -474,13 +443,9 @@ Transpose character.
 
 @end table
 
-
-
-@node CLI Advanced Commands,  , CLI Editing Commands, VTY CLI Commands
-@comment  node-name,  next,  previous,  up
+@node CLI Advanced Commands
 @subsubsection CLI Advanced Commands
 
-
 There are several additional CLI commands for command line completions,
 insta-help, and VTY session management.
 

+ 43 - 85
doc/bgpd.texi

@@ -1,9 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the Quagga Manual.
-@c Copyright (C) 1999, 2000, 2001 2002 Kunihiro Ishiguro <kunihiro@zebra.org>
-@c See file zebra.texi for copying conditions.
+@c @value{COPYRIGHT_STR}
+@c See file quagga.texi for copying conditions.
 @node BGP
-@comment  node-name,  next,  previous,  up
 @chapter BGP
 
   BGP stands for a Border Gateway Protocol.  The lastest BGP version
@@ -34,8 +33,7 @@ support to BGP-4.
 * Dump BGP packets and table::  
 @end menu
 
-@node Starting BGP, BGP router, BGP, BGP
-@comment  node-name,  next,  previous,  up
+@node Starting BGP
 @section Starting BGP
 
 Default configuration file of @command{bgpd} is @file{bgpd.conf}.
@@ -56,8 +54,7 @@ Set the bgp protocol's port number.
 When program terminates, retain BGP routes added by zebra.
 @end table
 
-@node BGP router, BGP network, Starting BGP, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP router
 @section BGP router
 
   First of all you must configure BGP router with @command{router bgp}
@@ -89,8 +86,7 @@ so @code{router-id} is set to 0.0.0.0.  So please set router-id by hand.
 * BGP decision process::        
 @end menu
 
-@node BGP distance, BGP decision process, BGP router, BGP router
-@comment  node-name,  next,  previous,  up
+@node BGP distance
 @subsection BGP distance
 
 @deffn {BGP} {distance bgp <1-255> <1-255> <1-255>} {}
@@ -103,8 +99,7 @@ value for external routes, internal routes and local routes.
 This command set distance value to 
 @end deffn
 
-@node BGP decision process,  , BGP distance, BGP router
-@comment  node-name,  next,  previous,  up
+@node BGP decision process
 @subsection BGP decision process
 
 @table @asis
@@ -121,8 +116,7 @@ This command set distance value to
 @item 6. MED check.
 @end table
 
-@node BGP network, BGP Peer, BGP router, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP network
 @section BGP network
 
 @menu
@@ -131,8 +125,7 @@ This command set distance value to
 * Redistribute to BGP::         
 @end menu
 
-@node BGP route, Route Aggregation, BGP network, BGP network
-@comment  node-name,  next,  previous,  up
+@node BGP route
 @subsection BGP route
 
 @deffn {BGP} {network @var{A.B.C.D/M}} {}
@@ -152,8 +145,7 @@ doesn't care about IGP routes when announcing its routes.
 @deffn {BGP} {no network @var{A.B.C.D/M}} {}
 @end deffn
 
-@node Route Aggregation, Redistribute to BGP, BGP route, BGP network
-@comment  node-name,  next,  previous,  up
+@node Route Aggregation
 @subsection Route Aggregation
 
 @deffn {BGP} {aggregate-address @var{A.B.C.D/M}} {}
@@ -173,8 +165,7 @@ not be announce.
 @deffn {BGP} {no aggregate-address @var{A.B.C.D/M}} {}
 @end deffn
 
-@node Redistribute to BGP,  , Route Aggregation, BGP network
-@comment  node-name,  next,  previous,  up
+@node Redistribute to BGP
 @subsection Redistribute to BGP
 
 @deffn {BGP} {redistribute kernel} {}
@@ -197,8 +188,7 @@ Redistribute RIP route to BGP process.
 Redistribute OSPF route to BGP process.
 @end deffn
 
-@node BGP Peer, BGP Peer Group, BGP network, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP Peer
 @section BGP Peer
 
 @menu
@@ -207,8 +197,7 @@ Redistribute OSPF route to BGP process.
 * Peer filtering::              
 @end menu
 
-@node Defining Peer, BGP Peer commands, BGP Peer, BGP Peer
-@comment  node-name,  next,  previous,  up
+@node Defining Peer
 @subsection Defining Peer
 
 @deffn {BGP} {neighbor @var{peer} remote-as @var{asn}} {}
@@ -230,8 +219,7 @@ can't find neighbor 10.0.0.1
 @end example
 @end deffn
 
-@node BGP Peer commands, Peer filtering, Defining Peer, BGP Peer
-@comment  node-name,  next,  previous,  up
+@node BGP Peer commands
 @subsection BGP Peer commands
 
 In a @code{router bgp} clause there are neighbor specific configurations
@@ -306,8 +294,7 @@ routes.
 @deffnx {BGP} {no neighbor @var{peer} maximum-prefix @var{number}} {}
 @end deffn
 
-@node Peer filtering,  , BGP Peer commands, BGP Peer
-@comment  node-name,  next,  previous,  up
+@node Peer filtering
 @subsection Peer filtering
 
 @deffn {BGP} {neighbor @var{peer} distribute-list @var{name} [in|out]} {}
@@ -327,8 +314,7 @@ Apply a route-map on the neighbor.  @var{direct} must be @code{in} or
 @end deffn
 
 @c -----------------------------------------------------------------------
-@node BGP Peer Group, BGP Address Family, BGP Peer, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP Peer Group
 @section BGP Peer Group
 
 @deffn {BGP} {neighbor @var{word} peer-group} {}
@@ -339,16 +325,14 @@ This command defines a new peer group.
 This command bind specific peer to peer group @var{word}.
 @end deffn
 
-@node BGP Address Family, Autonomous System, BGP Peer Group, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP Address Family
 @section BGP Address Family
 
 
 
 @page
 @c -----------------------------------------------------------------------
-@node Autonomous System, BGP Communities Attribute, BGP Address Family, BGP
-@comment  node-name,  next,  previous,  up
+@node Autonomous System
 @section Autonomous System
 
   AS (Autonomous System) is one of the essential element of BGP.  BGP
@@ -370,8 +354,7 @@ Internet.
 * Private AS Numbers::          
 @end menu
 
-@node AS Path Regular Expression, Display BGP Routes by AS Path, Autonomous System, Autonomous System
-@comment  node-name,  next,  previous,  up
+@node AS Path Regular Expression
 @subsection AS Path Regular Expression
 
   AS path regular expression can be used for displaying BGP routes and
@@ -403,8 +386,7 @@ used for AS value boundaries match.  @code{show ip bgp regexp _7675_}
 matches to all of BGP routes which as AS number include @var{7675}.
 @end table
 
-@node Display BGP Routes by AS Path, AS Path Access List, AS Path Regular Expression, Autonomous System
-@comment  node-name,  next,  previous,  up
+@node Display BGP Routes by AS Path
 @subsection Display BGP Routes by AS Path
 
   To show BGP routes which has specific AS path information @code{show
@@ -415,8 +397,7 @@ This commands display BGP routes that matches AS path regular
 expression @var{line}.
 @end deffn
 
-@node AS Path Access List, Using AS Path in Route Map, Display BGP Routes by AS Path, Autonomous System
-@comment  node-name,  next,  previous,  up
+@node AS Path Access List
 @subsection AS Path Access List
 
   AS path access list is user defined AS path.
@@ -429,8 +410,7 @@ This command defines a new AS path access list.
 @deffnx {Command} {no ip as-path access-list @var{word} @{permit|deny@} @var{line}} {}
 @end deffn
 
-@node Using AS Path in Route Map, Private AS Numbers, AS Path Access List, Autonomous System
-@comment  node-name,  next,  previous,  up
+@node Using AS Path in Route Map
 @subsection Using AS Path in Route Map
 
 @deffn {Route Map} {match as-path @var{word}} {}
@@ -439,14 +419,12 @@ This command defines a new AS path access list.
 @deffn {Route Map} {set as-path prepend @var{as-path}} {}
 @end deffn
 
-@node Private AS Numbers,  , Using AS Path in Route Map, Autonomous System
-@comment  node-name,  next,  previous,  up
+@node Private AS Numbers
 @subsection Private AS Numbers
 
 @page
 @c -----------------------------------------------------------------------
-@node BGP Communities Attribute, BGP Extended Communities Attribute, Autonomous System, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP Communities Attribute
 @section BGP Communities Attribute
 
   BGP communities attribute is widely used for implementing policy
@@ -500,8 +478,7 @@ values are sorted in numerical order.
 * Using BGP Communities Attribute::  
 @end menu
 
-@node BGP Community Lists, Numbered BGP Community Lists, BGP Communities Attribute, BGP Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node BGP Community Lists
 @subsection BGP Community Lists
 
   BGP community list is a user defined BGP communites attribute list.
@@ -563,8 +540,7 @@ Named Community standard list CLIST
 @end example
 @end deffn
 
-@node Numbered BGP Community Lists, BGP Community in Route Map, BGP Community Lists, BGP Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node Numbered BGP Community Lists
 @subsection Numbered BGP Community Lists
 
   When number is used for BGP community list name, the number has
@@ -596,8 +572,7 @@ list.  This feature is left for backward compability.  Use of this
 feature is not recommended.
 @end deffn
 
-@node BGP Community in Route Map, Display BGP Routes by Community, Numbered BGP Community Lists, BGP Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node BGP Community in Route Map
 @subsection BGP Community in Route Map
 
   In Route Map (@pxref{Route Map}), we can match or set BGP
@@ -637,8 +612,7 @@ is removed.  When all of communities value is removed eventually, the
 BGP update's communities attribute is completely removed.
 @end deffn
 
-@node Display BGP Routes by Community, Using BGP Communities Attribute, BGP Community in Route Map, BGP Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node Display BGP Routes by Community
 @subsection Display BGP Routes by Community
 
   To show BGP routes which has specific BGP communities attribute,
@@ -663,8 +637,7 @@ This commands display BGP routes that matches community list
 that have an exact match.
 @end deffn
 
-@node Using BGP Communities Attribute,  , Display BGP Routes by Community, BGP Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node Using BGP Communities Attribute
 @subsection Using BGP Communities Attribute
 
   Following configuration is the most typical usage of BGP communities
@@ -777,8 +750,7 @@ route-map RMAP permit 10
 @end example
 
 @c -----------------------------------------------------------------------
-@node BGP Extended Communities Attribute, Displaying BGP routes, BGP Communities Attribute, BGP
-@comment  node-name,  next,  previous,  up
+@node BGP Extended Communities Attribute
 @section BGP Extended Communities Attribute
 
   BGP extended communities attribute is introduced with MPLS VPN/BGP
@@ -818,8 +790,7 @@ This is a format to define IP address based Extended Community value.
 * BGP Extended Communities in Route Map::  
 @end menu
 
-@node BGP Extended Community Lists, BGP Extended Communities in Route Map, BGP Extended Communities Attribute, BGP Extended Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node BGP Extended Community Lists
 @subsection BGP Extended Community Lists
 
   Expanded Community Lists is a user defined BGP Expanded Community
@@ -863,8 +834,7 @@ This command display current extcommunity-list information.  When
 @end example
 @end deffn
 
-@node BGP Extended Communities in Route Map,  , BGP Extended Community Lists, BGP Extended Communities Attribute
-@comment  node-name,  next,  previous,  up
+@node BGP Extended Communities in Route Map
 @subsection BGP Extended Communities in Route Map
 
 @deffn {Route Map} {match extcommunity @var{word}} {}
@@ -879,8 +849,7 @@ This command set Site of Origin value.
 @end deffn
 
 @c -----------------------------------------------------------------------
-@node Displaying BGP routes, Capability Negotiation, BGP Extended Communities Attribute, BGP
-@comment  node-name,  next,  previous,  up
+@node Displaying BGP routes
 @section Displaying BGP Routes
 
 @menu
@@ -888,8 +857,7 @@ This command set Site of Origin value.
 * More Show IP BGP::            
 @end menu
 
-@node Show IP BGP, More Show IP BGP, Displaying BGP routes, Displaying BGP routes
-@comment  node-name,  next,  previous,  up
+@node Show IP BGP
 @subsection Show IP BGP
 
 @deffn {Command} {show ip bgp} {}
@@ -910,8 +878,7 @@ Origin codes: i - IGP, e - EGP, ? - incomplete
 Total number of prefixes 1
 @end example
 
-@node More Show IP BGP,  , Show IP BGP, Displaying BGP routes
-@comment  node-name,  next,  previous,  up
+@node More Show IP BGP
 @subsection More Show IP BGP
 
 @deffn {Command} {show ip bgp regexp @var{line}} {}
@@ -965,8 +932,7 @@ Clear peer using soft reconfiguration.
 @deffn {Command} {no debug keepalive} {}
 @end deffn
 
-@node Capability Negotiation, Route Reflector, Displaying BGP routes, BGP
-@comment  node-name,  next,  previous,  up
+@node Capability Negotiation
 @section Capability Negotiation
 
   When adding IPv6 routing information exchange feature to BGP.  There
@@ -1033,8 +999,7 @@ Override the result of Capability Negotiation with local configuration.
 Ignore remote peer's capability value.
 @end deffn
 
-@node Route Reflector, Route Server, Capability Negotiation, BGP
-@comment  node-name,  next,  previous,  up
+@node Route Reflector
 @section Route Reflector
 
 @deffn {BGP} {bgp cluster-id @var{a.b.c.d}} {}
@@ -1044,8 +1009,7 @@ Ignore remote peer's capability value.
 @deffnx {BGP} {no neighbor @var{peer} route-reflector-client} {}
 @end deffn
 
-@node Route Server, How to set up a 6-Bone connection, Route Reflector, BGP
-@comment  node-name,  next,  previous,  up
+@node Route Server
 @section Route Server
 
 At an Internet Exchange point, many ISPs are connected to each other by
@@ -1071,8 +1035,7 @@ normal BGP router or Route Server or both at the same time.
 * Viewing the view::            
 @end menu
 
-@node Multiple instance, BGP instance and view, Route Server, Route Server
-@comment  node-name,  next,  previous,  up
+@node Multiple instance
 @subsection Multiple instance
 
 To enable multiple view function of @code{bgpd}, you must turn on
@@ -1132,8 +1095,7 @@ router bgp 1
 Quagga style BGP configuration.  This is default.
 @end deffn
 
-@node BGP instance and view, Routing policy, Multiple instance, Route Server
-@comment  node-name,  next,  previous,  up
+@node BGP instance and view
 @subsection BGP instance and view
 
 BGP instance is a normal BGP process.  The result of route selection
@@ -1183,8 +1145,7 @@ router bgp 2 view 2
 @end group
 @end example
 
-@node Routing policy, Viewing the view, BGP instance and view, Route Server
-@comment  node-name,  next,  previous,  up
+@node Routing policy
 @subsection Routing policy
 
 You can set different routing policy for a peer.  For example, you can
@@ -1209,8 +1170,7 @@ This means BGP update from a peer 10.0.0.1 goes to both BGP view 1 and view
 applied.  On the other hand, when the update is inserted into view 2,
 distribute-list 2 is applied.
 
-@node Viewing the view,  , Routing policy, Route Server
-@comment  node-name,  next,  previous,  up
+@node Viewing the view
 @subsection Viewing the view
 
 To display routing table of BGP view, you must specify view name.
@@ -1219,8 +1179,7 @@ To display routing table of BGP view, you must specify view name.
 Display routing table of BGP view @var{name}.
 @end deffn
 
-@node How to set up a 6-Bone connection, Dump BGP packets and table, Route Server, BGP
-@comment  node-name,  next,  previous,  up
+@node How to set up a 6-Bone connection
 @section How to set up a 6-Bone connection
 
 @example
@@ -1268,8 +1227,7 @@ log file bgpd.log
 @end group
 @end example
 
-@node Dump BGP packets and table,  , How to set up a 6-Bone connection, BGP
-@comment  node-name,  next,  previous,  up
+@node Dump BGP packets and table
 @section Dump BGP packets and table
 
 @deffn Command {dump bgp all @var{path}} {}

+ 13 - 0
doc/defines.texi.in

@@ -0,0 +1,13 @@
+@c -*- texinfo -*-
+@c @configure_input@
+
+@c Set variables
+@set PACKAGE_NAME @PACKAGE_NAME@
+@set AUTHORS Kunihiro Ishiguro, et al.
+@set COPYRIGHT_YEAR 1999-2004
+@set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS}
+
+@c These may vary with installation environment.
+@set INSTALL_PREFIX_ETC /etc/quagga
+@set INSTALL_PREFIX_SBIN /usr/sbin
+@set INSTALL_PREFIX_STATE /var/run/quagga

+ 14 - 24
doc/filter.texi

@@ -11,9 +11,9 @@ defined, it can be applied in any direction.
 * IP Prefix List::              
 @end menu
 
-@node IP Access List, IP Prefix List, Filtering, Filtering
+@node IP Access List
 @comment  node-name,  next,  previous,  up
-@subsection IP Access List
+@section IP Access List
 
 @deffn {Command} {access-list @var{name} permit @var{ipv4-network}} {}
 @deffnx {Command} {access-list @var{name} deny @var{ipv4-network}} {}
@@ -27,9 +27,9 @@ access-list filter deny 10.0.0.0/9
 access-list filter permit 10.0.0.0/8
 @end example
 
-@node IP Prefix List,  , IP Access List, Filtering
+@node IP Prefix List
 @comment  node-name,  next,  previous,  up
-@subsection IP Prefix List
+@section IP Prefix List
 
 @command{ip prefix-list} provides the most powerful prefix based
 filtering mechanism.  In addition to @command{access-list} functionality,
@@ -88,14 +88,8 @@ the new list will overwrite the old list.
 Matching of IP Prefix is performed from the smaller sequential number to the
 larger.  The matching will stop once any rule has been applied.
 
-In the case of no le or ge command, 
-
-Version 0.85: the matching rule will apply to all prefix lengths that
-matched the prefix list.
-
-Version 0.86 or later: In the case of no le or ge command, the prefix
-length must match exactly the length specified in the prefix list.
-
+In the case of no le or ge command, the prefix length must match exactly the
+length specified in the prefix list.
 
 @deffn {Command} {no ip prefix-list @var{name}} {}
 @end deffn
@@ -107,9 +101,8 @@ length must match exactly the length specified in the prefix list.
 * Clear counter of ip prefix-list::  
 @end menu
 
-@node ip prefix-list description, ip prefix-list sequential number control, IP Prefix List, IP Prefix List
-@comment  node-name,  next,  previous,  up
-@subsubsection ip prefix-list description
+@node ip prefix-list description
+@subsection ip prefix-list description
 
 @deffn {Command} {ip prefix-list @var{name} description @var{desc}} {}
 Descriptions may be added to prefix lists.  This command adds a
@@ -121,9 +114,8 @@ Deletes the description from a prefix list.  It is possible to use the
 command without the full description.
 @end deffn
 
-@node  ip prefix-list sequential number control, Showing ip prefix-list, ip prefix-list description, IP Prefix List
-@comment  node-name,  next,  previous,  up
-@subsubsection ip prefix-list sequential number control
+@node  ip prefix-list sequential number control
+@subsection ip prefix-list sequential number control
 
 @deffn {Command} {ip prefix-list sequence-number} {}
 With this command, the IP prefix list sequential number is displayed.
@@ -135,9 +127,8 @@ With this command, the IP prefix list sequential number is not
 displayed.
 @end deffn
 
-@node  Showing ip prefix-list, Clear counter of ip prefix-list, ip prefix-list sequential number control, IP Prefix List
-@comment  node-name,  next,  previous,  up
-@subsubsection Showing ip prefix-list
+@node  Showing ip prefix-list
+@subsection Showing ip prefix-list
 
 @deffn {Command} {show ip prefix-list} {}
 Display all IP prefix lists.
@@ -175,9 +166,8 @@ displayed.
 @deffn {Command} {show ip prefix-list detail @var{name}} {}
 @end deffn
 
-@node  Clear counter of ip prefix-list,  , Showing ip prefix-list, IP Prefix List
-@comment  node-name,  next,  previous,  up
-@subsubsection Clear counter of ip prefix-list
+@node  Clear counter of ip prefix-list
+@subsection Clear counter of ip prefix-list
 
 @deffn {Command} {clear ip prefix-list} {}
 Clears the counters of all IP prefix lists.  Clear IP Prefix List can be

+ 56 - 51
doc/install.texi

@@ -1,5 +1,4 @@
-@node  Installation, Basic commands, Overview, Top
-@comment  node-name,  next,  previous,  up
+@node  Installation
 @chapter Installation
 
 @cindex How to install Quagga
@@ -8,16 +7,16 @@
 @cindex Building the system
 @cindex Making Quagga
 
-  There are three steps for installing the software: configuration,
+There are three steps for installing the software: configuration,
 compilation, and installation.
 
 @menu
-* Configure the Software::      
-* Build the Software::          
-* Install the Software::        
+* Configure the Software::
+* Build the Software::
+* Install the Software::
 @end menu
 
-  The easiest way to get Quagga running is to issue the following
+The easiest way to get Quagga running is to issue the following
 commands:
 
 @example
@@ -26,20 +25,28 @@ commands:
 % make install
 @end example
 
-@node Configure the Software, Build the Software, Installation, Installation
-@comment  node-name,  next,  previous,  up
+@node Configure the Software
 @section Configure the Software
 
+@menu
+* The Configure script and its options::
+* Least-Privilege support::
+* Linux notes::
+@end menu
+
+@node The Configure script and its options
+@subsection The Configure script and its options
+
 @cindex Configuration options
 @cindex Options for configuring
 @cindex Build options
 @cindex Distribution configuration
 @cindex Options to @code{./configure}
  
-  Quagga has an excellent configure script which
-automatically detects most host configurations.  There are several
-additional configure options you can use to turn off IPv6 support, to
-disable the compilation of specific daemons, and to enable SNMP support.
+Quagga has an excellent configure script which automatically detects most
+host configurations.  There are several additional configure options you can
+use to turn off IPv6 support, to disable the compilation of specific
+daemons, and to enable SNMP support.
 
 @table @option
 @item --enable-guile
@@ -106,10 +113,22 @@ Configure zebra to use @var{dir} for local state files, such
 as pid files and unix sockets.
 @end table
 
-Additionally, you may configure zebra to drop its elevated
-privileges shortly after startup and switch
-to another user, there are three configure options
-to control zebra's behaviour.
+@example
+% ./configure --disable-ipv6
+@end example
+
+This command will configure zebra and the routing daemons.
+
+@node Least-Privilege support
+@subsection Least-Privilege support
+
+@cindex Quagga Least-Privileges
+@cindex Quagga Privileges
+
+Additionally, you may configure zebra to drop its elevated privileges
+shortly after startup and switch to another user. The configure script will
+automatically try to configure this support. There are three configure
+options to control the behaviour of Quagga daemons.
 
 @table @option
 @item --enable-user=@var{user}
@@ -127,42 +146,35 @@ this group.
 @end table
 
 The default user and group which will be configured is 'quagga' if no user
-or group is specified. Note that this user or group requires write access
-to the local state directory (see --localstatedir) and requires at least
-read access, and write access if you wish to allow daemons
-to write out their configuration, to the configuration directory
-(see --sysconfdir).
+or group is specified. Note that this user or group requires write access to
+the local state directory (see --localstatedir) and requires at least read
+access, and write access if you wish to allow daemons to write out their
+configuration, to the configuration directory (see --sysconfdir).
 
 On systems which have the 'libcap' capabilities manipulation library
-(currently only linux), the quagga system will retain
-only minimal capabilities required, further it will only raise these
-capabilities for brief periods. On systems without libcap, quagga will run
-as the user specified and only raise its uid back to uid 0 for brief
-periods.
+(currently only linux), the quagga system will retain only minimal
+capabilities required, further it will only raise these capabilities for
+brief periods. On systems without libcap, quagga will run as the user
+specified and only raise its uid back to uid 0 for brief periods.
 
-@example
-% ./configure --disable-ipv6
-@end example
-
-This command will configure zebra and the routing daemons.
+@node Linux notes
+@subsection Linux Notes
 
 @cindex Configuring Quagga
-@cindex Configuration the software build
 @cindex Building on Linux boxes
 @cindex Linux configurations
 
 There are several options available only to @sc{gnu}/Linux systems:
-@footnote{GNU/Linux has very flexible kernel configuration features.  If
-you use GNU/Linux, make sure that the current kernel configuration is
+@footnote{@sc{gnu}/Linux has very flexible kernel configuration features}.  If
+you use @sc{gnu}/Linux, make sure that the current kernel configuration is
 what you want.  Quagga will run with any kernel configuration but some
 recommendations do exist.
 
 @table @var
 
 @item CONFIG_NETLINK
-Kernel/User netlink socket.  
-This is a brand new feature which enables
-an advanced interface between the Linux kernel and zebra (@pxref{Kernel Interface}).
+Kernel/User netlink socket. This is a brand new feature which enables an
+advanced interface between the Linux kernel and zebra (@pxref{Kernel Interface}).
 
 @item CONFIG_RTNETLINK
 Routing messages.
@@ -172,8 +184,8 @@ updates directly from the kernel (@pxref{Kernel Interface}).
 
 @item CONFIG_IP_MULTICAST
 IP: multicasting.  
-This option should be specified when you use @command{ripd} or
-@command{ospfd} because these protocols use multicast.
+This option should be specified when you use @command{ripd} (@pxref{RIP}) or
+@command{ospfd} (@pxref{OSPFv2}) because these protocols use multicast.
 
 @end table
 
@@ -190,20 +202,18 @@ The @code{inet6-apps} package includes basic IPv6 related libraries such
 as @code{inet_ntop} and @code{inet_pton}.  Some basic IPv6 programs such
 as @command{ping}, @command{ftp}, and @command{inetd} are also
 included. The @code{inet-apps} can be found at
-@url{ftp://ftp.inner.net/pub/ipv6/}.
+@uref{ftp://ftp.inner.net/pub/ipv6/}.
 
 @item net-tools
 The @code{net-tools} package provides an IPv6 enabled interface and
 routing utility.  It contains @command{ifconfig}, @command{route},
 @command{netstat}, and other tools.  @code{net-tools} may be found at
-@url{http://www.tazenda.demon.co.uk/phil/net-tools/}.
+@uref{http://www.tazenda.demon.co.uk/phil/net-tools/}.
 
 @end table
 @c A - end of footnote 
-}.
 
-@node Build the Software, Install the Software, Configure the Software, Installation
-@comment  node-name,  next,  previous,  up
+@node Build the Software
 @section Build the Software
 
 After configuring the software, you will need to compile it for your
@@ -225,7 +235,7 @@ at this stage, be certain to send a bug report @xref{Bug Reports}.
 @c A - End of node, Building the Software
 
 
-@node Install the Software,  , Build the Software, Installation
+@node Install the Software
 @comment  node-name,  next,  previous,  up
 @section Install the Software
 
@@ -243,11 +253,6 @@ prompt: @command{make install}.
 %
 @end example
 
-@c A - removed this section and placed it with Install the Software
-@c @node Additional Notes,  , Install the Software, Installation
-@comment  node-name,  next,  previous,  up
-@c @section Additional Notes
-
 Quagga daemons have their own terminal interface or VTY.  After
 installation, you have to setup each beast's port number to connect to
 them.  Please add the following entries to @file{/etc/services}.

+ 2 - 4
doc/ipv6.texi

@@ -1,5 +1,4 @@
-@node IPv6 Support, Kernel Interface, Route Map, Top
-@comment  node-name,  next,  previous,  up
+@node IPv6 Support
 @chapter IPv6 Support
 
 Quagga fully supports IPv6 routing.  As described so far, Quagga supports
@@ -13,8 +12,7 @@ messages to the all nodes that exist on the network.
 * Router Advertisement::        
 @end menu
 
-@node Router Advertisement,  , IPv6 Support, IPv6 Support
-@comment  node-name,  next,  previous,  up
+@node Router Advertisement
 @section Router Advertisement
 
 @deffn {Interface Command} {no ipv6 nd suppress-ra} {}

+ 1 - 2
doc/kernel.texi

@@ -1,5 +1,4 @@
-@node Kernel Interface, SNMP Support, IPv6 Support, Top
-@comment  node-name,  next,  previous,  up
+@node Kernel Interface
 @chapter Kernel Interface
 
 There are several different methods for reading kernel routing table

+ 4 - 9
doc/main.texi

@@ -1,5 +1,4 @@
 @node Zebra
-@comment  node-name,  next,  previous,  up
 @chapter Zebra
 
 @c SYNOPSIS
@@ -15,8 +14,7 @@ different routing protocols.
 @end menu
 
 
-@node Invoking zebra, Interface Commands, Zebra, Zebra
-@comment  node-name,  next,  previous,  up
+@node Invoking zebra
 @section Invoking zebra
 
 Besides the common invocation options (@pxref{Common Invocation Options}), the
@@ -42,8 +40,7 @@ When program terminates, retain routes added by zebra.
 
 @end table
 
-@node Interface Commands, Static Route Commands, Invoking zebra, Zebra
-@comment  node-name,  next,  previous,  up
+@node Interface Commands
 @section Interface Commands
 
 @deffn Command {interface @var{ifname}} {}
@@ -90,8 +87,7 @@ only linux and with certain drivers - those which properly support the
 IFF_RUNNING flag.
 @end deffn
 
-@node Static Route Commands, zebra Terminal Mode Commands, Interface Commands, Zebra
-@comment  node-name,  next,  previous,  up
+@node Static Route Commands
 @section Static Route Commands
 
 Static routing is a very fundamental feature of routing technology.  It
@@ -191,8 +187,7 @@ and later).  After setting @var{tableno} with this command,
 static routes defined after this are added to the specified table.
 @end deffn
 
-@node zebra Terminal Mode Commands,  , Static Route Commands, Zebra
-@comment  node-name,  next,  previous,  up
+@node zebra Terminal Mode Commands
 @section zebra Terminal Mode Commands
 
 @deffn Command {show ip route} {}

+ 6 - 12
doc/ospf6d.texi

@@ -1,5 +1,4 @@
-@node OSPFv3, BGP, OSPFv2, Top
-@comment  node-name,  next,  previous,  up
+@node OSPFv3
 @chapter OSPFv3
 
 @command{ospf6d} is a daemon support OSPF version 3 for IPv6 network.
@@ -13,8 +12,7 @@ OSPF for IPv6 is described in RFC2740.
 * Showing OSPF6 information::   
 @end menu
 
-@node OSPF6 router, OSPF6 area, OSPFv3, OSPFv3
-@comment  node-name,  next,  previous,  up
+@node OSPF6 router
 @section OSPF6 router
 
 @deffn {Command} {router ospf6} {}
@@ -29,14 +27,12 @@ Bind interface to specified area, and start sending OSPF packets.  @var{area} ca
 be specified as 0.
 @end deffn
 
-@node OSPF6 area, OSPF6 interface, OSPF6 router, OSPFv3
-@comment  node-name,  next,  previous,  up
+@node OSPF6 area
 @section OSPF6 area
 
 Area support for OSPFv3 is not yet implemented.
 
-@node OSPF6 interface, Redistribute routes to OSPF6, OSPF6 area, OSPFv3
-@comment  node-name,  next,  previous,  up
+@node OSPF6 interface
 @section OSPF6 interface
 
 @deffn {Interface Command} {ipv6 ospf6 cost COST} {}
@@ -63,8 +59,7 @@ Sets interface's Router Priority.  Default value is 1.
 Sets interface's Inf-Trans-Delay.  Default value is 1.
 @end deffn
 
-@node Redistribute routes to OSPF6, Showing OSPF6 information, OSPF6 interface, OSPFv3
-@comment  node-name,  next,  previous,  up
+@node Redistribute routes to OSPF6
 @section Redistribute routes to OSPF6
 
 @deffn {OSPF6 Command} {redistribute static} {}
@@ -72,8 +67,7 @@ Sets interface's Inf-Trans-Delay.  Default value is 1.
 @deffnx {OSPF6 Command} {redistribute ripng} {}
 @end deffn
 
-@node Showing OSPF6 information,  , Redistribute routes to OSPF6, OSPFv3
-@comment  node-name,  next,  previous,  up
+@node Showing OSPF6 information
 @section Showing OSPF6 information
 
 @deffn {Command} {show ipv6 ospf6 [INSTANCE_ID]} {}

+ 8 - 16
doc/ospfd.texi

@@ -1,5 +1,4 @@
-@node OSPFv2, OSPFv3, RIPng, Top
-@comment  node-name,  next,  previous,  up
+@node OSPFv2
 @chapter OSPFv2
 
   OSPF version 2 is a routing protocol which described in
@@ -18,8 +17,7 @@ networks such as ISP backbone and enterprise networks.
 * Debugging OSPF::              
 @end menu
 
-@node Configuring ospfd, OSPF router, OSPFv2, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node Configuring ospfd
 @section Configuring ospfd
 
 There is no @command{ospfd} specific options.  Common options can be
@@ -31,8 +29,7 @@ please make it sure @command{zebra} is running before invoking
 Like other daemons, @command{ospfd} configuration is done in OSPF
 specific configuration file @file{ospfd.conf}.
 
-@node OSPF router, OSPF area, Configuring ospfd, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node OSPF router
 @section OSPF router
 
 To start OSPF process you have to specify the OSPF router.  As of this
@@ -112,8 +109,7 @@ ospf on interface with address 192.168.1.1/23, but it does on interface with
 address 192.168.1.129/25.
 @end deffn
 
-@node OSPF area, OSPF interface, OSPF router, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node OSPF area
 @section OSPF area
 
 @deffn {OSPF Command} {area @var{a.b.c.d} range @var{a.b.c.d/m}} {}
@@ -244,8 +240,7 @@ makes sense in ABR only.
 @deffnx {OSPF Command} {area <0-4294967295> authentication message-digest} {}
 @end deffn
 
-@node OSPF interface, Redistribute routes to OSPF, OSPF area, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node OSPF interface
 @section OSPF interface
 
 @deffn {Interface Command} {ip ospf authentication-key AUTH_KEY} {}
@@ -318,8 +313,7 @@ incremented by this value when transmitting.
 The default value is 1 seconds.
 @end deffn
 
-@node Redistribute routes to OSPF, Showing OSPF information, OSPF interface, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node Redistribute routes to OSPF
 @section Redistribute routes to OSPF
 
 @deffn {OSPF Command} {redistribute (kernel|connected|static|rip|bgp)} {}
@@ -364,8 +358,7 @@ The default value is 1 seconds.
 @deffnx {Command} {no router zebra} {}
 @end deffn
 
-@node Showing OSPF information, Debugging OSPF, Redistribute routes to OSPF, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node Showing OSPF information
 @section Showing OSPF information
 
 @deffn {Command} {show ip ospf} {}
@@ -403,8 +396,7 @@ The default value is 1 seconds.
 @deffn {Command} {show ip ospf route} {}
 @end deffn
 
-@node Debugging OSPF,  , Showing OSPF information, OSPFv2
-@comment  node-name,  next,  previous,  up
+@node Debugging OSPF
 @section Debugging OSPF
 
 @deffn {Command} {debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) [detail]} {}

+ 104 - 139
doc/overview.texi

@@ -1,28 +1,25 @@
-@node Overview, Installation, Top, Top
-@comment  node-name,  next,  previous,  up
+@node Overview
 @chapter Overview
 @cindex Overview
 
-  Quagga is a routing software package that provides TCP/IP based
-routing services with routing protocols support such as RIPv1, RIPv2,
-RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (@pxref{Supported RFC}).
-Quagga also supports special BGP Route Reflector and Route Server
-behavior.  In addition to traditional IPv4 routing protocols, Quagga
-also supports IPv6 routing protocols.  With SNMP daemon which supports
-SMUX protocol, Quagga provides routing protocol MIBs (@pxref{SNMP
-Support}).
+  @uref{http://www.quagga.net,,Quagga} is a routing software package that
+provides TCP/IP based routing services with routing protocols support such
+as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (@pxref{Supported
+RFC}). Quagga also supports special BGP Route Reflector and Route Server
+behavior.  In addition to traditional IPv4 routing protocols, Quagga also
+supports IPv6 routing protocols.  With SNMP daemon which supports SMUX
+protocol, Quagga provides routing protocol MIBs (@pxref{SNMP Support}).
 
-  Quagga uses an advanced software architecture to provide you with a
-high quality, multi server routing engine.  Quagga has an interactive
-user interface for each routing protocol and supports common client
-commands.  Due to this design, you can add new protocol daemons to Quagga
-easily.  You can use Quagga library as your program's client user
-interface.
+  Quagga uses an advanced software architecture to provide you with a high
+quality, multi server routing engine. Quagga has an interactive user
+interface for each routing protocol and supports common client commands. 
+Due to this design, you can add new protocol daemons to Quagga easily.  You
+can use Quagga library as your program's client user interface.
 
-  Zebra is distributed under the @sc{gnu} General Public License.
+  Quagga is distributed under the @sc{gnu} General Public License.
 
 @menu
-* About Quagga::                 Basic information about Quagga
+* About Quagga::                Basic information about Quagga
 * System Architecture::         The Quagga system architecture
 * Supported Platforms::         Supported platforms and future plans
 * Supported RFC::               Supported RFCs
@@ -31,51 +28,49 @@ interface.
 * Bug Reports::                 Mail address for bug data
 @end menu
 
-@node About Quagga, System Architecture, Overview, Overview
+@node About Quagga
 @comment  node-name,  next,  previous,  up
 @section About Quagga
 @cindex About Quagga
 
-  Today, TCP/IP networks are covering all of the world.  The Internet
-has been deployed in many countries, companies, and to the home.  When
-you connect to the Internet your packet will pass many routers which
-have TCP/IP routing functionality.
+  Today, TCP/IP networks are covering all of the world.  The Internet has
+been deployed in many countries, companies, and to the home.  When you
+connect to the Internet your packet will pass many routers which have TCP/IP
+routing functionality.
 
   A system with Quagga installed acts as a dedicated router.  With Quagga,
-your machine exchanges routing information with other routers using
-routing protocols.  Quagga uses this information to update the kernel
-routing table so that the right data goes to the right place.  You can
-dynamically change the configuration and you may view routing table
-information from the Quagga terminal interface.
+your machine exchanges routing information with other routers using routing
+protocols.  Quagga uses this information to update the kernel routing table
+so that the right data goes to the right place.  You can dynamically change
+the configuration and you may view routing table information from the Quagga
+terminal interface.
 
   Adding to routing protocol support, Quagga can setup interface's flags,
-interface's address, static routes and so on.  If you have a small
-network, or a stub network, or xDSL connection, configuring the Quagga
-routing software is very easy.  The only thing you have to do is to set
-up the interfaces and put a few commands about static routes and/or
-default routes.  If the network is rather large, or if the network
-structure changes frequently, you will want to take advantage of Quagga's
-dynamic routing protocol support for protocols such as RIP, OSPF or BGP.
-Quagga is with you.
+interface's address, static routes and so on.  If you have a small network,
+or a stub network, or xDSL connection, configuring the Quagga routing
+software is very easy.  The only thing you have to do is to set up the
+interfaces and put a few commands about static routes and/or default routes. 
+If the network is rather large, or if the network structure changes
+frequently, you will want to take advantage of Quagga's dynamic routing
+protocol support for protocols such as RIP, OSPF or BGP.
 
   Traditionally, UNIX based router configuration is done by
 @command{ifconfig} and @command{route} commands.  Status of routing
-table is displayed by @command{netstat} utility.  Almost of these
-commands work only if the user has root privileges.  Quagga has a different
-system administration method.  There are two user modes in Quagga.  One is
-normal mode, the other is enable mode.  Normal mode user can only view
-system status, enable mode user can change system configuration.  This
-UNIX account independent feature will be great help to the router
-administrator.
+table is displayed by @command{netstat} utility.  Almost of these commands
+work only if the user has root privileges.  Quagga has a different system
+administration method.  There are two user modes in Quagga.  One is normal
+mode, the other is enable mode.  Normal mode user can only view system
+status, enable mode user can change system configuration.  This UNIX account
+independent feature will be great help to the router administrator.
 
   Currently, Quagga supports common unicast routing protocols.  Multicast
-routing protocols such as BGMP, PIM-SM, PIM-DM may be supported in
-Quagga 2.0.  MPLS support is going on.  In the future, TCP/IP filtering
-control, QoS control, diffserv configuration will be added to Quagga.
-Quagga project's final goal is making a productive, quality, free TCP/IP
-routing software.
+routing protocols such as BGMP, PIM-SM, PIM-DM may be supported in Quagga
+2.0.  MPLS support is going on.  In the future, TCP/IP filtering control,
+QoS control, diffserv configuration will be added to Quagga. Quagga
+project's final goal is making a productive, quality, free TCP/IP routing
+software.
 
-@node System Architecture, Supported Platforms, About Quagga, Overview
+@node System Architecture
 @comment  node-name,  next,  previous,  up
 @section System Architecture
 @cindex System architecture
@@ -84,23 +79,22 @@ routing software.
 
   Traditional routing software is made as a one process program which
 provides all of the routing protocol functionalities.  Quagga takes a
-different approach.  It is made from a collection of several daemons
-that work together to build the routing table.  There may be several
+different approach.  It is made from a collection of several daemons that
+work together to build the routing table.  There may be several
 protocol-specific routing daemons and zebra the kernel routing manager.
 
   The @command{ripd} daemon handles the RIP protocol, while
 @command{ospfd} is a daemon which supports OSPF version 2.
 @command{bgpd} supports the BGP-4 protocol.  For changing the kernel
 routing table and for redistribution of routes between different routing
-protocols, there is a kernel routing table manager @command{zebra}
-daemon.  It is easy to add a new routing protocol daemons to the entire
-routing system without affecting any other software.  You need to run only
-the protocol daemon associated with routing protocols in use.  Thus,
-user may run a specific daemon and send routing reports to a central
-routing console.
-
-  There is no need for these daemons to be running on the same machine.
-You can even run several same protocol daemons on the same machine.  This
+protocols, there is a kernel routing table manager @command{zebra} daemon. 
+It is easy to add a new routing protocol daemons to the entire routing
+system without affecting any other software.  You need to run only the
+protocol daemon associated with routing protocols in use.  Thus, user may
+run a specific daemon and send routing reports to a central routing console.
+
+  There is no need for these daemons to be running on the same machine. You
+can even run several same protocol daemons on the same machine.  This
 architecture creates new possibilities for the routing system.
 
 @example
@@ -120,29 +114,23 @@ architecture creates new possibilities for the routing system.
 @end example
 
   Multi-process architecture brings extensibility, modularity and
-maintainability.  At the same time it also brings many configuration
-files and terminal interfaces.  Each daemon has it's own configuration
-file and terminal interface.  When you configure a static route, it must
-be done in @command{zebra} configuration file.  When you configure BGP
-network it must be done in @command{bgpd} configuration file.  This can be a
-very annoying thing.  To resolve the problem, Quagga provides integrated
-user interface shell called @command{vtysh}.  @command{vtysh} connects to
-each daemon with UNIX domain socket and then works as a proxy for user input.
+maintainability.  At the same time it also brings many configuration files
+and terminal interfaces.  Each daemon has it's own configuration file and
+terminal interface.  When you configure a static route, it must be done in
+@command{zebra} configuration file.  When you configure BGP network it must
+be done in @command{bgpd} configuration file.  This can be a very annoying
+thing.  To resolve the problem, Quagga provides integrated user interface
+shell called @command{vtysh}.  @command{vtysh} connects to each daemon with
+UNIX domain socket and then works as a proxy for user input.
 
   Quagga was planned to use multi-threaded mechanism when it runs with a
-kernel that supports multi-threads.  But at the moment, the thread
-library which comes with @sc{gnu}/Linux or FreeBSD has some problems with
-running reliable services such as routing software, so we don't use
-threads at all.  Instead we use the @command{select(2)} system call for
-multiplexing the events.
-
-  When @command{zebra} runs under a @sc{gnu} Hurd kernel it will act as a
-kernel routing table itself.  Under @sc{gnu} Hurd, all TCP/IP services are
-provided by user processes called @command{pfinet}.  Quagga will provide
-all the routing selection mechanisms for the process.  This feature will
-be implemented when @sc{gnu} Hurd becomes stable.
-
-@node Supported Platforms, Supported RFC, System Architecture, Overview
+kernel that supports multi-threads.  But at the moment, the thread library
+which comes with @sc{gnu}/Linux or FreeBSD has some problems with running
+reliable services such as routing software, so we don't use threads at all. 
+Instead we use the @command{select(2)} system call for multiplexing the
+events.
+
+@node Supported Platforms
 @comment  node-name,  next,  previous,  up
 @section Supported Platforms
 
@@ -151,33 +139,28 @@ be implemented when @sc{gnu} Hurd becomes stable.
 @cindex Compatibility with other systems
 @cindex Operating systems that support Quagga
 
-  Currently Quagga supports @sc{gnu}/Linux, BSD and Solaris.  Below is a list
-of OS versions on which Quagga runs.  Porting Quagga to other platforms is
-not so too difficult.  Platform dependent codes exist only in
-@command{zebra} daemon.  Protocol daemons are platform independent.
-Please let us know when you find out Quagga runs on a platform which is not
-listed below.
+  Currently Quagga supports @sc{gnu}/Linux, BSD and Solaris. Porting Quagga
+to other platforms is not too difficult as platform dependent code should
+most be limited to the @command{zebra} daemon.  Protocol daemons are mostly
+platform independent. Please let us know when you find out Quagga runs on a
+platform which is not listed below.
+
+  The list of officially supported platforms are listed below. Note that
+Quagga may run correctly on other platforms, and may run with partial
+functionality on further platforms.
 
 @sp 1
 @itemize @bullet
 @item
-GNU/Linux 2.0.37
-@item
-GNU/Linux 2.2.x and higher
-@item
-FreeBSD 2.2.8
-@item
-FreeBSD 3.x
+@sc{gnu}/Linux 2.2.x and higher
 @item
-FreeBSD 4.x
+FreeBSD 4.x and higher
 @item
-NetBSD 1.4
+NetBSD 1.6 and higher
 @item
-OpenBSD 2.5
+OpenBSD 2.5 and higher
 @item
-Solaris 2.6
-@item
-Solaris 7
+Solaris 2.6 and higher (IPv6 support requires a patch at moment)
 @end itemize
 
 @sp 1
@@ -194,7 +177,7 @@ KAME IPv6 stack for BSD.
 INRIA IPv6 stack for BSD.
 @end itemize
 
-@node Supported RFC, How to get Quagga, Supported Platforms, Overview
+@node Supported RFC
 @comment  node-name,  next,  previous,  up
 @section Supported RFC
 
@@ -269,33 +252,31 @@ November 1995.}
 
 @end table
 
-@node How to get Quagga, Mailing List, Supported RFC, Overview
+@node How to get Quagga
 @comment  node-name,  next,  previous,  up
 @section How to get Quagga
 
-  Quagga is still beta software and there is no officially released
-version. Once Quagga is released you can get it from @sc{gnu} FTP
-site and its mirror sites.  We are planning Quagga-1.0 as the first
-released version.
+Quagga is still beta software and there is no officially released
+version.
 
-  Zebra's official web page is located at:
+Zebra's official web page is located at:
 
-@url{http://www.gnu.org/software/zebra/zebra.html}.
+@uref{http://www.gnu.org/software/zebra/zebra.html}.
 
-  The original Zebra web site is located at: 
+The original Zebra web site is located at: 
 
-@url{http://www.zebra.org/}.
+@uref{http://www.zebra.org/}.
 
-  As of this writing, development by zebra.org on Zebra has slowed down.
-Some work is being done by third-parties to try maintain bug-fixes and
+As of this writing, development by zebra.org on Zebra has slowed down. Some
+work is being done by third-parties to try maintain bug-fixes and
 enhancements to the current Zebra code-base, which has resulted in a fork of
 Zebra called Quagga, see:
 
-@url{http://www.quagga.net/}.
+@uref{http://www.quagga.net/}
 
 for further information, as well as links to additional zebra resources.
 
-@node Mailing List, Bug Reports, How to get Quagga, Overview
+@node Mailing List
 @comment  node-name,  next,  previous,  up
 @section Mailing List
 @cindex How to get in touch with Quagga
@@ -303,32 +284,17 @@ for further information, as well as links to additional zebra resources.
 @cindex Contact information
 @cindex Mailing lists
 
-  There is a mailing list for discussions about Quagga.  If you have any
-comments or suggestions to Quagga, please subscribe to
-@url{http://lists.quagga.net/mailman/listinfo/quagga-users}.
-
-  There is an additional mailing list, @email{znog@@dishone.st,ZNOG} for
-general discussion of zebra related issues and network operation. To
-subscribe send an email to @email{znog-subscribe@@dishone.st} with a message
-body that includes only:
-
-@quotation
-subscribe znog
-@end quotation
+There is a mailing list for discussions about Quagga.  If you have any
+comments or suggestions to Quagga, please subscribe to:
 
- To unsubscribe, send an email to @email{znog-unsubscribe@@dishone.st}
-with a message body that includes only:
+@uref{http://lists.quagga.net/mailman/listinfo/quagga-users}.
 
-@quotation
-unsubscribe znog
-@end quotation
+The @uref{http://www.quagga.net/,,Quagga} site has further information on
+the available mailing lists, see:
 
- Alternatively, you may use the web interface located at
-@url{http://www.dishone.st/mailman/listinfo/znog}. Links to archives of the
-znog list are available at this URL.
+	@uref{http://www.quagga.net/lists.php}
 
-@node Bug Reports,  , Mailing List, Overview
-@comment  node-name,  next,  previous,  up
+@node Bug Reports
 @section Bug Reports
 
 @cindex Bug Reports
@@ -339,7 +305,7 @@ znog list are available at this URL.
 @cindex Errors in the software
 
   If you think you have found a bug, please send a bug report to
-@url{http://bugzilla.quagga.net}.  When you send a bug report, please be
+@uref{http://bugzilla.quagga.net}. When you send a bug report, please be
 careful about the points below.
 
 @itemize @bullet
@@ -357,5 +323,4 @@ arguments to the configure script please note that too.
 
   Bug reports are very important for us to improve the quality of Quagga.
 Quagga is still in the development stage, but please don't hesitate to
-send a bug report to @url{http://bugzilla.quagga.net}.
-
+send a bug report to @uref{http://bugzilla.quagga.net}.

+ 1 - 2
doc/protocol.texi

@@ -1,5 +1,4 @@
-@node  Zebra Protocol, Packet Binary Dump Format, SNMP Support, Top
-@comment  node-name,  next,  previous,  up
+@node  Zebra Protocol
 @appendix Zebra Protocol
 
 Zebra Protocol is a protocol which is used between protocol daemon and

+ 20 - 25
doc/quagga.texi

@@ -1,21 +1,18 @@
 \input texinfo @c -*- texinfo -*-
 @c %**start of header
 @setchapternewpage odd
-@settitle Quagga
+@settitle @uref{http://www.quagga.net,,Quagga}
 @setfilename quagga.info
 @defcodeindex op
 @synindex pg cp
 @c %**end of header
 
-@c Set variables
-@set EDITION 0.1
-@set VERSION 0.96
-@set UPDATED 12 August 2003
-@set UPDATED-MONTH August 2003
+@c Set variables - sourced from defines.texi
+@include defines.texi
 
-@c These may vary with installation environment.
-@set INSTALL_PREFIX_ETC /usr/local/etc
-@set INSTALL_PREFIX_SBIN /usr/local/sbin
+@c automake will automatically generate version.texi
+@c and set EDITION, VERSION, UPDATED and UPDATED-MONTH
+@include version.texi
 
 @c Info entry
 @dircategory Routing Software:
@@ -30,9 +27,10 @@ This file documents the @sc{gnu} Quagga software which manages common
 TCP/IP routing protocols.
 
 This is Edition @value{EDITION}, last updated @value{UPDATED} of
-@cite{The Quagga Manual}, for Quagga Version @value{VERSION}.
+@cite{The Quagga Manual}, for @uref{http://www.quagga.net/,,Quagga}
+Version @value{VERSION}.
 
-Copyright (C) 1999-2004 Kunihiro Ishiguro, et al.
+@value{COPYRIGHT_STR}
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -57,15 +55,15 @@ approved by Kunihiro Ishiguro.
 @end ifinfo
 
 @titlepage
-@title Quagga
+@title @uref{http://www.quagga.net,,Quagga}
 @subtitle A routing software package for TCP/IP networks
-@subtitle Quagga version @value{VERSION}
+@subtitle @uref{http://www.quagga.net,,Quagga} version @value{VERSION}
 @subtitle @value{UPDATED-MONTH}
-@author Kunihiro Ishiguro, et al
+@author @value{AUTHORS}
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999-2004 Kunihiro Ishiguro, et al.
+@value{COPYRIGHT_STR}
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -84,13 +82,13 @@ by Kunihiro Ishiguro.
 @page
 
 @ifnottex
-@node Top, Overview, (dir), (dir)
-@comment  node-name,  next,  previous,  up
+@node Top
 @top Quagga
 		     
-Quagga is a advanced routing software package that provides TCP/IP
-based routing protocols.  This is the Quagga Manual for
-quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
+@uref{http://www.quagga.net,,Quagga} is an advanced routing software package
+that provides a suite of TCP/IP based routing protocols.  This is the Manual
+for quagga-@value{VERSION}. @uref{http://www.quagga.net,,Quagga} is a fork of 
+@uref{http://www.zebra.org,,GNU Zebra}.
 @end ifnottex
 
 @menu
@@ -114,7 +112,6 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
 * Command Index::               
 * VTY Key Index::               
 @end menu
-@summarycontents
 @contents
 
 @include overview.texi
@@ -135,14 +132,12 @@ quagga-@value{VERSION}. Quagga is a fork of GNU Zebra.
 @include protocol.texi
 @include appendix.texi
 
-@node Command Index, VTY Key Index, Top, Top
-@comment  node-name,  next,  previous,  up
+@node Command Index
 @unnumbered Command Index
 
 @printindex fn
 
-@node VTY Key Index,  , Command Index, Top
-@comment  node-name,  next,  previous,  up
+@node VTY Key Index
 @unnumbered VTY Key Index
 
 @printindex ky

+ 14 - 27
doc/ripd.texi

@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the Quagga Manual.
-@c Copyright (C) 1999, 2000 Kunihiro Ishiguro
-@c See file zebra.texi for copying conditions.
+@c @value{COPYRIGHT_STR}
+@c See file quagga.texi for copying conditions.
 @node RIP
 @comment  node-name,  next,  previous,  up
 @chapter RIP
@@ -32,8 +32,7 @@ version 1 as described in RFC1058.
 * RIP Debug Commands::          
 @end menu
 
-@node Starting and Stopping ripd, RIP Configuration, RIP, RIP
-@comment  node-name,  next,  previous,  up
+@node Starting and Stopping ripd
 @section Starting and Stopping ripd
 
 The default configuration file name of @command{ripd}'s is
@@ -85,8 +84,7 @@ When the program terminates, retain routes added by @command{ripd}.
 * RIP netmask::                 
 @end menu
 
-@node RIP netmask,  , Starting and Stopping ripd, Starting and Stopping ripd
-@comment  node-name,  next,  previous,  up
+@node RIP netmask
 @subsection RIP netmask
 
 The netmask features of @command{ripd} support both version 1 and version 2 of
@@ -107,8 +105,7 @@ old information will be suppressed.  Ripd does not currently support
 equal cost multipath routing.
 
 
-@node RIP Configuration, How to Announce RIP route, Starting and Stopping ripd, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP Configuration
 @section RIP Configuration
 
 @deffn Command {router rip} {}
@@ -220,8 +217,7 @@ split-horizon}.  If you don't perform split-horizon on the interface,
 please specify @code{no ip split-horizon}.
 @end deffn
 
-@node How to Announce RIP route, Filtering RIP Routes, RIP Configuration, RIP
-@comment  node-name,  next,  previous,  up
+@node How to Announce RIP route
 @section How to Announce RIP route
 
 @deffn {RIP command} {redistribute kernel} {}
@@ -284,9 +280,7 @@ most cases, we recommend creating a static route in Quagga and
 redistributing it in RIP using @code{redistribute static}.
 @end deffn
 
-
-@node  Filtering RIP Routes, RIP Metric Manipulation, How to Announce RIP route, RIP
-@comment  node-name,  next,  previous,  up
+@node  Filtering RIP Routes
 @section Filtering RIP Routes
 
 RIP routes can be filtered by a distribute-list.
@@ -326,8 +320,7 @@ name.  Next is the direction of @samp{in} or @samp{out}.  If
 @var{direct} is @samp{in} the access list is applied to input packets.
 @end deffn
 
-@node RIP Metric Manipulation, RIP distance, Filtering RIP Routes, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP Metric Manipulation
 @section RIP Metric Manipulation
 
 RIP metric is a value for distance for the network.  Usually
@@ -348,8 +341,7 @@ affects connected routes.
 @deffnx {RIP command} {offset-list @var{access-list} (in|out) @var{ifname}} {}
 @end deffn
 
-@node RIP distance, RIP route-map, RIP Metric Manipulation, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP distance
 @section RIP distance
 
 Distance value is used in zebra daemon.  Default RIP distance is 120.
@@ -371,8 +363,7 @@ Set default RIP distance to specified value when the route's source IP
 address matches the specified prefix and the specified access-list.
 @end deffn
 
-@node RIP route-map, RIP Authentication, RIP distance, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP route-map
 @section RIP route-map
 
 Usage of @command{ripd}'s route-map support.
@@ -435,8 +426,7 @@ value range is very large for compatibility with other protocols.  For
 RIP, valid metric values are from 1 to 16.
 @end deffn
 
-@node RIP Authentication, RIP Timers, RIP route-map, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP Authentication
 @section RIP Authentication
 
 @deffn {Interface command} {ip rip authentication mode md5} {}
@@ -472,8 +462,7 @@ interface eth1
 !
 @end example
 
-@node RIP Timers, Show RIP Information, RIP Authentication, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP Timers
 @section RIP Timers
 
 @deffn {RIP command} {timers basic @var{update} @var{timeout} @var{garbage}} {}
@@ -511,8 +500,7 @@ The @code{no timers basic} command will reset the timers to the default
 settings listed above.
 @end deffn
 
-@node Show RIP Information, RIP Debug Commands, RIP Timers, RIP
-@comment  node-name,  next,  previous,  up
+@node Show RIP Information
 @section Show RIP Information
 
 To display RIP routes.
@@ -555,8 +543,7 @@ Routing Protocol is "rip"
 @end group
 @end example
 
-@node RIP Debug Commands,  , Show RIP Information, RIP
-@comment  node-name,  next,  previous,  up
+@node RIP Debug Commands
 @section RIP Debug Commands
 
 Debug for RIP protocol.

+ 5 - 10
doc/ripngd.texi

@@ -1,5 +1,4 @@
-@node RIPng, OSPFv2, RIP, Top
-@comment  node-name,  next,  previous,  up
+@node RIPng
 @chapter RIPng
 
 @command{ripngd} supports the RIPng protocol as described in RFC2080.  It's an
@@ -12,15 +11,13 @@ IPv6 reincarnation of the RIP protocol.
 * ripngd Filtering Commands::   
 @end menu
 
-@node Invoking ripngd, ripngd Configuration, RIPng, RIPng
-@comment  node-name,  next,  previous,  up
+@node Invoking ripngd
 @section Invoking ripngd
 
 There are no @code{ripngd} specific invocation options.  Common options
 can be specified (@pxref{Common Invocation Options}).
 
-@node ripngd Configuration, ripngd Terminal Mode Commands, Invoking ripngd, RIPng
-@comment  node-name,  next,  previous,  up
+@node ripngd Configuration
 @section ripngd Configuration
 
 Currently ripngd supports the following commands:
@@ -50,8 +47,7 @@ This command is the default and does not appear in the configuration.
 With this statement, RIPng routes go to the @command{zebra} daemon.
 @end deffn
 
-@node ripngd Terminal Mode Commands, ripngd Filtering Commands, ripngd Configuration, RIPng
-@comment  node-name,  next,  previous,  up
+@node ripngd Terminal Mode Commands
 @section ripngd Terminal Mode Commands
 
 @deffn Command {show ip ripng} {}
@@ -69,8 +65,7 @@ With this statement, RIPng routes go to the @command{zebra} daemon.
 @deffn Command {debug ripng zebra} {}
 @end deffn
 
-@node ripngd Filtering Commands,  , ripngd Terminal Mode Commands, RIPng
-@comment  node-name,  next,  previous,  up
+@node ripngd Filtering Commands
 @section ripngd Filtering Commands
 
 @deffn Command {distribute-list @var{access_list} (in|out) @var{ifname}} {}

+ 7 - 11
doc/routemap.texi

@@ -1,5 +1,4 @@
-@node Route Map, IPv6 Support, Filtering, Top
-@comment  node-name,  next,  previous,  up
+@node Route Map
 @chapter Route Map
 
 Route map is a very useful function in zebra.  There is a match and set
@@ -22,16 +21,14 @@ local-preference value is set to 200.
 * Route Map Set Command::       
 @end menu
 
-@node Route Map Command, Route Map Match Command, Route Map, Route Map
-@comment  node-name,  next,  previous,  up
-@subsection Route Map Command
+@node Route Map Command
+@section Route Map Command
 
 @deffn {Command} {route-map @var{route-map-name} permit @var{priority}} {}
 @end deffn
 
-@node Route Map Match Command, Route Map Set Command, Route Map Command, Route Map
-@comment  node-name,  next,  previous,  up
-@subsection Route Map Match Command
+@node Route Map Match Command
+@section Route Map Match Command
 
 @deffn {Route-map Command} {match ip address @var{access_list}} {}
 Matches the specified @var{access_list}
@@ -53,9 +50,8 @@ Matches the specified @var{metric}.
 Matches the specified  @var{community_list}
 @end deffn
 
-@node Route Map Set Command,  , Route Map Match Command, Route Map
-@comment  node-name,  next,  previous,  up
-@subsection Route Map Set Command
+@node Route Map Set Command
+@section Route Map Set Command
 
 @deffn {Route-map Command} {set ip next-hop @var{ipv4_address}} {}
 Set the BGP nexthop address.

+ 5 - 15
doc/snmp.texi

@@ -1,5 +1,4 @@
-@node SNMP Support, Zebra Protocol, Kernel Interface, Top
-@comment  node-name,  next,  previous,  up
+@node SNMP Support
 @chapter SNMP Support
 
 SNMP (Simple Network Managing Protocol) is a widely implemented feature for
@@ -14,23 +13,17 @@ available through it.
 * MIB and command reference::
 @end menu
 
-
-
-@node Getting and installing an SNMP agent, SMUX configuration, SNMP Support, SNMP Support
-@comment  node-name,  next,  previous,  up
+@node Getting and installing an SNMP agent
 @section Getting and installing an SNMP agent
 
 There are several SNMP agent which support SMUX. We recommend to use the latest
 version of @code{net-snmp} which was formerly known as @code{ucd-snmp}.
-It is free and open software and available at @url{http://www.net-snmp.org/}
+It is free and open software and available at @uref{http://www.net-snmp.org/}
 and as binary package for most Linux distributions.
 @code{net-snmp} has to be compiled with @code{--with-mib-modules=smux} to
 be able to accept connections from Quagga.
 
-
-
-@node SMUX configuration, MIB and command reference, Getting and installing an SNMP agent, SNMP Support
-@comment  node-name,  next,  previous,  up
+@node SMUX configuration
 @section SMUX configuration
 
 To enable SMUX protocol support, Quagga must have been build with the
@@ -85,10 +78,7 @@ If that is a problem you should consider to patch snmpd and comment out the
 troublesome @code{snmp_log()} line in the function
 @code{netsnmp_agent_check_packet()} in @code{agent/snmp_agent.c}.
 
-
-
-@node MIB and command reference, ,SMUX configuration, SNMP Support
-@comment  node-name,  next,  previous,  up
+@node MIB and command reference
 @section MIB and command reference
 
 The following OID numbers are used for the interprocess communication of snmpd and

File diff suppressed because it is too large
+ 4162 - 2840
doc/texinfo.tex


+ 30 - 22
doc/vtysh.texi

@@ -1,5 +1,4 @@
 @node VTY shell
-@comment  node-name,  next,  previous,  up
 @chapter VTY shell
 
 @command{vtysh} is integrated shell of Quagga software.
@@ -14,6 +13,14 @@ authentication settings.
 
 Currently, vtysh.conf has only two commands.
 
+@menu
+* VTY shell username::
+* VTY shell integrated configuration::
+@end menu
+
+@node VTY shell username
+@section VTY shell username
+
 @deffn {Command} {username @var{username} nopassword} {}
 
 With this set, user foo does not need password authentication for user vtysh.
@@ -26,28 +33,29 @@ of unix groups and the --enable-vty-group configure option.
 
 @end deffn
 
-@deffn {Command} {write-conf daemon} {}
-Instruct daemons to write out their config files when 'write file'
-is issued.
-@end deffn
-@deffn {Command} {write-conf integrated} {}
+@node VTY shell integrated configuration
+@section
+
+@deffn {Command} {service integrated-vtysh-config} {}
 Write out integrated Quagga.conf file when 'write file' is issued.
-@end deffn
 
-This command controls the behaviour of vtysh when it is told
-to write out the configuration.  If @command{write-conf integrated} is
-set, the daemon will write out a Quagga.conf with all daemons' commands
-integrated into it. If @command{write-conf daemon} is set, vtysh
-will instruct each daemon to write out their config files.
+This command controls the behaviour of vtysh when it is told to write out
+the configuration.  Per default, vtysh will instruct each daemon to write
+out their own config files when @command{write file} is issued.  However, if
+@command{service integrated-vtysh-config} is set, when @command{write file}
+is issued, vtysh will instruct the daemons will write out a Quagga.conf with
+all daemons' commands integrated into it. 
 
 Vtysh per default behaves as if @command{write-conf daemon} is set. Note
-that both may be set at same time if one wishes to have both
-Quagga.conf and daemon specific files written out. Further, note that the
-daemons are hard-coded to first look for the integrated Quagga.conf
-file before looking for their own file.
-
-We recommend you do not mix the use of the two types of files.
-Further, it is better not to use the integrated Quagga.conf file,
-as any syntax error in it can lead to /all/ of your daemons being unable
-to start up. Per daemon files are more robust as impact of errors in
-configuration are limited to the daemon in whose file the error is made.
+that both may be set at same time if one wishes to have both Quagga.conf and
+daemon specific files written out. Further, note that the daemons are
+hard-coded to first look for the integrated Quagga.conf file before looking
+for their own file.
+
+We recommend you do not mix the use of the two types of files. Further, it
+is better not to use the integrated Quagga.conf file, as any syntax error in
+it can lead to /all/ of your daemons being unable to start up. Per daemon
+files are more robust as impact of errors in configuration are limited to
+the daemon in whose file the error is made.
+
+@end deffn