4 files changed, 19 insertions, 19 deletions
diff --git a/docs/configuration/interfaces/l2tpv3.rst b/docs/configuration/interfaces/l2tpv3.rst
index bd5d6862..897e38dc 100644
--- a/docs/configuration/interfaces/l2tpv3.rst
+++ b/docs/configuration/interfaces/l2tpv3.rst
@@ -141,29 +141,26 @@ IPSec:
 
 .. code-block:: none
 
+  set vpn ipsec authentication psk <pre-shared-name> id '%any'
+  set vpn ipsec authentication psk <pre-shared-name> secret <pre-shared-key>
   set vpn ipsec interface <VPN-interface>
-  set vpn ipsec esp-group test-ESP-1 compression 'disable'
   set vpn ipsec esp-group test-ESP-1 lifetime '3600'
   set vpn ipsec esp-group test-ESP-1 mode 'transport'
   set vpn ipsec esp-group test-ESP-1 pfs 'enable'
   set vpn ipsec esp-group test-ESP-1 proposal 1 encryption 'aes128'
   set vpn ipsec esp-group test-ESP-1 proposal 1 hash 'sha1'
-  set vpn ipsec ike-group test-IKE-1 ikev2-reauth 'no'
   set vpn ipsec ike-group test-IKE-1 key-exchange 'ikev1'
   set vpn ipsec ike-group test-IKE-1 lifetime '3600'
   set vpn ipsec ike-group test-IKE-1 proposal 1 dh-group '5'
   set vpn ipsec ike-group test-IKE-1 proposal 1 encryption 'aes128'
   set vpn ipsec ike-group test-IKE-1 proposal 1 hash 'sha1'
-  set vpn ipsec site-to-site peer <peer-ip> authentication mode 'pre-shared-secret'
-  set vpn ipsec site-to-site peer <peer-ip> authentication pre-shared-secret <pre-shared-key>
-  set vpn ipsec site-to-site peer <peer-ip> connection-type 'initiate'
-  set vpn ipsec site-to-site peer <peer-ip> ike-group 'test-IKE-1'
-  set vpn ipsec site-to-site peer <peer-ip> ikev2-reauth 'inherit'
-  set vpn ipsec site-to-site peer <peer-ip> local-address <local-ip>
-  set vpn ipsec site-to-site peer <peer-ip> tunnel 1 allow-nat-networks 'disable'
-  set vpn ipsec site-to-site peer <peer-ip> tunnel 1 allow-public-networks 'disable'
-  set vpn ipsec site-to-site peer <peer-ip> tunnel 1 esp-group 'test-ESP-1'
-  set vpn ipsec site-to-site peer <peer-ip> tunnel 1 protocol 'l2tp'
+  set vpn ipsec site-to-site peer <connection-name> authentication mode 'pre-shared-secret'
+  set vpn ipsec site-to-site peer <connection-name> connection-type 'initiate'
+  set vpn ipsec site-to-site peer <connection-name> ike-group 'test-IKE-1'
+  set vpn ipsec site-to-site peer <connection-name> ikev2-reauth 'inherit'
+  set vpn ipsec site-to-site peer <connection-name> local-address <local-ip>
+  set vpn ipsec site-to-site peer <connection-name> tunnel 1 esp-group 'test-ESP-1'
+  set vpn ipsec site-to-site peer <connection-name> tunnel 1 protocol 'l2tp'
 
 Bridge:
 
diff --git a/docs/configuration/interfaces/pppoe.rst b/docs/configuration/interfaces/pppoe.rst
index 0953e948..cf406baf 100644
--- a/docs/configuration/interfaces/pppoe.rst
+++ b/docs/configuration/interfaces/pppoe.rst
@@ -91,7 +91,7 @@ PPPoE options
    This command allows you to select a specific access concentrator when you
    know the access concentrators `<name>`.
 
-.. cfgcmd:: set interfaces pppoe <interface> authentication user <username>
+.. cfgcmd:: set interfaces pppoe <interface> authentication username <username>
 
    Use this command to set the username for authenticating with a remote PPPoE
    endpoint. Authentication is optional from the system's point of view but
@@ -324,7 +324,7 @@ Requirements:
 
 .. code-block:: none
 
-  set interfaces pppoe pppoe0 authentication user 'userid'
+  set interfaces pppoe pppoe0 authentication username 'userid'
   set interfaces pppoe pppoe0 authentication password 'secret'
   set interfaces pppoe pppoe0 source-interface 'eth0'
 
@@ -349,7 +349,7 @@ which is the default VLAN for Deutsche Telekom:
 
 .. code-block:: none
 
-  set interfaces pppoe pppoe0 authentication user 'userid'
+  set interfaces pppoe pppoe0 authentication username 'userid'
   set interfaces pppoe pppoe0 authentication password 'secret'
   set interfaces pppoe pppoe0 source-interface 'eth0.7'
 
@@ -367,7 +367,7 @@ If you do not know the prefix size delegated to you, start with sla-len 0.
 
 .. code-block:: none
 
-  set interfaces pppoe pppoe0 authentication user vyos
+  set interfaces pppoe pppoe0 authentication username vyos
   set interfaces pppoe pppoe0 authentication password vyos
   set interfaces pppoe pppoe0 dhcpv6-options pd 0 interface eth0 address '1'
   set interfaces pppoe pppoe0 dhcpv6-options pd 0 interface eth0 sla-id '0'
diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst
index bd7a8460..31539d9f 100644
--- a/docs/configuration/interfaces/tunnel.rst
+++ b/docs/configuration/interfaces/tunnel.rst
@@ -18,7 +18,11 @@ a closer look at the protocols and options currently supported by VyOS.
 Common interface configuration
 ------------------------------
 
-.. cmdinclude:: /_include/interface-common-without-dhcp1.txt
+.. cmdinclude:: /_include/interface-address.txt
+   :var0: tunnel
+   :var1: tun0
+
+.. cmdinclude:: /_include/interface-common-without-mac.txt
    :var0: tunnel
    :var1: tun0
 
@@ -207,7 +211,7 @@ GRETAP
 ^^^^^^^
 
 While normal GRE is for layer 3, GRETAP is for layer 2. GRETAP can encapsulate
-Ethernet frames, thus it can be bridged with other interfaces to create 
+Ethernet frames, thus it can be bridged with other interfaces to create
 datalink layer segments that span multiple remote sites.
 
 .. code-block:: none
diff --git a/docs/configuration/interfaces/wwan.rst b/docs/configuration/interfaces/wwan.rst
index 45b18387..98890158 100644
--- a/docs/configuration/interfaces/wwan.rst
+++ b/docs/configuration/interfaces/wwan.rst
@@ -22,7 +22,6 @@ Common interface configuration
    :var0: wwan
    :var1: wwan0
 
-
 .. cmdinclude:: /_include/interface-description.txt
    :var0: wwan
    :var1: wwan0