17 files changed, 204 insertions, 508 deletions
diff --git a/docs/interfaces/advanced-index.rst b/docs/interfaces/advanced-index.rst
index c666f7ae..f955c6b1 100644
--- a/docs/interfaces/advanced-index.rst
+++ b/docs/interfaces/advanced-index.rst
@@ -10,7 +10,9 @@ Advanced Network Interfaces
    bond
    bridge
    dummy
+   ethernet
    geneve
+   loopback
    l2tpv3
    macsec
    pseudo-ethernet
diff --git a/docs/interfaces/bond.rst b/docs/interfaces/bond.rst
index 9e67809a..859c25c3 100644
--- a/docs/interfaces/bond.rst
+++ b/docs/interfaces/bond.rst
@@ -13,62 +13,22 @@ Additionally, link integrity monitoring may be performed.
 Configuration
 #############
 
-Address
--------
-
-.. cfgcmd:: set interfaces bonding <interface> address <address | dhcp | dhcpv6>
-
-   Configure interface `<interface>` with one or more interface addresses.
-
-   * **address** can be specified multiple times as IPv4 and/or IPv6 address,
-     e.g. 192.0.2.1/24 and/or 2001:db8::1/64
-   * **dhcp** interface address is received by DHCP from a DHCP server on this
-     segment.
-   * **dhcpv6** interface address is received by DHCPv6 from a DHCPv6 server on
-     this segment.
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces bonding bond0 address 192.0.2.1/24
-     set interfaces bonding bond0 address 192.0.2.2/24
-     set interfaces bonding bond0 address 2001:db8::ffff/64
-     set interfaces bonding bond0 address 2001:db8:100::ffff/64
-
-
-.. cfgcmd:: set interfaces bonding <interface> ipv6 address autoconf
-
-   .. include:: common-ipv6-addr-autoconf.txt
-
-.. cfgcmd:: set interfaces bonding <interface> ipv6 address eui64 <prefix>
-
-   :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
-   :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address.
-
-   .. code-block:: none
-
-     set interfaces bonding bond0 ipv6 address eui64 2001:db8:beef::/64
+Common interface configuration
+------------------------------
 
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: bond
+   :var1: bond0
 
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces bonding <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-
-.. cfgcmd:: set interfaces bonding <interface> disable
+Member Interfaces
+-----------------
 
-   Disable given `<interface>`. It will be placed in administratively down
-   (``A/D``) state.
+.. cfgcmd:: set interfaces bonding <interface> member interface <member>
 
-.. cfgcmd:: set interfaces bonding <interface> mac <mac-address>
+   Enslave `<member>` interface to bond `<interface>`.
 
-   Configure user defined :abbr:`MAC (Media Access Control)` address on given
-   `<interface>`.
+Bond options
+------------
 
 .. cfgcmd:: set interfaces bonding <interface> mode <mode>
 
@@ -293,13 +253,6 @@ Link Administration
    The maximum number of targets that can be specified is 16. The default value
    is no IP addresses.
 
-Member Interfaces
------------------
-
-.. cfgcmd:: set interfaces bonding <interface> member interface <member>
-
-   Enslave `<member>` interface to bond `<interface>`.
-
 Example
 -------
 
diff --git a/docs/interfaces/bridge.rst b/docs/interfaces/bridge.rst
index a7343a0d..144e5f6d 100644
--- a/docs/interfaces/bridge.rst
+++ b/docs/interfaces/bridge.rst
@@ -17,92 +17,12 @@ standard.
 Configuration
 #############
 
