diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer/ospf-sr.rst | 3 | ||||
| -rw-r--r-- | doc/developer/workflow.rst | 8 | ||||
| -rw-r--r-- | doc/user/installation.rst | 3 | ||||
| -rw-r--r-- | doc/user/ospfd.rst | 16 | ||||
| -rw-r--r-- | doc/user/routemap.rst | 5 |
5 files changed, 22 insertions, 13 deletions
diff --git a/doc/developer/ospf-sr.rst b/doc/developer/ospf-sr.rst index 263db9dfb9..1c164433dc 100644 --- a/doc/developer/ospf-sr.rst +++ b/doc/developer/ospf-sr.rst @@ -310,8 +310,7 @@ Routing. ospf router-id 192.168.1.11 capability opaque segment-routing on - segment-routing global-block 10000 19999 - segment-routing local-block 5000 5999 + segment-routing global-block 10000 19999 local-block 5000 5999 segment-routing node-msd 8 segment-routing prefix 192.168.1.11/32 index 1100 diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index adab9725d9..688ce545fb 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -163,13 +163,13 @@ as early as possible, i.e. the first 2-week window. For reference, the expected release schedule according to the above is: +---------+------------+------------+------------+------------+------------+ -| Release | 2021-11-02 | 2022-03-01 | 2022-07-05 | 2022-11-01 | 2023-03-07 | +| Release | 2022-07-05 | 2022-11-01 | 2023-03-07 | 2023-07-04 | 2023-10-31 | +---------+------------+------------+------------+------------+------------+ -| RC | 2021-10-19 | 2022-02-15 | 2022-06-21 | 2022-10-18 | 2023-02-21 | +| RC | 2022-06-21 | 2022-10-18 | 2023-02-21 | 2023-06-20 | 2023-10-17 | +---------+------------+------------+------------+------------+------------+ -| dev/X.Y | 2021-10-05 | 2022-02-01 | 2022-06-07 | 2022-10-04 | 2023-02-07 | +| dev/X.Y | 2022-06-07 | 2022-10-04 | 2023-02-07 | 2023-06-06 | 2023-10-03 | +---------+------------+------------+------------+------------+------------+ -| freeze | 2021-09-21 | 2022-01-18 | 2022-05-24 | 2022-09-20 | 2023-01-24 | +| freeze | 2022-05-24 | 2022-09-20 | 2023-01-24 | 2023-05-23 | 2023-09-19 | +---------+------------+------------+------------+------------+------------+ Each release is managed by one or more volunteer release managers from the FRR diff --git a/doc/user/installation.rst b/doc/user/installation.rst index b24a9fb471..401a1f2721 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -212,7 +212,8 @@ options from the list below. .. option:: --disable-ospfclient - Disable building of the example OSPF-API client. + Disable installation of the python ospfclient and building of the example + OSPF-API client. .. option:: --disable-isisd diff --git a/doc/user/ospfd.rst b/doc/user/ospfd.rst index d1a0bb6f7b..e438d04e93 100644 --- a/doc/user/ospfd.rst +++ b/doc/user/ospfd.rst @@ -867,6 +867,12 @@ Opaque LSA Show Opaque LSA from the database. +.. clicmd:: show ip ospf (1-65535) reachable-routers + +.. clicmd:: show ip ospf [vrf <NAME|all>] reachable-routers + + Show routing table of reachable routers. + .. _ospf-traffic-engineering: Traffic Engineering @@ -985,12 +991,6 @@ dataplane. Block, i.e. the label range used for Adjacency SID. The negative version of the command always unsets both ranges. -.. clicmd:: segment-routing local-block (16-1048575) (16-1048575) - - Set the Segment Routing Local Block i.e. the label range used by MPLS to - store label in the MPLS FIB for Adjacency SID. This command is deprecated - in favor of the combined command above. - .. clicmd:: segment-routing node-msd (1-16) Fix the Maximum Stack Depth supported by the router. The value depend of the @@ -1064,6 +1064,10 @@ Debugging OSPF library messages and OSPF BFD integration messages that are mostly state transitions and validation problems. +.. clicmd:: debug ospf client-api + + Show debug information for the OSPF opaque data client API. + .. clicmd:: debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) (send|recv) [detail] diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst index ef7aef9c5e..754b709173 100644 --- a/doc/user/routemap.rst +++ b/doc/user/routemap.rst @@ -205,6 +205,11 @@ Route Map Match Command interface name specified if the neighbor was specified in this manner. +.. clicmd:: match peer PEER_GROUP_NAME + + This is a BGP specific match command. Matches the peer + group name specified for the peer in question. + .. clicmd:: match source-protocol PROTOCOL_NAME This is a ZEBRA specific match command. Matches the |