diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/basic.rst | 2 | ||||
| -rw-r--r-- | doc/user/bfd.rst | 2 | ||||
| -rw-r--r-- | doc/user/pimv6.rst | 8 | ||||
| -rw-r--r-- | doc/user/scripting.rst | 2 | ||||
| -rw-r--r-- | doc/user/zebra.rst | 19 |
5 files changed, 26 insertions, 7 deletions
diff --git a/doc/user/basic.rst b/doc/user/basic.rst index ea4b3f41f3..42faefd10b 100644 --- a/doc/user/basic.rst +++ b/doc/user/basic.rst @@ -471,7 +471,7 @@ recommendations apply in regards to upgrades: for differences against your old configuration. If any defaults changed that affect your setup, lines may appear or disappear. If a new line appears, it was previously the default (or not supported) and is now - neccessary to retain previous behavior. If a line disappears, it + necessary to retain previous behavior. If a line disappears, it previously wasn't the default, but now is, so it is no longer necessary. 3. Check the log files for deprecation warnings by using ``grep -i deprecat``. diff --git a/doc/user/bfd.rst b/doc/user/bfd.rst index 14aacc0f6b..c47ed04f63 100644 --- a/doc/user/bfd.rst +++ b/doc/user/bfd.rst @@ -236,7 +236,7 @@ BFD Peer Specific Commands Notes: - - Profile configurations can be overriden on a peer basis by specifying + - Profile configurations can be overridden on a peer basis by specifying non-default parameters in peer configuration node. - Non existing profiles can be configured and they will only be applied once they start to exist. diff --git a/doc/user/pimv6.rst b/doc/user/pimv6.rst index e71cf4631c..f0946a13f7 100644 --- a/doc/user/pimv6.rst +++ b/doc/user/pimv6.rst @@ -113,6 +113,14 @@ Certain signals have special meanings to *pim6d*. notifications to the kernel. This command is vrf aware, to configure for a vrf, enter the vrf submode. +.. clicmd:: ipv6 ssmpingd [X:X::X:X] + + Enable ipv6 ssmpingd configuration. A network level management tool + to check whether one can receive multicast packets via SSM from host. + The host target given to ssmping must run the ssmpingd daemon which listens + for IPv4 and IPv6 unicast requests. When it receives one, it responds to a + well known SSM multicast group which ssmping just have joined. + .. _pimv6-interface-configuration: PIMv6 Interface Configuration diff --git a/doc/user/scripting.rst b/doc/user/scripting.rst index badc82c500..42855de1ab 100644 --- a/doc/user/scripting.rst +++ b/doc/user/scripting.rst @@ -58,7 +58,7 @@ The documentation for :ref:`on-rib-process-dplane-results` tells us its arguments. Here, the destination prefix for a route is being logged out. Scripts live in :file:`/etc/frr/scripts/` by default. This is configurable at -compile time via ``--with-scriptdir``. It may be overriden at runtime with the +compile time via ``--with-scriptdir``. It may be overridden at runtime with the ``--scriptdir`` daemon option. The documentation for :ref:`on-rib-process-dplane-results` indicates that the diff --git a/doc/user/zebra.rst b/doc/user/zebra.rst index cd220a4141..29f305520a 100644 --- a/doc/user/zebra.rst +++ b/doc/user/zebra.rst @@ -283,6 +283,17 @@ the default route. Allow IPv6 nexthop tracking to resolve via the default route. This parameter is configured per-VRF, so the command is also available in the VRF subnode. +.. clicmd:: show ip nht [vrf NAME] [A.B.C.D|X:X::X:X] [mrib] + + Show nexthop tracking status for address resolution. If vrf is not specified + then display the default vrf. If ``all`` is specified show all vrf address + resolution output. If an ipv4 or ipv6 address is not specified then display + all addresses tracked, else display the requested address. The mrib keyword + indicates that the operator wants to see the multicast rib address resolution + table. An alternative form of the command is ``show ip import-check`` and this + form of the command is deprecated at this point in time. + + Administrative Distance ======================= @@ -290,7 +301,7 @@ Administrative distance allows FRR to make decisions about what routes should be installed in the rib based upon the originating protocol. The lowest Admin Distance is the route selected. This is purely a subjective decision about ordering and care has been taken to choose -the same distances that other routing suites have choosen. +the same distances that other routing suites have chosen. +------------+-----------+ | Protocol | Distance | @@ -350,7 +361,7 @@ has multiple routes for the same prefix from multiple sources. An example here would be if someone else was running another routing suite besides FRR at the same time, the kernel must choose what route to use to forward on. FRR choose the value of 20 because of two reasons. FRR wanted a -value small enough to be choosen but large enough that the operator could +value small enough to be chosen but large enough that the operator could allow route prioritization by the kernel when multiple routing suites are being run and FRR wanted to take advantage of Route Replace semantics that the linux kernel offers. In order for Route Replacement semantics to @@ -541,7 +552,7 @@ via a ``ip route show X`` command: nexthop via 192.168.161.9 dev enp39s0 weight 1 Once installed into the FIB, FRR currently has little control over what -nexthops are choosen to forward packets on. Currently the Linux kernel +nexthops are chosen to forward packets on. Currently the Linux kernel has a ``fib_multipath_hash_policy`` sysctl which dictates how the hashing algorithm is used to forward packets. @@ -1182,7 +1193,7 @@ zebra Terminal Mode Commands Display statistics about clients that are connected to zebra. This is useful for debugging and seeing how much data is being passed between - zebra and it's clients. If the summary form of the command is choosen + zebra and it's clients. If the summary form of the command is chosen a table is displayed with shortened information. .. clicmd:: show zebra router table summary |