-Address
--------
-
-.. cfgcmd:: set interfaces bridge <interface> address <address | dhcp |
-   dhcpv6>
-
-   Configure interface `<interface>` with one or more interface
-   addresses.
-
-   * **address** can be specified multiple times as IPv4 and/or IPv6
-     address, e.g. 192.0.2.1/24 and/or 2001:db8::1/64
-   * **dhcp** interface address is received by DHCP from a DHCP server
-     on this segment.
-   * **dhcpv6** interface address is received by DHCPv6 from a DHCPv6
-     server on this segment.
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces bridge br0 address 192.0.2.1/24
-     set interfaces bridge br0 address 192.0.2.2/24
-     set interfaces bridge br0 address 2001:db8::ffff/64
-     set interfaces bridge br0 address 2001:db8:100::ffff/64
-
-
-.. cfgcmd:: set interfaces bridge <interface> ipv6 address autoconf
-
-   .. include:: common-ipv6-addr-autoconf.txt
-
-.. cfgcmd:: set interfaces bridge <interface> ipv6 address eui64
-   <prefix>
-
-   :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
-   :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6
-   address.
-
-   .. code-block:: none
-
-     set interfaces bridge br0 ipv6 address eui64 2001:db8:beef::/64
-
-
-.. cfgcmd:: set interfaces bridge <interface> aging <time>
-
-   MAC address aging `<time`> in seconds (default: 300).
-
-
-.. cfgcmd:: set interfaces bridge <interface> max-age <time>
-
-   Bridge maximum aging `<time>` in seconds (default: 20).
-
-   If a another bridge in the spanning tree does not send out a hello
-   packet for a long period of time, it is assumed to be dead.
-
-
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces bridge <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be
-   passed to SNMP monitoring systems.
-
-
-.. cfgcmd:: set interfaces bridge <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively
-   down (``A/D``) state.
-
-
-.. cfgcmd:: set interfaces bridge <interface> disable-flow-control
-
-   Disable Ethernet flow control (pause frames).
-
-
-.. cfgcmd:: set interfaces bridge <interface> mac <mac-address>
-
-   Configure user defined :abbr:`MAC (Media Access Control)` address on
-   given `<interface>`.
-
-
-.. cfgcmd:: set interfaces bridge <interface> igmp querier
-
-   Enable IGMP querier
-
+Common interface configuration
+------------------------------
 
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: bridge
+   :var1: br0
 
 Member Interfaces
 -----------------
@@ -139,7 +59,6 @@ Member Interfaces
    deciding which link to use. Faster interfaces should have lower
    costs.
 
-
 .. _stp:
 
 STP Parameter
@@ -175,9 +94,26 @@ links providing fault tolerance if an active link fails.
    Designated Bridges. Hello packets are used to communicate information
    about the topology throughout the entire Bridged Local Area Network.
 
+Additional Bridge Options
+-------------------------
+
+.. cfgcmd:: set interfaces bridge <interface> aging <time>
+
+   MAC address aging `<time`> in seconds (default: 300).
+
+.. cfgcmd:: set interfaces bridge <interface> max-age <time>
+
+   Bridge maximum aging `<time>` in seconds (default: 20).
+
+   If a another bridge in the spanning tree does not send out a hello
+   packet for a long period of time, it is assumed to be dead.
+
+.. cfgcmd:: set interfaces bridge <interface> igmp querier
+
+   Enable IGMP querier
 
 Example
--------
+#######
 
 Creating a bridge interface is very simple. In this example we will
 have:
@@ -212,7 +148,7 @@ This results in the active configuration:
 
 
 Operation
-=========
+#########
 
 .. opcmd:: show bridge
 
diff --git a/docs/interfaces/common-ip-ipv6-addr.txt b/docs/interfaces/common-ip-ipv6-addr.txt
deleted file mode 100644
index f53eaeee..00000000
--- a/docs/interfaces/common-ip-ipv6-addr.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Configure interface `<interface>` with one or more interface addresses.
-
-* **address** can be specified multiple times as IPv4 and/or IPv6 address,
-  e.g. 192.0.2.1/24 and/or 2001:db8::1/64
-* **dhcp** interface address is received by DHCP from a DHCP server on this
-  segment.
-* **dhcpv6** interface address is received by DHCPv6 from a DHCPv6 server on
-  this segment.
diff --git a/docs/interfaces/common-ipv6-addr-autoconf.txt b/docs/interfaces/common-ipv6-addr-autoconf.txt
deleted file mode 100644
index 838b299f..00000000
--- a/docs/interfaces/common-ipv6-addr-autoconf.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-:abbr:`SLAAC (Stateless Address Autoconfiguration)`
-:rfc:`4862`. IPv6 hosts can configure themselves automatically when connected
-to an IPv6 network using the Neighbor Discovery Protocol via :abbr:`ICMPv6
-(Internet Control Message Protocol version 6)` router discovery messages.
-When first connected to a network, a host sends a link-local router
-solicitation multicast request for its configuration parameters; routers
-respond to such a request with a router advertisement packet that contains
-Internet Layer configuration parameters.
-
-.. note:: This method automatically disables IPv6 traffic forwarding on the
-  interface in question.
-
diff --git a/docs/interfaces/dummy.rst b/docs/interfaces/dummy.rst
index e452ae73..e0557d1d 100644
--- a/docs/interfaces/dummy.rst
+++ b/docs/interfaces/dummy.rst
@@ -22,36 +22,24 @@ you can have as many as you want.
 Configuration
 #############
 
