4 files changed, 26 insertions, 18 deletions
diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst
index e2ca8599..c95cadc9 100644
--- a/docs/configuration/service/conntrack-sync.rst
+++ b/docs/configuration/service/conntrack-sync.rst
@@ -127,11 +127,11 @@ Operation
     conntrack is not enabled. To enable conntrack, just create a NAT or a firewall
     rule. :cfgcmd:`set firewall state-policy established action accept`
 
-.. opcmd:: show conntrack-sync external-cache
+.. opcmd:: show conntrack-sync cache external
 
   Show connection syncing external cache entries
 
-.. opcmd:: show conntrack-sync internal-cache
+.. opcmd:: show conntrack-sync cache internal
 
   Show connection syncing internal cache entries
 
diff --git a/docs/configuration/service/dhcp-relay.rst b/docs/configuration/service/dhcp-relay.rst
index 5adb83bb..b9aefbfb 100644
--- a/docs/configuration/service/dhcp-relay.rst
+++ b/docs/configuration/service/dhcp-relay.rst
@@ -78,6 +78,7 @@ The generated configuration will look like:
 
   show service dhcp-relay
       interface eth1
+      interface eth2
       server 10.0.1.4
       relay-options {
          relay-agents-packets discard
diff --git a/docs/configuration/service/dhcp-server.rst b/docs/configuration/service/dhcp-server.rst
index 38f4d7fc..f55c7a45 100644
--- a/docs/configuration/service/dhcp-server.rst
+++ b/docs/configuration/service/dhcp-server.rst
@@ -59,10 +59,17 @@ Configuration
    respond to the client. The lease will remain abandoned for a minimum of
    abandon-lease-time seconds (defaults to 24 hours).
 
-   If a there are no free addressses but there are abandoned IP addresses, the
+   If there are no free addresses but there are abandoned IP addresses, the
    DHCP server will attempt to reclaim an abandoned IP address regardless of the
    value of abandon-lease-time.
 
+.. cfgcmd:: set service dhcp-server listen-address <address>
+
+   This configuration parameter lets the DHCP server to listen for DHCP 
+   requests sent to the specified address, it is only realistically useful for 
+   a server whose only clients are reached via unicasts, such as via DHCP relay 
+   agents.
+
 Individual Client Subnet
 -------------------------
 
@@ -141,7 +148,7 @@ Individual Client Subnet
    respond to the client. The lease will remain abandoned for a minimum of
    abandon-lease-time seconds (defaults to 24 hours).
 
-   If a there are no free addressses but there are abandoned IP addresses, the
+   If a there are no free addresses but there are abandoned IP addresses, the
    DHCP server will attempt to reclaim an abandoned IP address regardless of the
    value of abandon-lease-time.
 
@@ -476,18 +483,6 @@ Operation Mode
 
    Show logs from specific `interface` DHCP client process.
 
-.. opcmd:: show log dhcpv6 server
-
-   Show DHCPv6 server daemon log file
-
-.. opcmd:: show log dhcpv6 client
-
-   Show logs from all DHCPv6 client processes.
-
-.. opcmd:: show log dhcpv6 client interface <interface>
-
-   Show logs from specific `interface` DHCPv6 client process.
-
 .. opcmd:: restart dhcp server
 
    Restart the DHCP server
@@ -697,6 +692,18 @@ The configuration will look as follows:
 Operation Mode
 ==============
 
+.. opcmd:: show log dhcpv6 server
+
+   Show DHCPv6 server daemon log file
+
+.. opcmd:: show log dhcpv6 client
+
+   Show logs from all DHCPv6 client processes.
+
+.. opcmd:: show log dhcpv6 client interface <interface>
+
+   Show logs from specific `interface` DHCPv6 client process.
+
 .. opcmd:: restart dhcpv6 server
 
    To restart the DHCPv6 server
@@ -707,7 +714,7 @@ Operation Mode
 
 .. opcmd:: show dhcpv6 server leases
 
-   Show statuses of all assigned leases:
+   Shows status of all assigned leases:
 
 .. code-block:: none
 
diff --git a/docs/configuration/service/https.rst b/docs/configuration/service/https.rst
index 18227027..de5e759a 100644
--- a/docs/configuration/service/https.rst
+++ b/docs/configuration/service/https.rst
@@ -93,4 +93,4 @@ To use this full configuration we asume a globally resolvable hostname.
    set service https virtual-host rtr01 listen-address 198.51.100.2
    set service https virtual-host rtr01 listen-port 11443
    set service https virtual-host rtr01 server-name rtr01.example.com
-   set service https api-restrict virtual-host rtr01.example.com
+   set service https api-restrict virtual-host rtr01