From: Otto <otto.moerbeek@open-xchange.com>
Date: Fri, 22 Oct 2021 13:51:00 +0000 (+0200)
Subject: Combine three related merges
X-Git-Tag: rec-4.6.0-beta1~37^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd6d5c289bf4aa70d07d938a694d6ab1f79f672;p=thirdparty%2Fpdns.git

Combine three related merges
---

diff --git a/pdns/recursordist/docs/changelog/4.6.rst b/pdns/recursordist/docs/changelog/4.6.rst
index 02c1185f6e..14e94cf7aa 100644
--- a/pdns/recursordist/docs/changelog/4.6.rst
+++ b/pdns/recursordist/docs/changelog/4.6.rst
@@ -7,21 +7,9 @@ Changelogs for 4.6.X
 
   .. change::
     :tags: Improvements
-    :pullreq: 10870
+    :pullreq: 10646,10868,10870
 
-    Use make_unique instead of new (Rosen Penev).
-
-  .. change::
-    :tags: Improvements
-    :pullreq: 10868
-
-    Get rid of make_pair (Rosen Penev).
-
-  .. change::
-    :tags: Improvements
-    :pullreq: 10646
-
-    Convert make_pair to emplace (Rosen Penev).
+    Move to modern C++ constructs (Rosen Penev).
 
   .. change::
     :tags: Bug Fixes
@@ -46,7 +34,7 @@ Changelogs for 4.6.X
     :pullreq: 10567
     :tickets: 7558,7420
 
-    Introduce experimental Event Trace function to more detailed view the work done by the Recursor.
+    Introduce experimental Event Trace function to get a more detailed view the work done by the Recursor.
 
   .. change::
     :tags: Improvements