Merge remote-tracking branch 'origin/master' into EIGRP

[mirror_frr.git] / doc / main.texi

diff --git a/doc/main.texi b/doc/main.texi
index dfe02e1b5da4bd2b382b5b2536f33431f3bbe8ed..706baa25f7d18e138601e6098f9b54b46da5ba96 100644 (file)
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -385,7 +385,8 @@ ip protocol rip route-map RM1
 
 Zebra supports a 'FIB push' interface that allows an external
 component to learn the forwarding information computed by the Frr
 
 Zebra supports a 'FIB push' interface that allows an external
 component to learn the forwarding information computed by the Frr

-routing suite.
+routing suite.  This is a loadable module that needs to be enabled
+at startup as described in @ref{Loadable Module Support}.

 
 In Frr, the Routing Information Base (RIB) resides inside
 zebra. Routing protocols communicate their best routes to zebra, and
 
 In Frr, the Routing Information Base (RIB) resides inside
 zebra. Routing protocols communicate their best routes to zebra, and


@@ -440,9 +441,9 @@ independently.
 @end itemize
 
 As mentioned before, zebra encodes routes sent to the FPM in netlink
 @end itemize
 
 As mentioned before, zebra encodes routes sent to the FPM in netlink

-format by default. The format can be controlled via the
-@code{--fpm_format} command-line option to zebra, which currently
-takes the values @code{netlink} and @code{protobuf}.
+format by default. The format can be controlled via the FPM module's
+load-time option to zebra, which currently takes the values @code{netlink}
+and @code{protobuf}.

 
 The zebra FPM interface uses replace semantics. That is, if a 'route
 add' message for a prefix is followed by another 'route add' message,
 
 The zebra FPM interface uses replace semantics. That is, if a 'route
 add' message for a prefix is followed by another 'route add' message,