-Address
--------
+Common interface configuration
+------------------------------
 
-.. cfgcmd:: set interfaces dummy <interface> address <address | dhcp | dhcpv6>
+.. cmdinclude:: ../_include/interface-address.txt
+   :var0: dummy
+   :var1: dum0
 
-   Configure dummy interface `<interface>` with one or more interface
-   addresses. Address can be specified multiple times as IPv4 and/or IPv6
-   address, e.g. 192.0.2.1/24 and/or 2001:db8::1/64
+.. cmdinclude:: ../_include/interface-description.txt
+   :var0: dummy
+   :var1: dum0
 
-   Example:
+.. cmdinclude:: ../_include/interface-disable.txt
+   :var0: dummy
+   :var1: dum0
 
-   .. code-block:: none
-
-     set interfaces dummy dum10 address 192.0.2.1/24
-     set interfaces dummy dum10 address 192.0.2.2/24
-     set interfaces dummy dum10 address 2001:db8::ffff/64
-     set interfaces dummy dum10 address 2001:db8:100::ffff/64
-
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces dummy <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-.. cfgcmd:: set interfaces dummy <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively down
-   state.
+.. cmdinclude:: ../_include/interface-vrf.txt
+   :var0: dummy
+   :var1: dum0
 
 Operation
 =========
diff --git a/docs/interfaces/ethernet.rst b/docs/interfaces/ethernet.rst
index 95aef851..1d3aeda3 100644
--- a/docs/interfaces/ethernet.rst
+++ b/docs/interfaces/ethernet.rst
@@ -7,34 +7,12 @@ Ethernet
 Configuration
 #############
 
-Address
--------
+Common interface configuration
+------------------------------
 
-.. cfgcmd:: set interfaces ethernet <interface> address <address | dhcp | dhcpv6>
-
-   .. include:: common-ip-ipv6-addr.txt
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces ethernet eth0 address 192.0.2.1/24
-     set interfaces ethernet eth0 address 192.0.2.2/24
-     set interfaces ethernet eth0 address 2001:db8::ffff/64
-     set interfaces ethernet eth0 address 2001:db8:100::ffff/64
-
-.. cfgcmd:: set interfaces ethernet <interface> ipv6 address autoconf
-
-   .. include:: common-ipv6-addr-autoconf.txt
-
-.. cfgcmd:: set interfaces ethernet <interface> ipv6 address eui64 <prefix>
-
-   :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
-   :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address.
-
-   .. code-block:: none
-
-     set interfaces ethernet eth0 ipv6 address eui64 2001:db8:beef::/64
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: ethernet
+   :var1: eth0
 
 Speed/Duplex
 ------------
@@ -67,71 +45,12 @@ Speed/Duplex
 
    VyOS default will be `auto`.
 
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces ethernet <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-.. cfgcmd:: set interfaces ethernet <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively down
-   (``A/D``) state.
-
-.. cfgcmd:: set interfaces ethernet <interface> disable-flow-control
-
-   Disable Ethernet flow control (pause frames).
-
-
-.. cfgcmd:: set interfaces ethernet <interface> mac <mac-address>
-
-   Configure user defined :abbr:`MAC (Media Access Control)` address on given
-   `<interface>`.
-
-.. cfgcmd:: set interfaces ethernet <interface> mtu <mtu>
-
-   Configure :abbr:`MTU (Maximum Transmission Unit)` on given `<interface>`. It
-   is the size (in bytes) of the largest ethernet frame sent on this link.
-
-Prefix Delegation (DHCPv6-PD)
------------------------------
-
-VyOS 1.3 (equuleus) supports DHCPv6-PD. DHCPv6 Prefix Delegation is supported
-by most ISPs who provide native IPv6 for consumers on fixed networks.
-
-.. cfgcmd:: set interfaces ethernet <interface> dhcpv6-option pd <id> length <length>
-
-   Some ISPs by default only delegate a /64 prefix. To request for a specific
-   prefix size use this option to request for a bigger delegation for this pd
-   `<id>`. This value
-   is in the range from 32 - 64 so you could request up to /32 down to a /64
-   delegation.
-
-   Default value is 64.
-
-.. cfgcmd:: set interfaces ethernet <interface> dhcpv6-option pd <id> interface <delegatee> address <address>
-
-   Specify the interface address used locally on the interfcae where the prefix
-   has been delegated to. ID must be a decimal integer.
-
-   It will be combined with the delegated prefix and the sla-id to form a complete
-   interface address. The default is to use the EUI-64 address of the interface.
-
-   Example:
-
-   Using ``<id>`` value 65535 will assign IPv6 address ``<prefix>::ffff`` to the
-   interface.
-
-.. cfgcmd:: set interfaces ethernet <interface> dhcpv6-option pd <id> interface <delegatee> sla-id <id>
+VLAN (802.1q) configuration
+---------------------------
 
-   Specify the identifier value of the site-level aggregator (SLA) on the
-   interface. ID must be a decimal number greater then 0 which fits in the length
-   of SLA IDs (see below). For example, if ID is 1 and the client is delegated
-   an IPv6 prefix 2001:db8:ffff::/48, dhcp6c will combine the two values into a
-   single IPv6 prefix, 2001:db8:ffff:1::/64, and will configure the prefix on
-   the specified interface.
+.. cmdinclude:: ../_include/interface-vlan.txt
+   :var0: ethernet
+   :var1: eth0
 
 Operation
 =========
diff --git a/docs/interfaces/geneve.rst b/docs/interfaces/geneve.rst
index a4bc22aa..b59bb311 100644
--- a/docs/interfaces/geneve.rst
+++ b/docs/interfaces/geneve.rst
@@ -35,21 +35,15 @@ Geneve Header:
 Configuration
 =============
 
-.. cfgcmd:: set interfaces geneve gnv0 address <address>
+Common interface configuration
+------------------------------
 
-   Configure interface `<interface>` with one or more interface addresses.
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
+   :var0: geneve
+   :var1: gnv0
 
-   **address** can be specified multiple times as IPv4 and/or IPv6 address,
-   e.g. 192.0.2.1/24 and/or 2001:db8::1/64
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces geneve gnv0 address 192.0.2.1/24
-     set interfaces geneve gnv0 address 192.0.2.2/24
-     set interfaces geneve gnv0 address 2001:db8::ffff/64
-     set interfaces geneve gnv0 address 2001:db8:100::ffff/64
+GENEVE specific options
+-----------------------
 
 .. cfgcmd:: set interfaces geneve gnv0 remote <address>
 
@@ -64,7 +58,3 @@ Configuration
    decisions or MAY be used as a mechanism to distinguish between overlapping
    address spaces contained in the encapsulated packet when load balancing
    across CPUs.
-
-.. cfgcmd:: set interfaces geneve gnv0 mtu <mtu>
-
-   Set interface :abbr:`MTU (Maximum Transfer Unit)` size.
diff --git a/docs/interfaces/l2tpv3.rst b/docs/interfaces/l2tpv3.rst
index ea540c01..c456a58e 100644
--- a/docs/interfaces/l2tpv3.rst
+++ b/docs/interfaces/l2tpv3.rst
@@ -2,8 +2,9 @@
 
 .. _l2tpv3-interface:
 
+######
 L2TPv3
-------
+######
 
 L2TPv3 is a pseudowire protocol, you can read more about on `Wikipedia L2TPv3`_
 or in :rfc:`3921`
@@ -11,6 +12,16 @@ or in :rfc:`3921`
 L2TPv3 can transport any traffic including ethernet frames. L2TPv2 is limited
 to PPP.
 
+Configuration
+#############
+
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
+   :var0: l2tpv3
+   :var1: l2tpeth0
+
 Over IP
 ^^^^^^^
 
diff --git a/docs/interfaces/loopback.rst b/docs/interfaces/loopback.rst
index e15062cf..ed241eb2 100644
--- a/docs/interfaces/loopback.rst
+++ b/docs/interfaces/loopback.rst
@@ -22,22 +22,16 @@ services on your local machine.
 Configuration
 =============
 
