Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / doc / user / ripd.rst

diff --git a/doc/user/ripd.rst b/doc/user/ripd.rst
index 66bdd26f1a785a041d4404b2ed114f522d70407d..f9c772430221de0bf212793caaf9fd4503236441 100644 (file)
--- a/doc/user/ripd.rst
+++ b/doc/user/ripd.rst
@@ -40,7 +40,8 @@ sequence for running RIP is like below:
 Please note that *zebra* must be invoked before *ripd*.
 
 To stop *ripd*. Please use::
-   kill `cat /var/run/ripd.pid`
+
+   kill `cat /var/run/frr/ripd.pid`
 
 Certain signals have special meanings to *ripd*.
 
@@ -87,15 +88,12 @@ multipath routing.
 RIP Configuration
 =================
 
-.. clicmd:: router rip
+.. clicmd:: router rip [vrf NAME]
 
    The `router rip` command is necessary to enable RIP. To disable RIP, use the
    `no router rip` command. RIP must be enabled before carrying out any of the
    RIP commands.
 
-
-   Disable RIP.
-
 .. clicmd:: network NETWORK
 
 
@@ -151,13 +149,21 @@ RIP Configuration
 
    The default is to be passive on all interfaces.
 
-.. clicmd:: ip split-horizon
+.. clicmd:: ip split-horizon [poisoned-reverse]
 
 
    Control split-horizon on the interface. Default is `ip split-horizon`. If
    you don't perform split-horizon on the interface, please specify `no ip
    split-horizon`.
 
+   If `poisoned-reverse` is also set, the router sends the poisoned routes
+   with highest metric back to the sending router.
+
+.. clicmd:: allow-ecmp [1-MULTIPATH_NUM]
+
+   Control how many ECMP paths RIP can inject for the same prefix. If specified
+   without a number, a maximum is taken (compiled with ``--enable-multipath``).
+
 .. _rip-version-control:
 
 RIP Version Control
@@ -176,8 +182,8 @@ discussion on the security implications of RIPv1 see :ref:`rip-authentication`.
 
 .. clicmd:: version VERSION
 
-   Set RIP version to accept for reads and send. ``VERSION`` can be either 1 or
-   1.
+   Set RIP version to accept for reads and send. VERSION can be either
+   ``1`` or ``2``.
 
    Disabling RIPv1 by specifying version 2 is STRONGLY encouraged,
    :ref:`rip-authentication`. This may become the default in a future release.
@@ -474,7 +480,7 @@ Show RIP Information
 
 To display RIP routes.
 
-.. clicmd:: show ip rip
+.. clicmd:: show ip rip [vrf NAME]
 
    Show RIP routes.
 
@@ -483,7 +489,7 @@ through RIP, this command will display the time the packet was sent and
 the tag information. This command will also display this information
 for routes redistributed into RIP.
 
-.. clicmd:: show ip rip status
+.. clicmd:: show ip rip [vrf NAME] status
 
    The command displays current RIP status. It includes RIP timer,
    filtering, version, RIP enabled interface and RIP peer information.