diff --git a/.gitignore b/.gitignore
index f1fee6a299c..080af565146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,6 @@ yarn.lock
package-lock.json
pnpm-lock.yaml
-# Docs site output
+# Docs site
_site
+/docs/src/assets/css
diff --git a/docs/src/_includes/components/alert.macro.html b/docs/src/_includes/components/alert.macro.html
index f07195a812f..91e3a94a8b8 100644
--- a/docs/src/_includes/components/alert.macro.html
+++ b/docs/src/_includes/components/alert.macro.html
@@ -1,5 +1,5 @@
{%- macro warning(params) -%}
-
Versions
-
Language Switcher
+
Version Switcher
- Selecting a language will take you to the ESLint Web site in that language.
+ Selecting a version will take you to the chosen version of the ESLint docs.
- Version
+ Version
-
-
- v{{ eslintVersion }}
-
+
+ v{{ eslintVersion }}
{% for version in versions.items %}
+ data-url="{{ version.url }}">
v{{ version.number }}
{% endfor %}
diff --git a/docs/src/_includes/components/navigation.html b/docs/src/_includes/components/navigation.html
index 2aedb4bf664..975e70c97bd 100644
--- a/docs/src/_includes/components/navigation.html
+++ b/docs/src/_includes/components/navigation.html
@@ -1,6 +1,6 @@
-
Donate
+
Donate
@@ -19,7 +19,6 @@
{% include 'components/nav-version-switcher.html' %}
- {% include 'components/nav-search.html' %}
diff --git a/docs/src/_includes/components/rule.macro.html b/docs/src/_includes/components/rule.macro.html
index aa84e3448c9..bcb5c03a698 100644
--- a/docs/src/_includes/components/rule.macro.html
+++ b/docs/src/_includes/components/rule.macro.html
@@ -7,7 +7,7 @@
deprecated
{%- if params.replacedBy|length -%}
- Replaced by {{ params.replacedBy }}
+ Replaced by {{ params.replacedBy }}
{%- else -%}{{ params.description }}
{%- endif -%}
{%- elseif params.removed == true -%}
@@ -16,11 +16,11 @@
removed
{%- if params.replacedBy -%}
- Replaced by {{ params.replacedBy }}
+ Replaced by {{ params.replacedBy }}
{%- else -%}{{ params.description }}
{%- endif -%}
{%- else -%}
- {{ params.name }}
+ {{ params.name }}
{{ params.description }}
{%- endif -%}
diff --git a/docs/src/_includes/components/search.html b/docs/src/_includes/components/search.html
index 6f86571b740..336385869b8 100644
--- a/docs/src/_includes/components/search.html
+++ b/docs/src/_includes/components/search.html
@@ -1,12 +1,22 @@
diff --git a/docs/src/_includes/components/theme-switcher.html b/docs/src/_includes/components/theme-switcher.html
index 7604dc5f705..8100136da41 100644
--- a/docs/src/_includes/components/theme-switcher.html
+++ b/docs/src/_includes/components/theme-switcher.html
@@ -1,13 +1,13 @@
-
Theme Switcher
+
Theme Switcher
diff --git a/docs/src/_includes/components/version-switcher.html b/docs/src/_includes/components/version-switcher.html
index 0d28ba7dc3a..e3431fbb932 100644
--- a/docs/src/_includes/components/version-switcher.html
+++ b/docs/src/_includes/components/version-switcher.html
@@ -1,19 +1,18 @@
+
Versions
Version Switcher
- Selecting a version will take you to the ESLint Web site for that version.
+ Selecting a version will take you to the chosen version of the ESLint docs.
- Version
+ Version
-
- v{{ eslintVersion }}
-
+ v{{ eslintVersion }}
{% for version in versions.items %}
diff --git a/docs/src/_includes/layouts/components.html b/docs/src/_includes/layouts/components.html
index 208186cb07d..07670f8e0dc 100644
--- a/docs/src/_includes/layouts/components.html
+++ b/docs/src/_includes/layouts/components.html
@@ -27,7 +27,7 @@
{% for item in collections.library %}
- {{ item.data.title }}
{% endfor %}
diff --git a/docs/src/_includes/layouts/doc.html b/docs/src/_includes/layouts/doc.html
index 941a880db5e..608d68cfcfc 100644
--- a/docs/src/_includes/layouts/doc.html
+++ b/docs/src/_includes/layouts/doc.html
@@ -5,10 +5,9 @@
{% include "partials/docs-header.html" %}
-