Release notes: integrate detached release notes

5 files changed, 33 insertions, 60 deletions

diff --git a/doc/release-notes-14060.md b/doc/release-notes-14060.md
deleted file mode 100644
index 2cc5ab49fb..0000000000
--- a/doc/release-notes-14060.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Configuration
--------------
-
-The outbound message high water mark of the ZMQ PUB sockets are now
-configurable via the options:
-
-`-zmqpubhashtxhwm=n`
-
-`-zmqpubhashblockhwm=n`
-
-`-zmqpubrawblockhwm=n`
-
-`-zmqpubrawtxhwm=n`
-
-Each high water mark value must be an integer greater than or equal to 0.
-The high water mark limits the maximum number of messages that ZMQ will
-queue in memory for any single subscriber. A value of 0 means no limit.
-When not specified, the default value continues to be 1000.
-When a ZMQ PUB socket reaches its high water mark for a subscriber, then
-additional messages to the subscriber are dropped until the number of
-queued messages again falls below the high water mark value.
diff --git a/doc/release-notes-14477.md b/doc/release-notes-14477.md
deleted file mode 100644
index bb8c0a623e..0000000000
--- a/doc/release-notes-14477.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Miscellaneous RPC changes
-------------
-
-- `getaddressinfo` now reports `solvable`, a boolean indicating whether all information necessary for signing is present in the wallet (ignoring private keys).
-- `getaddressinfo`, `listunspent`, and `scantxoutset` have a new output field `desc`, an output descriptor that encapsulates all signing information and key paths for the address (only available when `solvable` is true for `getaddressinfo` and `listunspent`).
diff --git a/doc/release-notes-14565.md b/doc/release-notes-14565.md
deleted file mode 100644
index 38d76fee46..0000000000
--- a/doc/release-notes-14565.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Low-level RPC changes
----------------------
-
-The `importmulti` RPC will now contain a new per-request `warnings` field with strings
-that explain when fields are being ignored or inconsistant, if any.
diff --git a/doc/release-notes-pr13381.md b/doc/release-notes-pr13381.md
deleted file mode 100644
index 75faad9906..0000000000
--- a/doc/release-notes-pr13381.md
+++ /dev/null
@@ -1,29 +0,0 @@
-RPC importprivkey: new label behavior
--------------------------------------
-
-Previously, `importprivkey` automatically added the default empty label
-("") to all addresses associated with the imported private key.  Now it
-defaults to using any existing label for those addresses.  For example:
-
-- Old behavior: you import a watch-only address with the label "cold
-  wallet".  Later, you import the corresponding private key using the
-  default settings.  The address's label is changed from "cold wallet"
-  to "".
-
-- New behavior: you import a watch-only address with the label "cold
-  wallet".  Later, you import the corresponding private key using the
-  default settings.  The address's label remains "cold wallet".
-
-In both the previous and current case, if you directly specify a label
-during the import, that label will override whatever previous label the
-addresses may have had.  Also in both cases, if none of the addresses
-previously had a label, they will still receive the default empty label
-("").  Examples:
-
-- You import a watch-only address with the label "temporary".  Later you
-  import the corresponding private key with the label "final".  The
-  address's label will be changed to "final".
-
-- You use the default settings to import a private key for an address that
-  was not previously in the wallet.  Its addresses will receive the default
-  empty label ("").
diff --git a/doc/release-notes.md b/doc/release-notes.md
index 618244bb56..53b5a2119f 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -82,6 +82,13 @@ Configuration option changes
   configuration file.  Recognized sections are `[test]`, `[main]`, and
   `[regtest]`.
 
+- Four new options are available for configuring the maximum number of
+  messages that ZMQ will queue in memory (the "high water mark") before
+  dropping additional messages.  The default value is 1,000, the same as
+  was used for previous releases.  See the [ZMQ
+  documentation](https://github.com/bitcoin/bitcoin/blob/master/doc/zmq.md#usage)
+  for details.
+
 - The `enablebip61` option (introduced in Bitcoin Core 0.17.0) is
   used to toggle sending of BIP 61 reject messages. Reject messages have no use
   case on the P2P network and are only logged for debugging by most network
@@ -211,6 +218,32 @@ in the Low-level Changes section below.
   P2SH-P2WPKH, and P2SH-P2WSH. Requests for P2WSH and P2SH-P2WSH accept
   an additional `witnessscript` parameter.
 
+- The `importmulti` RPC now returns an additional `warnings` field for
+  each request with an array of strings explaining when fields are being
+  ignored or are inconsistent, if there are any.
+
+- The `getaddressinfo` RPC now returns an additional `solvable` boolean
+  field when Bitcoin Core knows enough about the address's scriptPubKey,
+  optional redeemScript, and optional witnessScript in order for the
+  wallet to be able to generate an unsigned input spending funds sent to
+  that address.
+
+- The `getaddressinfo`, `listunspent`, and `scantxoutset` RPCs now
+  return an additional `desc` field that contains an output descriptor
+  containing all key paths and signing information for the address
+  (except for the private key).  The `desc` field is only returned for
+  `getaddressinfo` and `listunspent` when the address is solvable.
+
+- The `importprivkey` RPC will preserve previously-set labels for
+  addresses or public keys corresponding to the private key being
+  imported.  For example, if you imported a watch-only address with the
+  label "cold wallet" in earlier releases of Bitcoin Core, subsequently
+  importing the private key would default to resetting the address's
+  label to the default empty-string label ("").  In this release, the
+  previous label of "cold wallet" will be retained.  If you optionally
+  specify any label besides the default when calling `importprivkey`,
+  the new label will be applied to the address.
+
 - See the [Mining](#mining) section for changes to `getblocktemplate`.
 
 Graphical User Interface (GUI)