Merge pull request #842 from fett0/ospfv3-correction

ospfv3 /mpls : wrong commands and description

2 files changed, 17 insertions, 14 deletions

diff --git a/docs/configuration/protocols/mpls.rst b/docs/configuration/protocols/mpls.rst
index d1d0cd87..550473d7 100644
--- a/docs/configuration/protocols/mpls.rst
+++ b/docs/configuration/protocols/mpls.rst
@@ -27,12 +27,14 @@ network transport of data packets.
 For more information on how MPLS label switching works, please go visit
 `Wikipedia (MPLS)`_.
 
-.. note:: MPLS support in VyOS is not finished yet, and therefore its
-   functionality is limited. Currently there is no support for MPLS enabled VPN
-   services such as L3VPNs, L2VPNs, and mVPNs. RSVP support is also not present
-   as the underlying routing stack (FRR) does not implement it. Currently VyOS
-   can be configured as a label switched router (MPLS P router), in both
-   penultimate and ultimate hop popping operations.
+.. note:: MPLS support in VyOS is not finished yet, and therefore its 
+  functionality is limited. Currently there is no support for MPLS enabled VPN
+  services such as L2VPNs and mVPNs. RSVP support is also not present as the
+  underlying routing stack (FRR) does not implement it. Currently VyOS 
+  implements LDP as described in RFC 5036; other LDP standard are the 
+  following ones: RFC 6720, RFC 6667, RFC 5919, RFC 5561, RFC 7552, RFC 4447. 
+  Because MPLS is already available (FRR also supports RFC 3031).
+
 
 Label Distribution Protocol
 ===========================
diff --git a/docs/configuration/protocols/ospf.rst b/docs/configuration/protocols/ospf.rst
index e3f9759e..4949cded 100644
--- a/docs/configuration/protocols/ospf.rst
+++ b/docs/configuration/protocols/ospf.rst
@@ -43,7 +43,8 @@ starts when the first ospf enabled interface is configured.
    enable ospf on interface with address 192.168.1.1/23, but it does on 
    interface with address 192.168.1.129/25.
 
-   In some cases it may be more convenient to enable OSPF on a per interface/subnet
+   In some cases it may be more convenient to enable OSPF on a per 
+   interface/subnet
    basis :cfgcmd:`set protocols ospf interface <interface> area <x.x.x.x | x>`
 
 .. cfgcmd:: set protocols ospf auto-cost reference-bandwidth <number>
@@ -790,7 +791,7 @@ General
 VyOS does not have a special command to start the OSPFv3 process. The OSPFv3
 process starts when the first ospf enabled interface is configured.
 
-.. cfgcmd:: set protocols ospfv3 area <number> interface <interface>
+.. cfgcmd:: set protocols ospfv3 interface <interface> area <number> 
 
    This command specifies the OSPFv3 enabled interface. This command is also
    used to enable the OSPF process. The area number can be specified in
@@ -987,7 +988,7 @@ A typical configuration using 2 nodes.
 
 .. code-block:: none
 
-  set protocols ospfv3 area 0.0.0.0 interface eth1
+  set protocols ospfv3 interface eth1 area 0.0.0.0 
   set protocols ospfv3 area 0.0.0.0 range 2001:db8:1::/64
   set protocols ospfv3 parameters router-id 192.168.1.1
   set protocols ospfv3 redistribute connected
@@ -996,7 +997,7 @@ A typical configuration using 2 nodes.
 
 .. code-block:: none
 
-  set protocols ospfv3 area 0.0.0.0 interface eth1
+  set protocols ospfv3 interface eth1 area 0.0.0.0 
   set protocols ospfv3 area 0.0.0.0 range 2001:db8:2::/64
   set protocols ospfv3 parameters router-id 192.168.2.1
   set protocols ospfv3 redistribute connected
@@ -1025,8 +1026,8 @@ Example configuration for WireGuard interfaces:
   set interfaces wireguard wg01 peer ospf02 pubkey 'ie3...='
   set interfaces wireguard wg01 port '12345'
   set protocols ospfv3 parameters router-id 192.168.1.1
-  set protocols ospfv3 area 0.0.0.0 interface 'wg01'
-  set protocols ospfv3 area 0.0.0.0 interface 'lo'
+  set protocols ospfv3 interface 'wg01' area 0.0.0.0 
+  set protocols ospfv3 interface 'lo' area 0.0.0.0
 
 **Node 2**
 
@@ -1040,8 +1041,8 @@ Example configuration for WireGuard interfaces:
   set interfaces wireguard wg01 peer ospf01 pubkey 'NHI...='
   set interfaces wireguard wg01 port '12345'
   set protocols ospfv3 parameters router-id 192.168.1.2
-  set protocols ospfv3 area 0.0.0.0 interface 'wg01'
-  set protocols ospfv3 area 0.0.0.0 interface 'lo'
+  set protocols ospfv3 interface 'wg01' area 0.0.0.0 
+  set protocols ospfv3 interface 'lo' area 0.0.0.0
 
 **Status**