From e6e08429446ea4c20d57ffa347ea699afdd1d4a6 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 13 May 2019 21:11:47 +0100
Subject: [PATCH] Small markup changes to PBDS docs

	* doc/xml/manual/policy_data_structures.xml: Comment out stray
	<remark> elements. Fix formatting of bibliography references.

From-SVN: r271132
---
 libstdc++-v3/ChangeLog                           |  5 +++++
 .../doc/xml/manual/policy_data_structures.xml    |  8 +++++---
 .../xml/manual/test_policy_data_structures.xml   | 16 ++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 14999fae8fa..afd1b3c47f8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/xml/manual/policy_data_structures.xml: Comment out stray
+	<remark> elements. Fix formatting of bibliography references.
+
 2019-05-13  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
 	* doc/xml/manual/status_cxx2020.xml: Document P0811R3 status.
diff --git a/libstdc++-v3/doc/xml/manual/policy_data_structures.xml b/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
index 0f19be315a8..107018043ae 100644
--- a/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
+++ b/libstdc++-v3/doc/xml/manual/policy_data_structures.xml
@@ -458,10 +458,10 @@
 	    priority-queues container), there is a possible need for
 	    different types of iterators for self-organizing containers:
 	    the iterator concept seems overloaded to mean two different
-	    things (in some cases). <remark> XXX
+	    things (in some cases). <!-- <remark> XXX
 	    "ds_gen.html#find_range">Design::Associative
 	    Containers::Data-Structure Genericity::Point-Type and Range-Type
-	    Methods</remark>.
+	    Methods</remark>. -->
 	  </para>
 
 	  <section xml:id="associative.iterators.using">
@@ -3415,7 +3415,9 @@
 
 	    <para>Α<subscript>min</subscript> ≤ (number of
 	    stored elements) / (hash-table size) ≤
-	    Α<subscript>max</subscript><remark>load factor min max</remark></para>
+	    Α<subscript>max</subscript>
+            <!-- <remark>load factor min max</remark> -->
+            </para>
 
 	    <para>Collision-check policies work in the opposite direction of
 	    load-check policies. They focus on keeping the number of
diff --git a/libstdc++-v3/doc/xml/manual/test_policy_data_structures.xml b/libstdc++-v3/doc/xml/manual/test_policy_data_structures.xml
index 27d6c1df084..ea35efa22b9 100644
--- a/libstdc++-v3/doc/xml/manual/test_policy_data_structures.xml
+++ b/libstdc++-v3/doc/xml/manual/test_policy_data_structures.xml
@@ -2513,7 +2513,7 @@
 
 
 	  <para>This test inserts a number of values with keys from an arbitrary
-	  text ([ wickland96thirty ]) into a container
+	  text ([wickland96thirty]) into a container
 	  using <function>insert</function> . It measures the average time
 	  for <function>insert</function> as a function of the number of
 	  values inserted.</para>
@@ -3156,7 +3156,7 @@
 
 
 	  <para>This test inserts a number of values with keys from an
-	  arbitrary text ([ wickland96thirty ]) into
+	  arbitrary text ([wickland96thirty]) into
 	  a container, then performs a series of finds using
 	  <function>find</function>. It is different than Tree-Based and
 	  Trie-Based Text <function>find</function> Find Timing Test in the
@@ -3846,7 +3846,7 @@
 
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform i.i.d.integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
@@ -4310,7 +4310,7 @@
 
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
@@ -4775,7 +4775,7 @@
 
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
@@ -5242,7 +5242,7 @@
 
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
@@ -5708,7 +5708,7 @@
 	  </title></info>
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
@@ -6168,7 +6168,7 @@
 	  </title></info>
 	  <para>This test inserts a number of pairs into a container. The
 	  first item of each pair is a string from an arbitrary text
-	  [wickland96thirty], and
+	  ([wickland96thirty]), and
 	  the second is a uniform integer. The container is a
 	  "multimap" - it considers the first member of each pair as a
 	  primary key, and the second member of each pair as a secondary
-- 
2.30.2