-Address
--------
+Common interface configuration
+------------------------------
 
-.. cfgcmd:: set interfaces loopback lo address <address>
+.. cmdinclude:: ../_include/interface-address.txt
+   :var0: loopback
+   :var1: lo
 
-   Configure Loopback interface `lo` with one or more interface addresses.
-   Address can be specified multiple times as IPv4 and/or IPv6 address, e.g.
-   192.0.2.1/24 and/or 2001:db8::1/64.
-
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces loopback lo description <description>
-
-   Assign given `<description>` to interface `lo`. Description will also be
-   passed to SNMP monitoring systems.
+.. cmdinclude:: ../_include/interface-description.txt
+   :var0: loopback
+   :var1: lo
 
 Operation
 =========
diff --git a/docs/interfaces/macsec.rst b/docs/interfaces/macsec.rst
index d7af0c16..f841e17d 100644
--- a/docs/interfaces/macsec.rst
+++ b/docs/interfaces/macsec.rst
@@ -16,6 +16,16 @@ used for their own specific use cases.
 Configuration
 #############
 
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: macsec
+   :var1: macsec0
+
+MACsec specific options
+-----------------------
+
 .. cfgcmd:: set interfaces macsec <interface> security cipher [gcm-aes-128]
 
   Select cipher suite used for cryptographic operations. This setting is
@@ -34,9 +44,8 @@ Configuration
   A physical interface is required to connect this MACsec instance to. Traffic
   leaving this interfac will now be authenticated/encrypted.
 
-
 Key Management
---------------
+^^^^^^^^^^^^^^
 
 :abbr:`MKA (MACsec Key Agreement protocol)` is used to synchronize keys between
 individual peers.
@@ -56,7 +65,7 @@ individual peers.
   distributing SAKs.
 
 Replay protection
------------------
+^^^^^^^^^^^^^^^^^
 
 .. cfgcmd:: set interfaces macsec <interface> security replay-window <window>
 
@@ -68,7 +77,7 @@ Replay protection
   - ``1-4294967295``: Number of packets that could be misordered
 
 Operation
-=========
+#########
 
 .. opcmd:: run generate macsec mka-cak
 
@@ -115,7 +124,7 @@ Operation
         TXSC: 005056bfefaa0001 on SA 0
 
 Examples
-========
+########
 
 * Two routers connected both via eth1 through an untrusted switch
 * R1 has 192.0.2.1/24 & 2001:db8::1/64
diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst
index 8fa35492..e85c16aa 100644
--- a/docs/interfaces/pppoe.rst
+++ b/docs/interfaces/pppoe.rst
@@ -54,6 +54,24 @@ vDSL/aDSL understands.
 Configuration
 =============
 
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-description.txt
+   :var0: pppoe
+   :var1: pppoe0
+
+.. cmdinclude:: ../_include/interface-disable.txt
+   :var0: pppoe
+   :var1: pppoe0
+
+.. cmdinclude:: ../_include/interface-vrf.txt
+   :var0: pppoe
+   :var1: pppoe0
+
+PPPoE specific configuration
+----------------------------
+
 .. cfgcmd:: set interfaces pppoe <interface> access-concentrator <name>
 
    Use this command to restrict the PPPoE session on a given access
@@ -102,16 +120,6 @@ Configuration
    **default:** A default route to the remote endpoint is automatically added
    when the link comes up (i.e. auto).
 
-.. cfgcmd:: set interfaces pppoe <interface> description
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-.. cfgcmd:: set interfaces pppoe <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively down
-   (``A/D``) state.
-
 .. cfgcmd:: set interfaces pppoe <interface> idle-timeout <time>
 
    Use this command to set the idle timeout interval to be used with on-demand
@@ -167,43 +175,9 @@ IPv6
    Use this command to enable acquisition of IPv6 address using stateless
    autoconfig (SLAAC).
 
