Release notes: integrate detached release notes

7 files changed, 52 insertions, 50 deletions

diff --git a/doc/release-notes-13152.md b/doc/release-notes-13152.md
deleted file mode 100644
index ace56f4d1b..0000000000
--- a/doc/release-notes-13152.md
+++ /dev/null
@@ -1,5 +0,0 @@
-New RPC methods
-------------
-
-- `getnodeaddresses` returns peer addresses known to this node. It may be used to connect to nodes over TCP without using the DNS seeds.
-- `listwalletdir` returns a list of wallets in the wallet directory which is configured with `-walletdir` parameter.
diff --git a/doc/release-notes-14023.md b/doc/release-notes-14023.md
deleted file mode 100644
index 18ea6f26d0..0000000000
--- a/doc/release-notes-14023.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Account API removed
--------------------
-
-The 'account' API was deprecated in v0.17 and has been fully removed in v0.18.
-The 'label' API was introduced in v0.17 as a replacement for accounts.
-
-See the release notes from v0.17 for a full description of the changes from the
-'account' API to the 'label' API.
diff --git a/doc/release-notes-14282.md b/doc/release-notes-14282.md
deleted file mode 100644
index 900ca04324..0000000000
--- a/doc/release-notes-14282.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Low-level RPC changes
-----------------------
-
-`-usehd` was removed in version 0.16. From that version onwards, all new
-wallets created are hierarchical deterministic wallets. Version 0.18 makes
-specifying `-usehd` invalid config.
-
-`ischange` field of boolean type that shows if an address was used for change
-output was added to `getaddressinfo` method response.
diff --git a/doc/release-notes-14296.md b/doc/release-notes-14296.md
deleted file mode 100644
index f7c52baace..0000000000
--- a/doc/release-notes-14296.md
+++ /dev/null
@@ -1,5 +0,0 @@
-addwitnessaddress RPC method removed
-------------------------------------
-
-The `addwitnessaddress` RPC was added for segwit testing in version 0.13.0. It
-was deprecated in version 0.16.0. This version fully removes the RPC method.
diff --git a/doc/release-notes-14454.md b/doc/release-notes-14454.md
deleted file mode 100644
index dd2c6c7ced..0000000000
--- a/doc/release-notes-14454.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Low-level RPC changes
-----------------------
-
-The `importmulti` RPC has been updated to support P2WSH, P2WPKH, P2SH-P2WPKH,
-P2SH-P2WSH. Each request now accepts an additional `witnessscript` to be used
-for P2WSH or P2SH-P2WSH.
diff --git a/doc/release-notes-14468.md b/doc/release-notes-14468.md
deleted file mode 100644
index fb0243aba8..0000000000
--- a/doc/release-notes-14468.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Wallet `generate` RPC method deprecated
----------------------------------------
-
-The wallet's `generate` RPC method has been deprecated and will be fully
-removed in v0.19.
-
-`generate` is only used for testing. The RPC call reaches across multiple
-subsystems (wallet and mining), so is deprecated to simplify the wallet-node
-interface. Projects that are using `generate` for testing purposes should
-transition to using the `generatetoaddress` call, which does not require or use
-the wallet component. Calling `generatetoaddress` with an address returned by
-`getnewaddress` gives the same functionality as the old `generate` method.
-
-To continue using `generate` in v0.18, restart bitcoind with the
-`-deprecatedrpc=generate` configuration.
diff --git a/doc/release-notes.md b/doc/release-notes.md
index ad80c8e71f..f5c139e3f1 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -116,12 +116,50 @@ Build system changes
   need BIP70 support are encouraged to use this option to reduce their
   exposure to future vulnerabilities.
 
-Updated RPCs
-------------
+Deprecated or removed RPCs
+--------------------------
 
 - The `signrawtransaction` RPC is removed after being deprecated and
   hidden behind a special configuration option in version 0.17.0.
 
+- The 'account' API is removed after being deprecated in v0.17.  The
+  'label' API was introduced in v0.17 as a replacement for accounts.
+  See the [release notes from v0.17](https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.17.0.md#label-and-account-apis-for-wallet)
+  for a full description of the changes from the 'account' API to the
+  'label' API.
+
+- The `addwitnessaddress` RPC is removed after being deprecated in
+  version 0.13.0.
+
+- The wallet's `generate` RPC method is deprecated and will be fully
+  removed in a subsequent major version.  This RPC is only used for
+  testing, but its implementation reached across multiple subsystems
+  (wallet and mining), so it is being deprecated to simplify the
+  wallet-node interface.  Projects that are using `generate` for testing
+  purposes should transition to using the `generatetoaddress` RPC, which
+  does not require or use the wallet component. Calling
+  `generatetoaddress` with an address returned by the `getnewaddress`
+  RPC gives the same functionality as the old `generate` RPC.  To
+  continue using `generate` in this version, restart bitcoind with the
+  `-deprecatedrpc=generate` configuration option.
+
+New RPCs
+--------
+
+- A new `getnodeaddresses` RPC returns peer addresses known to this
+  node. It may be used to find nodes to connect to without using a DNS
+  seeder.
+
+- A new `listwalletdir` RPC returns a list of wallets in the wallet
+  directory (either the default wallet directory or the directory
+  configured by the `-walletdir` parameter).
+
+Updated RPCs
+------------
+
+Note: some low-level RPC changes mainly useful for testing are described
+in the Low-level Changes section below.
+
 - The `getpeerinfo` RPC now returns an additional "minfeefilter" field
   set to the peer's BIP133 fee filter.  You can use this to detect that
   you have peers that are willing to accept transactions below the
@@ -140,6 +178,10 @@ Updated RPCs
 - The `getaddressinfo` RPC now provides an `ischange` field indicating
   whether the wallet used the address in a change output.
 
+- The `importmulti` RPC has been updated to support P2WSH, P2WPKH,
+  P2SH-P2WPKH, and P2SH-P2WSH. Requests for P2WSH and P2SH-P2WSH accept
+  an additional `witnessscript` parameter.
+
 Low-level changes
 =================
 
@@ -156,6 +198,14 @@ RPC
 - A new `submitheader` RPC allows submitting block headers independently
   from their block.  This is likely only useful for testing.
 
+Configuration
+-------------
+
+- The `-usehd` configuration option was removed in version 0.16. From
+  that version onwards, all new wallets created are hierarchical
+  deterministic wallets. This release makes specifying `-usehd` an
+  invalid configuration option.
+
 Credits
 =======