3 files changed, 75 insertions, 9 deletions
diff --git a/docs/configuration/service/dhcp-relay.rst b/docs/configuration/service/dhcp-relay.rst
index a93c1046..43abf254 100644
--- a/docs/configuration/service/dhcp-relay.rst
+++ b/docs/configuration/service/dhcp-relay.rst
@@ -20,8 +20,20 @@ Configuration
 
 .. cfgcmd:: set service dhcp-relay interface <interface>
 
-   Interfaces that participate in the DHCP relay process, including the uplink
-   to the DHCP server.
+   Interfaces that participate in the DHCP relay process. If this command is
+   used, at least two entries of it are required: one for the interface that
+   captures the dhcp-requests, and one for the interface to forward such
+   requests. A warning message will be shown if this command is used, since
+   new implementations should use ``listen-interface`` and
+   ``upstream-interface``.
+
+.. cfgcmd:: set service dhcp-relay listen-interface <interface>
+
+   Interface for DHCP Relay Agent to listen for requests.
+
+.. cfgcmd:: set service dhcp-relay upstream-interface <interface>
+
+   Interface for DHCP Relay Agent to forward requests out.
 
 .. cfgcmd:: set service dhcp-relay server <server>
 
@@ -70,8 +82,8 @@ Example
 
 * Listen for DHCP requests on interface ``eth1``.
 * DHCP server is located at IPv4 address 10.0.1.4 on ``eth2``.
-* Router receives DHCP client requests on ``eth1`` and relays them to the server
-  at 10.0.1.4 on ``eth2``.
+* Router receives DHCP client requests on ``eth1`` and relays them to the
+  server at 10.0.1.4 on ``eth2``.
 
 .. figure:: /_static/images/service_dhcp-relay01.png
    :scale: 80 %
@@ -84,6 +96,19 @@ The generated configuration will look like:
 .. code-block:: none
 
   show service dhcp-relay
+      listen-interface eth1
+      upstrem-interface eth2
+      server 10.0.1.4
+      relay-options {
+         relay-agents-packets discard
+      }
+
+Also, for backwards compatibility this configuration, which uses generic
+interface definition, is still valid:
+
+.. code-block:: none
+
+  show service dhcp-relay
       interface eth1
       interface eth2
       server 10.0.1.4
diff --git a/docs/configuration/service/dhcp-server.rst b/docs/configuration/service/dhcp-server.rst
index 3f4b7b89..b5b12a5b 100644
--- a/docs/configuration/service/dhcp-server.rst
+++ b/docs/configuration/service/dhcp-server.rst
@@ -234,7 +234,7 @@ inside the subnet definition but can be outside of the range statement.
 
 **Example:**
 
-* IP address ``192.168.1.100`` shall be statically mapped to client named ``client100``
+* IP address ``192.168.1.100`` shall be statically mapped to client named ``client1``
 
 .. code-block:: none
 
@@ -747,10 +747,6 @@ Operation Mode
 
    To restart the DHCPv6 server
 
-.. opcmd:: show dhcpv6 server status
-
-   To show the current status of the DHCPv6 server.
-
 .. opcmd:: show dhcpv6 server leases
 
    Shows status of all assigned leases:
diff --git a/docs/configuration/service/ipoe-server.rst b/docs/configuration/service/ipoe-server.rst
index e42ab42e..c219a063 100644
--- a/docs/configuration/service/ipoe-server.rst
+++ b/docs/configuration/service/ipoe-server.rst
@@ -146,4 +146,49 @@ The rate-limit is set in kbit/sec.
   -------+------------+-------------------+-------------+-----+--------+------------+--------+----------+------------------
   ipoe0  | eth2       | 08:00:27:2f:d8:06 | 192.168.0.2 |     |        | 500/500    | active | 00:00:05 | dccc870fd31349fb
 
+Example
+=======
+
+* IPoE server will listen on interfaces eth1.50 and eth1.51
+* There are rate-limited and non rate-limited users (MACs)
+
+Server configuration
+--------------------
+
+.. code-block:: none
+
+    set interfaces dummy dum1000 address 100.64.0.1/32
+    set interfaces dummy dum1000 address 2001:db8::1/128
+
+    set interfaces ethernet eth1 description 'IPoE'
+    set interfaces ethernet eth1 vif 50
+    set interfaces ethernet eth1 vif 51
+
+    set service ipoe-server authentication interface eth1.50 mac 00:0c:29:b7:49:a7
+    set service ipoe-server authentication interface eth1.50 mac 00:0c:29:f0:be:4c rate-limit download '5000'
+    set service ipoe-server authentication interface eth1.50 mac 00:0c:29:f0:be:4c rate-limit upload '5000'
+    set service ipoe-server authentication interface eth1.51 mac 00:0c:29:b7:49:a7 rate-limit download '50000'
+    set service ipoe-server authentication interface eth1.51 mac 00:0c:29:b7:49:a7 rate-limit upload '50000'
+    set service ipoe-server authentication mode 'local'
+    
+    set service ipoe-server client-ipv6-pool delegate 2001:db8:ffff::/48 delegation-prefix '56'
+    set service ipoe-server client-ipv6-pool prefix 2001:db8:fffe::/48 mask '64'
+    set service ipoe-server interface eth1.50 client-subnet '100.64.50.0/24'
+    set service ipoe-server interface eth1.50 mode 'l2'
+    set service ipoe-server interface eth1.51 client-subnet '100.64.51.0/24'
+    set service ipoe-server interface eth1.51 mode 'l2'
+    set service ipoe-server name-server '100.64.0.1'
+    set service ipoe-server name-server '2001:db8::1'
+
+Client configuration
+--------------------
+
+.. code-block:: none
+
+    set interfaces ethernet eth0 mac '00:0c:29:b7:49:a7'
+
+    set interfaces ethernet eth0 vif 50 address 'dhcp'
+    set interfaces ethernet eth0 vif 50 address 'dhcpv6'
+    set interfaces ethernet eth0 vif 50 dhcpv6-options pd 0 interface eth1 sla-id '1'
+
 .. include:: /_include/common-references.txt