-Prefix Delegation (DHCPv6-PD)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-VyOS 1.3 (equuleus) supports DHCPv6-PD. DHCPv6 Prefix Delegation is supported
-by most ISPs who provide native IPv6 for consumers on fixed networks.
-
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option pd <id> length <length>
-
-   Some ISPs by default only delegate a /64 prefix. To request for a specific
-   prefix size use this option to request for a bigger delegation for this pd
-   `<id>`. This value
-   is in the range from 32 - 64 so you could request up to /32 down to a /64
-   delegation.
-
-   Default value is 64.
-
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option pd <id> interface <delegatee> address <address>
-
-   Specify the interface address used locally on the interfcae where the prefix
-   has been delegated to. ID must be a decimal integer.
-
-   It will be combined with the delegated prefix and the sla-id to form a complete
-   interface address. The default is to use the EUI-64 address of the interface.
-
-   Example:
-
-   Using ``<id>`` value 65535 will assign IPv6 address ``<prefix>::ffff`` to the
-   interface.
-
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option pd <id> interface <delegatee> sla-id <id>
-
-   Specify the identifier value of the site-level aggregator (SLA) on the
-   interface. ID must be a decimal number greater then 0 which fits in the length
-   of SLA IDs (see below). For example, if ID is 1 and the client is delegated
-   an IPv6 prefix 2001:db8:ffff::/48, dhcp6c will combine the two values into a
-   single IPv6 prefix, 2001:db8:ffff:1::/64, and will configure the prefix on
-   the specified interface.
+.. cmdinclude:: ../_include/interface-dhcpv6-prefix-delegation.txt
+  :var0: pppoe
+  :var1: pppoe0
 
 Operation
 =========
diff --git a/docs/interfaces/pseudo-ethernet.rst b/docs/interfaces/pseudo-ethernet.rst
index a2066555..26d8a364 100644
--- a/docs/interfaces/pseudo-ethernet.rst
+++ b/docs/interfaces/pseudo-ethernet.rst
@@ -41,49 +41,17 @@ Ethernet interfaces:
 Configuration
 =============
 
-Address
--------
+Common interface configuration
+------------------------------
 
-.. cfgcmd:: set interfaces pseudo-ethernet <interface> address <address | dhcp | dhcpv6>
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: pseudo-ethernet
+   :var1: peth0
 
-   .. include:: common-ip-ipv6-addr.txt
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces pseudo-ethernet peth0 address 192.0.2.1/24
-     set interfaces pseudo-ethernet peth0 address 192.0.2.2/24
-     set interfaces pseudo-ethernet peth0 address 2001:db8::ffff/64
-     set interfaces pseudo-ethernet peth0 address 2001:db8:100::ffff/64
-
-.. cfgcmd:: set interfaces pseudo-ethernet <interface> ipv6 address autoconf
-
-   .. include:: common-ipv6-addr-autoconf.txt
-
-Physical Asignment
-------------------
+Pseudo Ethernet/MACVLAN specific options
+----------------------------------------
 
 .. cfgcmd:: set interfaces pseudo-ethernet <interface> source-interface <ethX>
 
    Specifies the physical `<ethX>` Ethernet interface associated with a Pseudo
    Ethernet `<interface>`.
-
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces pseudo-ethernet <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-.. cfgcmd:: set interfaces pseudo-ethernet <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively down
-   (``A/D``) state.
-
-.. cfgcmd:: set interfaces pseudo-ethernet <interface> mac <mac-address>
-
-   Configure user defined :abbr:`MAC (Media Access Control)` address on given
-   `<interface>`.
-
diff --git a/docs/interfaces/tunnel.rst b/docs/interfaces/tunnel.rst
index 24fbed44..c14314d1 100644
--- a/docs/interfaces/tunnel.rst
+++ b/docs/interfaces/tunnel.rst
@@ -13,6 +13,13 @@ GRE options that can be useful.
 All those protocols are grouped under ``interfaces tunnel`` in VyOS. Let's take
 a closer look at the protocols and options currently supported by VyOS.
 
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
+   :var0: tunnel
+   :var1: tun0
+
 IPIP
 ----
 
diff --git a/docs/interfaces/vxlan.rst b/docs/interfaces/vxlan.rst
index bf3b6dee..40dc5400 100644
--- a/docs/interfaces/vxlan.rst
+++ b/docs/interfaces/vxlan.rst
@@ -36,106 +36,58 @@ may be blocked by the hypervisor.
 Configuration
 =============
 
