aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-03-08 13:56:53 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2019-03-08 13:56:53 +0000
commitc7904d9e08a0ca3f733be3c2e8a3b912fa851fc5 (patch)
treeb6c2e49c0f723b658126b3c0d0b01bb500c1e4e7
parent43aaf5ab736c7464bfeaa8a41b3e9b789cb4f7ff (diff)
downloadgcc-c7904d9e08a0ca3f733be3c2e8a3b912fa851fc5.zip
gcc-c7904d9e08a0ca3f733be3c2e8a3b912fa851fc5.tar.gz
gcc-c7904d9e08a0ca3f733be3c2e8a3b912fa851fc5.tar.bz2
Fix text of hyperlink in manual
* doc/xml/manual/using.xml: Use link element instead of xref. * doc/html/*: Regenerate. From-SVN: r269494
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/doc/html/manual/using_macros.html3
-rw-r--r--libstdc++-v3/doc/xml/manual/using.xml4
3 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e752285..7da2594 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2019-03-08 Jonathan Wakely <jwakely@redhat.com>
+ * doc/xml/manual/using.xml: Use link element instead of xref.
+ * doc/html/*: Regenerate.
+
* include/bits/fs_path.h (path::format): Add fixed underlying type.
2019-03-08 François Dumont <fdumont@gcc.gnu.org>
diff --git a/libstdc++-v3/doc/html/manual/using_macros.html b/libstdc++-v3/doc/html/manual/using_macros.html
index 7030bd2..dad6564 100644
--- a/libstdc++-v3/doc/html/manual/using_macros.html
+++ b/libstdc++-v3/doc/html/manual/using_macros.html
@@ -116,7 +116,8 @@
enabled for
<code class="classname">std::vector&lt;T, std::allocator&lt;T&gt;&gt;</code>
and only when <code class="classname">std::allocator</code> is derived from
- <a class="xref" href="memory.html#allocator.impl" title="Implementation">the section called “Implementation”</a>. The annotations
+ <a class="link" href="memory.html#allocator.impl" title="Implementation"><code class="classname">new_allocator</code>
+ or <code class="classname">malloc_allocator</code></a>. The annotations
must be present on all vector operations or none, so this macro must
be defined to the same value for all translation units that create,
destroy or modify vectors.
diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml
index 2d44a73..7647e9b 100644
--- a/libstdc++-v3/doc/xml/manual/using.xml
+++ b/libstdc++-v3/doc/xml/manual/using.xml
@@ -1192,8 +1192,8 @@ g++ -Winvalid-pch -I. -include stdc++.h -H -g -O2 hello.cc -o test.exe
enabled for
<classname>std::vector&lt;T, std::allocator&lt;T&gt;&gt;</classname>
and only when <classname>std::allocator</classname> is derived from
- <xref linkend="allocator.impl"><classname>new_allocator</classname>
- or <classname>malloc_allocator</classname></xref>. The annotations
+ <link linkend="allocator.impl"><classname>new_allocator</classname>
+ or <classname>malloc_allocator</classname></link>. The annotations
must be present on all vector operations or none, so this macro must
be defined to the same value for all translation units that create,
destroy or modify vectors.