summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/user/ospfd.rst20
-rw-r--r--doc/user/pim.rst2
-rw-r--r--doc/user/routemap.rst12
3 files changed, 25 insertions, 9 deletions
diff --git a/doc/user/ospfd.rst b/doc/user/ospfd.rst
index 349b54098e..d1a0bb6f7b 100644
--- a/doc/user/ospfd.rst
+++ b/doc/user/ospfd.rst
@@ -268,8 +268,10 @@ To start OSPF process you have to specify the OSPF router.
the destination prefix. Otherwise, we test whether the network command prefix
contains the local address prefix of the interface.
- In some cases it may be more convenient to enable OSPF on a per
- interface/subnet basis (:clicmd:`ip ospf area AREA [ADDR]`).
+ It is also possible to enable OSPF on a per interface/subnet basis
+ using the interface command (:clicmd:`ip ospf area AREA [ADDR]`).
+ However, mixing both network commands (:clicmd:`network`) and interface
+ commands (:clicmd:`ip ospf`) on the same router is not supported.
.. clicmd:: proactive-arp
@@ -515,12 +517,14 @@ Interfaces
Enable OSPF on the interface, optionally restricted to just the IP address
- given by `ADDR`, putting it in the `AREA` area. Per interface area settings
- take precedence to network commands
- (:clicmd:`network A.B.C.D/M area A.B.C.D`).
-
- If you have a lot of interfaces, and/or a lot of subnets, then enabling OSPF
- via this command may result in a slight performance improvement.
+ given by `ADDR`, putting it in the `AREA` area. If you have a lot of
+ interfaces, and/or a lot of subnets, then enabling OSPF via this command
+ instead of (:clicmd:`network A.B.C.D/M area A.B.C.D`) may result in a
+ slight performance improvement.
+
+ Notice that, mixing both network commands (:clicmd:`network`) and interface
+ commands (:clicmd:`ip ospf`) on the same router is not supported.
+ If (:clicmd:`ip ospf`) is present, (:clicmd:`network`) commands will fail.
.. clicmd:: ip ospf authentication-key AUTH_KEY
diff --git a/doc/user/pim.rst b/doc/user/pim.rst
index 5a009eda6b..1c3a0110ac 100644
--- a/doc/user/pim.rst
+++ b/doc/user/pim.rst
@@ -176,7 +176,7 @@ Certain signals have special meanings to *pimd*.
Generate IGMP query (v2/v3) on user requirement. This will not depend on
the existing IGMP general query timer.If no version is provided in the cli,
- it will be considered as default v2 query.This is a hidden command.
+ the default will be the igmp version enabled on that interface.
.. clicmd:: ip igmp watermark-warn (1-65535)
diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst
index a7f22cd40c..ef7aef9c5e 100644
--- a/doc/user/routemap.rst
+++ b/doc/user/routemap.rst
@@ -215,6 +215,18 @@ Route Map Match Command
This is a ZEBRA specific match command. The number is a range from (0-255).
Matches the originating protocols instance specified.
+.. clicmd:: match evpn route-type ROUTE_TYPE_NAME
+
+ This is a BGP EVPN specific match command. It matches to EVPN route-type
+ from type-1 (EAD route-type) to type-5 (Prefix route-type).
+ User can provide in an integral form (1-5) or string form of route-type
+ (i.e ead, macip, multicast, es, prefix).
+
+.. clicmd:: match evpn vni NUMBER
+
+ This is a BGP EVPN specific match command which matches to EVPN VNI id.
+ The number is a range from (1-6777215).
+
.. _route-map-set-command:
Route Map Set Command