-Address
--------
-
-.. cfgcmd:: set interfaces vxlan <interface> address <address>
-
-   Configure VXLAN interface `<interface>` with one or more interface
-   addresses. Address can be specified multiple times as IPv4 and/or IPv6
-   address, e.g. 192.0.2.1/24 and/or 2001:db8::1/64
-
-   Example:
-
-   .. code-block:: none
-
-     set interfaces vxlan vxlan0 address 192.0.2.1/24
-     set interfaces vxlan vxlan0 address 192.0.2.2/24
-     set interfaces vxlan vxlan0 address 2001:db8::ffff/64
-     set interfaces vxlan vxlan0 address 2001:db8:100::ffff/64
-
-
-.. cfgcmd:: set interfaces vxlan <interface> ipv6 address autoconf
-
-   .. include:: common-ipv6-addr-autoconf.txt
+Common interface configuration
+------------------------------
 
-.. cfgcmd:: set interfaces vxlan <interface> ipv6 address eui64 <prefix>
-
-   :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in
-   :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address.
-
-   .. code-block:: none
-
-     set interfaces vxlan vxlan0 ipv6 address eui64 2001:db8:beef::/64
+.. cmdinclude:: ../_include/interface-common-without-dhcp.txt
+  :var0: vxlan
+  :var1: vxlan0
 
+VXLAN specific options
+-----------------------
 
 .. cfgcmd:: set interfaces vxlan <interface> vni <number>
 
-   Each VXLAN segment is identified through a 24-bit segment ID, termed the
-   :abbr:`VNI (VXLAN Network Identifier (or VXLAN Segment ID))`, This allows
-   up to 16M VXLAN segments to coexist within the same administrative domain.
-
-Multicast
-^^^^^^^^^
-
-.. cfgcmd:: set interfaces vxlan <interface> source-interface <interface>
+  Each VXLAN segment is identified through a 24-bit segment ID, termed the
+  :abbr:`VNI (VXLAN Network Identifier (or VXLAN Segment ID))`, This allows
+  up to 16M VXLAN segments to coexist within the same administrative domain.
 
-   Interface used for VXLAN underlay. This is mandatory when using VXLAN via
-   a multicast network. VXLAN traffic will always enter and exit this interface.
+.. cfgcmd:: set interfaces vxlan <interface> port <port>
 
+  Configure port number of remote VXLAN endpoint.
 
-.. cfgcmd:: set interfaces vxlan <interface> group <address>
+  .. note:: As VyOS is Linux based the default port used is not using 4789
+     as the default IANA-assigned destination UDP port number. Instead VyOS
+     uses the Linux default port of 8472.
 
-   Multicast group address for VXLAN interface. VXLAN tunnels can be built
-   either via Multicast or via Unicast.
+.. cfgcmd:: set interfaces vxlan <interface> source-address <interface>
 
-   Both IPv4 and IPv6 multicast is possible.
+  Source IP address used for VXLAN underlay. This is mandatory when using VXLAN
+  via L2VPN/EVPN.
 
 Unicast
 ^^^^^^^
 
 .. cfgcmd:: set interfaces vxlan <interface> remote <address>
 
-   IPv4/IPv6 remote address of the VXLAN tunnel. Alternative to multicast, the
-   remote IPv4/IPv6 address can set directly.
-
-
-.. cfgcmd:: set interfaces vxlan <interface> port <port>
-
-    Configure port number of remote VXLAN endpoint.
-
-    .. note:: As VyOS is Linux based the default port used is not using 4789
-       as the default IANA-assigned destination UDP port number. Instead VyOS
-       uses the Linux default port of 8472.
-
-L2VVPN / EVPN
-^^^^^^^^^^^^^
+  IPv4/IPv6 remote address of the VXLAN tunnel. Alternative to multicast, the
+  remote IPv4/IPv6 address can set directly.
 
-.. cfgcmd:: set interfaces vxlan <interface> source-address <interface>
-
-   Source IP address used for VXLAN underlay. This is mandatory when using
-   VXLAN via L2VPN/EVPN.
-
-
-Link Administration
--------------------
+Multicast
+^^^^^^^^^
 
-.. cfgcmd:: set interfaces vxlan <interface> description <description>
+.. cfgcmd:: set interfaces vxlan <interface> source-interface <interface>
 
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
+  Interface used for VXLAN underlay. This is mandatory when using VXLAN via
+  a multicast network. VXLAN traffic will always enter and exit this interface.
 
-.. cfgcmd:: set interfaces vxlan <interface> disable
 
