Fix incorrect DR numbers in libstdc++ manual

Backport from mainline
2019-05-07  Jonathan Wakely  <jwakely@redhat.com>

	* doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion.

From-SVN: r272302

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1aba7c8b1f6ba7a89f46b62bfe558ca5d619eefe..7b46e22eca02954810c1d4c60164610b97aff0a5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2019-06-14  Jonathan Wakely  <jwakely@redhat.com>
+
+       Backport from mainline
+       2019-05-07  Jonathan Wakely  <jwakely@redhat.com>
+
+       * doc/xml/manual/intro.xml: Fix DR 2537 and DR 2566 confusion.
+
 2019-06-14  Jonathan Wakely  <jwakely@redhat.com>
 
        Backport from mainline

diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml
index 9761b82fd6559df3be29d4fa6a88043190e238fd..518981559a01dd3bfc8afe40a9719a63f01f7a2b 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/intro.xml
+++ b/libstdc++-v3/doc/xml/manual/intro.xml
@@ -1121,18 +1121,18 @@ requirements of the license of GCC.
     </para></listitem></varlistentry>
 
     <varlistentry xml:id="manual.bugs.dr2537"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2537">2537</link>:
-       <emphasis>Requirements on the first template parameter of container adaptors
+       <emphasis>Constructors for <code>priority_queue</code> taking allocators
+        should call <code>make_heap</code>
        </emphasis>
     </term>
-    <listitem><para>Add static assertions to enforce the requirement.
+    <listitem><para>Call <code>make_heap</code>.
     </para></listitem></varlistentry>
 
     <varlistentry xml:id="manual.bugs.dr2566"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2566">2566</link>:
-       <emphasis>Constructors for <code>priority_queue</code> taking allocators
-        should call <code>make_heap</code>
+       <emphasis>Requirements on the first template parameter of container adaptors
        </emphasis>
     </term>
-    <listitem><para>Call <code>make_heap</code>.
+    <listitem><para>Add static assertions to enforce the requirement.
     </para></listitem></varlistentry>
 
     <varlistentry xml:id="manual.bugs.dr2583"><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&DR;#2583">2583</link>: