summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/user/bgp.rst10
-rw-r--r--doc/user/isisd.rst7
-rw-r--r--doc/user/ospf6d.rst3
-rw-r--r--doc/user/pathd.rst10
-rw-r--r--doc/user/pim.rst4
5 files changed, 18 insertions, 16 deletions
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index 4c216cdbcb..da6c0d9824 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -257,9 +257,6 @@ internal or external.
Enable a BGP protocol process with the specified ASN. After
this statement you can input any `BGP Commands`.
-
- Destroy a BGP protocol process with the specified ASN.
-
.. clicmd:: bgp router-id A.B.C.D
This command specifies the router-ID. If *bgpd* connects to *zebra* it gets
@@ -1205,6 +1202,13 @@ Route Aggregation-IPv6 Address Family
Redistribution
--------------
+Redistribution configuration should be placed under the ``address-family``
+section for the specific AF to redistribute into. Protocol availability for
+redistribution is determined by BGP AF; for example, you cannot redistribute
+OSPFv3 into ``address-family ipv4 unicast`` as OSPFv3 supports IPv6.
+
+.. clicmd:: redistribute <babel|connected|eigrp|isis|kernel|openfabric|ospf|ospf6|rip|ripng|sharp|static|table> [metric (0-4294967295)] [route-map WORD]
+
Redistribute routes from other protocols into BGP.
.. clicmd:: redistribute vnc-direct
diff --git a/doc/user/isisd.rst b/doc/user/isisd.rst
index 265b3c0313..457f841118 100644
--- a/doc/user/isisd.rst
+++ b/doc/user/isisd.rst
@@ -129,6 +129,11 @@ ISIS Fast-Reroute
Limit LFA backup computation up to the specified prefix priority.
+.. clicmd:: fast-reroute lfa tiebreaker [downstream | lowest-backup-metric | node-protecting] index (1-255) [level-1 | level-2]
+
+ Configure a tie-breaker for multiple LFA backups. Lower indexes are
+ processed first.
+
.. clicmd:: fast-reroute load-sharing disable [level-1 | level-2]
Disable load sharing across multiple LFA backups.
@@ -560,6 +565,8 @@ A Segment Routing configuration, with IPv4, IPv6, SRGB and MSD configuration.
lsp-gen-interval 2
segment-routing on
segment-routing node-msd 8
+ segment-routing prefix 10.1.1.1/32 index 100 explicit-null
+ segment-routing prefix 2001:db8:1000::1/128 index 101 explicit-null
!
diff --git a/doc/user/ospf6d.rst b/doc/user/ospf6d.rst
index f5ecc74d4e..6f8ac978de 100644
--- a/doc/user/ospf6d.rst
+++ b/doc/user/ospf6d.rst
@@ -72,11 +72,12 @@ OSPF6 router
This configuration setting MUST be consistent across all routers
within the OSPF domain.
-.. clicmd::[no] maximum-paths (1-64)
+.. clicmd:: maximum-paths (1-64)
Use this command to control the maximum number of parallel routes that
OSPFv3 can support. The default is 64.
+
.. _ospf6-area:
OSPF6 area
diff --git a/doc/user/pathd.rst b/doc/user/pathd.rst
index 65882b0dc8..fe50a5e7eb 100644
--- a/doc/user/pathd.rst
+++ b/doc/user/pathd.rst
@@ -339,16 +339,6 @@ The asterisk (*) marks the best, e.g. active, candidate path. Note that for segm
retrieved via PCEP a random number based name is generated.
-.. clicmd:: show debugging pathd
-
- Display the current status of the pathd debugging.
-
-
-.. clicmd:: show debugging pathd-pcep
-
- Display the current status of the pcep module debugging.
-
-
.. clicmd:: show sr-te pcep counters
Display the counters from pceplib.
diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 275c224570..86716b49a4 100644
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -489,7 +489,7 @@ cause great confusion.
Display information about known S,G's and incoming interface as well as the
OIL and how they were chosen.
-.. clicmd:: show ip pim upstream
+.. clicmd:: show ip pim [vrf NAME] upstream [A.B.C.D [A.B.C.D]] [json]
Display upstream information about a S,G mroute. Allow the user to
specify sub Source and Groups that we are only interested in.
@@ -503,7 +503,7 @@ cause great confusion.
Display upstream information for S,G's and the RPF data associated with them.
-.. clicmd:: show ip pim mlag upstream
+.. clicmd:: show ip pim [vrf NAME] mlag upstream [A.B.C.D [A.B.C.D]] [json]
Display upstream entries that are synced across MLAG switches.
Allow the user to specify sub Source and Groups address filters.