diff --git a/doc/refmanual/pair.html b/doc/refmanual/pair.html
index fecf243..2b49e28 100644
--- a/doc/refmanual/pair.html
+++ b/doc/refmanual/pair.html
@@ -62,7 +62,7 @@ typedef <a href="./fold.html" class="identifier">fold</a>&lt;
 </div>
 <div class="section" id="id1275">
 <h3><a class="subsection-title" href="#see-also" name="see-also">See also</a></h3>
-<p><a class="reference internal" href="./data-types.html">Data Types</a>, <a class="reference internal" href="./sequences.html">Sequences</a>, first &lt;<a class="reference internal" href="./trivial-metafunctions-summary.html#trivial-first">trivial-first</a>&gt;`__, second &lt;<a class="reference internal" href="./trivial-metafunctions-summary.html#trivial-second">trivial-second</a>&gt;`__</p>
+<p><a class="reference internal" href="./data-types.html">Data Types</a>, <a class="reference internal" href="./sequences.html">Sequences</a>, <a class="reference internal" href="./trivial-metafunctions-summary.html#first">first</a>, <a class="reference internal" href="./trivial-metafunctions-summary.html#second">second</a></p>
 <!-- Data Types/Miscellaneous//empty_base |20 -->
 </div>
 </div>
diff --git a/doc/refmanual/trivial-metafunction.html b/doc/refmanual/trivial-metafunction.html
index 33eeafa..f5c4985 100644
--- a/doc/refmanual/trivial-metafunction.html
+++ b/doc/refmanual/trivial-metafunction.html
@@ -66,9 +66,9 @@ typedef name&lt;x&gt;::type r;
 <div class="section" id="id857">
 <h3><a class="subsection-title" href="#models" name="models">Models</a></h3>
 <ul class="simple">
-<li>first &lt;<a class="reference internal" href="./trivial-metafunctions-summary.html#trivial-first">trivial-first</a>&gt;`__</li>
-<li>second &lt;<a class="reference internal" href="./trivial-metafunctions-summary.html#trivial-second">trivial-second</a>&gt;`__</li>
-<li>base &lt;<a class="reference internal" href="./trivial-metafunctions-summary.html#trivial-base">trivial-base</a>&gt;__</li>
+<li><a class="reference internal" href="./trivial-metafunctions-summary.html#first">first</a></li>
+<li><a class="reference internal" href="./trivial-metafunctions-summary.html#second">second</a></li>
+<li><a class="reference internal" href="./trivial-metafunctions-summary.html#base">base</a></li>
 </ul>
 </div>
 <div class="section" id="id858">
diff --git a/doc/refmanual/trivial-metafunctions-summary.html b/doc/refmanual/trivial-metafunctions-summary.html
index 5a08c51..b3f9df7 100644
--- a/doc/refmanual/trivial-metafunctions-summary.html
+++ b/doc/refmanual/trivial-metafunctions-summary.html
@@ -14,8 +14,8 @@
 <div class="section" id="trivial-metafunctions-summary">
 <h1><a class="toc-backref" href="./trivial.html#id1543">Trivial Metafunctions Summary</a></h1>
 <p>In the following table, <tt class="literal"><span class="pre">x</span></tt> is an arbitrary class type.</p>
-<table border="1" class="docutils table" id="trivial-base">
-<span id="trivial-second"></span><span id="trivial-first"></span><colgroup>
+<table border="1" class="docutils table" id="base">
+<span id="second"></span><span id="first"></span><colgroup>
 <col width="39%" />
 <col width="61%" />
 </colgroup>
diff --git a/doc/src/refmanual/Metafunctions-Trivial-Summary.rst b/doc/src/refmanual/Metafunctions-Trivial-Summary.rst
index 032062d..8490603 100644
--- a/doc/src/refmanual/Metafunctions-Trivial-Summary.rst
+++ b/doc/src/refmanual/Metafunctions-Trivial-Summary.rst
@@ -5,18 +5,13 @@ Trivial Metafunctions Summary
 
 In the following table, ``x`` is an arbitrary class type.
 
-.. |first| replace:: `:refentry:`first` <|first link|>`__
-.. |second| replace:: `:refentry:`second` <|second link|>`__
-.. |base| replace:: `:refentry:`base` <|base link|>__
+.. |first| replace:: `first`_
+.. |second| replace:: `second`_
+.. |base| replace:: `base`_
 
-.. |first link| replace:: `trivial-first`_
-.. |second link| replace:: `trivial-second`_
-.. |base link| replace:: `trivial-base`_
-
-
-.. _`trivial-first`:
-.. _`trivial-second`:
-.. _`trivial-base`:
+.. _`first`:
+.. _`second`:
+.. _`base`:
 
 
 +---------------------------+-------------------------------------------+