<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/PHPCSStandards/PHP_CodeSniffer-documentation/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 1;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

diff --git a/.github/workflows/publish-wiki.yml b/.github/workflows/publish-wiki.yml
index 0998cc8..a81643b 100644
--- a/.github/workflows/publish-wiki.yml
+++ b/.github/workflows/publish-wiki.yml
@@ -31,15 +31,31 @@ jobs:
     permissions:
       # Needed for the commit to the wiki.
       contents: write
+      # Needed for the PR comment.
+      pull-requests: write
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+
+      # ################################################################################
+      # Update Wiki files.
+      # ################################################################################
+
+      - name: Install DocToc table of contents generator
+        run: npm install -g doctoc
+
       - name: Copy wiki files to temporary location
         shell: bash
         run: cp -v -a wiki _wiki
 
+      - name: Update tables of contents
+        run: doctoc ./_wiki/ --github --maxlevel 4 --update-only
+
+      - name: Re-run tables of contents with different settings for specific file
+        run: doctoc ./_wiki/Version-4.0-User-Upgrade-Guide.md --github --maxlevel 3 --update-only
+
       - name: Preface markdown files with warning not to edit in place
         shell: bash
         # yamllint disable rule:line-length
@@ -50,6 +66,43 @@ jobs:
           '1i\<!--\nWARNING: DO NOT EDIT THIS FILE IN THE WIKI.\nThis wiki is updated from the https://github.com/PHPCSStandards/PHP_CodeSniffer-documentation repository.\nSubmit a PR to that repository updating the relevant file in the /wiki/ subdirectory instead.\n-->\n' {} \;
           # yamllint enable rule:line-length
 
+
+      # ################################################################################
+      # Dry-run/PRs: upload artifact with pre-processed files and post comment in PR.
+      # ################################################################################
+
+      # Retention is normally 90 days, but this artifact is only to help with reviewing PRs,
+      # especially when new output blocks are added or the (workflow) code for existing ones
+      # is updated. All in all, no need to keep the artifact for more than a few days.
+      - name: "[PR only] Upload the preprocessed wiki files as an artifact"
+        if: ${{ github.event_name == 'pull_request' }}
+        id: artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wiki-files
+          path: ./_wiki
+          if-no-files-found: error
+          retention-days: 10
+
+      - name: "[PR only] Post comment to review artifact"
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: mshick/add-pr-comment@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          message: |
+            Thank you for your PR.
+            A dry-run has been executed on your PR, executing all markdown pre-processing for the wiki files.
+
+            Please review the resulting final markdown files via the [created artifact](${{ steps.artifact.outputs.artifact-url }}).
+            This is especially important when adding new pages.
+
+            _N.B.: the above link will automatically be updated when this PR is updated._
+
+
+      # ################################################################################
+      # Deploy to the wiki in the PHPCS repo.
+      # ################################################################################
+
       - name: Check GitHub Git Operations status
         uses: crazy-max/ghaction-github-status@v4
         with:
diff --git a/wiki/About-Standards-for-PHP_CodeSniffer.md b/wiki/About-Standards-for-PHP_CodeSniffer.md
index d84a1a9..bff0f6e 100644
--- a/wiki/About-Standards-for-PHP_CodeSniffer.md
+++ b/wiki/About-Standards-for-PHP_CodeSniffer.md
@@ -1,15 +1,7 @@
 ## Table of contents
 
