diff --git a/Makefile b/Makefile
index cc763a938bf..a7e04fb8b58 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ $(MARKDOWN_TOC):
 # The recommended way to prepate a .md file for markdown-toc is
 # to add these comments:
 #
-#   <!-- Re-generate TOC with `make markdown-toc` -->
 #   <!-- toc -->
 #   <!-- tocstop -->
 .PHONY: markdown-toc
diff --git a/specification/baggage/api.md b/specification/baggage/api.md
index fe203c3117d..800e3415689 100644
--- a/specification/baggage/api.md
+++ b/specification/baggage/api.md
@@ -3,21 +3,23 @@
 **Status**: [Stable, Feature-freeze](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
+
+<!-- toc -->
 
 - [Overview](#overview)
 - [Operations](#operations)
-  - [Get Value](#get-value)
-  - [Get All Values](#get-all-values)
-  - [Set Value](#set-value)
-  - [Remove Value](#remove-value)
+  * [Get Value](#get-value)
+  * [Get All Values](#get-all-values)
+  * [Set Value](#set-value)
+  * [Remove Value](#remove-value)
 - [Context Interaction](#context-interaction)
-  - [Clear Baggage in the Context](#clear-baggage-in-the-context)
+  * [Clear Baggage in the Context](#clear-baggage-in-the-context)
 - [Propagation](#propagation)
 - [Conflict Resolution](#conflict-resolution)
 
+<!-- tocstop -->
+
 </details>
 
 ## Overview
diff --git a/specification/common/attribute-naming.md b/specification/common/attribute-naming.md
index 6599f6b2395..1cf593b9f73 100644
--- a/specification/common/attribute-naming.md
+++ b/specification/common/attribute-naming.md
@@ -3,13 +3,16 @@
 **Status**: [Experimental](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
 
-- [Name Pluralization Guidelines](#name-pluralization-guidelines)
+<!-- toc -->
+
+- [Name Pluralization guidelines](#name-pluralization-guidelines)
 - [Recommendations for OpenTelemetry Authors](#recommendations-for-opentelemetry-authors)
 - [Recommendations for Application Developers](#recommendations-for-application-developers)
+- [otel.* Namespace](#otel-namespace)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/common/common.md b/specification/common/common.md
index 19d3d87eb76..3e5f1704560 100644
--- a/specification/common/common.md
+++ b/specification/common/common.md
@@ -3,13 +3,15 @@
 **Status**: [Stable, Feature-freeze](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
+
+<!-- toc -->
 
 - [Attribute](#attribute)
-  - [Attribute Limits](#attribute-limits)
-    - [Exempt Entities](#exempt-entities)
+  * [Attribute Limits](#attribute-limits)
+    + [Exempt Entities](#exempt-entities)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/context/api-propagators.md b/specification/context/api-propagators.md
index c4a3ee0a78f..9f2d64ee369 100644
--- a/specification/context/api-propagators.md
+++ b/specification/context/api-propagators.md
@@ -3,9 +3,9 @@
 **Status**: [Stable, Feature-Freeze](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
+
+<!-- toc -->
 
 - [Overview](#overview)
 - [Propagator Types](#propagator-types)
@@ -34,6 +34,10 @@ Table of Contents
   * [B3 Requirements](#b3-requirements)
     + [B3 Extract](#b3-extract)
     + [B3 Inject](#b3-inject)
+    + [Fields](#fields-1)
+    + [Configuration](#configuration)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/context/context.md b/specification/context/context.md
index 91c76b51c8c..3a9c4c7e216 100644
--- a/specification/context/context.md
+++ b/specification/context/context.md
@@ -3,18 +3,20 @@
 **Status**: [Stable, Feature-freeze](../document-status.md).
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
+
+<!-- toc -->
 
 - [Overview](#overview)
 - [Create a key](#create-a-key)
 - [Get value](#get-value)
 - [Set value](#set-value)
-- [Optional global operations](#optional-global-operations)
-  - [Get current Context](#get-current-context)
-  - [Attach Context](#attach-context)
-  - [Detach Context](#detach-context)
+- [Optional Global operations](#optional-global-operations)
+  * [Get current Context](#get-current-context)
+  * [Attach Context](#attach-context)
+  * [Detach Context](#detach-context)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/glossary.md b/specification/glossary.md
index afe71ec5be4..34df1ffe73d 100644
--- a/specification/glossary.md
+++ b/specification/glossary.md
@@ -4,7 +4,8 @@ This document defines some terms that are used across this specification.
 
 Some other fundamental terms are documented in the [overview document](overview.md).
 
-<!-- Re-generate TOC with `markdown-toc --no-first-h1 -i` -->
+<details>
+<summary>Table of Contents</summary>
 
 <!-- toc -->
 
@@ -38,6 +39,8 @@ Some other fundamental terms are documented in the [overview document](overview.
 
 <!-- tocstop -->
 
+</details>
+
 ## User Roles
 
 ### Application Owner
diff --git a/specification/metrics/README.md b/specification/metrics/README.md
index 6b2c660eda7..464dfc82af1 100644
--- a/specification/metrics/README.md
+++ b/specification/metrics/README.md
@@ -3,20 +3,20 @@
 **Status**: [Experimental](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
 
-* [Overview](#overview)
+<!-- toc -->
+
+- [Overview](#overview)
   * [Design Goals](#design-goals)
   * [Concepts](#concepts)
-    * [API](#api)
-    * [SDK](#sdk)
-* [Specifications](#specifications)
-  * [Metrics API](./api.md)
-  * [Metrics SDK](./sdk.md)
-  * [Metrics Data Model and Protocol](./datamodel.md)
-  * [Semantic Conventions](./semantic_conventions/README.md)
+    + [API](#api)
+    + [SDK](#sdk)
+    + [Programming Model](#programming-model)
+- [Specifications](#specifications)
+- [References](#references)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/metrics/api.md b/specification/metrics/api.md
index 2a3101564ea..39c04be797c 100644
--- a/specification/metrics/api.md
+++ b/specification/metrics/api.md
@@ -3,37 +3,43 @@
 **Status**: [Stable](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
 
-* [Overview](#overview)
-* [MeterProvider](#meterprovider)
+<!-- toc -->
+
+- [Overview](#overview)
+- [MeterProvider](#meterprovider)
   * [MeterProvider operations](#meterprovider-operations)
-* [Meter](#meter)
+    + [Get a Meter](#get-a-meter)
+- [Meter](#meter)
   * [Meter operations](#meter-operations)
-* [Instrument](#instrument)
+- [Instrument](#instrument)
   * [Counter](#counter)
-    * [Counter creation](#counter-creation)
-    * [Counter operations](#counter-operations)
+    + [Counter creation](#counter-creation)
+    + [Counter operations](#counter-operations)
+      - [Add](#add)
   * [Asynchronous Counter](#asynchronous-counter)
-    * [Asynchronous Counter creation](#asynchronous-counter-creation)
-    * [Asynchronous Counter operations](#asynchronous-counter-operations)
-  * [Asynchronous Gauge](#asynchronous-gauge)
-    * [Asynchronous Gauge creation](#asynchronous-gauge-creation)
-    * [Asynchronous Gauge operations](#asynchronous-gauge-operations)
+    + [Asynchronous Counter creation](#asynchronous-counter-creation)
+    + [Asynchronous Counter operations](#asynchronous-counter-operations)
   * [Histogram](#histogram)
-    * [Histogram creation](#histogram-creation)
-    * [Histogram operations](#histogram-operations)
+    + [Histogram creation](#histogram-creation)
+    + [Histogram operations](#histogram-operations)
+      - [Record](#record)
+  * [Asynchronous Gauge](#asynchronous-gauge)
+    + [Asynchronous Gauge creation](#asynchronous-gauge-creation)
+    + [Asynchronous Gauge operations](#asynchronous-gauge-operations)
   * [UpDownCounter](#updowncounter)
-    * [UpDownCounter creation](#updowncounter-creation)
-    * [UpDownCounter operations](#updowncounter-operations)
+    + [UpDownCounter creation](#updowncounter-creation)
+    + [UpDownCounter operations](#updowncounter-operations)
+      - [Add](#add-1)
   * [Asynchronous UpDownCounter](#asynchronous-updowncounter)
-    * [Asynchronous UpDownCounter creation](#asynchronous-updowncounter-creation)
-    * [Asynchronous UpDownCounter operations](#asynchronous-updowncounter-operations)
-* [Measurement](#measurement)
-* [Compatibility requirements](#compatibility-requirements)
-* [Concurrency requirements](#concurrency-requirements)
+    + [Asynchronous UpDownCounter creation](#asynchronous-updowncounter-creation)
+    + [Asynchronous UpDownCounter operations](#asynchronous-updowncounter-operations)
+- [Measurement](#measurement)
+- [Compatibility requirements](#compatibility-requirements)
+- [Concurrency requirements](#concurrency-requirements)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/metrics/datamodel.md b/specification/metrics/datamodel.md
index 64b1b3b2b38..e1d8524e617 100644
--- a/specification/metrics/datamodel.md
+++ b/specification/metrics/datamodel.md
@@ -2,7 +2,8 @@
 
 **Status**: [Mixed](../document-status.md)
 
-<!-- Re-generate TOC with `make markdown-toc` -->
+<details>
+<summary>Table of Contents</summary>
 
 <!-- toc -->
 
@@ -48,6 +49,8 @@
 
 <!-- tocstop -->
 
+</details>
+
 ## Overview
 
 **Status**: [Stable](../document-status.md)
diff --git a/specification/metrics/sdk.md b/specification/metrics/sdk.md
index 4380d824513..a61a886c52a 100644
--- a/specification/metrics/sdk.md
+++ b/specification/metrics/sdk.md
@@ -3,25 +3,45 @@
 **Status**: [Feature-freeze](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
-
-* [MeterProvider](#meterprovider)
-* [Attribute limits](#attribute-limits)
-* [Exemplar](#exemplar)
+<summary>Table of Contents</summary>
+
+<!-- toc -->
+
+- [MeterProvider](#meterprovider)
+  * [Meter Creation](#meter-creation)
+  * [Shutdown](#shutdown)
+  * [ForceFlush](#forceflush)
+  * [View](#view)
+  * [Aggregation](#aggregation)
+    + [Drop Aggregation](#drop-aggregation)
+    + [Default Aggregation](#default-aggregation)
+    + [Sum Aggregation](#sum-aggregation)
+    + [Last Value Aggregation](#last-value-aggregation)
+    + [Histogram Aggregation](#histogram-aggregation)
+    + [Explicit Bucket Histogram Aggregation](#explicit-bucket-histogram-aggregation)
+- [Attribute limits](#attribute-limits)
+- [Exemplar](#exemplar)
   * [ExemplarFilter](#exemplarfilter)
   * [ExemplarReservoir](#exemplarreservoir)
   * [Exemplar defaults](#exemplar-defaults)
-* [MetricReader](#metricreader)
+- [MetricReader](#metricreader)
+  * [MetricReader operations](#metricreader-operations)
+    + [Collect](#collect)
+  * [Shutdown](#shutdown-1)
   * [Periodic exporting MetricReader](#periodic-exporting-metricreader)
-* [MetricExporter](#metricexporter)
+- [MetricExporter](#metricexporter)
   * [Push Metric Exporter](#push-metric-exporter)
+    + [Interface Definition](#interface-definition)
+      - [Export(batch)](#exportbatch)
+      - [ForceFlush()](#forceflush)
+      - [Shutdown()](#shutdown)
   * [Pull Metric Exporter](#pull-metric-exporter)
-* [Defaults and configuration](#defaults-and-configuration)
-* [Numerical limits handling](#numerical-limits-handling)
-* [Compatibility requirements](#compatibility-requirements)
-* [Concurrency requirements](#concurrency-requirements)
+- [Defaults and configuration](#defaults-and-configuration)
+- [Numerical limits handling](#numerical-limits-handling)
+- [Compatibility requirements](#compatibility-requirements)
+- [Concurrency requirements](#concurrency-requirements)
+
+<!-- tocstop -->
 
 </details>
 
@@ -273,8 +293,8 @@ e.g. The View specifies an Aggregation by string name (i.e. "ExplicitBucketHisto
 # Use Histogram with custom boundaries
 meter_provider
   .add_view(
-    "X", 
-    aggregation="ExplicitBucketHistogram", 
+    "X",
+    aggregation="ExplicitBucketHistogram",
     aggregation_params={"Boundaries": [0, 10, 100]}
     )
 ```
@@ -424,7 +444,7 @@ A Metric SDK MUST allow `Exemplar` sampling to be disabled.  In this instance th
 
 A Metric SDK MUST sample `Exemplar`s only from measurements within the context of a sampled trace BY DEFAULT.
 
-A Metric SDK MUST allow exemplar sampling to leverage the configuration of a metric aggregator.  
+A Metric SDK MUST allow exemplar sampling to leverage the configuration of a metric aggregator.
 For example, Exemplar sampling of histograms should be able to leverage bucket boundaries.
 
 A Metric SDK SHOULD provide extensible hooks for Exemplar sampling, specifically:
diff --git a/specification/metrics/supplementary-guidelines.md b/specification/metrics/supplementary-guidelines.md
index e8175557e42..2603675ae6f 100644
--- a/specification/metrics/supplementary-guidelines.md
+++ b/specification/metrics/supplementary-guidelines.md
@@ -4,18 +4,24 @@ Note: this document is NOT a spec, it is provided to support the Metrics
 [API](./api.md) and [SDK](./sdk.md) specifications, it does NOT add any extra
 requirements to the existing specifications.
 
-Table of Contents:
+<details>
+<summary>Table of Contents</summary>
 
-* [Guidelines for instrumentation library
-  authors](#guidelines-for-instrumentation-library-authors)
+<!-- toc -->
+
+- [Guidelines for instrumentation library authors](#guidelines-for-instrumentation-library-authors)
   * [Instrument selection](#instrument-selection)
   * [Additive property](#additive-property)
   * [Monotonicity property](#monotonicity-property)
   * [Semantic convention](#semantic-convention)
-* [Guidelines for SDK authors](#guidelines-for-sdk-authors)
+- [Guidelines for SDK authors](#guidelines-for-sdk-authors)
   * [Aggregation temporality](#aggregation-temporality)
   * [Memory management](#memory-management)
 
+<!-- tocstop -->
+
+</details>
+
 ## Guidelines for instrumentation library authors
 
 ### Instrument selection
diff --git a/specification/overview.md b/specification/overview.md
index b813414ffb8..505fddb50f2 100644
--- a/specification/overview.md
+++ b/specification/overview.md
@@ -1,10 +1,7 @@
 # Overview
 
 <details>
-<summary>
-Table of Contents
-</summary>
-<!-- Re-generate TOC with `markdown-toc --no-first-h1 -i` -->
+<summary>Table of Contents</summary>
 
 <!-- toc -->
 
diff --git a/specification/protocol/otlp.md b/specification/protocol/otlp.md
index ff5f5679a99..d4f605ab3eb 100644
--- a/specification/protocol/otlp.md
+++ b/specification/protocol/otlp.md
@@ -7,9 +7,9 @@ and delivery mechanism of telemetry data between telemetry sources, intermediate
 nodes such as collectors and telemetry backends.
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
+
+<!-- toc -->
 
 - [Signals Maturity Level](#signals-maturity-level)
 - [Protocol Details](#protocol-details)
@@ -40,6 +40,8 @@ Table of Contents
 - [Glossary](#glossary)
 - [References](#references)
 
+<!-- tocstop -->
+
 </details>
 
 OTLP is a general-purpose telemetry data delivery protocol designed in the scope
@@ -259,7 +261,7 @@ Here is a sample Go code to illustrate:
   }
 
   return st.Err()
-  
+
   ...
 
   // Do this on client side.
diff --git a/specification/sdk-configuration.md b/specification/sdk-configuration.md
index 2839d8225db..03348306d37 100644
--- a/specification/sdk-configuration.md
+++ b/specification/sdk-configuration.md
@@ -3,8 +3,14 @@
 <details>
 <summary>Table of Contents</summary>
 
-* [Abstract](#abstract)
-* [Configuration Interface](#configuration-interface)
+<!-- toc -->
+
+- [Abstract](#abstract)
+- [Configuration Interface](#configuration-interface)
+  * [Programmatic](#programmatic)
+  * [Other Mechanisms](#other-mechanisms)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/trace/api.md b/specification/trace/api.md
index d88340958f4..6c91c94fa01 100644
--- a/specification/trace/api.md
+++ b/specification/trace/api.md
@@ -3,41 +3,46 @@
 **Status**: [Stable, Feature-freeze](../document-status.md)
 
 <details>
-<summary>
-Table of Contents
-</summary>
+<summary>Table of Contents</summary>
 
-* [Data types](#data-types)
+<!-- toc -->
+
+- [Data types](#data-types)
   * [Time](#time)
-    * [Timestamp](#timestamp)
-    * [Duration](#duration)
-* [TracerProvider](#tracerprovider)
+    + [Timestamp](#timestamp)
+    + [Duration](#duration)
+- [TracerProvider](#tracerprovider)
   * [TracerProvider operations](#tracerprovider-operations)
-* [Context Interaction](#context-interaction)
-* [Tracer](#tracer)
+    + [Get a Tracer](#get-a-tracer)
+- [Context Interaction](#context-interaction)
+- [Tracer](#tracer)
   * [Tracer operations](#tracer-operations)
-* [SpanContext](#spancontext)
+- [SpanContext](#spancontext)
   * [Retrieving the TraceId and SpanId](#retrieving-the-traceid-and-spanid)
   * [IsValid](#isvalid)
   * [IsRemote](#isremote)
-* [Span](#span)
-  * [Span creation](#span-creation)
-    * [Determining the Parent Span from a Context](#determining-the-parent-span-from-a-context)
-    * [Specifying Links](#specifying-links)
+  * [TraceState](#tracestate)
+- [Span](#span)
+  * [Span Creation](#span-creation)
+    + [Determining the Parent Span from a Context](#determining-the-parent-span-from-a-context)
+    + [Specifying links](#specifying-links)
   * [Span operations](#span-operations)
-    * [Get Context](#get-context)
-    * [IsRecording](#isrecording)
-    * [Set Attributes](#set-attributes)
-    * [Add Events](#add-events)
-    * [Set Status](#set-status)
-    * [UpdateName](#updatename)
-    * [End](#end)
-    * [Record Exception](#record-exception)
+    + [Get Context](#get-context)
+    + [IsRecording](#isrecording)
+    + [Set Attributes](#set-attributes)
+    + [Add Events](#add-events)
+    + [Set Status](#set-status)
+    + [UpdateName](#updatename)
+    + [End](#end)
+    + [Record Exception](#record-exception)
   * [Span lifetime](#span-lifetime)
   * [Wrapping a SpanContext in a Span](#wrapping-a-spancontext-in-a-span)
-* [SpanKind](#spankind)
-* [Concurrency](#concurrency)
-* [Included Propagators](#included-propagators)
+- [SpanKind](#spankind)
+- [Concurrency](#concurrency)
+- [Included Propagators](#included-propagators)
+- [Behavior of the API in the absence of an installed SDK](#behavior-of-the-api-in-the-absence-of-an-installed-sdk)
+
+<!-- tocstop -->
 
 </details>
 
@@ -120,7 +125,7 @@ This API MUST accept the following parameters:
 - `version` (optional): Specifies the version of the instrumentation library (e.g. `1.0.0`).
 - [since 1.4.0] `schema_url` (optional): Specifies the Schema URL that should be
   recorded in the emitted telemetry.
-  
+
 It is unspecified whether or under which conditions the same or different
 `Tracer` instances are returned from this functions.
 
diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md
index 9b3211fb54a..fdbd1b7a462 100644
--- a/specification/trace/sdk.md
+++ b/specification/trace/sdk.md
@@ -3,12 +3,8 @@
 **Status**: [Stable](../document-status.md)
 
 <details>
-
 <summary>Table of Contents</summary>
 
-<!-- Re-generate TOC with `markdown-toc --no-first-h1 -i` -->
-<!-- https://github.com/jonschlinkert/markdown-toc -->
-
 <!-- toc -->
 
 - [Tracer Provider](#tracer-provider)
diff --git a/specification/vendors.md b/specification/vendors.md
index 211edb4a33e..79c0a99406e 100644
--- a/specification/vendors.md
+++ b/specification/vendors.md
@@ -3,10 +3,14 @@
 <details>
 <summary>Table of Contents</summary>
 
-* [Abstract](#abstract)
-* [Supports OpenTelemetry](#supports-opentelemetry)
-* [Implements OpenTelemetry](#implements-opentelemetry)
-* [Qualifications](#qualifications)
+<!-- toc -->
+
+- [Abstract](#abstract)
+- [Supports OpenTelemetry](#supports-opentelemetry)
+- [Implements OpenTelemetry](#implements-opentelemetry)
+- [Qualifications](#qualifications)
+
+<!-- tocstop -->
 
 </details>
 
diff --git a/specification/versioning-and-stability.md b/specification/versioning-and-stability.md
index de6f142c7f8..8a4125598eb 100644
--- a/specification/versioning-and-stability.md
+++ b/specification/versioning-and-stability.md
@@ -2,7 +2,8 @@
 
 **Status**: [Stable](document-status.md)
 
-<!-- Re-generate TOC with `markdown-toc --no-first-h1 -i` -->
+<details>
+<summary>Table of Contents</summary>
 
 <!-- toc -->
 
@@ -31,6 +32,8 @@
 
 <!-- tocstop -->
 
+</details>
+
 This document defines the stability guarantees offered by the OpenTelemetry clients, along with the rules and procedures for meeting those guarantees.
 
 In this document, the terms "OpenTelemetry" and "language implementations" both specifically refer to the OpenTelemetry clients.