diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs
index ff448d720c..7eab5b2c21 100644
--- a/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/markup/table.adoc.hbs
@@ -1,4 +1,4 @@
-[{{#if cols}}cols={{cols}}{{/if}}]
+[{{#if cols}}cols={{#if (eq cols 2)}}"1,4"{{else}}{{cols}}{{/if}}{{/if}}]
 |===
 {{> @partial-block }}
 |===
diff --git a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
index bc35cf07a5..3a36721832 100644
--- a/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/adoc/partials/symbol.adoc.hbs
@@ -31,10 +31,10 @@
 {{! Base classes }}
 {{#if (any_of_by symbol.bases "isPublic")}}
 {{#> markup/dynamic-level-h }}Base Classes{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each (filter_by symbol.bases "isPublic")}}
 | {{#>markup/code}}{{> type/declarator type }}{{/markup/code}}
 | {{> doc/block/inline-brief type.name.symbol.doc.brief }}
@@ -45,10 +45,10 @@
 {{! Protected Base classes }}
 {{#if (any_of_by symbol.bases "isProtected")}}
 {{#> markup/dynamic-level-h }}Protected Base Classes{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each (filter_by symbol.bases "isProtected")}}
 | {{#>markup/code}}{{> type/declarator type }}{{/markup/code}}
 | {{> doc/block/inline-brief type.name.symbol.doc.brief }}
@@ -74,10 +74,10 @@
 {{! Friends }}
 {{#if symbol.friends}}
 {{#> markup/dynamic-level-h }}Friends{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each symbol.friends }}
 {{#if symbol}}
 | {{#>markup/code}}{{> symbol/qualified-name symbol }}{{/markup/code}}
@@ -98,7 +98,7 @@
 {{! Related symbols }}
 {{#if symbol.doc.related}}
 {{#> markup/dynamic-level-h }}Non-Member Functions{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -112,10 +112,10 @@
 {{! Derived classes }}
 {{#if symbol.derived}}
 {{#> markup/dynamic-level-h }}Derived Classes{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each symbol.derived}}
 | {{#if url~}}
 {{#>markup/a href=url}}{{#>markup/code}}{{> type/name-info-text . }}{{/markup/code}}{{/markup/a}}
@@ -140,10 +140,10 @@
 {{#if symbol.shadows}}
 {{#> markup/dynamic-level-h }}Introduced Symbols{{/markup/dynamic-level-h~}}
 {{#if (any_of_by symbol.shadows "doc")}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each symbol.shadows}}
 | {{> symbol/qualified-name . }}
 | {{> doc/block/inline-brief doc.brief }}
@@ -162,7 +162,7 @@
 {{! Exceptions }}
 {{#if symbol.doc.exceptions}}
 {{#> markup/dynamic-level-h }}Exceptions{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -190,10 +190,10 @@
 {{! Template Parameters }}
 {{#if symbol.doc.tparams}}
 {{#> markup/dynamic-level-h }}Template Parameters{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each symbol.doc.tparams}}
 | *{{name}}*
 | {{>doc/block .}}
@@ -204,10 +204,10 @@
 {{! Parameters }}
 {{#if symbol.doc.params}}
 {{#> markup/dynamic-level-h }}Parameters{{/markup/dynamic-level-h~}}
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 {{#each symbol.doc.params}}
 | *{{name}}*{{#if direction}} [{{direction}}]{{/if}}
 | {{>doc/block .}}
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs
index 83964543b7..fec8a6772b 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/detail/members-table-impl.hbs
@@ -1,10 +1,7 @@
 {{#>markup/table cols=(select includeBrief 2 1)}}
 {{#>markup/thead}}
 {{#>markup/tr~}}
-{{#>markup/th}}Name{{/markup/th}}
-{{#if includeBrief}}
-{{#>markup/th}}Description{{/markup/th}}
-{{/if}}
+{{#>markup/th}}Name{{/markup/th}}{{#if includeBrief}}{{#>markup/th}}Description{{/markup/th}}{{/if}}
 {{/markup/tr}}
 {{/markup/thead}}
 {{#>markup/tbody}}
diff --git a/test-files/golden-tests/config/auto-brief/auto-brief.adoc b/test-files/golden-tests/config/auto-brief/auto-brief.adoc
index 3d328b2037..69bc33a8ec 100644
--- a/test-files/golden-tests/config/auto-brief/auto-brief.adoc
+++ b/test-files/golden-tests/config/auto-brief/auto-brief.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#copyBriefFromCopyBrief[`copyBriefFromCopyBrief`] 
 | This is the explicit brief.
 | link:#copyBriefFromExplicitBrief[`copyBriefFromExplicitBrief`] 
diff --git a/test-files/golden-tests/config/auto-brief/auto-brief.html b/test-files/golden-tests/config/auto-brief/auto-brief.html
index dc5d44dc3d..4a363652e2 100644
--- a/test-files/golden-tests/config/auto-brief/auto-brief.html
+++ b/test-files/golden-tests/config/auto-brief/auto-brief.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc b/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc
index c4edc9ae5e..fd1710d0ea 100644
--- a/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc
+++ b/test-files/golden-tests/config/auto-brief/no-auto-brief.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#copyBriefFromCopyBrief[`copyBriefFromCopyBrief`] 
 | This is the explicit brief&period;
 | link:#copyBriefFromExplicitBrief[`copyBriefFromExplicitBrief`] 
diff --git a/test-files/golden-tests/config/auto-brief/no-auto-brief.html b/test-files/golden-tests/config/auto-brief/no-auto-brief.html
index ef3572b66e..3460c5f14a 100644
--- a/test-files/golden-tests/config/auto-brief/no-auto-brief.html
+++ b/test-files/golden-tests/config/auto-brief/no-auto-brief.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
index 37c4a37472..819c0a3b24 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A helper tag
 | link:#X[`X`] 
@@ -46,10 +45,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2constructor-08[`X`]         [.small]#[constructor]#
 | Constructors
 | link:#X-2destructor[`&#126;X`] [.small]#[destructor]#
@@ -164,10 +162,10 @@ X(link:#X[X] const& other) = default;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -189,10 +187,10 @@ X(link:#X[X]&& other) = default;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -213,10 +211,10 @@ X(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -237,10 +235,10 @@ X(link:#A[A] const& value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to copy construct from
 |===
@@ -261,10 +259,10 @@ X(link:#A[A]&& value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to move construct from
 |===
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
index 44301b34ea..8c2439389f 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.adoc b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.adoc
index d6b2b01e1b..444393c8c4 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A helper tag
 | link:#X[`X`] 
@@ -20,10 +19,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#operator_lshift[`operator&lt;&lt;`] 
 | Stream insertion operator
 |===
@@ -58,10 +56,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-operator_assign-0a[`operator&equals;`] 
 | Assignment operators
 | link:#X-operator_plus_eq[`operator&plus;&equals;`] 
@@ -131,10 +128,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy assign from
 |===
@@ -160,10 +157,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move assign from
 |===
@@ -189,10 +186,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to copy assign from
 |===
@@ -218,10 +215,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -242,7 +239,7 @@ struct ostream;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -273,10 +270,10 @@ Reference to the current output stream
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *os*
 | An output stream
 | *x*
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
index 9127351baa..9b3f4e34b5 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-operator.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -29,8 +28,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -77,8 +75,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
index 9d407284ce..52425da1c2 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A helper tag
 | link:#X[`X`] 
@@ -46,10 +45,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2constructor-08[`X`]         [.small]#[constructor]#
 | Constructors
 | link:#X-operator_assign-0a[`operator&equals;`] 
@@ -131,10 +129,10 @@ X(link:#X[X] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -155,10 +153,10 @@ X(link:#X[X]&& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -179,10 +177,10 @@ X(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -203,10 +201,10 @@ X(link:#A[A] const& value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to copy construct from
 |===
@@ -227,10 +225,10 @@ X(link:#A[A]&& value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to move construct from
 |===
@@ -320,10 +318,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy assign from
 |===
@@ -349,10 +347,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move assign from
 |===
@@ -378,10 +376,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to assign from
 |===
@@ -407,10 +405,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to copy assign from
 |===
@@ -436,10 +434,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to move assign from
 |===
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
index 318ce00984..c3247d17fd 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.adoc b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.adoc
index 5ffba3d136..04da71ed9f 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A helper tag
 | link:#X[`X`] 
@@ -20,10 +19,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#operator_minus[`operator&hyphen;`] 
 | Subtraction operator
 | link:#operator_lshift[`operator&lt;&lt;`] 
@@ -62,17 +60,16 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-operator_plus[`operator&plus;`] 
 | Addition operator
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -103,10 +100,10 @@ Another instance of the object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | The right operand
 |===
@@ -127,7 +124,7 @@ struct ostream;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -158,10 +155,10 @@ Test class
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | The left operand
 | *y*
@@ -191,10 +188,10 @@ Reference to the current output stream
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *os*
 | An output stream
 | *x*
@@ -222,10 +219,10 @@ Test class
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | The operand
 |===
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
index b87e0880b1..36ecc963fd 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-operator.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -29,8 +28,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -79,8 +77,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.adoc b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.adoc
index de356cb5ed..828f50efb0 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X[`X`] 
 | Test class
 |===
@@ -30,10 +29,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-empty[`empty`] 
 | Determines whether the range is empty&period;
 | link:#X-front[`front`] 
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
index e397c6107e..a3c4ff7488 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-brief.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -43,8 +42,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc
index 3b959da7b2..575beefbd5 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.adoc
@@ -6,20 +6,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#R[`R`] 
 | The return type of the function
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#getR[`getR`] 
 | Test function
 |===
@@ -40,7 +38,7 @@ struct R;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
index 5cdc9840a2..e0ad994278 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-return-brief.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -27,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.adoc b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.adoc
index 20faf5a1ea..a540ec2d00 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A helper class
 | link:#Undoc[`Undoc`] 
@@ -22,10 +21,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#operator_lshift[`operator&lt;&lt;`] 
 | Stream insertion operator
 | link:#operator_not[`operator!`] 
@@ -62,7 +60,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -112,10 +110,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-operator_assign-0a[`operator&equals;`] 
 | Assignment operators
 | link:#X-operator_plus[`operator&plus;`] 
@@ -196,10 +193,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to copy assign from
 |===
@@ -225,10 +222,10 @@ Rvalue reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to move assign from
 |===
@@ -254,10 +251,10 @@ Another instance of the object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -357,10 +354,10 @@ operator&equals;&equals;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -386,10 +383,10 @@ operator!&equals;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -415,10 +412,10 @@ operator&lt;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -444,10 +441,10 @@ operator&lt;&equals;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -473,10 +470,10 @@ operator&gt;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -502,10 +499,10 @@ operator&gt;&equals;(link:#X[X] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -531,10 +528,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -555,7 +552,7 @@ struct ostream;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -586,10 +583,10 @@ Reference to the current output stream
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *os*
 | An output stream
 | *value*
@@ -617,10 +614,10 @@ operator!(link:#A[A] const& value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The operand
 |===
@@ -648,10 +645,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -681,10 +678,10 @@ operator!&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -714,10 +711,10 @@ operator&lt;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -747,10 +744,10 @@ operator&lt;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -780,10 +777,10 @@ operator&gt;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -813,10 +810,10 @@ operator&gt;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -846,10 +843,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
diff --git a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
index e60a481f21..2f0a519798 100644
--- a/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
+++ b/test-files/golden-tests/config/auto-function-metadata/returns-from-special.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -30,8 +29,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -122,8 +120,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/auto-relates.adoc b/test-files/golden-tests/config/auto-relates/auto-relates.adoc
index 8897caa946..816e36882b 100644
--- a/test-files/golden-tests/config/auto-relates/auto-relates.adoc
+++ b/test-files/golden-tests/config/auto-relates/auto-relates.adoc
@@ -6,20 +6,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A class with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | A non&hyphen;member function of A
 | link:#f2[`f2`] 
@@ -50,7 +48,7 @@ class A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-relates/auto-relates.html b/test-files/golden-tests/config/auto-relates/auto-relates.html
index f50d7347a2..0b600d9858 100644
--- a/test-files/golden-tests/config/auto-relates/auto-relates.html
+++ b/test-files/golden-tests/config/auto-relates/auto-relates.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -27,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/derived.adoc b/test-files/golden-tests/config/auto-relates/derived.adoc
index b1a101fc86..64ae3d641f 100644
--- a/test-files/golden-tests/config/auto-relates/derived.adoc
+++ b/test-files/golden-tests/config/auto-relates/derived.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A concrete implementation for ABase
 | link:#ABase[`ABase`] 
@@ -22,10 +21,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | A non&hyphen;member function of ABase
 | link:#f2[`f2`] 
@@ -57,17 +55,17 @@ struct A
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#ABase[ABase]`
 | A base class for non&hyphen;member functions
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -99,7 +97,7 @@ struct ABase;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -119,10 +117,10 @@ struct ABase;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A[`A`]
 | A concrete implementation for ABase
 | link:#AView[`AView`]
@@ -146,17 +144,17 @@ struct AView
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#ABase[ABase]`
 | A base class for non&hyphen;member functions
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -174,10 +172,10 @@ struct AView
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#AView2[`AView2`]
 | Another view of A
 |===
@@ -199,17 +197,17 @@ struct AView2
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#AView[AView]`
 | A view of A
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-relates/derived.html b/test-files/golden-tests/config/auto-relates/derived.html
index 89399b3fed..1575c041c4 100644
--- a/test-files/golden-tests/config/auto-relates/derived.html
+++ b/test-files/golden-tests/config/auto-relates/derived.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -30,8 +29,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/enum.adoc b/test-files/golden-tests/config/auto-relates/enum.adoc
index a24ed2e688..647d63e0e2 100644
--- a/test-files/golden-tests/config/auto-relates/enum.adoc
+++ b/test-files/golden-tests/config/auto-relates/enum.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Result[`Result`] 
 | Helper result class
 | link:#SmallVector[`SmallVector`] 
@@ -18,20 +17,18 @@
 
 === Enums
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#E[`E`] 
 | An enum with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#makeE[`makeE`] 
 | Function that returns A
 | link:#makeEs[`makeEs`] 
@@ -57,7 +54,7 @@ class Result;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -84,7 +81,7 @@ class SmallVector;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -108,7 +105,7 @@ enum class E : int;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-relates/enum.html b/test-files/golden-tests/config/auto-relates/enum.html
index ba6073a7a8..f898e4b1f3 100644
--- a/test-files/golden-tests/config/auto-relates/enum.html
+++ b/test-files/golden-tests/config/auto-relates/enum.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -28,8 +27,7 @@ <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -42,8 +40,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/no-auto-relates.adoc b/test-files/golden-tests/config/auto-relates/no-auto-relates.adoc
index 2b0e76b165..45ff0749db 100644
--- a/test-files/golden-tests/config/auto-relates/no-auto-relates.adoc
+++ b/test-files/golden-tests/config/auto-relates/no-auto-relates.adoc
@@ -6,20 +6,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A class with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | A non&hyphen;member function of A
 | link:#f2[`f2`] 
diff --git a/test-files/golden-tests/config/auto-relates/no-auto-relates.html b/test-files/golden-tests/config/auto-relates/no-auto-relates.html
index 082ac009f1..08bba0d164 100644
--- a/test-files/golden-tests/config/auto-relates/no-auto-relates.html
+++ b/test-files/golden-tests/config/auto-relates/no-auto-relates.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -27,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/qualified.adoc b/test-files/golden-tests/config/auto-relates/qualified.adoc
index 354b1c0143..29a46b6512 100644
--- a/test-files/golden-tests/config/auto-relates/qualified.adoc
+++ b/test-files/golden-tests/config/auto-relates/qualified.adoc
@@ -15,20 +15,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A class with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | A non&hyphen;member function of A
 | link:#f5[`f5`] 
@@ -48,20 +46,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-B[`B`] 
 | A nested class with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-f2[`f2`] 
 | A non&hyphen;member function of A
 | link:#N-f3[`f3`] 
@@ -73,10 +69,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-M-f4[`f4`] 
 | A non&hyphen;member function of &colon;&colon;N&colon;&colon;B
 |===
@@ -112,7 +107,7 @@ struct B;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -161,10 +156,9 @@ f3(link:#N-B[N::B] const&);
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#O-f6[`f6`] 
 | A non&hyphen;member function of &colon;&colon;N&colon;&colon;B
 |===
@@ -200,7 +194,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-relates/qualified.html b/test-files/golden-tests/config/auto-relates/qualified.html
index fa739bf85f..271fb582f1 100644
--- a/test-files/golden-tests/config/auto-relates/qualified.html
+++ b/test-files/golden-tests/config/auto-relates/qualified.html
@@ -27,8 +27,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -41,8 +40,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -74,8 +72,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -88,8 +85,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -108,8 +104,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -213,8 +208,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.adoc b/test-files/golden-tests/config/auto-relates/remove-friend.adoc
index 2dc687683d..cc523a9d55 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.adoc
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.adoc
@@ -6,20 +6,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A record with non&hyphen;member functions
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#to_string[`to&lowbar;string`] 
 | Non&hyphen;member function of A
 | link:#operator_eq[`operator&equals;&equals;`] 
@@ -42,17 +40,17 @@ class A;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#operator_eq[operator&equals;&equals;]`
 | Friend function not listed as non&hyphen;member
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -81,10 +79,10 @@ The string representation of the object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The object to stringify
 |===
@@ -116,10 +114,10 @@ Friends are already listed in the class definition&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left&hyphen;hand side of the comparison
 | *rhs*
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.html b/test-files/golden-tests/config/auto-relates/remove-friend.html
index 3d37741ebd..76a7d64f81 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.html
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -27,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/auto-relates/return-type.adoc b/test-files/golden-tests/config/auto-relates/return-type.adoc
index 93d2191ba5..c8417da439 100644
--- a/test-files/golden-tests/config/auto-relates/return-type.adoc
+++ b/test-files/golden-tests/config/auto-relates/return-type.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A class with non&hyphen;member functions
 | link:#Result[`Result`] 
@@ -20,10 +19,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#makeA[`makeA`] 
 | Function that returns A
 | link:#makeAs[`makeAs`] 
@@ -48,7 +46,7 @@ class A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -77,7 +75,7 @@ class Result;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -104,7 +102,7 @@ class SmallVector;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/config/auto-relates/return-type.html b/test-files/golden-tests/config/auto-relates/return-type.html
index 67c8fa0a76..ace0c99b14 100644
--- a/test-files/golden-tests/config/auto-relates/return-type.html
+++ b/test-files/golden-tests/config/auto-relates/return-type.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -29,8 +28,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/extract-all/no-extract-all.adoc b/test-files/golden-tests/config/extract-all/no-extract-all.adoc
index 99127f68b5..7c60afb568 100644
--- a/test-files/golden-tests/config/extract-all/no-extract-all.adoc
+++ b/test-files/golden-tests/config/extract-all/no-extract-all.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#docFunction[`docFunction`] 
 | Documented function
 | link:#sometimesDocFunction[`sometimesDocFunction`] 
diff --git a/test-files/golden-tests/config/extract-all/no-extract-all.html b/test-files/golden-tests/config/extract-all/no-extract-all.html
index d7b96dca06..b065c31d51 100644
--- a/test-files/golden-tests/config/extract-all/no-extract-all.html
+++ b/test-files/golden-tests/config/extract-all/no-extract-all.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc
index d96c4b1bc1..cde28b6345 100644
--- a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc
+++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.adoc
@@ -6,10 +6,9 @@
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#documented_ns[`documented&lowbar;ns`] 
 | Namespace documentation
 | link:#mixed_ns[`mixed&lowbar;ns`] 
@@ -24,10 +23,9 @@
 
 === Namespace Aliases
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#empty_ns_alias[`empty&lowbar;ns&lowbar;alias`] 
 | Should still work
 | link:#regular_ns_alias[`regular&lowbar;ns&lowbar;alias`] 
diff --git a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
index c183f1751c..3a38f8cf5e 100644
--- a/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
+++ b/test-files/golden-tests/config/extract-empty-namespaces/no-extract-empty-namespaces.html
@@ -13,8 +13,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -31,8 +30,7 @@ <h2>Namespace Aliases</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/extract-friends/extract-friends.adoc b/test-files/golden-tests/config/extract-friends/extract-friends.adoc
index 3b91a36efd..8176f9d0dc 100644
--- a/test-files/golden-tests/config/extract-friends/extract-friends.adoc
+++ b/test-files/golden-tests/config/extract-friends/extract-friends.adoc
@@ -93,10 +93,10 @@ class A;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#std-hash-08[std::hash&lt;A&gt;]`
 | 
 |===
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/base.adoc b/test-files/golden-tests/config/extract-implicit-specializations/base.adoc
index c497efcfca..c88f65a135 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/base.adoc
+++ b/test-files/golden-tests/config/extract-implicit-specializations/base.adoc
@@ -28,10 +28,10 @@ struct A
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#B[B]`
 | 
 |===
@@ -66,10 +66,10 @@ struct B;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A[`A`]
 | 
 |===
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc
index bd41f32dee..906ca8c654 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc
+++ b/test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.adoc
@@ -28,10 +28,10 @@ struct A
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#B-00[B&lt;int&gt;]`
 | 
 |===
@@ -80,10 +80,10 @@ struct B;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A[`A`]
 | 
 |===
diff --git a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc
index 65428e6175..0a99f31923 100644
--- a/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc
+++ b/test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.adoc
@@ -28,10 +28,10 @@ struct A
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#B[B&lt;int&gt;]`
 | 
 |===
@@ -67,10 +67,10 @@ struct B;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A[`A`]
 | 
 |===
diff --git a/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc b/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc
index 7f73875e16..588a63e5a3 100644
--- a/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/base-overload-set.adoc
@@ -29,10 +29,10 @@ class Base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#ConstBase[ConstBase]`
 | 
 |===
@@ -47,10 +47,10 @@ class Base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#C[`C`]
 | 
 |===
@@ -121,10 +121,10 @@ class C
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#Base[Base]`
 | 
 |===
@@ -159,10 +159,10 @@ class ConstBase;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#Base[`Base`]
 | 
 |===
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
index c09ad5f580..cced326a01 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base[`base`] 
 | A base class to test inheritance and shadowing
 | link:#base_base[`base&lowbar;base`] 
@@ -39,20 +38,19 @@ class base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base_base[base&lowbar;base]`
 | A second&hyphen;order base class to test indirect inheritance
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
@@ -67,10 +65,9 @@ class base
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -81,10 +78,10 @@ class base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#derived[`derived`]
 | A class that derives from base and excluded&lowbar;base
 |===
@@ -219,10 +216,9 @@ class base&lowbar;base;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
@@ -231,10 +227,10 @@ class base&lowbar;base;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#base[`base`]
 | A base class to test inheritance and shadowing
 |===
@@ -295,10 +291,10 @@ class derived
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -307,10 +303,9 @@ class derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
@@ -329,10 +324,9 @@ class derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -446,10 +440,9 @@ class private&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -512,10 +505,10 @@ class protected&lowbar;derived
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -524,10 +517,9 @@ class protected&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -536,10 +528,9 @@ class protected&lowbar;derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
index c2da370fbe..c5e2b01c25 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -81,8 +79,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -255,8 +252,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -362,8 +358,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -383,8 +378,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -513,8 +507,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -605,8 +598,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -621,8 +613,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.adoc b/test-files/golden-tests/config/inherit-base-members/copy.adoc
index 3f9cabdfca..b9975df4d0 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/copy.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base[`base`] 
 | A base class to test inheritance and shadowing
 | link:#base_base[`base&lowbar;base`] 
@@ -39,20 +38,19 @@ class base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base_base[base&lowbar;base]`
 | A second&hyphen;order base class to test indirect inheritance
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
@@ -67,10 +65,9 @@ class base
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -81,10 +78,10 @@ class base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#derived[`derived`]
 | A class that derives from base and excluded&lowbar;base
 |===
@@ -257,10 +254,9 @@ class base&lowbar;base;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
@@ -269,10 +265,10 @@ class base&lowbar;base;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#base[`base`]
 | A base class to test inheritance and shadowing
 |===
@@ -333,10 +329,10 @@ class derived
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -345,10 +341,9 @@ class derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#derived-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#derived-base_inherited[`base&lowbar;inherited`] 
@@ -367,10 +362,9 @@ class derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#derived-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#derived-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -617,10 +611,9 @@ class private&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -683,10 +676,10 @@ class protected&lowbar;derived
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -695,10 +688,9 @@ class protected&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-derived_shadowed-0a[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#protected_derived-do_derived_shadowed-0e[`do&lowbar;derived&lowbar;shadowed`] 
@@ -707,10 +699,9 @@ class protected&lowbar;derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#protected_derived-base_inherited[`base&lowbar;inherited`] 
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.html b/test-files/golden-tests/config/inherit-base-members/copy.html
index b7b8da27f9..21d5fcf162 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -81,8 +79,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -297,8 +294,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -404,8 +400,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -425,8 +420,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -702,8 +696,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -794,8 +787,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -810,8 +802,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/inherit-base-members/never.adoc b/test-files/golden-tests/config/inherit-base-members/never.adoc
index 12603fb450..d481c548ef 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/never.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base[`base`] 
 | A base class to test inheritance and shadowing
 | link:#base_base[`base&lowbar;base`] 
@@ -39,20 +38,19 @@ class base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base_base[base&lowbar;base]`
 | A second&hyphen;order base class to test indirect inheritance
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-base_inherited[`base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-base_shadowed[`base&lowbar;shadowed`] 
@@ -63,10 +61,9 @@ class base
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -77,10 +74,10 @@ class base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#derived[`derived`]
 | A class that derives from base and excluded&lowbar;base
 |===
@@ -215,10 +212,9 @@ class base&lowbar;base;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
@@ -227,10 +223,10 @@ class base&lowbar;base;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#base[`base`]
 | A base class to test inheritance and shadowing
 |===
@@ -291,10 +287,10 @@ class derived
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -303,10 +299,9 @@ class derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -369,10 +364,9 @@ class private&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -435,10 +429,10 @@ class protected&lowbar;derived
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -447,10 +441,9 @@ class protected&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
diff --git a/test-files/golden-tests/config/inherit-base-members/never.html b/test-files/golden-tests/config/inherit-base-members/never.html
index 4a6878211e..43a045136d 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.html
+++ b/test-files/golden-tests/config/inherit-base-members/never.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -79,8 +77,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -253,8 +250,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -360,8 +356,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -437,8 +432,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -529,8 +523,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.adoc b/test-files/golden-tests/config/inherit-base-members/reference.adoc
index 4970145c67..7c76a8992e 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/reference.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base[`base`] 
 | A base class to test inheritance and shadowing
 | link:#base_base[`base&lowbar;base`] 
@@ -39,20 +38,19 @@ class base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base_base[base&lowbar;base]`
 | A second&hyphen;order base class to test indirect inheritance
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
@@ -67,10 +65,9 @@ class base
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -81,10 +78,10 @@ class base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#derived[`derived`]
 | A class that derives from base and excluded&lowbar;base
 |===
@@ -219,10 +216,9 @@ class base&lowbar;base;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
@@ -231,10 +227,10 @@ class base&lowbar;base;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#base[`base`]
 | A base class to test inheritance and shadowing
 |===
@@ -295,10 +291,10 @@ class derived
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -307,10 +303,9 @@ class derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
@@ -327,10 +322,9 @@ class derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -395,10 +389,9 @@ class private&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -461,10 +454,10 @@ class protected&lowbar;derived
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | A base class to test inheritance and shadowing
 | `excluded&lowbar;base`
@@ -473,10 +466,9 @@ class protected&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 | link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
@@ -485,10 +477,9 @@ class protected&lowbar;derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.html b/test-files/golden-tests/config/inherit-base-members/reference.html
index 10e0c2786b..3fdca1f3f4 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.html
+++ b/test-files/golden-tests/config/inherit-base-members/reference.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -62,8 +61,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -81,8 +79,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -255,8 +252,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -362,8 +358,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -382,8 +377,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -459,8 +453,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -551,8 +544,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -567,8 +559,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
index ce79aba4d5..e4719052be 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base[`base`] 
 | 
 | link:#base_base[`base&lowbar;base`] 
@@ -37,20 +36,19 @@ class base
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base_base[base&lowbar;base]`
 | 
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-2constructor[`base`]         [.small]#[constructor]#
 | Constructor should not be inherited
 | link:#base-2destructor[`&#126;base`] [.small]#[destructor]#
@@ -69,10 +67,9 @@ class base
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -83,10 +80,10 @@ class base
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#derived[`derived`]
 | 
 |===
@@ -223,10 +220,9 @@ class base&lowbar;base;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-2constructor[`base&lowbar;base`]         [.small]#[constructor]#
 | Constructor should not be inherited
 | link:#base_base-2destructor[`&#126;base&lowbar;base`] [.small]#[destructor]#
@@ -239,10 +235,10 @@ class base&lowbar;base;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#base[`base`]
 | 
 |===
@@ -321,10 +317,10 @@ class derived
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | 
 | `excluded&lowbar;base`
@@ -333,10 +329,9 @@ class derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#derived-2constructor[`derived`]         [.small]#[constructor]#
 | Constructor should not be inherited
 | link:#derived-2destructor[`&#126;derived`] [.small]#[destructor]#
@@ -359,10 +354,9 @@ class derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -494,10 +488,9 @@ class private&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#private_derived-2constructor[`private&lowbar;derived`]         [.small]#[constructor]#
 | Constructor should not be inherited
 | link:#private_derived-2destructor[`&#126;private&lowbar;derived`] [.small]#[destructor]#
@@ -584,10 +577,10 @@ class protected&lowbar;derived
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#base[base]`
 | 
 | `excluded&lowbar;base`
@@ -596,10 +589,9 @@ class protected&lowbar;derived
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#protected_derived-2constructor[`protected&lowbar;derived`]         [.small]#[constructor]#
 | Constructor should not be inherited
 | link:#protected_derived-2destructor[`&#126;protected&lowbar;derived`] [.small]#[destructor]#
@@ -612,10 +604,9 @@ class protected&lowbar;derived
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-base_inherited[`base&lowbar;inherited`] 
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.html b/test-files/golden-tests/config/inherit-base-members/skip-special.html
index 650896a0cf..9dc0a99ae8 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.html
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -59,8 +58,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -80,8 +78,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -259,8 +256,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -389,8 +385,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -412,8 +407,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -563,8 +557,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -681,8 +674,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -699,8 +691,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/legible-names/constructor.adoc b/test-files/golden-tests/config/legible-names/constructor.adoc
index 13a03218d4..13f89c5d61 100644
--- a/test-files/golden-tests/config/legible-names/constructor.adoc
+++ b/test-files/golden-tests/config/legible-names/constructor.adoc
@@ -26,10 +26,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2constructor-08[`X`]         [.small]#[constructor]#
 | Constructors
 |===
@@ -123,10 +122,10 @@ X(link:#X[X] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -147,10 +146,10 @@ X(link:#X[X]&& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -171,10 +170,10 @@ X(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -195,10 +194,10 @@ X(double value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
diff --git a/test-files/golden-tests/config/legible-names/constructor.html b/test-files/golden-tests/config/legible-names/constructor.html
index f20945858e..41dd753415 100644
--- a/test-files/golden-tests/config/legible-names/constructor.html
+++ b/test-files/golden-tests/config/legible-names/constructor.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/missing-include-shims/main.adoc b/test-files/golden-tests/config/missing-include-shims/main.adoc
index 185fd9112c..196d6f3aeb 100644
--- a/test-files/golden-tests/config/missing-include-shims/main.adoc
+++ b/test-files/golden-tests/config/missing-include-shims/main.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | Function satisfied by missing&hyphen;include&hyphen;shims
 |===
diff --git a/test-files/golden-tests/config/missing-include-shims/main.html b/test-files/golden-tests/config/missing-include-shims/main.html
index c62a988b3c..3a521c8857 100644
--- a/test-files/golden-tests/config/missing-include-shims/main.html
+++ b/test-files/golden-tests/config/missing-include-shims/main.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.adoc b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.adoc
index 8b7c9d7dbd..80828738b3 100644
--- a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.adoc
+++ b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.adoc
@@ -6,10 +6,9 @@
 
 === Enums
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Color[`Color`] 
 | A simple enum
 |===
@@ -30,10 +29,9 @@ enum class Color : int;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | `Red` 
 | The color red
 | `Green` 
diff --git a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.html b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.html
index 07e582383a..373967c432 100644
--- a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.html
+++ b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-false.html
@@ -13,8 +13,7 @@ <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -43,8 +42,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.adoc b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.adoc
index 557a038d88..a05104d409 100644
--- a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.adoc
+++ b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.adoc
@@ -6,10 +6,9 @@
 
 === Enums
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Color[`Color`] 
 | A simple enum
 |===
@@ -30,10 +29,9 @@ enum class Color : int;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Color-Red[`Red`] 
 | The color red
 | link:#Color-Green[`Green`] 
diff --git a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.html b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.html
index d763b20401..82958df22d 100644
--- a/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.html
+++ b/test-files/golden-tests/config/show-enum-constants/show-enum-constants-true.html
@@ -13,8 +13,7 @@ <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -43,8 +42,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.adoc b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.adoc
index 5d687880eb..e7189dcd93 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.adoc
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.adoc
@@ -26,10 +26,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-2constructor-00[`Z`]         [.small]#[constructor]#
 | Constructors
 | link:#Z-2destructor[`&#126;Z`] [.small]#[destructor]#
@@ -95,10 +94,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -215,10 +214,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -244,10 +243,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -273,10 +272,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.html b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.html
index 05bbb2612a..fd850bdd6b 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-location.html
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-location.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
index c71581bd81..53ccdc8bb0 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
@@ -26,10 +26,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-2constructor-00[`Z`]         [.small]#[constructor]#
 | Constructors
 | link:#Z-2destructor[`&#126;Z`] [.small]#[destructor]#
@@ -109,10 +108,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -215,10 +214,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -244,10 +243,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -273,10 +272,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
index ac4fdcaf47..3bb75aa170 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
index 0ee4e63c75..c88bd28d08 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
@@ -22,10 +22,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#h[`h`] 
 | 
 | link:#g-0f[`g`] 
@@ -148,7 +147,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -174,10 +173,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-2constructor-00[`Z`]         [.small]#[constructor]#
 | Constructors
 | link:#Z-2destructor[`&#126;Z`] [.small]#[destructor]#
@@ -255,10 +253,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -348,10 +346,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -377,10 +375,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -406,10 +404,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -648,10 +646,10 @@ operator!(link:#A[A] const& v);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *v*
 | The operand
 |===
@@ -679,10 +677,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -712,10 +710,10 @@ operator!&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
index b2ac897a1b..3176ff6a7b 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
@@ -34,8 +34,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -212,8 +211,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
index 6c59c4d92b..b67d487a76 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
@@ -22,10 +22,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | 
 | link:#g-0f[`g`] 
@@ -54,7 +53,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -174,10 +173,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-2constructor-00[`Z`]         [.small]#[constructor]#
 | Constructors
 | link:#Z-2destructor[`&#126;Z`] [.small]#[destructor]#
@@ -255,10 +253,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -348,10 +346,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -377,10 +375,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -406,10 +404,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -648,10 +646,10 @@ operator!(link:#A[A] const& v);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *v*
 | The operand
 |===
@@ -679,10 +677,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -712,10 +710,10 @@ operator!&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
index 948aabf43e..e468b6fbdc 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
@@ -34,8 +34,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -212,8 +211,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc
index 3dd7b2dffd..02d641760c 100644
--- a/test-files/golden-tests/config/sort/sort-members.adoc
+++ b/test-files/golden-tests/config/sort/sort-members.adoc
@@ -22,10 +22,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | 
 | link:#g-0f[`g`] 
@@ -54,7 +53,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -174,10 +173,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-2constructor-00[`Z`]         [.small]#[constructor]#
 | Constructors
 | link:#Z-2destructor[`&#126;Z`] [.small]#[destructor]#
@@ -255,10 +253,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -348,10 +346,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -377,10 +375,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -406,10 +404,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -648,10 +646,10 @@ operator!(link:#A[A] const& v);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *v*
 | The operand
 |===
@@ -679,10 +677,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -712,10 +710,10 @@ operator!&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html
index a1261d558b..5df0de8cec 100644
--- a/test-files/golden-tests/config/sort/sort-members.html
+++ b/test-files/golden-tests/config/sort/sort-members.html
@@ -34,8 +34,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -212,8 +211,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc
index 91a785a154..ec08d339ac 100644
--- a/test-files/golden-tests/config/sort/unordered.adoc
+++ b/test-files/golden-tests/config/sort/unordered.adoc
@@ -22,10 +22,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#operator_not_eq[`operator!&equals;`] 
 | Inequality operator
 | link:#operator_eq[`operator&equals;&equals;`] 
@@ -148,7 +147,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -174,10 +173,9 @@ struct Z;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Z-operator_3way[`operator&lt;&equals;&gt;`] 
 | Three&hyphen;way comparison operator
 | link:#Z-operator_not_eq[`operator!&equals;`] 
@@ -217,10 +215,10 @@ The relative order of the objects
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -246,10 +244,10 @@ operator!&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -275,10 +273,10 @@ operator&equals;&equals;(link:#Z[Z] const& rhs) const;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -406,10 +404,10 @@ Z(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -437,10 +435,10 @@ operator!&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -470,10 +468,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -501,10 +499,10 @@ operator!(link:#A[A] const& v);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *v*
 | The operand
 |===
diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html
index fbe5eff335..838f12f00d 100644
--- a/test-files/golden-tests/config/sort/unordered.html
+++ b/test-files/golden-tests/config/sort/unordered.html
@@ -34,8 +34,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -212,8 +211,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/core/libcxx.adoc b/test-files/golden-tests/core/libcxx.adoc
index 3272e8e79e..1eda5d6c83 100644
--- a/test-files/golden-tests/core/libcxx.adoc
+++ b/test-files/golden-tests/core/libcxx.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#sqrt[`sqrt`] 
 | Computes the square root of an integral value&period;
 |===
@@ -37,7 +36,7 @@ This function calculates the square root of a given integral value using bit man
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -51,20 +50,20 @@ The square root of the input value&period;
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type of the input value&period; Must be an integral type&period;
 |===
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The integral value to compute the square root of&period;
 |===
diff --git a/test-files/golden-tests/core/libcxx.html b/test-files/golden-tests/core/libcxx.html
index 34d65f72dd..df84cf40fd 100644
--- a/test-files/golden-tests/core/libcxx.html
+++ b/test-files/golden-tests/core/libcxx.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/filters/file/include-symlink.adoc b/test-files/golden-tests/filters/file/include-symlink.adoc
index e3bb2f2961..c279e79338 100644
--- a/test-files/golden-tests/filters/file/include-symlink.adoc
+++ b/test-files/golden-tests/filters/file/include-symlink.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A brief&period;
 |===
diff --git a/test-files/golden-tests/filters/file/include-symlink.html b/test-files/golden-tests/filters/file/include-symlink.html
index a465e1f3f9..b60a669c6d 100644
--- a/test-files/golden-tests/filters/file/include-symlink.html
+++ b/test-files/golden-tests/filters/file/include-symlink.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/filters/file/subdirectories.adoc b/test-files/golden-tests/filters/file/subdirectories.adoc
index 02b9ced9cf..d187ff147e 100644
--- a/test-files/golden-tests/filters/file/subdirectories.adoc
+++ b/test-files/golden-tests/filters/file/subdirectories.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A brief&period;
 |===
diff --git a/test-files/golden-tests/filters/file/subdirectories.html b/test-files/golden-tests/filters/file/subdirectories.html
index ad78f0971f..e037e39f5c 100644
--- a/test-files/golden-tests/filters/file/subdirectories.html
+++ b/test-files/golden-tests/filters/file/subdirectories.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/filters/file/subdirectories2.adoc b/test-files/golden-tests/filters/file/subdirectories2.adoc
index 02b9ced9cf..d187ff147e 100644
--- a/test-files/golden-tests/filters/file/subdirectories2.adoc
+++ b/test-files/golden-tests/filters/file/subdirectories2.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A brief&period;
 |===
diff --git a/test-files/golden-tests/filters/file/subdirectories2.html b/test-files/golden-tests/filters/file/subdirectories2.html
index ad78f0971f..e037e39f5c 100644
--- a/test-files/golden-tests/filters/file/subdirectories2.html
+++ b/test-files/golden-tests/filters/file/subdirectories2.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc b/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc
index 275311b634..6aa6161c77 100644
--- a/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc
+++ b/test-files/golden-tests/filters/symbol-name/excluded-base-class.adoc
@@ -39,10 +39,10 @@ class D
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `B::C`
 | 
 |===
@@ -127,10 +127,10 @@ class E
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `B::C`
 | 
 |===
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
index 58fc6a599a..69fa426e3e 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.adoc
@@ -6,10 +6,9 @@
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular_ns[`regular&lowbar;ns`] 
 | A regular namespace with different filters for members
 | link:#see_below_ns[`see&lowbar;below&lowbar;ns`] 
@@ -18,10 +17,9 @@
 
 === Namespace Aliases
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#dependency_ns_alias[`dependency&lowbar;ns&lowbar;alias`] 
 | Namespace alias to form the dependency on dependency&lowbar;ns
 | link:#implementation_defined_ns_alias[`implementation&lowbar;defined&lowbar;ns&lowbar;alias`] 
@@ -32,10 +30,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular[`regular`] 
 | A regular symbol in the global namespace
 | link:#see_below[`see&lowbar;below`] 
@@ -44,10 +41,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#get_dependency[`get&lowbar;dependency`] 
 | A function to get a dependency symbol on the global namespace
 | link:#get_implementation_defined[`get&lowbar;implementation&lowbar;defined`] 
@@ -65,10 +61,9 @@ A regular namespace with different filters for members
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular_ns-regular[`regular`] 
 | A symbol that passes the filters
 | link:#regular_ns-see_below[`see&lowbar;below`] 
@@ -77,10 +72,9 @@ A regular namespace with different filters for members
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular_ns-get_dependency[`get&lowbar;dependency`] 
 | A function to get an excluded symbol
 | link:#regular_ns-get_implementation_defined[`get&lowbar;implementation&lowbar;defined`] 
@@ -107,17 +101,16 @@ struct regular;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular_ns-regular-also_regular[`also&lowbar;regular`] 
 | Child of a regular symbol extracted as regular
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -145,10 +138,9 @@ struct also&lowbar;regular;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular_ns-regular-also_regular-regular_as_well[`regular&lowbar;as&lowbar;well`] 
 | Grandchild of a regular symbol extracted as regular
 |===
@@ -282,10 +274,9 @@ A see&hyphen;below namespace
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#see_below_ns-regular[`regular`] 
 | Regular symbol in a see&hyphen;below namespace
 | link:#see_below_ns-see_below[`see&lowbar;below`] 
@@ -294,10 +285,9 @@ A see&hyphen;below namespace
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#see_below_ns-get_dependency[`get&lowbar;dependency`] 
 | A function to get a dependency symbol in a see&hyphen;below namespace
 | link:#see_below_ns-get_implementation_defined[`get&lowbar;implementation&lowbar;defined`] 
@@ -454,17 +444,16 @@ struct regular;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular-also_regular[`also&lowbar;regular`] 
 | Child of a regular symbol&colon; should be traversed as usual
 |===
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -492,10 +481,9 @@ struct also&lowbar;regular;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#regular-also_regular-regular_as_well[`regular&lowbar;as&lowbar;well`] 
 | Grandchild of a regular symbol&colon; should be traversed as usual
 |===
diff --git a/test-files/golden-tests/filters/symbol-name/extraction-mode.html b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
index c99c5acbc5..2f5a29f0eb 100644
--- a/test-files/golden-tests/filters/symbol-name/extraction-mode.html
+++ b/test-files/golden-tests/filters/symbol-name/extraction-mode.html
@@ -13,8 +13,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -28,8 +27,7 @@ <h2>Namespace Aliases</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -44,8 +42,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -59,8 +56,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -84,8 +80,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -99,8 +94,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -132,8 +126,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -182,8 +175,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -343,8 +335,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -358,8 +349,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -538,8 +528,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -588,8 +577,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc b/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc
index 043588a56c..6a1b77ec52 100644
--- a/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc
+++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.adoc
@@ -6,10 +6,9 @@
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N0[`N0`] 
 | This namespace should extracted because it&apos;s implied by `N0&colon;&colon;f0&lowbar;WL`
 | link:#N1[`N1`] 
@@ -20,10 +19,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#C[`C`] 
 | This namespace should be included because it strictly matches `C`
 |===
@@ -35,10 +33,9 @@ This namespace should extracted because it&apos;s implied by `N0&colon;&colon;f0
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N0-f0_WL[`f0&lowbar;WL`] 
 | This function should be included because it matches `N0&colon;&colon;f0&lowbar;WL`
 |===
@@ -65,10 +62,9 @@ This namespace should extracted because it&apos;s implied by `N1&colon;&colon;N3
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N1-N3_WL[`N3&lowbar;WL`] 
 | This namespace should extracted because it&apos;s explicitly included by `N1&colon;&colon;N3&lowbar;WL`
 | link:#N1-N4[`N4`] 
@@ -82,10 +78,9 @@ This namespace should extracted because it&apos;s explicitly included by `N1&col
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N1-N3_WL-f1_WL[`f1&lowbar;WL`] 
 | This function should extracted because the namespace `N1&colon;&colon;N3&lowbar;WL` is included as a literal&period;
 |===
@@ -112,10 +107,9 @@ This namespace should extracted because it&apos;s implied by `N1&colon;&colon;N4
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N1-N4-f1_WL[`f1&lowbar;WL`] 
 | This function should extracted because it matches `N1&colon;&colon;N4&colon;&colon;f1&lowbar;WL`
 |===
@@ -142,10 +136,9 @@ This namespace should extracted because it&apos;s implied by `N5&colon;&colon;N6
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N5-N6[`N6`] 
 | This namespace should extracted because it&apos;s implied by `N5&colon;&colon;N6&colon;&colon;&ast;7`
 |===
@@ -157,10 +150,9 @@ This namespace should extracted because it&apos;s implied by `N5&colon;&colon;N6
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N5-N6-M7[`M7`] 
 | This namespace should be included because it matches `N5&colon;&colon;N6&colon;&colon;&ast;7`
 | link:#N5-N6-N7[`N7`] 
@@ -174,10 +166,9 @@ This namespace should be included because it matches `N5&colon;&colon;N6&colon;&
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N5-N6-M7-f2_WL[`f2&lowbar;WL`] 
 | This function should be included because it&apos;s a member of `M7`, which matches `N5&colon;&colon;N6&colon;&colon;&ast;7`
 |===
@@ -204,10 +195,9 @@ This namespace should be included because it matches `N5&colon;&colon;N6&colon;&
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N5-N6-N7-f2_WL[`f2&lowbar;WL`] 
 | This function should be included because it&apos;s a member of `N7`, which matches `N5&colon;&colon;N6&colon;&colon;&ast;7`
 |===
@@ -243,20 +233,18 @@ struct C;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#C-D[`D`] 
 | This struct should be included because it&apos;s a member of `C`
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#C-f0_WL[`f0&lowbar;WL`] 
 | This function should be included because it&apos;s a member of `C`
 |===
@@ -277,10 +265,9 @@ struct D;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#C-D-f1_WL[`f1&lowbar;WL`] 
 | This function should be included because it&apos;s a member of `D`
 |===
diff --git a/test-files/golden-tests/filters/symbol-name/whitelist_0.html b/test-files/golden-tests/filters/symbol-name/whitelist_0.html
index 230852e3f5..e407a86a61 100644
--- a/test-files/golden-tests/filters/symbol-name/whitelist_0.html
+++ b/test-files/golden-tests/filters/symbol-name/whitelist_0.html
@@ -13,8 +13,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -29,8 +28,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -51,8 +49,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -90,8 +87,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -113,8 +109,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -152,8 +147,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -191,8 +185,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -213,8 +206,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -236,8 +228,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -275,8 +266,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -322,8 +312,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -336,8 +325,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -368,8 +356,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/brief/brief-1.adoc b/test-files/golden-tests/javadoc/brief/brief-1.adoc
index f57e3d4837..0f4e1e82a4 100644
--- a/test-files/golden-tests/javadoc/brief/brief-1.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-1.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f5[`f5`] 
 | brief *bold* it continues to the line&period;
 | link:#f6[`f6`] 
diff --git a/test-files/golden-tests/javadoc/brief/brief-1.html b/test-files/golden-tests/javadoc/brief/brief-1.html
index bbd45a71df..41666ab56b 100644
--- a/test-files/golden-tests/javadoc/brief/brief-1.html
+++ b/test-files/golden-tests/javadoc/brief/brief-1.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/brief/brief-2.adoc b/test-files/golden-tests/javadoc/brief/brief-2.adoc
index c750a9d8ef..b185dd4e7b 100644
--- a/test-files/golden-tests/javadoc/brief/brief-2.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-2.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | brief
 | link:#f2[`f2`] 
diff --git a/test-files/golden-tests/javadoc/brief/brief-2.html b/test-files/golden-tests/javadoc/brief/brief-2.html
index e1cd4c8d5c..94a92d510a 100644
--- a/test-files/golden-tests/javadoc/brief/brief-2.html
+++ b/test-files/golden-tests/javadoc/brief/brief-2.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.adoc b/test-files/golden-tests/javadoc/brief/brief-3.adoc
index ca43fd6e0b..669ae336f7 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-3.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0c[`f`] 
 | `f` overloads
 |===
diff --git a/test-files/golden-tests/javadoc/brief/brief-3.html b/test-files/golden-tests/javadoc/brief/brief-3.html
index 159fa6c371..86775b32dd 100644
--- a/test-files/golden-tests/javadoc/brief/brief-3.html
+++ b/test-files/golden-tests/javadoc/brief/brief-3.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/brief/brief-5.adoc b/test-files/golden-tests/javadoc/brief/brief-5.adoc
index 89bab7a6e5..3d5602fb4b 100644
--- a/test-files/golden-tests/javadoc/brief/brief-5.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-5.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | brief
 | link:#f1[`f1`] 
diff --git a/test-files/golden-tests/javadoc/brief/brief-5.html b/test-files/golden-tests/javadoc/brief/brief-5.html
index c17730c232..9b17d8f5d7 100644
--- a/test-files/golden-tests/javadoc/brief/brief-5.html
+++ b/test-files/golden-tests/javadoc/brief/brief-5.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/brief/brief-6.adoc b/test-files/golden-tests/javadoc/brief/brief-6.adoc
index 32fdb0a852..629479ff1c 100644
--- a/test-files/golden-tests/javadoc/brief/brief-6.adoc
+++ b/test-files/golden-tests/javadoc/brief/brief-6.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | brief
 |===
diff --git a/test-files/golden-tests/javadoc/brief/brief-6.html b/test-files/golden-tests/javadoc/brief/brief-6.html
index 828cd5d17f..38b9413a63 100644
--- a/test-files/golden-tests/javadoc/brief/brief-6.html
+++ b/test-files/golden-tests/javadoc/brief/brief-6.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/code/code.adoc b/test-files/golden-tests/javadoc/code/code.adoc
index cf2ba54f22..b4e1b75c1b 100644
--- a/test-files/golden-tests/javadoc/code/code.adoc
+++ b/test-files/golden-tests/javadoc/code/code.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | brief
 |===
diff --git a/test-files/golden-tests/javadoc/code/code.html b/test-files/golden-tests/javadoc/code/code.html
index d131fd881c..5fd8849b7c 100644
--- a/test-files/golden-tests/javadoc/code/code.html
+++ b/test-files/golden-tests/javadoc/code/code.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copybrief/copybrief.adoc b/test-files/golden-tests/javadoc/copybrief/copybrief.adoc
index 9966872077..78ef036c01 100644
--- a/test-files/golden-tests/javadoc/copybrief/copybrief.adoc
+++ b/test-files/golden-tests/javadoc/copybrief/copybrief.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | brief1
 | link:#f2[`f2`] 
diff --git a/test-files/golden-tests/javadoc/copybrief/copybrief.html b/test-files/golden-tests/javadoc/copybrief/copybrief.html
index 7c1af691aa..be7d6ca9c2 100644
--- a/test-files/golden-tests/javadoc/copybrief/copybrief.html
+++ b/test-files/golden-tests/javadoc/copybrief/copybrief.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydetails/copydetails.adoc b/test-files/golden-tests/javadoc/copydetails/copydetails.adoc
index 6334cf3cf0..747e9b3c9c 100644
--- a/test-files/golden-tests/javadoc/copydetails/copydetails.adoc
+++ b/test-files/golden-tests/javadoc/copydetails/copydetails.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#dest[`dest`] 
 | Destination doc function
 | link:#destOverride[`destOverride`] 
@@ -52,10 +51,10 @@ A nice integer
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | The template parameter A&period;
 | *B*
@@ -64,10 +63,10 @@ A nice integer
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The parameter a&period;
 | *b*
@@ -120,7 +119,7 @@ Parameter b is not copied because it doesn&apos;t exist in the destination funct
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -134,10 +133,10 @@ An integer meaning something else&period;
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | Overwrites the template parameter A&period;
 | *C*
@@ -148,10 +147,10 @@ An integer meaning something else&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Overwrites the parameter a&period;
 | *c*
@@ -198,7 +197,7 @@ This is the documentation from the source function&period;
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -212,10 +211,10 @@ A nice integer
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | The template parameter A&period;
 | *B*
@@ -224,10 +223,10 @@ A nice integer
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The parameter a&period;
 | *b*
diff --git a/test-files/golden-tests/javadoc/copydetails/copydetails.html b/test-files/golden-tests/javadoc/copydetails/copydetails.html
index 9553453870..9f4f6c5cf0 100644
--- a/test-files/golden-tests/javadoc/copydetails/copydetails.html
+++ b/test-files/golden-tests/javadoc/copydetails/copydetails.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.adoc b/test-files/golden-tests/javadoc/copydoc/conversion.adoc
index 7e4beb24d9..e8432cd300 100644
--- a/test-files/golden-tests/javadoc/copydoc/conversion.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/conversion.adoc
@@ -28,10 +28,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-operator_assign-04[`operator&equals;`] 
 | Convert a string to A
 | link:#A-2conversion-02[`operator string&lowbar;type`] 
@@ -77,10 +76,10 @@ A representation of the string
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The string to convert
 |===
@@ -106,10 +105,10 @@ A representation of the string
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The string to convert
 |===
@@ -135,10 +134,10 @@ A representation of the string
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The string to convert
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/conversion.html b/test-files/golden-tests/javadoc/copydoc/conversion.html
index 5152c5e244..46ecf90d4a 100644
--- a/test-files/golden-tests/javadoc/copydoc/conversion.html
+++ b/test-files/golden-tests/javadoc/copydoc/conversion.html
@@ -41,8 +41,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
index dd1319dc21..9ceb9e6f4d 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#bar[`bar`] 
 | Brief from `foo()`
 | link:#foo-02[`foo`] 
@@ -42,10 +41,10 @@ A boolean value&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | An array of integers&period;
 |===
@@ -99,10 +98,10 @@ A boolean value&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | An integer&period;
 |===
@@ -147,10 +146,10 @@ foo(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | An integer&period;
 |===
@@ -181,10 +180,10 @@ A boolean value&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | An array of integers&period;
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/decay-params.html b/test-files/golden-tests/javadoc/copydoc/decay-params.html
index e54937b47d..b28ca5427d 100644
--- a/test-files/golden-tests/javadoc/copydoc/decay-params.html
+++ b/test-files/golden-tests/javadoc/copydoc/decay-params.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
index 7c1a5a42a3..a2205a55b8 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0c[`f`] 
 | `f` overloads
 | link:#g[`g`] 
@@ -51,10 +50,10 @@ link:#f-04[f](long a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Fail param
 |===
@@ -76,10 +75,10 @@ f(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Fail param
 |===
@@ -105,10 +104,10 @@ Details
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Param description
 |===
@@ -134,10 +133,10 @@ Details
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Param description
 |===
@@ -163,10 +162,10 @@ Details
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Param description
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/fundamental.html b/test-files/golden-tests/javadoc/copydoc/fundamental.html
index e364ef8f5e..049d481153 100644
--- a/test-files/golden-tests/javadoc/copydoc/fundamental.html
+++ b/test-files/golden-tests/javadoc/copydoc/fundamental.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.adoc b/test-files/golden-tests/javadoc/copydoc/no-param.adoc
index b6523e9c6f..eba4864efc 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#copyFromNoParam[`copyFromNoParam`] 
 | Brief from `foo()`
 | link:#copyfromOverloads[`copyfromOverloads`] 
@@ -107,10 +106,10 @@ A boolean value&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *ch*
 | A character&period;
 |===
@@ -165,10 +164,10 @@ A boolean value&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *ch*
 | A character&period;
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/no-param.html b/test-files/golden-tests/javadoc/copydoc/no-param.html
index 03b44d62d1..6a36f60c5e 100644
--- a/test-files/golden-tests/javadoc/copydoc/no-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/no-param.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
index dd7aab7914..a43defd0aa 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
@@ -26,10 +26,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-operator_call-08[`operator()`] 
 | Return true if ch is in the character set&period;
 |===
@@ -73,10 +72,10 @@ True if ch is in the set, otherwise false&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *ch*
 | The signed character to test&period;
 |===
@@ -107,10 +106,10 @@ True if ch is in the set, otherwise false&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *ch*
 | The signed character to test&period;
 |===
@@ -141,10 +140,10 @@ True if ch is in the set, otherwise false&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *ch*
 | The unsigned character to test&period;
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.html b/test-files/golden-tests/javadoc/copydoc/operator-param.html
index 101eafeeeb..b50f8ff151 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.adoc b/test-files/golden-tests/javadoc/copydoc/param-types.adoc
index 4e55b48dcd..31892d6f1f 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.adoc
@@ -6,20 +6,18 @@
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N[`N`] 
 | Namespace to test qualified identifier parameters&period;
 |===
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | Struct to test explicit object member functions&period;
 | link:#paramType[`paramType`] 
@@ -36,10 +34,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0c7[`f`] 
 | `f` overloads
 | link:#g-0f[`g`] 
@@ -53,10 +50,9 @@ Namespace to test qualified identifier parameters&period;
 
 === Namespaces
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-M[`M`] 
 | Namespace to test qualified identifier parameters&period;
 |===
@@ -68,10 +64,9 @@ Namespace to test qualified identifier parameters&period;
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-M-Q[`Q`] 
 | Struct to test qualified identifier parameters&period;
 |===
@@ -92,7 +87,7 @@ struct Q;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -116,10 +111,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f[`f`] 
 | Reference member function&period;
 | link:#A-g[`g`] 
@@ -128,7 +122,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -159,10 +153,10 @@ This reference uses the `this` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -190,10 +184,10 @@ Documentation for a function with an explicit object parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *self*
 | The object to operate on
 | *a*
@@ -217,7 +211,7 @@ struct paramType;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -255,7 +249,7 @@ enum testEnum;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -384,10 +378,10 @@ link:#f-081[f](link:#paramType[paramType&lt;9&gt;] a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of f
 |===
@@ -434,10 +428,10 @@ This function uses a reference with no parameters&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of f
 |===
@@ -465,10 +459,10 @@ This reference uses the `void` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of f
 |===
@@ -496,10 +490,10 @@ This reference uses the `&period;&period;&period;` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -527,10 +521,10 @@ This reference uses the `int` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -558,10 +552,10 @@ This reference uses the `auto` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -589,10 +583,10 @@ This reference uses the `decltype` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -620,10 +614,10 @@ This reference uses the `struct` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -651,10 +645,10 @@ This reference uses the `enum` keyword&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -682,10 +676,10 @@ This reference uses the qualified identifier `N&colon;&colon;M&colon;&colon;Q`&p
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -780,10 +774,10 @@ link:#g-0c[g](
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 | *b*
@@ -811,10 +805,10 @@ Documentation for a function with a struct parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -840,10 +834,10 @@ Documentation for a function with a qualified identifier parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -869,10 +863,10 @@ Documentation for a function with an `auto` parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -898,10 +892,10 @@ Documentation for a function with an enum parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -927,10 +921,10 @@ Documentation for the variadic function&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -956,10 +950,10 @@ Documentation for the non&hyphen;variadic function&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 |===
@@ -987,10 +981,10 @@ Documentation for a function with a `decltype` parameter&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter of g
 | *b*
diff --git a/test-files/golden-tests/javadoc/copydoc/param-types.html b/test-files/golden-tests/javadoc/copydoc/param-types.html
index 8643bebd66..52fee942b0 100644
--- a/test-files/golden-tests/javadoc/copydoc/param-types.html
+++ b/test-files/golden-tests/javadoc/copydoc/param-types.html
@@ -13,8 +13,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -27,8 +26,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -55,8 +53,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -78,8 +75,7 @@ <h2>Namespaces</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -100,8 +96,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -162,8 +157,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.adoc b/test-files/golden-tests/javadoc/copydoc/qualified.adoc
index 8e2497b3ce..4e11c1a1d0 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.adoc
@@ -14,10 +14,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#param_t[`param&lowbar;t`] 
 | Helper class for distinct parameter types
 |===
@@ -55,10 +54,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#N-A-f-05[`f`] 
 | Reference function
 | link:#N-A-g-06e[`g`] 
@@ -178,10 +176,10 @@ link:#N-A-f-07[f](link:#param_t[param&lowbar;t&lt;7&gt;] a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -207,10 +205,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -236,10 +234,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -265,10 +263,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -294,10 +292,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -323,10 +321,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -352,10 +350,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -381,10 +379,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -410,10 +408,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -451,10 +449,10 @@ link:#N-A-g-06c[g](int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -480,10 +478,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -509,10 +507,10 @@ Function with same number of parameters but different types&period; This should
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Fundamental type parameter
 |===
@@ -550,10 +548,10 @@ link:#N-A-h-06[h](int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -579,10 +577,10 @@ Documentation for the reference function
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Qualified param
 |===
@@ -608,10 +606,10 @@ Function with same number of parameters but different types&period; This should
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Fundamental type parameter
 |===
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.html b/test-files/golden-tests/javadoc/copydoc/qualified.html
index cba3c4c461..324b8deebf 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.html
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.html
@@ -26,8 +26,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -84,8 +83,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc b/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc
index 2a4fa3d648..36f322a4be 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.adoc
@@ -35,10 +35,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-begin-03[`begin`] 
 | `begin` overloads
 | link:#A-cbegin[`cbegin`] 
diff --git a/test-files/golden-tests/javadoc/copydoc/qualifiers.html b/test-files/golden-tests/javadoc/copydoc/qualifiers.html
index 4f6e94688d..f58c19d762 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualifiers.html
+++ b/test-files/golden-tests/javadoc/copydoc/qualifiers.html
@@ -53,8 +53,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc b/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
index 68b0b0127b..afd606c725 100644
--- a/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/template-arguments.adoc
@@ -17,10 +17,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-B-08[`B`] 
 | Main class template for B&period;
 | link:#A-B-09[`B&lt;int&gt;`] 
@@ -96,10 +95,10 @@ using B&lowbar;t = link:#A-B-08[B&lt;T, I&gt;];
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type parameter&period;
 |===
@@ -151,10 +150,10 @@ using C&lowbar;t = link:#A-C-05[C&lt;T, B&gt;];
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type parameter&period;
 |===
@@ -178,10 +177,10 @@ struct B;
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type parameter&period;
 | *int*
@@ -237,10 +236,10 @@ struct C;
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type parameter&period;
 | *bool*
diff --git a/test-files/golden-tests/javadoc/copydoc/template-arguments.html b/test-files/golden-tests/javadoc/copydoc/template-arguments.html
index 68cde37f70..fc9c6d9e15 100644
--- a/test-files/golden-tests/javadoc/copydoc/template-arguments.html
+++ b/test-files/golden-tests/javadoc/copydoc/template-arguments.html
@@ -31,8 +31,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/inline/styled.adoc b/test-files/golden-tests/javadoc/inline/styled.adoc
index 9e3d150fa8..5400943323 100644
--- a/test-files/golden-tests/javadoc/inline/styled.adoc
+++ b/test-files/golden-tests/javadoc/inline/styled.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | Brief for A
 |===
@@ -30,10 +29,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-compare[`compare`] 
 | Compare function
 |===
@@ -65,10 +63,10 @@ compare(link:#A[A] const& other) const noexcept;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The other object to compare against&period;
 |===
diff --git a/test-files/golden-tests/javadoc/inline/styled.html b/test-files/golden-tests/javadoc/inline/styled.html
index e83d4787b4..397066c8a5 100644
--- a/test-files/golden-tests/javadoc/inline/styled.html
+++ b/test-files/golden-tests/javadoc/inline/styled.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -43,8 +42,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/link/link.adoc b/test-files/golden-tests/javadoc/link/link.adoc
index 779a13a3e2..ffb3397f83 100644
--- a/test-files/golden-tests/javadoc/link/link.adoc
+++ b/test-files/golden-tests/javadoc/link/link.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A function with a link
 |===
diff --git a/test-files/golden-tests/javadoc/link/link.html b/test-files/golden-tests/javadoc/link/link.html
index 3dacd95ed8..73d29f255d 100644
--- a/test-files/golden-tests/javadoc/link/link.html
+++ b/test-files/golden-tests/javadoc/link/link.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/lists/li.adoc b/test-files/golden-tests/javadoc/lists/li.adoc
index 3e38bd9b68..8585f02b36 100644
--- a/test-files/golden-tests/javadoc/lists/li.adoc
+++ b/test-files/golden-tests/javadoc/lists/li.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A function
 |===
diff --git a/test-files/golden-tests/javadoc/lists/li.html b/test-files/golden-tests/javadoc/lists/li.html
index 9cb8586da0..4862d5a569 100644
--- a/test-files/golden-tests/javadoc/lists/li.html
+++ b/test-files/golden-tests/javadoc/lists/li.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/lists/listitem.adoc b/test-files/golden-tests/javadoc/lists/listitem.adoc
index a74b97c285..c727985220 100644
--- a/test-files/golden-tests/javadoc/lists/listitem.adoc
+++ b/test-files/golden-tests/javadoc/lists/listitem.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | 
 | link:#f1[`f1`] 
diff --git a/test-files/golden-tests/javadoc/lists/listitem.html b/test-files/golden-tests/javadoc/lists/listitem.html
index b93f8d64a6..40612534f4 100644
--- a/test-files/golden-tests/javadoc/lists/listitem.html
+++ b/test-files/golden-tests/javadoc/lists/listitem.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/paragraph/par-1.adoc b/test-files/golden-tests/javadoc/paragraph/par-1.adoc
index d5175acf14..58f40b65b8 100644
--- a/test-files/golden-tests/javadoc/paragraph/par-1.adoc
+++ b/test-files/golden-tests/javadoc/paragraph/par-1.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | Brief
 | link:#f2[`f2`] 
diff --git a/test-files/golden-tests/javadoc/paragraph/par-1.html b/test-files/golden-tests/javadoc/paragraph/par-1.html
index bdb6f9aa08..7a8006c3f5 100644
--- a/test-files/golden-tests/javadoc/paragraph/par-1.html
+++ b/test-files/golden-tests/javadoc/paragraph/par-1.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/paragraph/para-1.adoc b/test-files/golden-tests/javadoc/paragraph/para-1.adoc
index b00d9e6741..7fb8d8b445 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-1.adoc
+++ b/test-files/golden-tests/javadoc/paragraph/para-1.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | 
 | link:#f2[`f2`] 
diff --git a/test-files/golden-tests/javadoc/paragraph/para-1.html b/test-files/golden-tests/javadoc/paragraph/para-1.html
index 6395d4af02..25ef27a696 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-1.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-1.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/paragraph/para-2.adoc b/test-files/golden-tests/javadoc/paragraph/para-2.adoc
index f4bac0919c..2a0e90963c 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-2.adoc
+++ b/test-files/golden-tests/javadoc/paragraph/para-2.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | brief
 |===
diff --git a/test-files/golden-tests/javadoc/paragraph/para-2.html b/test-files/golden-tests/javadoc/paragraph/para-2.html
index 11116750ea..59db832058 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-2.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-2.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/paragraph/para-3.adoc b/test-files/golden-tests/javadoc/paragraph/para-3.adoc
index 9124317779..829a73b733 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-3.adoc
+++ b/test-files/golden-tests/javadoc/paragraph/para-3.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#my_function[`my&lowbar;function`] 
 | A function
 |===
diff --git a/test-files/golden-tests/javadoc/paragraph/para-3.html b/test-files/golden-tests/javadoc/paragraph/para-3.html
index a19e0cdb31..cae5d205ca 100644
--- a/test-files/golden-tests/javadoc/paragraph/para-3.html
+++ b/test-files/golden-tests/javadoc/paragraph/para-3.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/param/param-1.adoc b/test-files/golden-tests/javadoc/param/param-1.adoc
index 4e3f5f0386..05ea9e5d10 100644
--- a/test-files/golden-tests/javadoc/param/param-1.adoc
+++ b/test-files/golden-tests/javadoc/param/param-1.adoc
@@ -31,10 +31,10 @@ f0(int i);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i*
 | int
 |===
@@ -54,10 +54,10 @@ f1(int i);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i* [in]
 | int
 |===
@@ -77,10 +77,10 @@ f2(int& i);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i* [out]
 | int
 |===
@@ -100,10 +100,10 @@ f3(int& i);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i* [inout]
 | int
 |===
@@ -125,10 +125,10 @@ f4(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i,j*
 | numbers
 |===
diff --git a/test-files/golden-tests/javadoc/param/param-direction.adoc b/test-files/golden-tests/javadoc/param/param-direction.adoc
index a70c0068d4..56475fd382 100644
--- a/test-files/golden-tests/javadoc/param/param-direction.adoc
+++ b/test-files/golden-tests/javadoc/param/param-direction.adoc
@@ -36,10 +36,10 @@ f(int x0);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x0*
 | An integer `x0`
 |===
@@ -61,10 +61,10 @@ g(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x1*
 | An integer `x1`
 | *y1* [in]
@@ -88,10 +88,10 @@ h(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x2*
 | An integer `x2`
 | *y2* [out]
@@ -115,10 +115,10 @@ i(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x3* [in]
 | An integer `x3`
 | *y3* [out]
@@ -142,10 +142,10 @@ j(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x4*
 | An integer `x4`
 | *y4* [inout]
@@ -170,10 +170,10 @@ k(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x5* [out]
 | An integer `x5`
 | *y5* [in]
@@ -201,10 +201,10 @@ l(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x6* [out]
 | An integer `x6`
 | *y6*
@@ -230,10 +230,10 @@ m(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x7* [in]
 | An integer `x7`
 | *y7* [out]
@@ -255,10 +255,10 @@ n(int x8);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x8* [in]
 | An integer `x8`
 |===
@@ -278,10 +278,10 @@ o(int x9);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x9* [in]
 | An integer `x9`
 | *x9* [out]
diff --git a/test-files/golden-tests/javadoc/param/param-duplicate.adoc b/test-files/golden-tests/javadoc/param/param-duplicate.adoc
index d07ec01517..78a8cc4d88 100644
--- a/test-files/golden-tests/javadoc/param/param-duplicate.adoc
+++ b/test-files/golden-tests/javadoc/param/param-duplicate.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | f0 brief
 | link:#f1[`f1`] 
@@ -81,10 +80,10 @@ g0(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | one
 | *a*
@@ -108,10 +107,10 @@ g1(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | one
 | *b*
@@ -136,10 +135,10 @@ h0();
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | one
 | *T*
@@ -164,10 +163,10 @@ h1();
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | one
 | *U*
diff --git a/test-files/golden-tests/javadoc/param/param-duplicate.html b/test-files/golden-tests/javadoc/param/param-duplicate.html
index 607e9361ee..7d65d083fe 100644
--- a/test-files/golden-tests/javadoc/param/param-duplicate.html
+++ b/test-files/golden-tests/javadoc/param/param-duplicate.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/param/param.adoc b/test-files/golden-tests/javadoc/param/param.adoc
index f1e7bb06fe..336b04744e 100644
--- a/test-files/golden-tests/javadoc/param/param.adoc
+++ b/test-files/golden-tests/javadoc/param/param.adoc
@@ -30,10 +30,10 @@ f(int x);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | An integer `x`
 |===
@@ -55,10 +55,10 @@ g(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | An integer `x`
 | *y*
@@ -83,10 +83,10 @@ h(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | An integer `x`
 | *y*
@@ -114,10 +114,10 @@ i(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *w*
 | An integer `w`
 | *x*
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.adoc b/test-files/golden-tests/javadoc/ref/broken-ref.adoc
index 68b03ec6cc..9620600841 100644
--- a/test-files/golden-tests/javadoc/ref/broken-ref.adoc
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | 
 | link:#f1[`f1`] 
diff --git a/test-files/golden-tests/javadoc/ref/broken-ref.html b/test-files/golden-tests/javadoc/ref/broken-ref.html
index c5d4c4ca5f..70800723f0 100644
--- a/test-files/golden-tests/javadoc/ref/broken-ref.html
+++ b/test-files/golden-tests/javadoc/ref/broken-ref.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/ref/parent_context.adoc b/test-files/golden-tests/javadoc/ref/parent_context.adoc
index af8e530e79..9e4bc24f38 100644
--- a/test-files/golden-tests/javadoc/ref/parent_context.adoc
+++ b/test-files/golden-tests/javadoc/ref/parent_context.adoc
@@ -58,10 +58,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#boost-openmethod-policies-runtime_checks-runtime_checks[`runtime&lowbar;checks`] 
 | Documentation with ref to final&lowbar;virtual&lowbar;ptr
 |===
diff --git a/test-files/golden-tests/javadoc/ref/parent_context.html b/test-files/golden-tests/javadoc/ref/parent_context.html
index b571eebf89..ce746d9eb0 100644
--- a/test-files/golden-tests/javadoc/ref/parent_context.html
+++ b/test-files/golden-tests/javadoc/ref/parent_context.html
@@ -98,8 +98,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/ref/punctuation.adoc b/test-files/golden-tests/javadoc/ref/punctuation.adoc
index d4535aa27f..c5d3274126 100644
--- a/test-files/golden-tests/javadoc/ref/punctuation.adoc
+++ b/test-files/golden-tests/javadoc/ref/punctuation.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | 
 | link:#f1[`f1`] 
diff --git a/test-files/golden-tests/javadoc/ref/punctuation.html b/test-files/golden-tests/javadoc/ref/punctuation.html
index 7fcc227328..6774d9c261 100644
--- a/test-files/golden-tests/javadoc/ref/punctuation.html
+++ b/test-files/golden-tests/javadoc/ref/punctuation.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/ref/ref.adoc b/test-files/golden-tests/javadoc/ref/ref.adoc
index 0191e35d24..575993c937 100644
--- a/test-files/golden-tests/javadoc/ref/ref.adoc
+++ b/test-files/golden-tests/javadoc/ref/ref.adoc
@@ -22,10 +22,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | 
 | link:#f5[`f5`] 
@@ -39,10 +38,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-B[`B`] 
 | See link:#A-f1[`f1`]
 | link:#A-C[`C`] 
@@ -53,10 +51,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f1[`f1`] 
 | See link:#f0[`f0`]
 |===
@@ -126,10 +123,10 @@ struct C;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-D[`D`]
 | 
 |===
@@ -175,20 +172,19 @@ struct D
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#A-C[C]`
 | 
 |===
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-D-E[`E`] 
 | See link:#A-C-f3[`f3`]
 |===
diff --git a/test-files/golden-tests/javadoc/ref/ref.html b/test-files/golden-tests/javadoc/ref/ref.html
index 30eb752f08..3d86c2d696 100644
--- a/test-files/golden-tests/javadoc/ref/ref.html
+++ b/test-files/golden-tests/javadoc/ref/ref.html
@@ -39,8 +39,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -60,8 +59,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -76,8 +74,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -241,8 +238,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/relates/relates.adoc b/test-files/golden-tests/javadoc/relates/relates.adoc
index 51c0afc9a6..812bf30f0d 100644
--- a/test-files/golden-tests/javadoc/relates/relates.adoc
+++ b/test-files/golden-tests/javadoc/relates/relates.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | A brief for A&period;
 | link:#B[`B`] 
@@ -18,10 +17,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A brief for f&period;
 |===
@@ -42,7 +40,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/javadoc/relates/relates.html b/test-files/golden-tests/javadoc/relates/relates.html
index 1768c86ec0..4d095e09e1 100644
--- a/test-files/golden-tests/javadoc/relates/relates.html
+++ b/test-files/golden-tests/javadoc/relates/relates.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -28,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/returns/returns.adoc b/test-files/golden-tests/javadoc/returns/returns.adoc
index 671c43c1a7..e09c5470d4 100644
--- a/test-files/golden-tests/javadoc/returns/returns.adoc
+++ b/test-files/golden-tests/javadoc/returns/returns.adoc
@@ -14,10 +14,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A function with a single return value&period;
 | link:#g[`g`] 
@@ -50,7 +49,7 @@ struct pair;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/javadoc/returns/returns.html b/test-files/golden-tests/javadoc/returns/returns.html
index ff55927bd7..9d0f2dca28 100644
--- a/test-files/golden-tests/javadoc/returns/returns.html
+++ b/test-files/golden-tests/javadoc/returns/returns.html
@@ -26,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/throw/throw.adoc b/test-files/golden-tests/javadoc/throw/throw.adoc
index 017b960657..a9827574fa 100644
--- a/test-files/golden-tests/javadoc/throw/throw.adoc
+++ b/test-files/golden-tests/javadoc/throw/throw.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | brief
 |===
@@ -31,7 +30,7 @@ f();
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
diff --git a/test-files/golden-tests/javadoc/throw/throw.html b/test-files/golden-tests/javadoc/throw/throw.html
index e352355449..8c9245c766 100644
--- a/test-files/golden-tests/javadoc/throw/throw.html
+++ b/test-files/golden-tests/javadoc/throw/throw.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/javadoc/tparam/tparam-1.adoc b/test-files/golden-tests/javadoc/tparam/tparam-1.adoc
index d85a5ad004..328204b623 100644
--- a/test-files/golden-tests/javadoc/tparam/tparam-1.adoc
+++ b/test-files/golden-tests/javadoc/tparam/tparam-1.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f0[`f0`] 
 | 
 | link:#f1[`f1`] 
@@ -32,10 +31,10 @@ f0();
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | Template parameter `T`
 |===
@@ -62,10 +61,10 @@ desc
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | type
 |===
diff --git a/test-files/golden-tests/javadoc/tparam/tparam-1.html b/test-files/golden-tests/javadoc/tparam/tparam-1.html
index fd1ad2863b..de7a654dd6 100644
--- a/test-files/golden-tests/javadoc/tparam/tparam-1.html
+++ b/test-files/golden-tests/javadoc/tparam/tparam-1.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/snippets/distance.adoc b/test-files/golden-tests/snippets/distance.adoc
index 35c4040849..ecbede1f59 100644
--- a/test-files/golden-tests/snippets/distance.adoc
+++ b/test-files/golden-tests/snippets/distance.adoc
@@ -30,10 +30,10 @@ The distance between the two points
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x0*
 | The x&hyphen;coordinate of the first point
 | *y0*
diff --git a/test-files/golden-tests/snippets/is_prime.adoc b/test-files/golden-tests/snippets/is_prime.adoc
index 33eab6a6e3..5b719ee6a9 100644
--- a/test-files/golden-tests/snippets/is_prime.adoc
+++ b/test-files/golden-tests/snippets/is_prime.adoc
@@ -26,10 +26,10 @@ Whether `n` is prime&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *n*
 | The number to test
 |===
diff --git a/test-files/golden-tests/snippets/sqrt.adoc b/test-files/golden-tests/snippets/sqrt.adoc
index 5c35b2eebc..fdbd442eef 100644
--- a/test-files/golden-tests/snippets/sqrt.adoc
+++ b/test-files/golden-tests/snippets/sqrt.adoc
@@ -24,7 +24,7 @@ This function calculates the square root of a given integral value using bit man
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -38,20 +38,20 @@ The square root of the input value&period;
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The type of the input value&period; Must be an integral type&period;
 |===
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The integral value to compute the square root of&period;
 |===
diff --git a/test-files/golden-tests/symbols/enum/enum.adoc b/test-files/golden-tests/symbols/enum/enum.adoc
index 96972738b5..35c30cd0d1 100644
--- a/test-files/golden-tests/symbols/enum/enum.adoc
+++ b/test-files/golden-tests/symbols/enum/enum.adoc
@@ -6,10 +6,9 @@
 
 === Enums
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#E0[`E0`] 
 | E0 brief&period;
 | link:#E1[`E1`] 
@@ -36,10 +35,9 @@ enum E0;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | `e0` 
 | e0 brief&period;
 | `e1` 
@@ -87,10 +85,9 @@ enum class E2 : int;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | `e4` 
 | e4 brief&period;
 | `e5` 
diff --git a/test-files/golden-tests/symbols/enum/enum.html b/test-files/golden-tests/symbols/enum/enum.html
index 656077a9fe..2f1296047f 100644
--- a/test-files/golden-tests/symbols/enum/enum.html
+++ b/test-files/golden-tests/symbols/enum/enum.html
@@ -13,8 +13,7 @@ <h2>Enums</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -46,8 +45,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -108,8 +106,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/auto.adoc b/test-files/golden-tests/symbols/function/auto.adoc
index bf102041d6..ca071bfd57 100644
--- a/test-files/golden-tests/symbols/function/auto.adoc
+++ b/test-files/golden-tests/symbols/function/auto.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A function that uses auto
 |===
@@ -35,10 +34,10 @@ The result&period;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to use&period;
 |===
diff --git a/test-files/golden-tests/symbols/function/auto.html b/test-files/golden-tests/symbols/function/auto.html
index 9fff4e62ea..7e5daf5115 100644
--- a/test-files/golden-tests/symbols/function/auto.html
+++ b/test-files/golden-tests/symbols/function/auto.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc b/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc
index 7fd174b665..c62198534a 100644
--- a/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc
+++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.adoc
@@ -29,10 +29,9 @@ struct Explicit;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Explicit-2conversion[`operator bool`] 
 | Conversion to `bool`
 |===
@@ -71,10 +70,9 @@ struct ExplicitExpression;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitExpression-2conversion[`operator bool`] 
 | Conversion to `bool`
 |===
@@ -112,10 +110,9 @@ struct ExplicitFalse;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitFalse-2conversion[`operator bool`] 
 | Conversion to `bool`
 |===
@@ -153,10 +150,9 @@ struct ExplicitTrue;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitTrue-2conversion[`operator bool`] 
 | Conversion to `bool`
 |===
diff --git a/test-files/golden-tests/symbols/function/explicit-conv-operator.html b/test-files/golden-tests/symbols/function/explicit-conv-operator.html
index e8f80b4952..1c5980a814 100644
--- a/test-files/golden-tests/symbols/function/explicit-conv-operator.html
+++ b/test-files/golden-tests/symbols/function/explicit-conv-operator.html
@@ -42,8 +42,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -93,8 +92,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -143,8 +141,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -193,8 +190,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.adoc b/test-files/golden-tests/symbols/function/explicit-ctor.adoc
index 7760af0673..8456b03908 100644
--- a/test-files/golden-tests/symbols/function/explicit-ctor.adoc
+++ b/test-files/golden-tests/symbols/function/explicit-ctor.adoc
@@ -29,10 +29,9 @@ struct Explicit;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Explicit-2constructor-04[`Explicit`]         [.small]#[constructor]#
 | Constructors
 |===
@@ -124,10 +123,10 @@ Explicit(link:#Explicit[Explicit] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -149,10 +148,10 @@ Explicit(link:#Explicit[Explicit]&& other) noexcept;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -189,10 +188,9 @@ struct ExplicitExpression;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitExpression-2constructor-07[`ExplicitExpression`]         [.small]#[constructor]#
 | Constructors
 |===
@@ -284,10 +282,10 @@ ExplicitExpression(link:#ExplicitExpression[ExplicitExpression] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -309,10 +307,10 @@ ExplicitExpression(link:#ExplicitExpression[ExplicitExpression]&& other) noexcep
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -348,10 +346,9 @@ struct ExplicitFalse;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitFalse-2constructor-07[`ExplicitFalse`]         [.small]#[constructor]#
 | Constructors
 |===
@@ -443,10 +440,10 @@ ExplicitFalse(link:#ExplicitFalse[ExplicitFalse] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -468,10 +465,10 @@ ExplicitFalse(link:#ExplicitFalse[ExplicitFalse]&& other) noexcept;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
@@ -507,10 +504,9 @@ struct ExplicitTrue;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ExplicitTrue-2constructor-01[`ExplicitTrue`]         [.small]#[constructor]#
 | Constructors
 |===
@@ -602,10 +598,10 @@ ExplicitTrue(link:#ExplicitTrue[ExplicitTrue] const& other);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to copy construct from
 |===
@@ -627,10 +623,10 @@ ExplicitTrue(link:#ExplicitTrue[ExplicitTrue]&& other) noexcept;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *other*
 | The object to move construct from
 |===
diff --git a/test-files/golden-tests/symbols/function/explicit-ctor.html b/test-files/golden-tests/symbols/function/explicit-ctor.html
index 4f58082afc..96531a1c1d 100644
--- a/test-files/golden-tests/symbols/function/explicit-ctor.html
+++ b/test-files/golden-tests/symbols/function/explicit-ctor.html
@@ -42,8 +42,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -216,8 +215,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -389,8 +387,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -562,8 +559,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/mem-fn.adoc b/test-files/golden-tests/symbols/function/mem-fn.adoc
index de2cc298d3..c00b83e48c 100644
--- a/test-files/golden-tests/symbols/function/mem-fn.adoc
+++ b/test-files/golden-tests/symbols/function/mem-fn.adoc
@@ -450,10 +450,10 @@ struct T14;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#T17[`T17`]
 | 
 |===
@@ -554,10 +554,10 @@ struct T17
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#T14[T14]`
 | 
 |===
@@ -615,10 +615,10 @@ struct U;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#V[`V`]
 | 
 |===
@@ -681,10 +681,10 @@ struct V
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#U[U]`
 | 
 |===
diff --git a/test-files/golden-tests/symbols/function/merge-params.adoc b/test-files/golden-tests/symbols/function/merge-params.adoc
index b497953a42..3ef6914ed0 100644
--- a/test-files/golden-tests/symbols/function/merge-params.adoc
+++ b/test-files/golden-tests/symbols/function/merge-params.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | Function
 |===
@@ -33,10 +32,10 @@ f(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | The first parameter&period;
 | *b*
diff --git a/test-files/golden-tests/symbols/function/merge-params.html b/test-files/golden-tests/symbols/function/merge-params.html
index 284ca8c91b..58e78b6a81 100644
--- a/test-files/golden-tests/symbols/function/merge-params.html
+++ b/test-files/golden-tests/symbols/function/merge-params.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/merge-tparams.adoc b/test-files/golden-tests/symbols/function/merge-tparams.adoc
index db00998b10..aec8211ab4 100644
--- a/test-files/golden-tests/symbols/function/merge-tparams.adoc
+++ b/test-files/golden-tests/symbols/function/merge-tparams.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | Function
 |===
@@ -34,10 +33,10 @@ f();
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *T*
 | The first template parameter&period;
 | *U*
diff --git a/test-files/golden-tests/symbols/function/merge-tparams.html b/test-files/golden-tests/symbols/function/merge-tparams.html
index 79b3bd85bf..21f8ec3c03 100644
--- a/test-files/golden-tests/symbols/function/merge-tparams.html
+++ b/test-files/golden-tests/symbols/function/merge-tparams.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/noreturn.adoc b/test-files/golden-tests/symbols/function/noreturn.adoc
index b17fb0d15e..51b74956b2 100644
--- a/test-files/golden-tests/symbols/function/noreturn.adoc
+++ b/test-files/golden-tests/symbols/function/noreturn.adoc
@@ -50,10 +50,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f1[f1]`
 | 
 |===
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.adoc b/test-files/golden-tests/symbols/function/overloaded-op-1.adoc
index 5a261dd679..dee61cb23a 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-1.adoc
+++ b/test-files/golden-tests/symbols/function/overloaded-op-1.adoc
@@ -26,10 +26,9 @@ struct T;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#T-operator_plus[`operator&plus;`] 
 | Unary plus operator
 |===
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-1.html b/test-files/golden-tests/symbols/function/overloaded-op-1.html
index 48d60685d7..c50c7c1aed 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-1.html
+++ b/test-files/golden-tests/symbols/function/overloaded-op-1.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.adoc b/test-files/golden-tests/symbols/function/overloaded-op-2.adoc
index 42342bf985..73f52112a8 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-2.adoc
+++ b/test-files/golden-tests/symbols/function/overloaded-op-2.adoc
@@ -26,10 +26,9 @@ struct T;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#T-operator_plus[`operator&plus;`] 
 | Addition operator
 |===
@@ -55,10 +54,10 @@ Another instance of the object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
diff --git a/test-files/golden-tests/symbols/function/overloaded-op-2.html b/test-files/golden-tests/symbols/function/overloaded-op-2.html
index 781b25ac11..396e92acaf 100644
--- a/test-files/golden-tests/symbols/function/overloaded-op-2.html
+++ b/test-files/golden-tests/symbols/function/overloaded-op-2.html
@@ -39,8 +39,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/function/sfinae.adoc b/test-files/golden-tests/symbols/function/sfinae.adoc
index 8a7b8d406c..b99b0f67cd 100644
--- a/test-files/golden-tests/symbols/function/sfinae.adoc
+++ b/test-files/golden-tests/symbols/function/sfinae.adoc
@@ -14,10 +14,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-09[`A`] 
 | The partial specialization of A is enabled via a template parameter
 | link:#A-07[`A&lt;T&gt;`] 
@@ -30,10 +29,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f1[`f1`] 
 | Enabled via return type
 | link:#f10[`f10`] 
@@ -81,7 +79,7 @@ struct C;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
diff --git a/test-files/golden-tests/symbols/function/sfinae.html b/test-files/golden-tests/symbols/function/sfinae.html
index 334c5c3c80..c2554f2da2 100644
--- a/test-files/golden-tests/symbols/function/sfinae.html
+++ b/test-files/golden-tests/symbols/function/sfinae.html
@@ -26,8 +26,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -43,8 +42,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
index cff108b02a..a0080c7024 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | Overload briefs from function or operator classes
 | link:#B[`B`] 
@@ -18,10 +17,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#no_way_to_infer_this_brief-04[`no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief`] 
 | `no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief` overloads
 | link:#operator_plus-09[`operator&plus;`] 
@@ -46,10 +44,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-2constructor-0f[`A`]         [.small]#[constructor]#
 | Constructors
 | link:#A-operator_assign-04c[`operator&equals;`] 
@@ -62,7 +59,7 @@ struct A;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -101,10 +98,10 @@ link:#A-2constructor-01[A](int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -139,10 +136,10 @@ A(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -184,10 +181,10 @@ link:#A-operator_assign-06[operator&equals;](int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -213,10 +210,10 @@ operator&equals;(link:#A[A] const& a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -242,10 +239,10 @@ operator&equals;(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe b
 |===
@@ -287,10 +284,10 @@ link:#A-operator_plus-0e[operator&plus;](link:#A[A] const& a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -316,10 +313,10 @@ operator&plus;(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -345,10 +342,10 @@ operator&plus;(link:#A[A] const& a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -436,10 +433,10 @@ Result
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *rhs*
 | The right operand
 |===
@@ -460,7 +457,7 @@ struct B;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -501,10 +498,10 @@ link:#no_way_to_infer_this_brief-01[no&lowbar;way&lowbar;to&lowbar;infer&lowbar;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -541,10 +538,10 @@ no&lowbar;way&lowbar;to&lowbar;infer&lowbar;this&lowbar;brief(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -605,10 +602,10 @@ Result
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The operand
 |===
@@ -634,10 +631,10 @@ Result
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The operand
 |===
@@ -677,10 +674,10 @@ link:#sameBrief-0e[sameBrief](
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 | *b*
@@ -704,10 +701,10 @@ sameBrief(int a);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -731,10 +728,10 @@ sameBrief(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a again
 | *b*
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html
index 7878e8958d..38ee08db4f 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -28,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -60,8 +58,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
index 75a9b39415..22ad027650 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.adoc
@@ -6,10 +6,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0c[`f`] 
 | Test function
 |===
@@ -66,7 +65,7 @@ link:#f-02[f](
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -83,10 +82,10 @@ link:#f-02[f](
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | Describe A
 | *B*
@@ -95,10 +94,10 @@ link:#f-02[f](
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 | *b*
@@ -139,7 +138,7 @@ f(int a);
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -153,20 +152,20 @@ The number corresponding to a
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | Describe A
 |===
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a
 |===
@@ -206,10 +205,10 @@ The number corresponding to a
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a again
 |===
@@ -240,7 +239,7 @@ f(
 
 === Exceptions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Thrown on
@@ -254,10 +253,10 @@ The number corresponding to a and b
 
 === Template Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *A*
 | Describe A again
 | *B*
@@ -266,10 +265,10 @@ The number corresponding to a and b
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *a*
 | Describe a again
 | *b*
diff --git a/test-files/golden-tests/symbols/overloads/overloads-metadata.html b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
index 0c547a9374..7b3b6af1c6 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-metadata.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-metadata.html
@@ -13,8 +13,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
index 4880f82e3d..da5b8ae98c 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
@@ -46,10 +46,9 @@ class A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#left_shift-A-operator_lshift-00[`operator&lt;&lt;`] 
 | Left shift operators
 |===
@@ -106,10 +105,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *shift*
 | The right operand
 |===
@@ -135,10 +134,10 @@ Reference to the current object
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *shift*
 | The right operand
 |===
@@ -173,10 +172,9 @@ operator&lt;&lt;(
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#ostream-operator_lshift-0f[`operator&lt;&lt;`] 
 | Stream insertion operators
 |===
@@ -195,10 +193,10 @@ class B;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#ostream-operator_lshift-0d[ostream::operator&lt;&lt;]`
 | Stream insertion operator
 |===
@@ -229,7 +227,7 @@ class OStream;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -297,10 +295,10 @@ Reference to the current output stream
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *os*
 | An output stream
 | *value*
@@ -330,10 +328,10 @@ Reference to the current output stream
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *os*
 | An output stream
 | *value*
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
index 16ff20b5f8..1ce068dbbc 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
@@ -71,8 +71,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -225,8 +224,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc
index 5dd6b59df4..21cdd18c28 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads.adoc
@@ -15,10 +15,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0c[`f`] 
 | 
 | link:#operator_eq-073[`operator&equals;&equals;`] 
@@ -55,10 +54,10 @@ struct A;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#operator_eq-0e[operator&equals;&equals;]`
 | Equality operator
 | `link:#operator_eq-0a[operator&equals;&equals;]`
@@ -185,7 +184,7 @@ struct B;
 
 === Non-Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
 | Name
 | Description
@@ -330,10 +329,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -363,10 +362,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -396,10 +395,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
@@ -429,10 +428,10 @@ operator&equals;&equals;(
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *lhs*
 | The left operand
 | *rhs*
diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html
index 8ca5961eaa..9ed3fab044 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.html
+++ b/test-files/golden-tests/symbols/overloads/overloads.html
@@ -27,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
index 06a0621bda..3c6c2f5cbe 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
@@ -117,10 +117,10 @@ struct R0
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0cf[S0&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -157,10 +157,10 @@ struct R1
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0be[S0&lt;0&gt;]`
 | 
 |===
@@ -180,10 +180,10 @@ struct R10
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-08-S1-S2-08-S4[S0&lt;10&gt;::S1::S2&lt;11&gt;::S4&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -203,10 +203,10 @@ struct R11
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0e-S1-S2-02-S4-0c[S0&lt;12&gt;::S1::S2&lt;13&gt;::S4&lt;14&gt;]`
 | 
 |===
@@ -226,10 +226,10 @@ struct R12
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09e4-S1-S2-02-S4-00[S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, void*&gt;]`
 | 
 |===
@@ -249,10 +249,10 @@ struct R13
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09e4-S1-S2-02-S4-02[S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, int*&gt;]`
 | 
 |===
@@ -272,10 +272,10 @@ struct R14
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-07a-S5[S0&lt;18&gt;::S5&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -295,10 +295,10 @@ struct R15
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0a7-S5-07[S0&lt;19&gt;::S5&lt;20&gt;]`
 | 
 |===
@@ -318,10 +318,10 @@ struct R16
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0314-S5-07[S0&lt;21&gt;::S5&lt;22, void*&gt;]`
 | 
 |===
@@ -341,10 +341,10 @@ struct R17
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0314-S5-03[S0&lt;21&gt;::S5&lt;22, int*&gt;]`
 | 
 |===
@@ -364,10 +364,10 @@ struct R18
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-058-S5-09-S6[S0&lt;23&gt;::S5&lt;24&gt;::S6]`
 | 
 |===
@@ -387,10 +387,10 @@ struct R19
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0a2-S5-02-S6-S7[S0&lt;25&gt;::S5&lt;26&gt;::S6::S7&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -410,10 +410,10 @@ struct R2
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0cf[S0&lt;1, void*&gt;]`
 | 
 |===
@@ -450,10 +450,10 @@ struct R20
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09e2-S5-0c-S6-S7-0b[S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, void*&gt;]`
 | 
 |===
@@ -473,10 +473,10 @@ struct R21
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09e2-S5-0c-S6-S7-0d[S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, int*&gt;]`
 | 
 |===
@@ -496,10 +496,10 @@ struct R22
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-01-S5-04-S6-S7-05[S0&lt;30&gt;::S5&lt;31&gt;::S6::S7&lt;32&gt;]`
 | 
 |===
@@ -519,10 +519,10 @@ struct R23
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09ee-S5-02-S6-S7-03-S8[S0&lt;33&gt;::S5&lt;34&gt;::S6::S7&lt;35&gt;::S8]`
 | 
 |===
@@ -542,10 +542,10 @@ struct R24
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-033-S5-0f-S6-S7-0d-S9[S0&lt;36&gt;::S5&lt;37&gt;::S6::S7&lt;38&gt;::S9&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -565,10 +565,10 @@ struct R25
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-06-S5-07-S6-S7-0a-S9-05[S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, void*&gt;]`
 | 
 |===
@@ -588,10 +588,10 @@ struct R26
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-06-S5-07-S6-S7-0a-S9-08[S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, int*&gt;]`
 | 
 |===
@@ -611,10 +611,10 @@ struct R27
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0ba-S5-08-S6-S7-02-S9-0f[S0&lt;43&gt;::S5&lt;44&gt;::S6::S7&lt;45&gt;::S9&lt;46&gt;]`
 | 
 |===
@@ -634,10 +634,10 @@ struct R28
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0cf[S0&lt;0, bool&gt;]`
 | 
 |===
@@ -674,10 +674,10 @@ struct R29
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0cf[S0&lt;1, int&gt;]`
 | 
 |===
@@ -714,10 +714,10 @@ struct R3
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-020a[S0&lt;1, int*&gt;]`
 | 
 |===
@@ -737,10 +737,10 @@ struct R30
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-03c-S1[S0&lt;2, bool&gt;::S1]`
 | 
 |===
@@ -779,10 +779,10 @@ struct R31
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-092-S1-S2[S0&lt;3, bool&gt;::S1::S2&lt;I, T&gt;]`
 | 
 |===
@@ -802,10 +802,10 @@ struct R32
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0b6-S1-S2[S0&lt;4, bool&gt;::S1::S2&lt;5, bool&gt;]`
 | 
 |===
@@ -825,10 +825,10 @@ struct R33
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-023-S1-S2[S0&lt;6, bool&gt;::S1::S2&lt;7, int&gt;]`
 | 
 |===
@@ -848,10 +848,10 @@ struct R34
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-04-S1-S2-0a-S3[S0&lt;8, bool&gt;::S1::S2&lt;9, bool&gt;::S3]`
 | 
 |===
@@ -882,10 +882,10 @@ struct R35
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-05a-S1-S2-0b-S4[S0&lt;10, bool&gt;::S1::S2&lt;11, bool&gt;::S4&lt;I, T&gt;]`
 | 
 |===
@@ -905,10 +905,10 @@ struct R36
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0cd-S1-S2-05-S4[S0&lt;12, bool&gt;::S1::S2&lt;13, bool&gt;::S4&lt;14, bool&gt;]`
 | 
 |===
@@ -928,10 +928,10 @@ struct R37
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-000-S1-S2-03-S4[S0&lt;15, bool&gt;::S1::S2&lt;16, bool&gt;::S4&lt;17, int&gt;]`
 | 
 |===
@@ -954,10 +954,10 @@ struct R38
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-051-S5[S0&lt;18, bool&gt;::S5&lt;I, T&gt;]`
 | 
 |===
@@ -977,10 +977,10 @@ struct R39
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-002-S5[S0&lt;19, bool&gt;::S5&lt;20, bool&gt;]`
 | 
 |===
@@ -1000,10 +1000,10 @@ struct R4
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09c-S1[S0&lt;2&gt;::S1]`
 | 
 |===
@@ -1023,10 +1023,10 @@ struct R40
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-003-S5[S0&lt;21, bool&gt;::S5&lt;22, int&gt;]`
 | 
 |===
@@ -1046,10 +1046,10 @@ struct R41
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0c7-S5-0f-S6[S0&lt;23, bool&gt;::S5&lt;24, bool&gt;::S6]`
 | 
 |===
@@ -1088,10 +1088,10 @@ struct R42
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0529f-S5-05c-S6-S7[S0&lt;25, bool&gt;::S5&lt;26, bool&gt;::S6::S7&lt;I, T&gt;]`
 | 
 |===
@@ -1111,10 +1111,10 @@ struct R43
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-007-S5-0d-S6-S7[S0&lt;27, bool&gt;::S5&lt;28, bool&gt;::S6::S7&lt;29, int&gt;]`
 | 
 |===
@@ -1134,10 +1134,10 @@ struct R44
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-021-S5-0b-S6-S7[S0&lt;30, bool&gt;::S5&lt;31, bool&gt;::S6::S7&lt;32, bool&gt;]`
 | 
 |===
@@ -1157,10 +1157,10 @@ struct R45
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0318-S5-0b-S6-S7-05-S8[S0&lt;33, bool&gt;::S5&lt;34, bool&gt;::S6::S7&lt;35, bool&gt;::S8]`
 | 
 |===
@@ -1191,10 +1191,10 @@ struct R46
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0d-S5-0b-S6-S7-0d-S9[S0&lt;36, bool&gt;::S5&lt;37, bool&gt;::S6::S7&lt;38, bool&gt;::S9&lt;I, T&gt;]`
 | 
 |===
@@ -1214,10 +1214,10 @@ struct R47
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0206-S5-08-S6-S7-01-S9[S0&lt;39, bool&gt;::S5&lt;40, bool&gt;::S6::S7&lt;41, bool&gt;::S9&lt;42, int&gt;]`
 | 
 |===
@@ -1237,10 +1237,10 @@ struct R48
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-05291-S5-0e-S6-S7-0f-S9[S0&lt;43, bool&gt;::S5&lt;44, bool&gt;::S6::S7&lt;45, bool&gt;::S9&lt;46, bool&gt;]`
 | 
 |===
@@ -1260,10 +1260,10 @@ struct R5
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-073-S1-S2[S0&lt;3&gt;::S1::S2&lt;&hyphen;1&gt;]`
 | 
 |===
@@ -1283,10 +1283,10 @@ struct R6
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0a1-S1-S2-0f[S0&lt;4&gt;::S1::S2&lt;5&gt;]`
 | 
 |===
@@ -1306,10 +1306,10 @@ struct R7
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-07e-S1-S2-04[S0&lt;6&gt;::S1::S2&lt;7, void*&gt;]`
 | 
 |===
@@ -1329,10 +1329,10 @@ struct R8
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-07e-S1-S2-07[S0&lt;6&gt;::S1::S2&lt;7, int*&gt;]`
 | 
 |===
@@ -1352,10 +1352,10 @@ struct R9
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0a3-S1-S2-0c-S3[S0&lt;8&gt;::S1::S2&lt;9&gt;::S3]`
 | 
 |===
@@ -1394,10 +1394,10 @@ struct S0;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R0[`R0`]
 | 
 | link:#R2[`R2`]
@@ -1790,10 +1790,10 @@ struct link:#S0-0cf[S0]&lt;0&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R1[`R1`]
 | 
 |===
@@ -1931,10 +1931,10 @@ struct S4;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R10[`R10`]
 | 
 |===
@@ -2140,10 +2140,10 @@ struct link:#S0-0cf-S1-S2-S4[S4]&lt;14&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R11[`R11`]
 | 
 |===
@@ -2337,10 +2337,10 @@ struct S4;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R12[`R12`]
 | 
 |===
@@ -2360,10 +2360,10 @@ struct link:#S0-0cf-S1-S2-S4[S4]&lt;17, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R13[`R13`]
 | 
 |===
@@ -2494,10 +2494,10 @@ struct S5;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R14[`R14`]
 | 
 |===
@@ -2588,10 +2588,10 @@ struct link:#S0-0cf-S5[S5]&lt;20&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R15[`R15`]
 | 
 |===
@@ -2653,10 +2653,10 @@ struct S1;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R4[`R4`]
 | 
 |===
@@ -2750,10 +2750,10 @@ struct S5;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R16[`R16`]
 | 
 |===
@@ -2773,10 +2773,10 @@ struct link:#S0-0cf-S5[S5]&lt;22, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R17[`R17`]
 | 
 |===
@@ -2908,10 +2908,10 @@ struct S6;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R18[`R18`]
 | 
 |===
@@ -3074,10 +3074,10 @@ struct S7;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R19[`R19`]
 | 
 |===
@@ -3255,10 +3255,10 @@ struct S7;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R20[`R20`]
 | 
 |===
@@ -3278,10 +3278,10 @@ struct link:#S0-0cf-S5-S6-S7[S7]&lt;29, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R21[`R21`]
 | 
 |===
@@ -3413,10 +3413,10 @@ struct S2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R5[`R5`]
 | 
 |===
@@ -3608,10 +3608,10 @@ struct link:#S0-0cf-S5-S6-S7[S7]&lt;32&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R22[`R22`]
 | 
 |===
@@ -3830,10 +3830,10 @@ struct S8;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R23[`R23`]
 | 
 |===
@@ -4095,10 +4095,10 @@ struct S9;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R24[`R24`]
 | 
 |===
@@ -4347,10 +4347,10 @@ struct S9;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R25[`R25`]
 | 
 |===
@@ -4370,10 +4370,10 @@ struct link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R26[`R26`]
 | 
 |===
@@ -4532,10 +4532,10 @@ struct link:#S0-0cf-S1-S2[S2]&lt;5&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R6[`R6`]
 | 
 |===
@@ -4785,10 +4785,10 @@ struct link:#S0-0cf-S5-S6-S7-S9[S9]&lt;46&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R27[`R27`]
 | 
 |===
@@ -4922,10 +4922,10 @@ struct S2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R7[`R7`]
 | 
 |===
@@ -4945,10 +4945,10 @@ struct link:#S0-0cf-S1-S2[S2]&lt;7, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R8[`R8`]
 | 
 |===
@@ -5125,10 +5125,10 @@ struct S3;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R9[`R9`]
 | 
 |===
@@ -5217,10 +5217,10 @@ struct link:#S0-0cf[S0]&lt;1, int*&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R3[`R3`]
 | 
 |===
@@ -5358,10 +5358,10 @@ struct S4;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R35[`R35`]
 | 
 |===
@@ -5553,10 +5553,10 @@ struct S4;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R36[`R36`]
 | 
 |===
@@ -5748,10 +5748,10 @@ struct S4;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R37[`R37`]
 | 
 |===
@@ -5869,10 +5869,10 @@ struct S5;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R38[`R38`]
 | 
 |===
@@ -5949,10 +5949,10 @@ struct S5;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R39[`R39`]
 | 
 |===
@@ -6030,10 +6030,10 @@ struct S1;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R30[`R30`]
 | 
 |===
@@ -6153,10 +6153,10 @@ struct S5;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R40[`R40`]
 | 
 |===
@@ -6291,10 +6291,10 @@ struct S6;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R41[`R41`]
 | 
 |===
@@ -6485,10 +6485,10 @@ struct S7;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R42[`R42`]
 | 
 |===
@@ -6664,10 +6664,10 @@ struct S7;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R43[`R43`]
 | 
 |===
@@ -6786,10 +6786,10 @@ struct S2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R31[`R31`]
 | 
 |===
@@ -6967,10 +6967,10 @@ struct S7;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R44[`R44`]
 | 
 |===
@@ -7197,10 +7197,10 @@ struct S8;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R45[`R45`]
 | 
 |===
@@ -7475,10 +7475,10 @@ struct S9;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R46[`R46`]
 | 
 |===
@@ -7725,10 +7725,10 @@ struct S9;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R47[`R47`]
 | 
 |===
@@ -7860,10 +7860,10 @@ struct S2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R32[`R32`]
 | 
 |===
@@ -8099,10 +8099,10 @@ struct S9;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R48[`R48`]
 | 
 |===
@@ -8234,10 +8234,10 @@ struct S2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R33[`R33`]
 | 
 |===
@@ -8409,10 +8409,10 @@ struct S3;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R34[`R34`]
 | 
 |===
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.adoc b/test-files/golden-tests/symbols/record/conditional-explicit.adoc
index 9bbad65325..47259c624a 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.adoc
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.adoc
@@ -27,10 +27,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-2constructor-0f[`A`]         [.small]#[constructor]#
 | Constructors
 | link:#A-2conversion-0f[`operator U`] 
@@ -113,10 +112,10 @@ A(char value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -138,10 +137,10 @@ A(int value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -162,10 +161,10 @@ A(double value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The value to construct from
 |===
@@ -188,10 +187,10 @@ A(U value);
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *value*
 | The object to construct from
 |===
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.html b/test-files/golden-tests/symbols/record/conditional-explicit.html
index f61115e392..2405361010 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.html
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.html
@@ -40,8 +40,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/dtor-overloads.adoc b/test-files/golden-tests/symbols/record/dtor-overloads.adoc
index 191bbac162..273d0e9ca3 100644
--- a/test-files/golden-tests/symbols/record/dtor-overloads.adoc
+++ b/test-files/golden-tests/symbols/record/dtor-overloads.adoc
@@ -27,10 +27,9 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-2destructor-02[`&#126;A`] [.small]#[destructor]#
 | Destructors
 |===
diff --git a/test-files/golden-tests/symbols/record/dtor-overloads.html b/test-files/golden-tests/symbols/record/dtor-overloads.html
index 56b0e810e6..f8fe76c8de 100644
--- a/test-files/golden-tests/symbols/record/dtor-overloads.html
+++ b/test-files/golden-tests/symbols/record/dtor-overloads.html
@@ -40,8 +40,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/final-class.adoc b/test-files/golden-tests/symbols/record/final-class.adoc
index aba13a3322..65c5480e4c 100644
--- a/test-files/golden-tests/symbols/record/final-class.adoc
+++ b/test-files/golden-tests/symbols/record/final-class.adoc
@@ -57,10 +57,10 @@ class A3 final
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#B1[B1]`
 | 
 | `link:#B2[B2]`
@@ -81,10 +81,10 @@ class B1;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A3[`A3`]
 | 
 |===
@@ -103,10 +103,10 @@ class B2;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A3[`A3`]
 | 
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-duplicate.adoc b/test-files/golden-tests/symbols/record/friend-duplicate.adoc
index 8defca43c5..d61694b728 100644
--- a/test-files/golden-tests/symbols/record/friend-duplicate.adoc
+++ b/test-files/golden-tests/symbols/record/friend-duplicate.adoc
@@ -35,10 +35,10 @@ class A;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | 
 | `link:#B[B]`
diff --git a/test-files/golden-tests/symbols/record/friend-excluded.adoc b/test-files/golden-tests/symbols/record/friend-excluded.adoc
index 53f678dc03..df2066e4cc 100644
--- a/test-files/golden-tests/symbols/record/friend-excluded.adoc
+++ b/test-files/golden-tests/symbols/record/friend-excluded.adoc
@@ -35,10 +35,10 @@ class A;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | 
 | `link:#B[B]`
diff --git a/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc b/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
index 0b4fa80344..634990f94a 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.adoc
@@ -14,10 +14,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | f
 |===
@@ -36,10 +35,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | f
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn-has-docs.html b/test-files/golden-tests/symbols/record/friend-fn-has-docs.html
index a4691fa19f..cced3ec4bc 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-has-docs.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-has-docs.html
@@ -26,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.adoc b/test-files/golden-tests/symbols/record/friend-fn-member.adoc
index 3912a58c65..5c8ddc5f9b 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-member.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.adoc
@@ -27,10 +27,10 @@ struct U;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#X-foo[X::foo]`
 | Friend member&hyphen;function
 | `link:#X-2destructor[X::&#126;X]`
@@ -53,10 +53,9 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2constructor[`X`]         [.small]#[constructor]#
 | Default constructor
 | link:#X-2destructor[`&#126;X`] [.small]#[destructor]#
@@ -114,10 +113,10 @@ char&ast;
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *i*
 | Description of i
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn-member.html b/test-files/golden-tests/symbols/record/friend-fn-member.html
index 99c31a5978..7adfe8bf01 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-member.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-member.html
@@ -81,8 +81,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
index 25fb3386b7..371abe0f4b 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.adoc
@@ -15,10 +15,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | U&colon;&colon;f
 |===
@@ -37,10 +36,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | U&colon;&colon;f
 |===
@@ -59,10 +58,10 @@ struct U;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | U&colon;&colon;f
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
index 4612bceb82..5fa2e7041d 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-2nd.html
@@ -27,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
index 797db5e7bf..4f75ae9279 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.adoc
@@ -15,10 +15,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | f
 |===
@@ -37,10 +36,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | f
 |===
@@ -59,10 +58,10 @@ struct U;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | f
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi-free.html b/test-files/golden-tests/symbols/record/friend-fn-multi-free.html
index f0483d0a0a..75b2a87031 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi-free.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi-free.html
@@ -27,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi.adoc b/test-files/golden-tests/symbols/record/friend-fn-multi.adoc
index 7213779359..aa59d8b91d 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.adoc
@@ -15,10 +15,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | T&colon;&colon;f
 |===
@@ -37,10 +36,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | T&colon;&colon;f
 |===
@@ -59,10 +58,10 @@ struct U;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | T&colon;&colon;f
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn-multi.html b/test-files/golden-tests/symbols/record/friend-fn-multi.html
index 394c48ea36..6d31ef62ec 100644
--- a/test-files/golden-tests/symbols/record/friend-fn-multi.html
+++ b/test-files/golden-tests/symbols/record/friend-fn-multi.html
@@ -27,8 +27,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-fn.adoc b/test-files/golden-tests/symbols/record/friend-fn.adoc
index f96187e279..298068a123 100644
--- a/test-files/golden-tests/symbols/record/friend-fn.adoc
+++ b/test-files/golden-tests/symbols/record/friend-fn.adoc
@@ -14,10 +14,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | f
 |===
@@ -36,10 +35,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#f[f]`
 | f
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-fn.html b/test-files/golden-tests/symbols/record/friend-fn.html
index 74b6369f04..1911934fc9 100644
--- a/test-files/golden-tests/symbols/record/friend-fn.html
+++ b/test-files/golden-tests/symbols/record/friend-fn.html
@@ -26,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/friend-type.adoc b/test-files/golden-tests/symbols/record/friend-type.adoc
index cf369bcebf..aff55306ce 100644
--- a/test-files/golden-tests/symbols/record/friend-type.adoc
+++ b/test-files/golden-tests/symbols/record/friend-type.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#T[`T`] 
 | Struct T brief
 | link:#U[`U`] 
@@ -36,10 +35,10 @@ struct T;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#Z[Z]`
 | Friend class Z brief
 |===
@@ -60,10 +59,10 @@ struct U;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#T[T]`
 | Struct T brief
 |===
@@ -84,10 +83,10 @@ struct V;
 
 === Friends
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#U[U]`
 | Struct U brief
 |===
diff --git a/test-files/golden-tests/symbols/record/friend-type.html b/test-files/golden-tests/symbols/record/friend-type.html
index 888899cee1..0f4354b62c 100644
--- a/test-files/golden-tests/symbols/record/friend-type.html
+++ b/test-files/golden-tests/symbols/record/friend-type.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/local-class.adoc b/test-files/golden-tests/symbols/record/local-class.adoc
index 808d702225..bef0eb1120 100644
--- a/test-files/golden-tests/symbols/record/local-class.adoc
+++ b/test-files/golden-tests/symbols/record/local-class.adoc
@@ -35,10 +35,10 @@ struct B
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `decltype(f())`
 | 
 |===
diff --git a/test-files/golden-tests/symbols/record/record-1.adoc b/test-files/golden-tests/symbols/record/record-1.adoc
index e8fb9f0247..57afcab6fc 100644
--- a/test-files/golden-tests/symbols/record/record-1.adoc
+++ b/test-files/golden-tests/symbols/record/record-1.adoc
@@ -45,10 +45,9 @@ struct T;
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#T-g1[`g1`] 
 | brief&hyphen;g1
 | link:#T-g2[`g2`] 
@@ -179,10 +178,10 @@ the separator
 
 === Parameters
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | *x*
 | any old number
 |===
diff --git a/test-files/golden-tests/symbols/record/record-1.html b/test-files/golden-tests/symbols/record/record-1.html
index babe66e443..0aace6f81a 100644
--- a/test-files/golden-tests/symbols/record/record-1.html
+++ b/test-files/golden-tests/symbols/record/record-1.html
@@ -69,8 +69,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/record/record-inheritance.adoc b/test-files/golden-tests/symbols/record/record-inheritance.adoc
index 2a9d0c5a5b..9d0b7c9803 100644
--- a/test-files/golden-tests/symbols/record/record-inheritance.adoc
+++ b/test-files/golden-tests/symbols/record/record-inheritance.adoc
@@ -41,10 +41,10 @@ class C0;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#C2[`C2`]
 | 
 |===
@@ -77,10 +77,10 @@ class C2
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#C0[C0]`
 | 
 |===
@@ -100,10 +100,10 @@ class C3
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#C0[C0]`
 | 
 |===
@@ -136,10 +136,10 @@ class C5
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#C7[`C7`]
 | 
 |===
@@ -159,10 +159,10 @@ class C6
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#C7[`C7`]
 | 
 |===
@@ -183,10 +183,10 @@ class C7
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#C5[C5]`
 | 
 | `link:#C6[C6]`
@@ -207,10 +207,10 @@ struct S0;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#S2[`S2`]
 | 
 |===
@@ -229,10 +229,10 @@ struct S1;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#S3[`S3`]
 | 
 |===
@@ -252,20 +252,20 @@ struct S2
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0[S0]`
 | 
 |===
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#S4[`S4`]
 | 
 |===
@@ -285,20 +285,20 @@ struct S3
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S1[S1]`
 | 
 |===
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#S4[`S4`]
 | 
 |===
@@ -319,10 +319,10 @@ struct S4
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S2[S2]`
 | 
 | `link:#S3[S3]`
@@ -345,10 +345,10 @@ struct S5
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S1[S1]`
 | 
 |===
@@ -369,10 +369,10 @@ struct S6
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `Ts&period;&period;&period;`
 | 
 |===
diff --git a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
index e83107f5a9..05ecc912f3 100644
--- a/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
+++ b/test-files/golden-tests/symbols/record/template-specialization-inheritance.adoc
@@ -73,10 +73,10 @@ struct R0
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-0c[S0&lt;1&gt;]`
 | 
 |===
@@ -104,10 +104,10 @@ struct R1
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-09-S1[S0&lt;2&gt;::S1]`
 | 
 |===
@@ -127,10 +127,10 @@ struct R2
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#S0-073[S0&lt;3&gt;]`
 | 
 |===
@@ -160,10 +160,10 @@ struct S0;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R0[`R0`]
 | 
 |===
@@ -215,10 +215,10 @@ struct S1;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R1[`R1`]
 | 
 |===
@@ -238,10 +238,10 @@ struct link:#S0-0c[S0]&lt;3&gt;;
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#R2[`R2`]
 | 
 |===
diff --git a/test-files/golden-tests/symbols/record/unnamed.adoc b/test-files/golden-tests/symbols/record/unnamed.adoc
index ded90cd2ba..2a7d098cc8 100644
--- a/test-files/golden-tests/symbols/record/unnamed.adoc
+++ b/test-files/golden-tests/symbols/record/unnamed.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#_01record-01[`Unnamed struct`] 
 | 
 | link:#_01record-0f[`Unnamed struct`] 
@@ -18,10 +17,9 @@
 
 === Variables
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#F[`F`] 
 | 
 | link:#x[`x`] 
@@ -79,10 +77,9 @@ struct Unnamed struct;
 
 === Data Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#_01record-0f-a[`a`] 
 | A test field&period;
 |===
diff --git a/test-files/golden-tests/symbols/record/unnamed.html b/test-files/golden-tests/symbols/record/unnamed.html
index b896bf0c24..6f3e804e6b 100644
--- a/test-files/golden-tests/symbols/record/unnamed.html
+++ b/test-files/golden-tests/symbols/record/unnamed.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -28,8 +27,7 @@ <h2>Variables</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -102,8 +100,7 @@ <h2>Data Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc b/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc
index 85fc9d0339..0cacfee3ca 100644
--- a/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc
+++ b/test-files/golden-tests/symbols/typedef/dependency-propagation.adoc
@@ -100,10 +100,10 @@ struct E
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#N-C[N::C&lt;int&gt;]`
 | 
 |===
diff --git a/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.adoc b/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.adoc
index 3f177aa462..67e7e0f369 100644
--- a/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.adoc
+++ b/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.adoc
@@ -45,10 +45,9 @@ enum class E : int;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | `e1` 
 | The constant to be introduced
 |===
diff --git a/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.html b/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.html
index 185a41ec58..6c133496ab 100644
--- a/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.html
+++ b/test-files/golden-tests/symbols/using-enum/using-enum-in-ns.html
@@ -70,8 +70,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/using-enum/using-enum-in-record.adoc b/test-files/golden-tests/symbols/using-enum/using-enum-in-record.adoc
index c6bfbdf944..a6fd1956c7 100644
--- a/test-files/golden-tests/symbols/using-enum/using-enum-in-record.adoc
+++ b/test-files/golden-tests/symbols/using-enum/using-enum-in-record.adoc
@@ -53,10 +53,9 @@ enum class E : int;
 
 === Members
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | `e1` 
 | The constant to be introduced
 |===
diff --git a/test-files/golden-tests/symbols/using-enum/using-enum-in-record.html b/test-files/golden-tests/symbols/using-enum/using-enum-in-record.html
index c82b82025f..4e5e7433ca 100644
--- a/test-files/golden-tests/symbols/using-enum/using-enum-in-record.html
+++ b/test-files/golden-tests/symbols/using-enum/using-enum-in-record.html
@@ -83,8 +83,7 @@ <h2>Members</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 7420b025a0..06386e1a4e 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-after.adoc
@@ -14,10 +14,9 @@
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | f overloads are also available in the global namespace
 |===
@@ -27,10 +26,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f-08[`f`] 
 | `f` overloads
 |===
@@ -118,10 +116,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f-01[A::f]
 | A shadow declaration
 |===
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 427bb5e20b..960114b71b 100644
--- a/test-files/golden-tests/symbols/using/using-function-after.html
+++ b/test-files/golden-tests/symbols/using/using-function-after.html
@@ -26,8 +26,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -45,8 +44,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 8ccc328114..94c55fbcb3 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
@@ -14,10 +14,9 @@
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | A using declaration that shadows a function and the record&period;
 |===
@@ -27,20 +26,18 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f-05[`f`] 
 | A record
 |===
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f-01[`f`] 
 | A function
 |===
@@ -90,10 +87,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f-05[A::f]
 | A record
 | link:#A-f-01[A::f]
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 ff574f1b1b..c96834895c 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
@@ -26,8 +26,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -45,8 +44,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -59,8 +57,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 cc16ff33bd..f76ad35721 100644
--- a/test-files/golden-tests/symbols/using/using-function-excluded.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-excluded.adoc
@@ -6,10 +6,9 @@
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | Using excluded function f
 |===
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 6f1bf0cbfd..10a6d3d189 100644
--- a/test-files/golden-tests/symbols/using/using-function-excluded.html
+++ b/test-files/golden-tests/symbols/using/using-function-excluded.html
@@ -13,8 +13,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 71e3488287..68550d3580 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
@@ -14,10 +14,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f-0f[`f`] 
 | Local overload
 |===
@@ -35,10 +34,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f-08[`f`] 
 | `f` overloads
 |===
@@ -163,10 +161,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f-08[A::f]
 | `f` overloads
 |===
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 3106947709..e47cb7797d 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
@@ -26,8 +26,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -58,8 +57,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 d54d4e5339..4eb48f957c 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.adoc
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.adoc
@@ -14,10 +14,9 @@
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | Using the overloads from namespace A
 |===
@@ -27,10 +26,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f-08[`f`] 
 | `f` overloads
 |===
@@ -142,10 +140,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f-08[A::f]
 | `f` overloads
 |===
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 5f7ca2c1e7..8e960f62e8 100644
--- a/test-files/golden-tests/symbols/using/using-function-overloads.html
+++ b/test-files/golden-tests/symbols/using/using-function-overloads.html
@@ -26,8 +26,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -45,8 +44,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/using/using-function.adoc b/test-files/golden-tests/symbols/using/using-function.adoc
index 21040ec46c..483cedd1c9 100644
--- a/test-files/golden-tests/symbols/using/using-function.adoc
+++ b/test-files/golden-tests/symbols/using/using-function.adoc
@@ -14,10 +14,9 @@
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#f[`f`] 
 | f is also available in the global namespace
 |===
@@ -27,10 +26,9 @@
 
 === Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f[`f`] 
 | Function being used
 |===
@@ -66,10 +64,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f[A::f]
 | Function being used
 |===
diff --git a/test-files/golden-tests/symbols/using/using-function.html b/test-files/golden-tests/symbols/using/using-function.html
index 8be038c769..734396ff2e 100644
--- a/test-files/golden-tests/symbols/using/using-function.html
+++ b/test-files/golden-tests/symbols/using/using-function.html
@@ -26,8 +26,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -45,8 +44,7 @@ <h2>Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
diff --git a/test-files/golden-tests/symbols/using/using-member-conversion.adoc b/test-files/golden-tests/symbols/using/using-member-conversion.adoc
index a7f80d828f..f17a6f20dc 100644
--- a/test-files/golden-tests/symbols/using/using-member-conversion.adoc
+++ b/test-files/golden-tests/symbols/using/using-member-conversion.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X[`X`] 
 | This struct will be inherited as public
 | link:#Y[`Y`] 
@@ -48,20 +47,19 @@ struct X;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2conversion[`operator fun&lowbar;ptr`] 
 | Conversion operator to function pointer&period;
 |===
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#Y[`Y`]
 | This struct inherits from X
 |===
@@ -101,30 +99,28 @@ struct Y
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#X[X]`
 | This struct will be inherited as public
 |===
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#X-2conversion[`operator fun&lowbar;ptr`] 
 | Conversion operator to function pointer&period;
 |===
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#Y-2conversion[`operator void(&ast;)()`] 
 | Bring X&colon;&colon;operator fun&lowbar;ptr into Y&period;
 |===
@@ -145,10 +141,10 @@ using X::operator void(&ast;)();
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#X-2conversion[X::operator fun&lowbar;ptr]
 | Conversion operator to function pointer&period;
 |===
diff --git a/test-files/golden-tests/symbols/using/using-member-conversion.html b/test-files/golden-tests/symbols/using/using-member-conversion.html
index 3a84fcbd2a..60c81947b9 100644
--- a/test-files/golden-tests/symbols/using/using-member-conversion.html
+++ b/test-files/golden-tests/symbols/using/using-member-conversion.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -61,8 +60,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -143,8 +141,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -157,8 +154,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
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 86f6916a83..85a3847b11 100644
--- a/test-files/golden-tests/symbols/using/using-member-function.adoc
+++ b/test-files/golden-tests/symbols/using/using-member-function.adoc
@@ -6,10 +6,9 @@
 
 === Types
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A[`A`] 
 | This struct will be inherited as public
 | link:#B[`B`] 
@@ -44,20 +43,19 @@ struct A;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f[`f`] 
 | Public member function f taking a Tag&lt;0&gt;&period;
 |===
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#U[`U`]
 | This struct inherits from A, B, C, D, E, and F in various ways,
 |===
@@ -97,20 +95,19 @@ struct B;
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#B-f[`f`] 
 | Protected member function f taking a Tag&lt;1&gt;&period;
 |===
 
 === Derived Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#U[`U`]
 | This struct inherits from A, B, C, D, E, and F in various ways,
 |===
@@ -146,10 +143,9 @@ struct C;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#C-f[`f`] 
 | Public member function f taking a Tag&lt;2&gt;&period;
 |===
@@ -185,10 +181,9 @@ struct D;
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#D-f[`f`] 
 | Protected member function f taking a Tag&lt;3&gt;&period;
 |===
@@ -224,10 +219,9 @@ struct E;
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#E-f[`f`] 
 | Public member function f taking a Tag&lt;4&gt;&period;
 |===
@@ -263,10 +257,9 @@ struct F;
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#F-f[`f`] 
 | Protected member function f taking a Tag&lt;5&gt;&period;
 |===
@@ -321,10 +314,10 @@ struct U
 
 === Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#A[A]`
 | This struct will be inherited as public
 | `link:#B[B]`
@@ -333,10 +326,10 @@ struct U
 
 === Protected Base Classes
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | `link:#C[C]`
 | This struct will be inherited as protected
 | `link:#D[D]`
@@ -345,20 +338,18 @@ struct U
 
 === Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#A-f[`f`] 
 | Public member function f taking a Tag&lt;0&gt;&period;
 |===
 
 === Using Declarations
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#U-U-0a[`U`] 
 | Bring all the A&colon;&colon;A constructors into U&period;
 | link:#U-U-01b[`U`] 
@@ -387,10 +378,9 @@ struct U
 
 === Protected Member Functions
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+| Name| Description
 | link:#U-f-07[`f`] 
 | `f` overloads
 |===
@@ -499,10 +489,10 @@ using A::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#A-f[A::f]
 | Public member function f taking a Tag&lt;0&gt;&period;
 |===
@@ -522,10 +512,10 @@ using B::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#B-f[B::f]
 | Protected member function f taking a Tag&lt;1&gt;&period;
 |===
@@ -545,10 +535,10 @@ using C::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#C-f[C::f]
 | Public member function f taking a Tag&lt;2&gt;&period;
 |===
@@ -568,10 +558,10 @@ using D::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#D-f[D::f]
 | Protected member function f taking a Tag&lt;3&gt;&period;
 |===
@@ -591,10 +581,10 @@ using E::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#E-f[E::f]
 | Public member function f taking a Tag&lt;4&gt;&period;
 |===
@@ -614,10 +604,10 @@ using F::f;
 
 === Introduced Symbols
 
-[cols=2]
+[cols="1,4"]
 |===
-| Name
-| Description
+|Name|Description
+
 | link:#F-f[F::f]
 | Protected member function f taking a Tag&lt;5&gt;&period;
 |===
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 af587c006e..47b490a6ad 100644
--- a/test-files/golden-tests/symbols/using/using-member-function.html
+++ b/test-files/golden-tests/symbols/using/using-member-function.html
@@ -13,8 +13,7 @@ <h2>Types</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -50,8 +49,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -119,8 +117,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -182,8 +179,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -232,8 +228,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -280,8 +275,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -330,8 +324,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -431,8 +424,7 @@ <h2>Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -445,8 +437,7 @@ <h2>Using Declarations</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -471,8 +462,7 @@ <h2>Protected Member Functions</h2>
 <table style="table-layout: fixed; width: 100%;">
 <thead>
 <tr>
-<th>Name</th>
-<th>Description</th>
+<th>Name</th><th>Description</th>
 </tr>
 </thead>
 <tbody>