Re-apply changelog formatting tweaks from the 9.21.0 release

diff --git a/doc/arm/changelog.rst b/doc/arm/changelog.rst
index 4730b5c57144c4ac3a299ffae045fd9210692155..71bd10a20c969ee387d02ebfddb8b6437ccb073e 100644 (file)
--- a/doc/arm/changelog.rst
+++ b/doc/arm/changelog.rst
@@ -18,8 +18,8 @@ Changelog
    development. Regular users should refer to :ref:`Release Notes <relnotes>`
    for changes relevant to them.
 
-(-dev)
-------
+BIND 9.20.1
+-----------
 
 New Features
 ~~~~~~~~~~~~
@@ -88,9 +88,9 @@ Feature Changes
   converted to seconds before applying the limit. :gl:`#4320`
   :gl:`!9220`
 
-- Replace #define DNS_GETDB_ with struct of bools. ``6d1fdb8505``
+- Replace `#define DNS_GETDB_` with struct of bools. ``6d1fdb8505``
 
-  Replace #define DNS_GETDB_ with struct of bools to make it easier to
+  Replace `#define DNS_GETDB_` with struct of bools to make it easier to
   pretty-print the attributes in a debugger. :gl:`#4559` :gl:`!9205`
 
 - Fix data race in clean_finds_at_name. ``be1e649974``
@@ -221,23 +221,7 @@ Bug Fixes
   Decrementing optlen immediately before calling continue is unneccesary
   and inconsistent with the rest of dns_message_pseudosectiontoyaml and
   dns_message_pseudosectiontotext.  Coverity was also reporting an
-  impossible false positive overflow of optlen (CID 499061).
-
-  4176                        } else if (optcode == DNS_OPT_CLIENT_TAG)
-  {     4177                                uint16_t id;     4178
-  ADD_STRING(target, "; CLIENT-TAG:");     4179
-  if (optlen == 2U) {     4180                                        id
-  = isc_buffer_getuint16(&optbuf);     4181
-  snprintf(buf, sizeof(buf), " %u ", id);     4182
-  ADD_STRING(target, buf);
-
-  CID 499061: (#1 of 1): Overflowed constant (INTEGER_OVERFLOW)
-  overflow_const: Expression optlen, which is equal to 65534, underflows
-  the type that receives it, an unsigned integer 16 bits wide.     4183
-  optlen -= 2;     4184
-  POST(optlen);     4185
-  continue;     4186                                }     4187
-  } else if (optcode == DNS_OPT_SERVER_TAG) { :gl:`!9223`
+  impossible false positive overflow of optlen (CID 499061). :gl:`!9223`
 
 - Fix generation of 6to4-self name expansion from IPv4 address.
   ``00ce93a69c``