-* [A Project ruleset or a standard ?](#a-project-ruleset-or-a-standard-)
-* [How does PHP_CodeSniffer determine which standard or ruleset to apply ?](#how-does-php_codesniffer-determine-which-standard-or-ruleset-to-apply-)
-* [About standards](#about-standards)
-* [Creating an external standard for PHP_CodeSniffer](#creating-an-external-standard-for-php_codesniffer)
-* [Creating new rules](#creating-new-rules)
-    * [Naming conventions](#naming-conventions)
-        * [1. Directory structure](#1-directory-structure)
-        * [2. Sniff file name](#2-sniff-file-name)
-        * [3. Namespace and class name](#3-namespace-and-class-name)
-        * [Examples](#examples)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Advanced-Usage.md b/wiki/Advanced-Usage.md
index 6e74d10..5731a55 100644
--- a/wiki/Advanced-Usage.md
+++ b/wiki/Advanced-Usage.md
@@ -1,24 +1,7 @@
 ## Table of contents
 
-* [Specifying Valid File Extensions](#specifying-valid-file-extensions)
-* [Ignoring Files and Folders](#ignoring-files-and-folders)
-* [Ignoring Parts of a File](#ignoring-parts-of-a-file)
-* [Limiting Results to Specific Sniffs](#limiting-results-to-specific-sniffs)
-* [Filtering Errors and Warnings Based on Severity](#filtering-errors-and-warnings-based-on-severity)
-* [Replacing Tabs with Spaces](#replacing-tabs-with-spaces)
-* [Specifying an Encoding](#specifying-an-encoding)
-* [Using a Bootstrap File](#using-a-bootstrap-file)
-* [Using a Default Configuration File](#using-a-default-configuration-file)
-* [Specifying php.ini Settings](#specifying-phpini-settings)
-* [Setting Configuration Options](#setting-configuration-options)
-* [Deleting Configuration Options](#deleting-configuration-options)
-* [Viewing Configuration Options](#viewing-configuration-options)
-* [Printing Verbose Tokeniser Output](#printing-verbose-tokeniser-output)
-    * [The Scope Map](#the-scope-map)
-    * [The Level Map](#the-level-map)
-* [Printing Verbose Token Processing Output](#printing-verbose-token-processing-output)
-* [Quieting Output](#quieting-output)
-* [Understanding the Exit Codes](#understanding-the-exit-codes)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Coding-Standard-Tutorial.md b/wiki/Coding-Standard-Tutorial.md
index 675ad57..0b085de 100644
--- a/wiki/Coding-Standard-Tutorial.md
+++ b/wiki/Coding-Standard-Tutorial.md
@@ -2,6 +2,13 @@ In this tutorial, we will create a new coding standard with a single sniff. Our
 
 Sniffs need to follow [strict directory layout and naming conventions](https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/About-Standards-for-PHP_CodeSniffer#naming-conventions).
 
+## Table of contents
+
+<!-- START doctoc -->
+<!-- END doctoc -->
+
+***
+
 ## Creating the Coding Standard Directory
 
 All sniffs in PHP_CodeSniffer must belong to a coding standard. A coding standard is a directory with a specific sub-directory structure and a `ruleset.xml` file, so creating a standard is straight-forward.
@@ -39,6 +46,9 @@ The content of the `ruleset.xml` file should, at a minimum, be the following:
 > [!NOTE]
 > The ruleset.xml can be left quite small, as it is in this example coding standard. For information about the other features that the `ruleset.xml` provides, see the [[Annotated ruleset]].
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
+
 ## Creating the Sniff
 
 A sniff requires a single PHP file that must be placed into a sub-directory to categorise the type of check it performs. Its name should clearly describe the standard that we are enforcing and must end with `Sniff.php`. For our sniff, we will name the PHP file `DisallowHashCommentsSniff.php` and place it into a `Commenting` sub-directory to categorise this sniff as relating to commenting. Run the following commands to create the category and the sniff:
@@ -54,12 +64,18 @@ $ touch Commenting/DisallowHashCommentsSniff.php
 
 Each sniff must implement the `PHP_CodeSniffer\Sniffs\Sniff` interface so that PHP_CodeSniffer knows that it should instantiate the sniff once it's invoked. The interface defines two methods that must be implemented; `register` and `process`.
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
+
 ## The `register` and `process` Methods
 
 The `register` method allows a sniff to subscribe to one or more token types that it wants to process. Once PHP_CodeSniffer encounters one of those tokens, it calls the `process` method with the `PHP_CodeSniffer\Files\File` object (a representation of the current file being checked) and the position in the stack where the token was found.
 
 For our sniff, we are interested in single line comments. The `token_get_all` method that PHP_CodeSniffer uses to acquire the tokens within a file distinguishes doc comments and normal comments as two separate token types. Therefore, we don't have to worry about doc comments interfering with our test. The `register` method only needs to return one token type, `T_COMMENT`.
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
+
 ## The Token Stack
 
 A sniff can gather more information about a token by acquiring the token stack with a call to the `getTokens` method on the `PHP_CodeSniffer\Files\File` object. This method returns an array and is indexed by the position where the token occurs in the token stack. Each element in the array represents a token. All tokens have a `code`, `type` and a `content` index in their array. The `code` value is a unique integer for the type of token. The `type` value is a string representation of the token (e.g., `'T_COMMENT'` for comment tokens). The `type` has a corresponding globally defined integer with the same name. Finally, the `content` value contains the content of the token as it appears in the code.
@@ -67,11 +83,17 @@ A sniff can gather more information about a token by acquiring the token stack w
 > [!NOTE]
 > Depending on the token, the token array may contain various additional indexes with further information on a token.
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
+
 ## Reporting Errors
 
 Once an error is detected, a sniff should indicate that an error has occurred by calling the `addError` method on the `PHP_CodeSniffer\Files\File` object, passing in an appropriate error message as the first argument, the position in the stack where the error was detected as the second, a code to uniquely identify the error within this sniff and an array of data used inside the error message.
 Alternatively, if the violation is considered not as critical as an error, the `addWarning` method can be used.
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
+
 ## DisallowHashCommentsSniff.php
 
 We now have to write the content of our sniff. The content of the `DisallowHashCommentsSniff.php` file should be the following:
@@ -135,6 +157,8 @@ public $supportedTokenizers = [
 ];
 ```
 
+<p align="right"><a href="#table-of-contents">back to top</a></p>
+
 
 ## Results
 
@@ -173,3 +197,5 @@ FOUND 3 ERROR(S) AFFECTING 3 LINE(S)
  13 | ERROR | Hash comments are prohibited; found # Error.
 --------------------------------------------------------------------------------
 ```
+
+<p align="right"><a href="#table-of-contents">back to top</a></p>
diff --git a/wiki/Configuration-Options.md b/wiki/Configuration-Options.md
index 70113e9..f34357e 100644
--- a/wiki/Configuration-Options.md
+++ b/wiki/Configuration-Options.md
@@ -1,27 +1,7 @@
 ## Table of contents
 
-* [Setting the default coding standard](#setting-the-default-coding-standard)
-* [Setting the default report format](#setting-the-default-report-format)
-* [Hiding warnings by default](#hiding-warnings-by-default)
-* [Showing progress by default](#showing-progress-by-default)
-* [Using colors in output by default](#using-colors-in-output-by-default)
-* [Changing the default severity levels](#changing-the-default-severity-levels)
-* [Setting the default report width](#setting-the-default-report-width)
-* [Setting the default encoding](#setting-the-default-encoding)
-* [Setting the default tab width](#setting-the-default-tab-width)
-* [Setting the installed standard paths](#setting-the-installed-standard-paths)
-* [Setting the PHP version](#setting-the-php-version)
-* [Ignoring errors when generating the exit code](#ignoring-errors-when-generating-the-exit-code)
-* [Ignoring warnings when generating the exit code](#ignoring-warnings-when-generating-the-exit-code)
-* [Ignoring non-auto-fixable issues when generating the exit code (PHP_CodeSniffer >= 4.0.0)](#ignoring-non-auto-fixable-issues-when-generating-the-exit-code-php_codesniffer--400)
-* Setting tool paths
-    * [CSSLint](#setting-the-path-to-csslint)
-    * [Google Closure Linter](#setting-the-path-to-the-google-closure-linter)
-    * [PHP](#setting-the-path-to-php)
-    * [JSHint](#setting-the-path-to-jshint)
-    * [JSLint](#setting-the-path-to-jslint)
-    * [JavaScript Lint](#setting-the-path-to-javascript-lint)
-    * [Zend Code Analyzer](#setting-the-path-to-the-zend-code-analyzer)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Customisable-Sniff-Properties.md b/wiki/Customisable-Sniff-Properties.md
index dbb7ee0..208f84b 100644
--- a/wiki/Customisable-Sniff-Properties.md
+++ b/wiki/Customisable-Sniff-Properties.md
@@ -4,70 +4,8 @@ For more information about changing sniff behaviour by customising your ruleset,
 
 ## Table of contents
 
-* [Generic Sniffs](#generic-sniffs)
-    * [Generic.Arrays.ArrayIndent](#genericarraysarrayindent)
-    * [Generic.CodeAnalysis.UnusedFunctionParameter](#genericcodeanalysisunusedfunctionparameter)
-    * [Generic.ControlStructures.InlineControlStructure](#genericcontrolstructuresinlinecontrolstructure)
-    * [Generic.Debug.ClosureLinter](#genericdebugclosurelinter)
-    * [Generic.Debug.ESLint](#genericdebugeslint)
-    * [Generic.Files.LineEndings](#genericfileslineendings)
-    * [Generic.Files.LineLength](#genericfileslinelength)
-    * [Generic.Formatting.MultipleStatementAlignment](#genericformattingmultiplestatementalignment)
-    * [Generic.Formatting.SpaceAfterCast](#genericformattingspaceaftercast)
-    * [Generic.Formatting.SpaceAfterNot](#genericformattingspaceafternot)
-    * [Generic.Functions.OpeningFunctionBraceBsdAllman](#genericfunctionsopeningfunctionbracebsdallman)
-    * [Generic.Functions.OpeningFunctionBraceKernighanRitchie](#genericfunctionsopeningfunctionbracekernighanritchie)
-    * [Generic.Metrics.CyclomaticComplexity](#genericmetricscyclomaticcomplexity)
-    * [Generic.Metrics.NestingLevel](#genericmetricsnestinglevel)
-    * [Generic.NamingConventions.CamelCapsFunctionName](#genericnamingconventionscamelcapsfunctionname)
-    * [Generic.PHP.ForbiddenFunctions](#genericphpforbiddenfunctions)
-    * [Generic.PHP.NoSilencedErrors](#genericphpnosilencederrors)
-    * [Generic.Strings.UnnecessaryStringConcat](#genericstringsunnecessarystringconcat)
-    * [Generic.WhiteSpace.ArbitraryParenthesesSpacing](#genericwhitespacearbitraryparenthesesspacing)
-    * [Generic.WhiteSpace.ScopeIndent](#genericwhitespacescopeindent)
-    * [Generic.WhiteSpace.SpreadOperatorSpacingAfter](#genericwhitespacespreadoperatorspacingafter)
-* [PEAR Sniffs](#pear-sniffs)
-    * [PEAR.Commenting.FunctionComment](#pearcommentingfunctioncomment)
-    * [PEAR.ControlStructures.ControlSignature](#pearcontrolstructurescontrolsignature)
-    * [PEAR.ControlStructures.MultiLineCondition](#pearcontrolstructuresmultilinecondition)
-    * [PEAR.Formatting.MultiLineAssignment](#pearformattingmultilineassignment)
-    * [PEAR.Functions.FunctionCallSignature](#pearfunctionsfunctioncallsignature)
-    * [PEAR.Functions.FunctionDeclaration](#pearfunctionsfunctiondeclaration)
-    * [PEAR.WhiteSpace.ObjectOperatorIndent](#pearwhitespaceobjectoperatorindent)
-    * [PEAR.WhiteSpace.ScopeClosingBrace](#pearwhitespacescopeclosingbrace)
-    * [PEAR.WhiteSpace.ScopeIndent](#pearwhitespacescopeindent)
-* [PSR2 Sniffs](#psr2-sniffs)
-    * [PSR2.Classes.ClassDeclaration](#psr2classesclassdeclaration)
-    * [PSR2.ControlStructures.ControlStructureSpacing](#psr2controlstructurescontrolstructurespacing)
-    * [PSR2.ControlStructures.SwitchDeclaration](#psr2controlstructuresswitchdeclaration)
-    * [PSR2.Methods.FunctionCallSignature](#psr2methodsfunctioncallsignature)
-* [PSR12 Sniffs](#psr12-sniffs)
-    * [PSR12.Classes.AnonClassDeclaration](#psr12classesanonclassdeclaration)
-    * [PSR12.ControlStructures.BooleanOperatorPlacement](#psr12controlstructuresbooleanoperatorplacement)
-    * [PSR12.ControlStructures.ControlStructureSpacing](#psr12controlstructurescontrolstructurespacing)
-    * [PSR12.Namespaces.CompoundNamespaceDepth](#psr12namespacescompoundnamespacedepth)
-    * [PSR12.Operators.OperatorSpacing](#psr12operatorsoperatorspacing)
-* [Squiz Sniffs](#squiz-sniffs)
-    * [Squiz.Classes.ClassDeclaration](#squizclassesclassdeclaration)
-    * [Squiz.Commenting.FunctionComment](#squizcommentingfunctioncomment)
-    * [Squiz.Commenting.LongConditionClosingComment](#squizcommentinglongconditionclosingcomment)
-    * [Squiz.ControlStructures.ControlSignature](#squizcontrolstructurescontrolsignature)
-    * [Squiz.ControlStructures.ForEachLoopDeclaration](#squizcontrolstructuresforeachloopdeclaration)
-    * [Squiz.ControlStructures.ForLoopDeclaration](#squizcontrolstructuresforloopdeclaration)
-    * [Squiz.ControlStructures.SwitchDeclaration](#squizcontrolstructuresswitchdeclaration)
-    * [Squiz.CSS.ForbiddenStyles](#squizcssforbiddenstyles)
-    * [Squiz.CSS.Indentation](#squizcssindentation)
-    * [Squiz.Functions.FunctionDeclaration](#squizfunctionsfunctiondeclaration)
-    * [Squiz.Functions.FunctionDeclarationArgumentSpacing](#squizfunctionsfunctiondeclarationargumentspacing)
-    * [Squiz.PHP.CommentedOutCode](#squizphpcommentedoutcode)
-    * [Squiz.PHP.DiscouragedFunctions](#squizphpdiscouragedfunctions)
-    * [Squiz.PHP.ForbiddenFunctions](#squizphpforbiddenfunctions)
-    * [Squiz.Strings.ConcatenationSpacing](#squizstringsconcatenationspacing)
-    * [Squiz.WhiteSpace.FunctionSpacing](#squizwhitespacefunctionspacing)
-    * [Squiz.WhiteSpace.MemberVarSpacing](#squizwhitespacemembervarspacing)
-    * [Squiz.WhiteSpace.ObjectOperatorSpacing](#squizwhitespaceobjectoperatorspacing)
-    * [Squiz.WhiteSpace.OperatorSpacing](#squizwhitespaceoperatorspacing)
-    * [Squiz.WhiteSpace.SuperfluousWhitespace](#squizwhitespacesuperfluouswhitespace)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index db7e555..7da03c4 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -1,11 +1,7 @@
 ## Table of contents
 
-* [Does PHP_CodeSniffer perform any code coverage or unit testing?](#does-php_codesniffer-perform-any-code-coverage-or-unit-testing)
-* [My code is fine! Why do I need PHP_CodeSniffer?](#my-code-is-fine-why-do-i-need-php_codesniffer)
-* [Does PHP_CodeSniffer parse my code to ensure it will execute?](#does-php_codesniffer-parse-my-code-to-ensure-it-will-execute)
-* [I don't agree with your coding standards! Can I make PHP_CodeSniffer enforce my own?](#i-dont-agree-with-your-coding-standards-can-i-make-php_codesniffer-enforce-my-own)
-* [How come PHP_CodeSniffer reported errors, I fixed them, now I get even more?](#how-come-php_codesniffer-reported-errors-i-fixed-them-now-i-get-even-more)
-* [What does PHP_CodeSniffer use to tokenize my code?](#what-does-php_codesniffer-use-to-tokenize-my-code)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Fixing-Errors-Automatically.md b/wiki/Fixing-Errors-Automatically.md
index 44744de..d2901cc 100644
--- a/wiki/Fixing-Errors-Automatically.md
+++ b/wiki/Fixing-Errors-Automatically.md
@@ -1,8 +1,7 @@
 ## Table of contents
 
-* [About Automatic Fixing](#about-automatic-fixing)
-* [Using the PHP Code Beautifier and Fixer](#using-the-php-code-beautifier-and-fixer)
-* [Viewing Debug Information](#viewing-debug-information)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Usage.md b/wiki/Usage.md
index c421713..b0c40f5 100644
--- a/wiki/Usage.md
+++ b/wiki/Usage.md
@@ -1,12 +1,7 @@
 ## Table of contents
 
-* [Getting Help from the Command Line](#getting-help-from-the-command-line)
-* [Checking Files and Folders](#checking-files-and-folders)
-* [Printing a Summary Report](#printing-a-summary-report)
-* [Printing Progress Information](#printing-progress-information)
-* [Specifying a Coding Standard](#specifying-a-coding-standard)
-* [Printing a List of Installed Coding Standards](#printing-a-list-of-installed-coding-standards)
-* [Listing Sniffs Inside a Coding Standard](#listing-sniffs-inside-a-coding-standard)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Version-3.0-Upgrade-Guide.md b/wiki/Version-3.0-Upgrade-Guide.md
index e58cb99..278617a 100644
--- a/wiki/Version-3.0-Upgrade-Guide.md
+++ b/wiki/Version-3.0-Upgrade-Guide.md
@@ -7,20 +7,8 @@ PHP_CodeSniffer version 3 contains a large number of core changes and breaks bac
 
 ## Table of contents
 
-* [Upgrading Custom Sniffs](#upgrading-custom-sniffs)
-    * [Extending Other Sniffs](#extending-other-sniffs)
-    * [Extending the Included Abstract Sniffs](#extending-the-included-abstract-sniffs)
-        * [AbstractVariableSniff](#abstractvariablesniff)
-        * [AbstractPatternSniff](#abstractpatternsniff)
-        * [AbstractScopeSniff](#abstractscopesniff)
-    * [New Class Names](#new-class-names)
-        * [PHP_CodeSniffer_File](#php_codesniffer_file)
-        * [PHP_CodeSniffer_Tokens](#php_codesniffer_tokens)
-        * [PHP_CodeSniffer](#php_codesniffer)
-* [Upgrading Unit Tests](#upgrading-unit-tests)
-    * [Setting CLI Values](#setting-cli-values)
-* [Upgrading Custom Reports](#upgrading-custom-reports)
-    * [Supporting Concurrency](#supporting-concurrency)
+<!-- START doctoc -->
+<!-- END doctoc -->
 
 ***
 
diff --git a/wiki/Version-4.0-Developer-Upgrade-Guide.md b/wiki/Version-4.0-Developer-Upgrade-Guide.md
index abe1c7f..947dfce 100644
--- a/wiki/Version-4.0-Developer-Upgrade-Guide.md
+++ b/wiki/Version-4.0-Developer-Upgrade-Guide.md
@@ -14,38 +14,10 @@ There is a separate [[Upgrade Guide for Ruleset Maintainers and End-Users|Versio
 
 ## Table of contents
 
-* [Should I upgrade ?](#should-i-upgrade-)
-    * [Upgrade strategies](#upgrade-strategies)
-* [Upgrading the ruleset.xml file](#upgrading-the-rulesetxml-file)
-* [Upgrading Standards](#upgrading-standards)
-    * [Support for external standards named "Internal" has been removed](#support-for-external-standards-named-internal-has-been-removed)
-* [Upgrading Custom Sniffs](#upgrading-custom-sniffs)
-    * [Sniffs need to comply with the naming conventions](#sniffs-need-to-comply-with-the-naming-conventions)
-    * [Sniffs must implement the `PHP_CodeSniffer\Sniffs\Sniff` interface](#sniffs-must-implement-the-php_codesniffersniffssniff-interface)
-    * [Support for JS/CSS has been removed](#support-for-jscss-has-been-removed)
-    * [Property type casting has been made more consistent](#property-type-casting-has-been-made-more-consistent)
-    * [Changed Methods](#changed-methods)
-        * [File::getDeclarationName()](#filegetdeclarationname)
-        * [File::getMemberProperties()](#filegetmemberproperties)
-        * [Config::setConfigData() is no longer static](#configsetconfigdata-is-no-longer-static)
-    * [Tokens class changes](#tokens-class-changes)
-        * [Token arrays are now class constants](#token-arrays-are-now-class-constants)
-        * [Removed Tokens](#removed-tokens)
-    * [Tokenizer Changes](#tokenizer-changes)
-        * [T_USE (for closures), T_ISSET, T_UNSET, T_EMPTY, T_EVAL, T_EXIT are parenthesis owners](#t_use-for-closures-t_isset-t_unset-t_empty-t_eval-t_exit-are-parenthesis-owners)
-        * [Namespaced Names](#namespaced-names)
-        * [T_STATIC](#t_static)
-        * [T_OPEN_TAG](#t_open_tag)
-        * [`goto`](#goto)
-        * [Other Tokenizer Changes](#other-tokenizer-changes)
-    * [Changes to abstract sniffs](#changes-to-abstract-sniffs)
-    * [Changes to PHPCS native sniffs](#changes-to-phpcs-native-sniffs)
-        * [Various sniffs listen to fewer tokens](#various-sniffs-listen-to-fewer-tokens)
-        * [PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\SelfMemberReferenceSniff](#php_codesnifferstandardssquizsniffsclassesselfmemberreferencesniff)
-* [Miscellaneous other changes which may affect code extending PHP_CodeSniffer](#miscellaneous-other-changes-which-may-affect-code-extending-php_codesniffer)
-* [Unit Tests](#unit-tests)
-    * [For standards using their own test framework](#for-standards-using-their-own-test-framework)
-    * [For standards using the PHPCS native test framework](#for-standards-using-the-phpcs-native-test-framework)
+<!-- START doctoc -->
+<!-- END doctoc -->
+
+***
 
 ## Should I upgrade ?
 
@@ -124,7 +96,7 @@ Support for the JS/CSS tokenizers has been removed. To cause the least amount of
 
 This has been implemented in this way to allow external standards to be cross-version compatible with PHPCS 3.x as well as 4.x for a while and to not force external standards to release a new major release to support PHPCS 4.0 (due to sniffs needing to be removed).
 
-#### Upgrading
+**Upgrading**
 
 Search for sniffs which specify the `public $supportedTokenizers` property to find sniffs which may need updating.
 
@@ -146,7 +118,7 @@ Type casting for sniff property values set from within a ruleset has been made m
 * `null` will now be set to an actual `null` value. Previously, the sniff property would have been set to string `'null'`.
 * Array element values will now also get the type casting treatment. Previously, array values would always be strings.
 
-#### Upgrading
+**Upgrading**
 
 Search for sniff which have `public` properties which can be changed from within a ruleset.
 
@@ -434,7 +406,7 @@ The `AbstractPatternSniff::__construct()` method no longer takes any arguments.
 Since PHPCS 1.4.0, the  AbstractPatternSniff sets the `ignoreComments` option using a `public` var rather than through the constructor.
 This allows the setting to be overwritten in `ruleset.xml` files.
 
-#### Upgrading
+**Upgrading**
 
 * Search for sniffs which extend the `AbstractPatternSniff`.
 * If the sniff calls the `parent::__construct()` method with an argument, remove the argument.
@@ -561,7 +533,7 @@ The `protected` `getDeclarationNameWithNamespace()` and `getNamespaceOfScope()`
 
 The Ruleset class now respects sniff selection via `--sniffs=...`, even when in a test context.
 
-#### Upgrading
+**Upgrading**
 
 If your own test framework contained work-arounds to get round the previous restriction, it should now be safe to remove those work-arounds and to use the `--sniffs=...` argument when initiating the `Config` class.
 
@@ -611,7 +583,7 @@ If an external standard uses its own test framework, this section can be skipped
 For compatibility with the PHP_CodeSniffer native test framework, the directory layout conventions and class naming conventions for tests have to be strictly followed and external standards which want to use the PHPCS native test framework need to be registered in the PHP_CodeSniffer `CodeSniffer.conf` file.
 This is not really any different from before, just even more important now.
 
-#### Upgrading
+**Upgrading**
 
 In practice this means the following for most test suites for external standards which extend the PHP_CodeSniffer native test suite:
 1. In `composer.json`: update the PHPUnit version requirements.
diff --git a/wiki/Version-4.0-User-Upgrade-Guide.md b/wiki/Version-4.0-User-Upgrade-Guide.md
index e531faf..0b76662 100644
--- a/wiki/Version-4.0-User-Upgrade-Guide.md
+++ b/wiki/Version-4.0-User-Upgrade-Guide.md
@@ -10,27 +10,10 @@ There is a separate [[Upgrade Guide for Sniff Developers and Integrators|Version
 
 ## Table of contents
 
-* [Should I upgrade ?](#should-i-upgrade-)
-    * [External Standards](#external-standards)
-* [How do I upgrade ?](#how-do-i-upgrade-)
-    * [OMG BBQ, I'm inundated by deprecation notices from PHP_CodeSniffer 3.13.x!](#omg-bbq-im-inundated-by-deprecation-notices-from-php_codesniffer-313x)
-* [Upgrading step by step](#upgrading-step-by-step)
-    * [The minimum PHP version is now PHP 7.2.0](#the-minimum-php-version-is-now-php-720)
-    * [Ruleset processing changes](#ruleset-processing-changes)
-    * [Support for scanning JS/CSS files has been removed](#support-for-scanning-jscss-files-has-been-removed)
-    * [Setting array properties for sniffs](#setting-array-properties-for-sniffs)
-    * [Removed sniffs](#removed-sniffs)
-    * [Removed error codes](#removed-error-codes)
-    * [Changed error codes](#changed-error-codes)
-    * [Removed sniff properties](#removed-sniff-properties)
-    * [Ignore Annotation syntax](#ignore-annotation-syntax)
-    * [Exit codes](#exit-codes)
-    * [Branch rename in the PHP_CodeSniffer repo](#upcoming-branch-rename-in-the-php_codesniffer-repo)
-* [Notable other changes and new features](#notable-other-changes-and-new-features)
-    * [Progress, error and debug output is now send to STDERR](#progress-error-and-debug-output-is-now-send-to-stderr)
-    * [Files without extension can now be scanned](#files-without-extension-can-now-be-scanned)
-    * [Array properties can now extend default property values](#array-properties-can-now-extend-default-property-values)
-    * [My scans are failing on a "No files were checked" error...](#my-scans-are-failing-on-a-no-files-were-checked-error)
+<!-- START doctoc -->
+<!-- END doctoc -->
+
+***
 
 ## Should I upgrade ?
 
