diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
index 1f96b7516c..01181cfcb3 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
@@ -134,14 +134,25 @@
 {{! Using symbols }}
 {{#if symbol.shadows}}
 {{#> markup/dynamic-level-h }}Introduced Symbols{{/markup/dynamic-level-h}}
+{{#if (any_of_by symbol.shadows "doc")}}
+[cols=2]
+|===
+| Name
+| Description
+{{#each symbol.shadows}}
+| {{> symbol/qualified-name . }}
+| {{> javadoc/inline-brief doc.brief }}
+{{/each}}
+|===
+{{else}}
 [cols=1]
 |===
 | Name
 {{#each symbol.shadows}}
-| {{name}}
+| {{> symbol/qualified-name . }}
 {{/each}}
 |===
-
+{{/if}}
 {{/if}}
 {{! Exceptions }}
 {{#if symbol.doc.exceptions}}
diff --git a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
index 77b1dcc780..190dab3ae0 100644
--- a/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbol.html.hbs
@@ -183,20 +183,39 @@
 {{#if symbol.shadows}}
 <div>
 {{#> markup/dynamic-level-h level=2 }}Introduced Symbols{{/markup/dynamic-level-h}}
+{{#if (any_of_by symbol.shadows "doc")}}
 <table>
 <thead>
 <tr>
 <th>Name</th>
+<th>Description</th>
 </tr>
 </thead>
 <tbody>
 {{#each symbol.shadows}}
 <tr>
-<td>{{name}}</td>
+<td>{{> symbol/qualified-name . }}</td>
+<td>{{> javadoc/inline-brief doc.brief }}</td>
 </tr>
 {{/each}}
 </tbody>
 </table>
+{{else}}
+<table>
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+{{#each symbol.shadows}}
+<tr>
+<td>{{> symbol/qualified-name . }}</td>
+</tr>
+{{/each}}
+</tbody>
+</table>
+{{/if}}
 </div>
 
 {{/if}}
diff --git a/test-files/golden-tests/symbols/using/using-function-after.adoc b/test-files/golden-tests/symbols/using/using-function-after.adoc
index df57096c99..a99be5c38a 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-after.adoc
@@ -101,8 +101,7 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#A-f-01[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function-after.html b/test-files/golden-tests/symbols/using/using-function-after.html
index 7dddf77c53..5faf5c4c7f 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.html
+++ b/test-files/golden-tests/symbols/using/using-function-after.html
@@ -138,7 +138,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f-01">A::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function-and-type.adoc b/test-files/golden-tests/symbols/using/using-function-and-type.adoc
index d9eb0be33a..5fc3e53a7f 100644
--- a/test-files/golden-tests/symbols/using/using-function-and-type.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-and-type.adoc
@@ -122,9 +122,8 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
-| f
+| link:#A-f-05[A::f]
+| link:#A-f-01[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function-and-type.html b/test-files/golden-tests/symbols/using/using-function-and-type.html
index c967033ba9..2053fbee11 100644
--- a/test-files/golden-tests/symbols/using/using-function-and-type.html
+++ b/test-files/golden-tests/symbols/using/using-function-and-type.html
@@ -181,10 +181,10 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f-05">A::f</a></td>
 </tr>
 <tr>
-<td>f</td>
+<td><a href="#A-f-01">A::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function-excluded.adoc b/test-files/golden-tests/symbols/using/using-function-excluded.adoc
index 328778abc3..e7a2cf461b 100644
--- a/test-files/golden-tests/symbols/using/using-function-excluded.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-excluded.adoc
@@ -61,8 +61,7 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#A-f[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function-excluded.html b/test-files/golden-tests/symbols/using/using-function-excluded.html
index c348163f43..e213ffaef0 100644
--- a/test-files/golden-tests/symbols/using/using-function-excluded.html
+++ b/test-files/golden-tests/symbols/using/using-function-excluded.html
@@ -94,7 +94,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f">A::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc b/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
index 3d13676a24..51e7c4b73c 100644
--- a/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-local-overloads.adoc
@@ -148,10 +148,9 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
-| f
-| f
+| link:#A-f-037[A::f]
+| link:#A-f-039[A::f]
+| link:#A-f-01[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function-local-overloads.html b/test-files/golden-tests/symbols/using/using-function-local-overloads.html
index 55fdcc0a40..b4a76e57d2 100644
--- a/test-files/golden-tests/symbols/using/using-function-local-overloads.html
+++ b/test-files/golden-tests/symbols/using/using-function-local-overloads.html
@@ -195,13 +195,13 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f-037">A::f</a></td>
 </tr>
 <tr>
-<td>f</td>
+<td><a href="#A-f-039">A::f</a></td>
 </tr>
 <tr>
-<td>f</td>
+<td><a href="#A-f-01">A::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function-overloads.adoc b/test-files/golden-tests/symbols/using/using-function-overloads.adoc
index 0f834b5836..91b1c4c966 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.adoc
@@ -127,10 +127,9 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
-| f
-| f
+| link:#A-f-037[A::f]
+| link:#A-f-039[A::f]
+| link:#A-f-01[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function-overloads.html b/test-files/golden-tests/symbols/using/using-function-overloads.html
index 06745aeddc..5bc89e394d 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.html
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.html
@@ -166,13 +166,13 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f-037">A::f</a></td>
 </tr>
 <tr>
-<td>f</td>
+<td><a href="#A-f-039">A::f</a></td>
 </tr>
 <tr>
-<td>f</td>
+<td><a href="#A-f-01">A::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function.adoc b/test-files/golden-tests/symbols/using/using-function.adoc
index 8ebafde4f1..21040ec46c 100644
--- a/test-files/golden-tests/symbols/using/using-function.adoc
+++ b/test-files/golden-tests/symbols/using/using-function.adoc
@@ -27,15 +27,19 @@
 
 === Functions
 
-[cols=1]
+[cols=2]
 |===
 | Name
+| Description
 | link:#A-f[`f`] 
+| Function being used
 |===
 
 [#A-f]
 == link:#A[A]::f
 
+Function being used
+
 === Synopsis
 
 Declared in `&lt;using&hyphen;function&period;cpp&gt;`
@@ -62,11 +66,12 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=1]
+[cols=2]
 |===
 | Name
-| f
+| Description
+| link:#A-f[A::f]
+| Function being used
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-function.cpp b/test-files/golden-tests/symbols/using/using-function.cpp
index 814c452b60..460a5616ca 100644
--- a/test-files/golden-tests/symbols/using/using-function.cpp
+++ b/test-files/golden-tests/symbols/using/using-function.cpp
@@ -1,5 +1,6 @@
 namespace A
 {
+    /// Function being used
     void f(int);
 }
 
diff --git a/test-files/golden-tests/symbols/using/using-function.html b/test-files/golden-tests/symbols/using/using-function.html
index 269c4555bf..01189d815d 100644
--- a/test-files/golden-tests/symbols/using/using-function.html
+++ b/test-files/golden-tests/symbols/using/using-function.html
@@ -46,11 +46,12 @@ <h2>Functions</h2>
 <thead>
 <tr>
 <th>Name</th>
+<th>Description</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-f"><code>f</code></a> </td></tr>
+<td><a href="#A-f"><code>f</code></a> </td><td><span>Function being used</span></td></tr>
 </tbody>
 </table>
 
@@ -58,6 +59,10 @@ <h2>Functions</h2>
 <div>
 <div>
 <h2 id="A-f"><a href="#A-f">A::f</a></h2>
+<div>
+<span>Function being used</span>
+
+</div>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -95,11 +100,13 @@ <h3>Introduced Symbols</h3>
 <thead>
 <tr>
 <th>Name</th>
+<th>Description</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f">A::f</a></td>
+<td><span>Function being used</span></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-function.xml b/test-files/golden-tests/symbols/using/using-function.xml
index 979bfa71a1..5c6347696c 100644
--- a/test-files/golden-tests/symbols/using/using-function.xml
+++ b/test-files/golden-tests/symbols/using/using-function.xml
@@ -4,14 +4,19 @@
 <namespace id="//////////////////////////8=">
   <namespace name="A" id="jQQu/8mLNzRQvGtbkKMwwloVDpw=">
     <function name="f" id="FuaTgMW0VtO+b4uzr/DCmx9vlb0=">
-      <file short-path="using-function.cpp" source-path="using-function.cpp" line="3"/>
+      <file short-path="using-function.cpp" source-path="using-function.cpp" line="4"/>
       <param>
         <type name="int"/>
       </param>
+      <doc>
+        <brief>
+          <text>Function being used</text>
+        </brief>
+      </doc>
     </function>
   </namespace>
   <using id="FhSdC4kR2+KOxLCiCUQ9mu1WNoY=" class="using" qualifier="A::f">
-    <file short-path="using-function.cpp" source-path="using-function.cpp" line="7"/>
+    <file short-path="using-function.cpp" source-path="using-function.cpp" line="8"/>
     <doc>
       <brief>
         <text>f is also available in the global namespace</text>
diff --git a/test-files/golden-tests/symbols/using/using-member-function.adoc b/test-files/golden-tests/symbols/using/using-member-function.adoc
index f4765e791c..716f31477c 100644
--- a/test-files/golden-tests/symbols/using/using-member-function.adoc
+++ b/test-files/golden-tests/symbols/using/using-member-function.adoc
@@ -213,9 +213,8 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#A-f[A::f]
 |===
-
 [#C-f-03]
 == link:#C[C]::f
 
@@ -233,8 +232,7 @@ using B::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#B-f[B::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-member-function.html b/test-files/golden-tests/symbols/using/using-member-function.html
index d6da52301c..73e77c1f97 100644
--- a/test-files/golden-tests/symbols/using/using-member-function.html
+++ b/test-files/golden-tests/symbols/using/using-member-function.html
@@ -292,7 +292,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f">A::f</a></td>
 </tr>
 </tbody>
 </table>
@@ -323,7 +323,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#B-f">B::f</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-multi.adoc b/test-files/golden-tests/symbols/using/using-multi.adoc
index b21855b692..0f321ab75c 100644
--- a/test-files/golden-tests/symbols/using/using-multi.adoc
+++ b/test-files/golden-tests/symbols/using/using-multi.adoc
@@ -76,9 +76,8 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#A-f[A::f]
 |===
-
 [#g]
 == g
 
@@ -96,8 +95,7 @@ using A::g;
 [cols=1]
 |===
 | Name
-| g
+| link:#A-g[A::g]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-multi.html b/test-files/golden-tests/symbols/using/using-multi.html
index 6a70615f0a..a5ca2ebd73 100644
--- a/test-files/golden-tests/symbols/using/using-multi.html
+++ b/test-files/golden-tests/symbols/using/using-multi.html
@@ -112,7 +112,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f">A::f</a></td>
 </tr>
 </tbody>
 </table>
@@ -143,7 +143,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>g</td>
+<td><a href="#A-g">A::g</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-struct-template.adoc b/test-files/golden-tests/symbols/using/using-struct-template.adoc
index 436e850849..7756b326f6 100644
--- a/test-files/golden-tests/symbols/using/using-struct-template.adoc
+++ b/test-files/golden-tests/symbols/using/using-struct-template.adoc
@@ -74,9 +74,8 @@ using LongName::S1;
 [cols=1]
 |===
 | Name
-| S1
+| link:#LongName-S1[LongName::S1]
 |===
-
 [#S2]
 == S2
 
@@ -94,8 +93,7 @@ using LongName::S2;
 [cols=1]
 |===
 | Name
-| S2
+| link:#LongName-S2[LongName::S2]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-struct-template.html b/test-files/golden-tests/symbols/using/using-struct-template.html
index 9ddd3b04e6..078502a6a8 100644
--- a/test-files/golden-tests/symbols/using/using-struct-template.html
+++ b/test-files/golden-tests/symbols/using/using-struct-template.html
@@ -114,7 +114,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>S1</td>
+<td><a href="#LongName-S1">LongName::S1</a></td>
 </tr>
 </tbody>
 </table>
@@ -145,7 +145,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>S2</td>
+<td><a href="#LongName-S2">LongName::S2</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-struct.adoc b/test-files/golden-tests/symbols/using/using-struct.adoc
index da12a3bcab..e124a31c95 100644
--- a/test-files/golden-tests/symbols/using/using-struct.adoc
+++ b/test-files/golden-tests/symbols/using/using-struct.adoc
@@ -74,9 +74,8 @@ using LongName::S1;
 [cols=1]
 |===
 | Name
-| S1
+| link:#LongName-S1[LongName::S1]
 |===
-
 [#S2]
 == S2
 
@@ -94,8 +93,7 @@ using LongName::S2;
 [cols=1]
 |===
 | Name
-| S2
+| link:#LongName-S2[LongName::S2]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-struct.html b/test-files/golden-tests/symbols/using/using-struct.html
index 83e4f278b6..8db40d6fe5 100644
--- a/test-files/golden-tests/symbols/using/using-struct.html
+++ b/test-files/golden-tests/symbols/using/using-struct.html
@@ -114,7 +114,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>S1</td>
+<td><a href="#LongName-S1">LongName::S1</a></td>
 </tr>
 </tbody>
 </table>
@@ -145,7 +145,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>S2</td>
+<td><a href="#LongName-S2">LongName::S2</a></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/symbols/using/using-template-function.adoc b/test-files/golden-tests/symbols/using/using-template-function.adoc
index c97d3cde3d..3397258f59 100644
--- a/test-files/golden-tests/symbols/using/using-template-function.adoc
+++ b/test-files/golden-tests/symbols/using/using-template-function.adoc
@@ -61,8 +61,7 @@ using A::f;
 [cols=1]
 |===
 | Name
-| f
+| link:#A-f[A::f]
 |===
 
-
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/using/using-template-function.html b/test-files/golden-tests/symbols/using/using-template-function.html
index 47df000972..e62d4e0184 100644
--- a/test-files/golden-tests/symbols/using/using-template-function.html
+++ b/test-files/golden-tests/symbols/using/using-template-function.html
@@ -94,7 +94,7 @@ <h3>Introduced Symbols</h3>
 </thead>
 <tbody>
 <tr>
-<td>f</td>
+<td><a href="#A-f">A::f</a></td>
 </tr>
 </tbody>
 </table>