Skip to content

Commit

Permalink
Merge pull request #2721 from pguibert6WIND/doc_compile_issue
Browse files Browse the repository at this point in the history
doc: fix misc documentation compilation error
  • Loading branch information
qlyoung committed Jul 30, 2018
2 parents b380513 + 46337eb commit 2ce8c82
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
5 changes: 0 additions & 5 deletions doc/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,6 @@ customize the build to include or exclude specific features and dependencies.

Enable Traffic Engineering Extension for ISIS (RFC5305)

.. option:: --enable-multipath <ARG>

Enable support for Equal Cost Multipath. `ARG` is the maximum number
of ECMP paths to allow, set to 0 to allow unlimited number of paths.

.. option:: --enable-realms

Enable the support of Linux Realms. Convert tag values from 1-255 into a
Expand Down
14 changes: 8 additions & 6 deletions doc/user/zebra.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@ Besides the common invocation options (:ref:`common-invocation-options`), the

When *Zebra* starts with this option, the VRF backend is based on Linux
network namespaces. That implies that all network namespaces discovered by
ZEBRA will create an associated VRF. The other daemons will operate on the VRF
VRF defined by *Zebra*, as usual. More information in the :ref:`VRF Commands`
chapter.
ZEBRA will create an associated VRF. The other daemons will operate on the
VRF defined by *Zebra*, as usual.

.. program:: configure
.. seealso:: :ref:`zebra-vrf`

.. _interface-commands:

Expand Down Expand Up @@ -388,7 +387,7 @@ default) should the specified gateways not be reachable. E.g.:
and later). After setting TABLENO with this command,
static routes defined after this are added to the specified table.

.. _multicast-rib-commands:
.. _zebra-vrf:

VRF (Virtual Routing and Forwarding)
====================================
Expand Down Expand Up @@ -476,7 +475,7 @@ commands in relationship to VRF. Here is an extract of some of those commands:
on configuration mode, this applies to default VRF. Otherwise, this command
applies to the VRF of the vrf configuration mode. This command is used to
configure a vrf route leak across 2 VRFs. This command is only available when
*Zebra* is launched without :option:`-n` option.
*Zebra* is launched without :option:`-n` option.

.. index:: ip route NETWORK NETMASK GATEWAY table TABLENO
.. clicmd:: ip route NETWORK NETMASK GATEWAY table TABLENO
Expand Down Expand Up @@ -514,6 +513,7 @@ commands in relationship to VRF. Here is an extract of some of those commands:
ip route 10.0.0.0 255.255.255.0 10.0.0.2 vrf r1-cust1 table 43
show ip table vrf r1-cust1 table 43
.. _multicast-rib-commands:

Multicast RIB Commands
======================
Expand Down Expand Up @@ -683,6 +683,8 @@ The FIB push interface comprises of a TCP connection between zebra and
the FPM. The connection is initiated by zebra -- that is, the FPM acts
as the TCP server.

.. program:: configure

The relevant zebra code kicks in when zebra is configured with the
:option:`--enable-fpm` flag. Zebra periodically attempts to connect to
the well-known FPM port. Once the connection is up, zebra starts
Expand Down

0 comments on commit 2ce8c82

Please sign in to comment.