From e194ff748f53e4ed2ba17390c4f14f41e90642c6 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Thu, 16 Dec 2021 10:49:28 +0200 Subject: [PATCH] [#2245] Text edits --- doc/sphinx/arm/agent.rst | 2 -- doc/sphinx/arm/classify.rst | 7 ++----- doc/sphinx/arm/ddns.rst | 6 ------ doc/sphinx/arm/dhcp4-srv.rst | 2 -- doc/sphinx/arm/dhcp6-srv.rst | 5 ----- doc/sphinx/arm/hooks-lease-cmds.rst | 2 -- doc/sphinx/arm/hooks.rst | 2 -- doc/sphinx/arm/install.rst | 2 -- doc/sphinx/arm/keactrl.rst | 8 ++------ 9 files changed, 4 insertions(+), 32 deletions(-) diff --git a/doc/sphinx/arm/agent.rst b/doc/sphinx/arm/agent.rst index dcaec23d33..9e9ecdaa12 100644 --- a/doc/sphinx/arm/agent.rst +++ b/doc/sphinx/arm/agent.rst @@ -284,8 +284,6 @@ server enables authentication of the clients using certificates. } } -.. - .. note:: The configuration snippet provided above is for testing diff --git a/doc/sphinx/arm/classify.rst b/doc/sphinx/arm/classify.rst index 6141a84013..9ab182ee3b 100644 --- a/doc/sphinx/arm/classify.rst +++ b/doc/sphinx/arm/classify.rst @@ -887,8 +887,8 @@ to members of the class, and they can be used to choose a subnet from which an address will be assigned to a class member. When options are defined as part of the class definition -they override any global options that may be defined, and -in turn will be overridden by any options defined for an +they override any global options that may be defined, and +in turn will be overridden by any options defined for an individual subnet. Classes and Hooks @@ -979,9 +979,6 @@ The logging might then resemble this: 2016-05-19 13:35:04.167 DEBUG [kea.eval/44478] EVAL_DEBUG_STRING Pushing text string 'foo' 2016-05-19 13:35:04.168 DEBUG [kea.eval/44478] EVAL_DEBUG_EQUAL Popping 0x666F6F and 0x666F6F pushing result 'true' - -.. - .. note:: The debug logging may be quite verbose if there are multiple diff --git a/doc/sphinx/arm/ddns.rst b/doc/sphinx/arm/ddns.rst index 5f5df5b481..52d1996596 100644 --- a/doc/sphinx/arm/ddns.rst +++ b/doc/sphinx/arm/ddns.rst @@ -246,8 +246,6 @@ illustrates how to change D2's global parameters so it will listen at } } -.. - .. warning:: It is possible for a malicious attacker to send bogus @@ -557,8 +555,6 @@ running at "172.88.99.10", set the forward DNS server as follows: } } -.. - .. note:: Since ``hostname`` is not yet supported, the parameter ``ip-address`` @@ -692,8 +688,6 @@ service is running at "172.88.99.10", then set it as follows: } } -.. - .. note:: Since ``hostname`` is not yet supported, the parameter ``ip-address`` diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index 8b4814df05..4b0d4ebbf5 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -1331,8 +1331,6 @@ Calculating the values is controlled by the following three parameters. T2. It is expressed as a real number between 0.0 and 1.0 and must be greater than ``t1-percent``. The default value is .875, per RFC 2131. -.. - .. note:: In the event that both explicit values are specified and diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index 2811430208..dbb161be7d 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -1202,9 +1202,6 @@ with the addresses 2001:db8:1::cafe and 2001:db8:1::babe. ] } - -.. - .. note:: The value for the setting of the ``data`` element is split across two @@ -3320,8 +3317,6 @@ ISC tested the following configuration: } -.. - .. note:: Relayed DHCPv4-QUERY DHCPv6 messages are not supported. diff --git a/doc/sphinx/arm/hooks-lease-cmds.rst b/doc/sphinx/arm/hooks-lease-cmds.rst index ce45c9d78e..6506b900fc 100644 --- a/doc/sphinx/arm/hooks-lease-cmds.rst +++ b/doc/sphinx/arm/hooks-lease-cmds.rst @@ -577,8 +577,6 @@ following format: "text": "2 IPv6 lease(s) found." } -.. - .. warning:: The ``lease4-get-all`` and ``lease6-get-all`` commands may result in diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst index 936dba2a17..2001de3a5b 100644 --- a/doc/sphinx/arm/hooks.rst +++ b/doc/sphinx/arm/hooks.rst @@ -210,8 +210,6 @@ configuration would be: : } -.. - .. note:: Libraries are reloaded even if their lists have not changed, diff --git a/doc/sphinx/arm/install.rst b/doc/sphinx/arm/install.rst index 1103c4a0df..b688569816 100644 --- a/doc/sphinx/arm/install.rst +++ b/doc/sphinx/arm/install.rst @@ -374,8 +374,6 @@ relevant linker cache configuration file for the OS): $ ldconfig -.. - .. note:: If ``ldconfig`` is not run where required, users may see diff --git a/doc/sphinx/arm/keactrl.rst b/doc/sphinx/arm/keactrl.rst index c5e6b3ceee..f2b382eb40 100644 --- a/doc/sphinx/arm/keactrl.rst +++ b/doc/sphinx/arm/keactrl.rst @@ -99,9 +99,7 @@ The contents of ``keactrl.conf`` are: # Be verbose? kea_verbose=no -.. - - .. note:: +.. note:: In the example above, strings of the form @something@ are replaced by the appropriate values when Kea is installed. @@ -129,7 +127,7 @@ effect as long as ``kea_verbose`` is set to "yes." Setting it to Kea configuration file. If no logging configuration is specified, the default settings are used. - .. note:: +.. note:: The verbosity for the server is set when it is started. Once started, the verbosity can only be changed by stopping the server and starting @@ -244,8 +242,6 @@ take effect. INFO/keactrl: kea-ctrl-agent isn't running. INFO/keactrl: kea-netconf isn't running. -.. - .. note:: NETCONF is an optional feature that is disabled by default and can be