-   Disable given `<interface>`. It will be placed in administratively down
-   (``A/D``) state.
+.. cfgcmd:: set interfaces vxlan <interface> group <address>
 
-.. cfgcmd:: set interfaces vxlan <interface> mtu <mtu>
+  Multicast group address for VXLAN interface. VXLAN tunnels can be built
+  either via Multicast or via Unicast.
 
-   Configure :abbr:`MTU (Maximum Transmission Unit)` on given `<interface>`. It
-   is the size (in bytes) of the largest ethernet frame sent on this link.
-   MTU ranges from 1450 to 9000 bytes. For best performance you should have
-   a MTU > 1550 bytes on your underlay.
+  Both IPv4 and IPv6 multicast is possible.
 
 Multicast VXLAN
 ===============
diff --git a/docs/interfaces/wireless.rst b/docs/interfaces/wireless.rst
index 8b1195fa..b146a21b 100644
--- a/docs/interfaces/wireless.rst
+++ b/docs/interfaces/wireless.rst
@@ -1,7 +1,10 @@
+.. include:: ../_include/need_improvement.txt
+
 .. _wireless-interface:
 
+###################
 Wireless LAN (WiFi)
--------------------
+###################
 
 :abbr:`WLAN (Wireless LAN)` interface provide 802.11 (a/b/g/n/ac) wireless
 support (commonly referred to as Wi-Fi) by means of compatible hardware. If your
@@ -22,17 +25,30 @@ If the system detects an unconfigured wireless device, it will be automatically
 added the configuration tree, specifying any detected settings (for example,
 its MAC address) and configured to run in monitor mode.
 
+Configuration
+#############
+
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-common-with-dhcp.txt
+   :var0: wireless
+   :var1: wlan0
+
+Wireless specific options
+-------------------------
+
+Configuring Access-Point
+^^^^^^^^^^^^^^^^^^^^^^^^
+
 To be able to use the wireless interfaces you will first need to set a
 regulatory domain with the country code of your location.
 
-.. cfgcmd:: set system wifi-regulatory-domain DE
+.. cfgcmd:: set interfaces wireless <interface> country-code <cc>
 
    Configure system wide Wi-Fi regulatory domain. A reboot is required for this
    change to be enabled.
 
-Configuring Access-Point
-^^^^^^^^^^^^^^^^^^^^^^^^
-
 The following example creates a WAP. When configuring multiple WAP interfaces,
 you must specify unique IP addresses, channels, Network IDs commonly referred
 to as :abbr:`SSID (Service Set Identifier)`, and MAC addresses.
diff --git a/docs/interfaces/wirelessmodem.rst b/docs/interfaces/wirelessmodem.rst
index c41e71bf..4590a3bb 100644
--- a/docs/interfaces/wirelessmodem.rst
+++ b/docs/interfaces/wirelessmodem.rst
@@ -11,8 +11,23 @@ The wirelessmodem interface provides access (through a wireless modem/wwan) to
 wireless networks provided by various cellular providers. VyOS uses the
 interfaces wirelessmodem subsystem for configuration.
 
-Address
--------
+Common interface configuration
+------------------------------
+
+.. cmdinclude:: ../_include/interface-description.txt
+   :var0: wirelessmodem
+   :var1: wlm0
+
+.. cmdinclude:: ../_include/interface-disable.txt
+   :var0: wirelessmodem
+   :var1: wlm0
+
+.. cmdinclude:: ../_include/interface-vrf.txt
+   :var0: wirelessmodem
+   :var1: wlm0
+
+WWAN specific options
+---------------------
 
 .. cfgcmd:: set interfaces wirelessmodem <interface> apn <apn>
 
@@ -44,24 +59,6 @@ Address
    connection is established at boot time and remains up. If the link fails for
    any reason, the link is brought back up immediately.
 
-Link Administration
--------------------
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> description <description>
-
-   Assign given `<description>` to interface. Description will also be passed
-   to SNMP monitoring systems.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> disable
-
-   Disable given `<interface>`. It will be placed in administratively down
-   state.
-
-.. cfgcmd:: set interfaces wirelessmodem <interface> mtu <mtu>
-
-   Configure :abbr:`MTU (Maximum Transmission Unit)` on given `<interface>`. It
-   is the size (in bytes) of the largest ethernet frame sent on this link.
-
 Example
 =======