[gcc(refs/users/aoliva/heads/testbase)] libstdc++: Fix incorrect Docbook links

Alexandre Oliva aoliva@gcc.gnu.org
Tue Jun 2 12:25:26 GMT 2020 

https://gcc.gnu.org/g:a1ffe9b6f4d0e2dd9493c5bd669fc5a2ea24a6f9

commit a1ffe9b6f4d0e2dd9493c5bd669fc5a2ea24a6f9
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Jun 1 16:40:13 2020 +0100

    libstdc++: Fix incorrect Docbook links
    
    The <xref> element creates the link text automatically from the link
    target, rather than using the text node child of the element. This can
    be changed by using an endterm attribute, but it's simpler to just use
    the <link> element instead.
    
            * doc/xml/manual/containers.xml: Replace <xref> with <link>.
            * doc/xml/manual/evolution.xml: Likewise.
            * doc/html/manual/api.html: Regenerate.
            * doc/html/manual/containers.html: Regenerate.

Diff:
---
 libstdc++-v3/doc/html/manual/api.html        | 3 ++-
 libstdc++-v3/doc/html/manual/containers.html | 3 ++-
 libstdc++-v3/doc/xml/manual/containers.xml   | 4 ++--
 libstdc++-v3/doc/xml/manual/evolution.xml    | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libstdc++-v3/doc/html/manual/api.html b/libstdc++-v3/doc/html/manual/api.html
index 345c58802a4..261e7493d41 100644
--- a/libstdc++-v3/doc/html/manual/api.html
+++ b/libstdc++-v3/doc/html/manual/api.html
@@ -298,7 +298,8 @@ now defaults to zero.
   Support for mathematical special functions (ISO/IEC 29124:2010) added.
 </p><p>
   Assertions to check function preconditions can be enabled by defining the
-  <a class="xref" href="using_macros.html" title="Macros">Macros</a>.
+  <a class="link" href="using_macros.html" title="Macros"><span class="symbol">_GLIBCXX_ASSERTIONS</span>
+  macro</a>.
   The initial set of assertions are a subset of the checks enabled by
   the Debug Mode, but without the ABI changes and changes to algorithmic
   complexity that are caused by enabling the full Debug Mode.
diff --git a/libstdc++-v3/doc/html/manual/containers.html b/libstdc++-v3/doc/html/manual/containers.html
index e4030c4a694..7035a949074 100644
--- a/libstdc++-v3/doc/html/manual/containers.html
+++ b/libstdc++-v3/doc/html/manual/containers.html
@@ -8,7 +8,8 @@
   Containers
   <a id="id-1.3.4.7.1.1.1" class="indexterm"></a>
 </h2></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="section"><a href="containers.html#std.containers.sequences">Sequences</a></span></dt><dd><dl><dt><span class="section"><a href="containers.html#containers.sequences.list">list</a></span></dt><dd><dl><dt><span class="section"><a href="containers.html#sequences.list.size">list::size() is O(n)</a></span></dt></dl></dd></dl></dd><dt><span class="section"><a href="associative.html">Associative</a></span></dt><dd><dl><dt><span class="section"><a href="associative.html#containers.associative.insert_hints">Insertion Hints</a></span></dt><dt><span class="section"><a href="associative.html#containers.associative.bitset">bitset</a></span></dt><dd><dl><dt><span class="section"><a href="associative.html#associative.bitset.size_variable">Size Variable</a></span></dt><dt><span class="section"><a href="associative.html#associative.bitset.type_string">Type String</a></span></dt></dl></dd></dl></dd><dt><span class="section"><a href="unordered_associative.html">Unordered Associative</a></span></dt><dd><dl><dt><span class="section"><a href="unordered_associative.html#containers.unordered.insert_hints">Insertion Hints</a></span></dt><dt><span class="section"><a href="unordered_associative.html#containers.unordered.hash">Hash Code</a></span></dt><dd><dl><dt><span class="section"><a href="unordered_associative.html#containers.unordered.cache">Hash Code Caching Policy</a></span></dt></dl></dd></dl></dd><dt><span class="section"><a href="containers_and_c.html">Interacting with C</a></span></dt><dd><dl><dt><span class="section"><a href="containers_and_c.html#containers.c.vs_array">Containers vs. Arrays</a></span></dt></dl></dd></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="std.containers.sequences"></a>Sequences</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="containers.sequences.list"></a>list</h3></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="sequences.list.size"></a>list::size() is O(n)</h4></div></div></div><p>
-     Yes it is, at least using the <a class="xref" href="using_dual_abi.html" title="Dual ABI">Dual ABI</a>, and that's okay.  This is a decision that we preserved
+     Yes it is, at least using the <a class="link" href="using_dual_abi.html" title="Dual ABI">old
+     ABI</a>, and that's okay.  This is a decision that we preserved
      when we imported SGI's STL implementation.  The following is
      quoted from <a class="link" href="https://web.archive.org/web/20171225062613/http://www.sgi.com/tech/stl/FAQ.html" target="_top">their FAQ</a>:
    </p><div class="blockquote"><blockquote class="blockquote"><p>
diff --git a/libstdc++-v3/doc/xml/manual/containers.xml b/libstdc++-v3/doc/xml/manual/containers.xml
index 5c9854efbdd..6d568164b47 100644
--- a/libstdc++-v3/doc/xml/manual/containers.xml
+++ b/libstdc++-v3/doc/xml/manual/containers.xml
@@ -25,8 +25,8 @@
   <section xml:id="sequences.list.size" xreflabel="list::size() is O(n)"><info><title>list::size() is O(n)</title></info>
     
    <para>
-     Yes it is, at least using the <xref linkend="manual.intro.using.abi">old
-     ABI</xref>, and that's okay.  This is a decision that we preserved
+     Yes it is, at least using the <link linkend="manual.intro.using.abi">old
+     ABI</link>, and that's okay.  This is a decision that we preserved
      when we imported SGI's STL implementation.  The following is
      quoted from <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://web.archive.org/web/20171225062613/http://www.sgi.com/tech/stl/FAQ.html">their FAQ</link>:
    </para>
diff --git a/libstdc++-v3/doc/xml/manual/evolution.xml b/libstdc++-v3/doc/xml/manual/evolution.xml
index 1bd7bb1bb9f..ab04c1ad272 100644
--- a/libstdc++-v3/doc/xml/manual/evolution.xml
+++ b/libstdc++-v3/doc/xml/manual/evolution.xml
@@ -784,8 +784,8 @@ now defaults to zero.
 
 <para>
   Assertions to check function preconditions can be enabled by defining the
-  <xref linkend="manual.intro.using.macros"><symbol>_GLIBCXX_ASSERTIONS</symbol>
-  macro</xref>.
+  <link linkend="manual.intro.using.macros"><symbol>_GLIBCXX_ASSERTIONS</symbol>
+  macro</link>.
   The initial set of assertions are a subset of the checks enabled by
   the Debug Mode, but without the ABI changes and changes to algorithmic
   complexity that are caused by enabling the full Debug Mode.

More information about the Libstdc++-cvs mailing list