summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration-overview.rst9
-rw-r--r--docs/services/dhcp.rst11
2 files changed, 7 insertions, 13 deletions
diff --git a/docs/configuration-overview.rst b/docs/configuration-overview.rst
index 51091d9d..cbc4ab3b 100644
--- a/docs/configuration-overview.rst
+++ b/docs/configuration-overview.rst
@@ -247,11 +247,10 @@ Comment
Add comment as an annotation to a configuration node.
- The ``comment` command allows you to insert a comment above the
- ``<config node>`` configuration section. Comments are enclosed with
- ``/*`` and ``*/`` as open/close delimiters. A ``comment`` cannot be
- used at the top of the configuration hierarchy, only on subsections.
- Comments need to be commited, just like other config changes.
+ The ``comment`` command allows you to insert a comment above the
+ ``<config node>`` configuration section. When shown, comments are
+ enclosed with ``/*`` and ``*/`` as open/close delimiters. Comments
+ need to be commited, just like other config changes.
To remove an existing comment from your current configuration,
specify an empty string enclosed in double quote marks (``""``) as
diff --git a/docs/services/dhcp.rst b/docs/services/dhcp.rst
index c8b26263..2e8bb4b0 100644
--- a/docs/services/dhcp.rst
+++ b/docs/services/dhcp.rst
@@ -480,15 +480,10 @@ Configuration Options
Specify a NIS+ server address for DHCPv6 clients.
-.. cfgcmd:: set service dhcpv6-server shared-network-name <name> subnet <prefix> sip-server-address <address>
+.. cfgcmd:: set service dhcpv6-server shared-network-name <name> subnet <prefix> sip-server <address | fqdn>
- Specify a :abbr:`SIP (Session Initiation Protocol)` server by IPv6 address
- for all DHCPv6 clients.
-
-.. cfgcmd:: set service dhcpv6-server shared-network-name <name> subnet <prefix> sip-server-name <fqdn>
-
- Specify a :abbr:`SIP (Session Initiation Protocol)` server by FQDN for all
- DHCPv6 clients.
+ Specify a :abbr:`SIP (Session Initiation Protocol)` server by IPv6
+ address of Fully Qualified Domain Name for all DHCPv6 clients.
.. cfgcmd:: set service dhcpv6-server shared-network-name <name> subnet <prefix> sntp-server-address <address>