From 4d4069166da05436abdd14bc65d322e47a72d75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?=
 <76261501+zecakeh@users.noreply.github.com>
Date: Wed, 27 Aug 2025 08:35:57 +0200
Subject: [PATCH] Upgrade docsy to 0.12.0 (#2160)

---
 .github/workflows/main.yml                    |  2 +-
 README.md                                     |  2 +-
 .../internal/newsfragments/2160.clarification |  1 +
 config/_default/hugo.toml                     |  4 ++--
 content/changelog/_index.md                   |  1 +
 go.mod                                        |  2 +-
 go.sum                                        |  8 ++++----
 .../_markup/td-heading-self-link.html         | 11 ----------
 .../_markup/render-heading.html               |  2 +-
 layouts/{partials => _partials}/added-in.html |  0
 layouts/{partials => _partials}/alert.html    |  0
 .../{partials => _partials}/breadcrumb.html   |  0
 .../{partials => _partials}/changed-in.html   |  0
 .../events/example.html                       |  0
 .../events/render-event.html                  |  2 +-
 layouts/{partials => _partials}/favicons.html |  0
 .../footer/center.html                        |  0
 layouts/{partials => _partials}/head-css.html |  0
 .../hooks/body-end.html                       |  0
 .../hooks/head-end.html                       |  0
 .../json-schema/resolve-additional-types.html |  6 +++---
 .../json-schema/resolve-allof.html            |  0
 .../json-schema/resolve-examples.html         |  0
 .../json-schema/resolve-refs.html             |  0
 layouts/{partials => _partials}/navbar.html   |  2 +-
 .../openapi/render-api.html                   |  0
 .../openapi/render-content-type.html          |  0
 .../openapi/render-media-type-objects.html    |  0
 .../openapi/render-object-table.html          | 20 +++++++++----------
 .../openapi/render-operation.html             |  2 +-
 .../openapi/render-parameters.html            |  0
 .../openapi/render-request.html               |  0
 .../openapi/render-responses.html             |  0
 .../render-example.html                       |  0
 .../{partials => _partials}/sidebar-tree.html |  0
 layouts/{partials => _partials}/toc.html      |  0
 .../version-banner.html                       |  0
 .../{shortcodes => _shortcodes}/added-in.html |  0
 .../boxes/note.html                           |  0
 .../boxes/rationale.html                      |  0
 .../boxes/warning.html                        |  0
 .../changed-in.html                           |  0
 .../cs-module.html                            |  0
 .../definition.html                           |  0
 .../{shortcodes => _shortcodes}/diagram.html  |  0
 .../event-fields.html                         |  0
 .../event-group.html                          |  0
 .../{shortcodes => _shortcodes}/event.html    |  0
 .../{shortcodes => _shortcodes}/http-api.html |  0
 .../{shortcodes => _shortcodes}/msgtypes.html |  0
 .../proposal-tables.html                      |  0
 .../rver-fragment.html                        |  0
 .../sas-emojis.html                           |  0
 layouts/{_default => }/content.html           |  0
 layouts/docs/baseof.html                      |  4 +++-
 layouts/docs/changelog-index.html             | 13 ++++++++++++
 layouts/docs/changelog.html                   | 16 ++-------------
 57 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 changelogs/internal/newsfragments/2160.clarification
 delete mode 100644 layouts/_default/_markup/td-heading-self-link.html
 rename layouts/{_default => }/_markup/render-heading.html (86%)
 rename layouts/{partials => _partials}/added-in.html (100%)
 rename layouts/{partials => _partials}/alert.html (100%)
 rename layouts/{partials => _partials}/breadcrumb.html (100%)
 rename layouts/{partials => _partials}/changed-in.html (100%)
 rename layouts/{partials => _partials}/events/example.html (100%)
 rename layouts/{partials => _partials}/events/render-event.html (97%)
 rename layouts/{partials => _partials}/favicons.html (100%)
 rename layouts/{partials => _partials}/footer/center.html (100%)
 rename layouts/{partials => _partials}/head-css.html (100%)
 rename layouts/{partials => _partials}/hooks/body-end.html (100%)
 rename layouts/{partials => _partials}/hooks/head-end.html (100%)
 rename layouts/{partials => _partials}/json-schema/resolve-additional-types.html (98%)
 rename layouts/{partials => _partials}/json-schema/resolve-allof.html (100%)
 rename layouts/{partials => _partials}/json-schema/resolve-examples.html (100%)
 rename layouts/{partials => _partials}/json-schema/resolve-refs.html (100%)
 rename layouts/{partials => _partials}/navbar.html (98%)
 rename layouts/{partials => _partials}/openapi/render-api.html (100%)
 rename layouts/{partials => _partials}/openapi/render-content-type.html (100%)
 rename layouts/{partials => _partials}/openapi/render-media-type-objects.html (100%)
 rename layouts/{partials => _partials}/openapi/render-object-table.html (94%)
 rename layouts/{partials => _partials}/openapi/render-operation.html (97%)
 rename layouts/{partials => _partials}/openapi/render-parameters.html (100%)
 rename layouts/{partials => _partials}/openapi/render-request.html (100%)
 rename layouts/{partials => _partials}/openapi/render-responses.html (100%)
 rename layouts/{partials => _partials}/render-example.html (100%)
 rename layouts/{partials => _partials}/sidebar-tree.html (100%)
 rename layouts/{partials => _partials}/toc.html (100%)
 rename layouts/{partials => _partials}/version-banner.html (100%)
 rename layouts/{shortcodes => _shortcodes}/added-in.html (100%)
 rename layouts/{shortcodes => _shortcodes}/boxes/note.html (100%)
 rename layouts/{shortcodes => _shortcodes}/boxes/rationale.html (100%)
 rename layouts/{shortcodes => _shortcodes}/boxes/warning.html (100%)
 rename layouts/{shortcodes => _shortcodes}/changed-in.html (100%)
 rename layouts/{shortcodes => _shortcodes}/cs-module.html (100%)
 rename layouts/{shortcodes => _shortcodes}/definition.html (100%)
 rename layouts/{shortcodes => _shortcodes}/diagram.html (100%)
 rename layouts/{shortcodes => _shortcodes}/event-fields.html (100%)
 rename layouts/{shortcodes => _shortcodes}/event-group.html (100%)
 rename layouts/{shortcodes => _shortcodes}/event.html (100%)
 rename layouts/{shortcodes => _shortcodes}/http-api.html (100%)
 rename layouts/{shortcodes => _shortcodes}/msgtypes.html (100%)
 rename layouts/{shortcodes => _shortcodes}/proposal-tables.html (100%)
 rename layouts/{shortcodes => _shortcodes}/rver-fragment.html (100%)
 rename layouts/{shortcodes => _shortcodes}/sas-emojis.html (100%)
 rename layouts/{_default => }/content.html (100%)
 create mode 100644 layouts/docs/changelog-index.html

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cdaf0431..3bcc6010 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 name: "Spec"
 
 env:
-  HUGO_VERSION: 0.139.0
+  HUGO_VERSION: 0.148.1
   PYTHON_VERSION: 3.13
 
 on:
diff --git a/README.md b/README.md
index 91afa6c5..0678713b 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ place after an MSC has been accepted, not as part of a proposal itself.
 
 1. Install the extended version (often the OS default) of Hugo:
    <https://gohugo.io/getting-started/installing>. Note that at least Hugo
-   v0.123.1 is required.
+   v0.146.0 is required.
 
    Alternatively, use the Docker image at
    https://hub.docker.com/r/klakegg/hugo/. (The "extended edition" is required
diff --git a/changelogs/internal/newsfragments/2160.clarification b/changelogs/internal/newsfragments/2160.clarification
new file mode 100644
index 00000000..57f8b73e
--- /dev/null
+++ b/changelogs/internal/newsfragments/2160.clarification
@@ -0,0 +1 @@
+Upgrade the docsy theme to version 0.12.0.
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index abec3958..e3777cc7 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -8,7 +8,7 @@ enableRobotsTXT = true
 # We disable RSS, because (a) it's useless, (b) Hugo seems to generate broken
 # links to it when used with a --baseURL (for example, https://spec.matrix.org/v1.4/
 # contains `<link rel="alternate" type="application/rss&#43;xml" href="/v1.4/v1.4/index.xml">`).
-disableKinds = ["taxonomy", "RSS"]
+disableKinds = ["taxonomy", "rss"]
 
 [languages]
 [languages.en]
@@ -134,7 +134,7 @@ sidebar_menu_compact = true
 [module]
   [module.hugoVersion]
     extended = true
-    min = "0.123.1"
+    min = "0.146.0"
   [[module.imports]]
     path = "github.com/matrix-org/docsy"
     disable = false
diff --git a/content/changelog/_index.md b/content/changelog/_index.md
index c1c55f6c..0254102a 100644
--- a/content/changelog/_index.md
+++ b/content/changelog/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Changelog
 type: docs
+layout: changelog-index
 weight: 1000
 ---
 
diff --git a/go.mod b/go.mod
index 52d0f21c..60143ea9 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,4 @@ module github.com/matrix-org/matrix-spec
 
 go 1.12
 
-require github.com/matrix-org/docsy v0.0.0-20241106102557-ec7b98ee4014 // indirect
+require github.com/matrix-org/docsy v0.0.0-20250722140156-5df72519f5af // indirect
diff --git a/go.sum b/go.sum
index 04125160..ea991476 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,4 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20240716171331-37eff7fa00de/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/matrix-org/docsy v0.0.0-20241106102557-ec7b98ee4014 h1:CNvxuuURuxkEjA0QN+lRKELc7PRDsX270e8v4GDF3II=
-github.com/matrix-org/docsy v0.0.0-20241106102557-ec7b98ee4014/go.mod h1:4Ek1bcdbfU/j8hIatEjNhIs1Yua85FtQf3kLvoYZ0bQ=
-github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/matrix-org/docsy v0.0.0-20250722140156-5df72519f5af h1:XghgUC0H5BoGrvtT9/oWBUi+5Zux875qRHhpAZ0RURI=
+github.com/matrix-org/docsy v0.0.0-20250722140156-5df72519f5af/go.mod h1:4/t21g/nPraob/DVMm3jrk26k0CDL5I7Mxf+ar0IAgs=
+github.com/twbs/bootstrap v5.3.6+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/layouts/_default/_markup/td-heading-self-link.html b/layouts/_default/_markup/td-heading-self-link.html
deleted file mode 100644
index 3d8d7df5..00000000
--- a/layouts/_default/_markup/td-heading-self-link.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- /*
-
-    A simplified copy of the inlined "_default/_markup/_td-heading-self-link.html"
-    template in Docsy's "_default/_markup/td-render-heading.html" template to be
-    able to reuse it when the heading has custom markup.
-
-    Takes a string which is the ID of the heading.
-
-*/ -}}
-
-<a class="td-heading-self-link" href="#{{ . | safeURL }}" aria-label="Heading self-link"></a>
\ No newline at end of file
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_markup/render-heading.html
similarity index 86%
rename from layouts/_default/_markup/render-heading.html
rename to layouts/_markup/render-heading.html
index 7ae7aba7..d16aac8f 100644
--- a/layouts/_default/_markup/render-heading.html
+++ b/layouts/_markup/render-heading.html
@@ -8,4 +8,4 @@
     heading.
 
 */ -}}
-{{ template "_default/_markup/td-render-heading.html" . }}
+{{ partial "td/render-heading.html" . }}
diff --git a/layouts/partials/added-in.html b/layouts/_partials/added-in.html
similarity index 100%
rename from layouts/partials/added-in.html
rename to layouts/_partials/added-in.html
diff --git a/layouts/partials/alert.html b/layouts/_partials/alert.html
similarity index 100%
rename from layouts/partials/alert.html
rename to layouts/_partials/alert.html
diff --git a/layouts/partials/breadcrumb.html b/layouts/_partials/breadcrumb.html
similarity index 100%
rename from layouts/partials/breadcrumb.html
rename to layouts/_partials/breadcrumb.html
diff --git a/layouts/partials/changed-in.html b/layouts/_partials/changed-in.html
similarity index 100%
rename from layouts/partials/changed-in.html
rename to layouts/_partials/changed-in.html
diff --git a/layouts/partials/events/example.html b/layouts/_partials/events/example.html
similarity index 100%
rename from layouts/partials/events/example.html
rename to layouts/_partials/events/example.html
diff --git a/layouts/partials/events/render-event.html b/layouts/_partials/events/render-event.html
similarity index 97%
rename from layouts/partials/events/render-event.html
rename to layouts/_partials/events/render-event.html
index 31d71115..30a20974 100644
--- a/layouts/partials/events/render-event.html
+++ b/layouts/_partials/events/render-event.html
@@ -24,7 +24,7 @@
 
   <h1 id="{{ $anchor }}">
    {{ with .title }}{{ . | markdownify }}{{ else }}<code>{{ $event_name }}</code>{{ end }}
-   {{ template "_default/_markup/td-heading-self-link.html" $anchor }}
+   {{ partial "td/heading-self-link.html" (dict "Anchor" $anchor) }}
   </h1>
 
 </summary>
diff --git a/layouts/partials/favicons.html b/layouts/_partials/favicons.html
similarity index 100%
rename from layouts/partials/favicons.html
rename to layouts/_partials/favicons.html
diff --git a/layouts/partials/footer/center.html b/layouts/_partials/footer/center.html
similarity index 100%
rename from layouts/partials/footer/center.html
rename to layouts/_partials/footer/center.html
diff --git a/layouts/partials/head-css.html b/layouts/_partials/head-css.html
similarity index 100%
rename from layouts/partials/head-css.html
rename to layouts/_partials/head-css.html
diff --git a/layouts/partials/hooks/body-end.html b/layouts/_partials/hooks/body-end.html
similarity index 100%
rename from layouts/partials/hooks/body-end.html
rename to layouts/_partials/hooks/body-end.html
diff --git a/layouts/partials/hooks/head-end.html b/layouts/_partials/hooks/head-end.html
similarity index 100%
rename from layouts/partials/hooks/head-end.html
rename to layouts/_partials/hooks/head-end.html
diff --git a/layouts/partials/json-schema/resolve-additional-types.html b/layouts/_partials/json-schema/resolve-additional-types.html
similarity index 98%
rename from layouts/partials/json-schema/resolve-additional-types.html
rename to layouts/_partials/json-schema/resolve-additional-types.html
index 9d5e630a..bcc4e562 100644
--- a/layouts/partials/json-schema/resolve-additional-types.html
+++ b/layouts/_partials/json-schema/resolve-additional-types.html
@@ -66,7 +66,7 @@
  *     If the input `schema` was itself an object that we should create a table for,
  *     this will be the same as the first entry in `objects`.
  */
-{{ define "partials/resolve-additional-types-inner" }}
+{{ define "_partials/resolve-additional-types-inner" }}
     {{ $this_object := .schema }}
     {{ $anchor_base := .anchor_base }}
     {{ $name := .name }}
@@ -222,7 +222,7 @@
  *   * `objects`: The array of object schema definitions.
  *   * `schema`: An updated copy of the `schema` input (eg, an `anchor` may be added).
  */
-{{ define "partials/get-additional-objects" }}
+{{ define "_partials/get-additional-objects" }}
     /* .name is the name of the object for logging purposes */
     {{ $name := .name }}
 
@@ -246,6 +246,6 @@
  * This is needed for uniqify to work - otherwise objects that are the same
  * but with (for example) different examples will be considered different.
  */
-{{ define "partials/clean-object" }}
+{{ define "_partials/clean-object" }}
     {{ return (dict "title" .title "properties" .properties "additionalProperties" .additionalProperties "patternProperties" .patternProperties "required" .required "enum" .enum "anchor" .anchor) }}
 {{ end }}
diff --git a/layouts/partials/json-schema/resolve-allof.html b/layouts/_partials/json-schema/resolve-allof.html
similarity index 100%
rename from layouts/partials/json-schema/resolve-allof.html
rename to layouts/_partials/json-schema/resolve-allof.html
diff --git a/layouts/partials/json-schema/resolve-examples.html b/layouts/_partials/json-schema/resolve-examples.html
similarity index 100%
rename from layouts/partials/json-schema/resolve-examples.html
rename to layouts/_partials/json-schema/resolve-examples.html
diff --git a/layouts/partials/json-schema/resolve-refs.html b/layouts/_partials/json-schema/resolve-refs.html
similarity index 100%
rename from layouts/partials/json-schema/resolve-refs.html
rename to layouts/_partials/json-schema/resolve-refs.html
diff --git a/layouts/partials/navbar.html b/layouts/_partials/navbar.html
similarity index 98%
rename from layouts/partials/navbar.html
rename to layouts/_partials/navbar.html
index ca8347ee..0de6f46c 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/_partials/navbar.html
@@ -80,7 +80,7 @@
 </div>
 </nav>
 
-{{ define "partials/version-string" }}
+{{ define "_partials/version-string" }}
     {{ $ret := "unstable version"}}
 
     {{ $status := .Site.Params.version.status }}
diff --git a/layouts/partials/openapi/render-api.html b/layouts/_partials/openapi/render-api.html
similarity index 100%
rename from layouts/partials/openapi/render-api.html
rename to layouts/_partials/openapi/render-api.html
diff --git a/layouts/partials/openapi/render-content-type.html b/layouts/_partials/openapi/render-content-type.html
similarity index 100%
rename from layouts/partials/openapi/render-content-type.html
rename to layouts/_partials/openapi/render-content-type.html
diff --git a/layouts/partials/openapi/render-media-type-objects.html b/layouts/_partials/openapi/render-media-type-objects.html
similarity index 100%
rename from layouts/partials/openapi/render-media-type-objects.html
rename to layouts/_partials/openapi/render-media-type-objects.html
diff --git a/layouts/partials/openapi/render-object-table.html b/layouts/_partials/openapi/render-object-table.html
similarity index 94%
rename from layouts/partials/openapi/render-object-table.html
rename to layouts/_partials/openapi/render-object-table.html
index 08dd5790..00bc4b21 100644
--- a/layouts/partials/openapi/render-object-table.html
+++ b/layouts/_partials/openapi/render-object-table.html
@@ -47,8 +47,8 @@
 
  <tr>
   <td><code>{{ $property_name }}</code></td>
-  <td><code>{{ partial "partials/property-type" $property | safeHTML }}</code></td>
-  <td>{{ partial "partials/property-description" (dict "property" $property "required" $required) }}</td>
+  <td><code>{{ partial "property-type" $property | safeHTML }}</code></td>
+  <td>{{ partial "property-description" (dict "property" $property "required" $required) }}</td>
  </tr>
 
     {{ end }}
@@ -71,8 +71,8 @@
 
  <tr>
   <td>&lt;Other properties&gt;</td>
-  <td><code>{{ partial "partials/property-type" .additionalProperties | safeHTML }}</code></td>
-  <td>{{ partial "partials/property-description" (dict "property" .additionalProperties) }}</td>
+  <td><code>{{ partial "property-type" .additionalProperties | safeHTML }}</code></td>
+  <td>{{ partial "property-description" (dict "property" .additionalProperties) }}</td>
  </tr>
     {{ end }}
 </table>
@@ -101,8 +101,8 @@ resolve-additional-types.)
  {{ $property := . }}
 
  <tr>
-  <td><code>{{ partial "partials/property-type" $property | safeHTML }}</code></td>
-  <td>{{ partial "partials/property-description" (dict "property" $property) }}</td>
+  <td><code>{{ partial "property-type" $property | safeHTML }}</code></td>
+  <td>{{ partial "property-description" (dict "property" $property) }}</td>
  </tr>
 </table>
 
@@ -138,7 +138,7 @@ resolve-additional-types.)
     * `format`: optional string for the format of the type, used for strings.
 
 */}}
-{{ define "partials/property-type" }}
+{{ define "_partials/property-type" }}
     {{ $type := "" }}
 
     {{ if eq .type "object" }}
@@ -215,7 +215,7 @@ resolve-additional-types.)
 
     * `anchor`: optional HTML element id for the target type, which will be used to link to it.
 */}}
-{{ define "partials/object-type-or-title" }}
+{{ define "_partials/object-type-or-title" }}
     {{ $type := "object" }}
     {{ if .properties }}
         {{/*
@@ -306,7 +306,7 @@ resolve-additional-types.)
       * `x-changedInMatrixVersion`: optional string indicating in which Matrix
         spec version this property was last changed.
 */}}
-{{ define "partials/property-description" -}}
+{{ define "_partials/property-description" -}}
     {{ $description := .property.description -}}
     {{ if .required -}}
         {{/*
@@ -331,7 +331,7 @@ resolve-additional-types.)
     Computes the type to display for a string format, given the identifier of
     the format as a string.
 */}} 
-{{ define "partials/string-format" }}
+{{ define "_partials/string-format" }}
   {{ $stringFormat := "" }}
 
   {{ with index site.Data "string-formats" . }}
diff --git a/layouts/partials/openapi/render-operation.html b/layouts/_partials/openapi/render-operation.html
similarity index 97%
rename from layouts/partials/openapi/render-operation.html
rename to layouts/_partials/openapi/render-operation.html
index 7869a42b..c1e34ddf 100644
--- a/layouts/partials/openapi/render-operation.html
+++ b/layouts/_partials/openapi/render-operation.html
@@ -37,7 +37,7 @@
   <h1 id="{{ $anchor }}">
    <span class="http-api-method">{{ $method }}</span>
    <span class="endpoint{{ if $operation_data.deprecated }} deprecated-inline{{ end }}">{{ $endpoint }}</span>
-   {{ template "_default/_markup/td-heading-self-link.html" $anchor }}
+   {{ partial "td/heading-self-link.html" (dict "Anchor" $anchor) }}
   </h1>
 </summary>
 
diff --git a/layouts/partials/openapi/render-parameters.html b/layouts/_partials/openapi/render-parameters.html
similarity index 100%
rename from layouts/partials/openapi/render-parameters.html
rename to layouts/_partials/openapi/render-parameters.html
diff --git a/layouts/partials/openapi/render-request.html b/layouts/_partials/openapi/render-request.html
similarity index 100%
rename from layouts/partials/openapi/render-request.html
rename to layouts/_partials/openapi/render-request.html
diff --git a/layouts/partials/openapi/render-responses.html b/layouts/_partials/openapi/render-responses.html
similarity index 100%
rename from layouts/partials/openapi/render-responses.html
rename to layouts/_partials/openapi/render-responses.html
diff --git a/layouts/partials/render-example.html b/layouts/_partials/render-example.html
similarity index 100%
rename from layouts/partials/render-example.html
rename to layouts/_partials/render-example.html
diff --git a/layouts/partials/sidebar-tree.html b/layouts/_partials/sidebar-tree.html
similarity index 100%
rename from layouts/partials/sidebar-tree.html
rename to layouts/_partials/sidebar-tree.html
diff --git a/layouts/partials/toc.html b/layouts/_partials/toc.html
similarity index 100%
rename from layouts/partials/toc.html
rename to layouts/_partials/toc.html
diff --git a/layouts/partials/version-banner.html b/layouts/_partials/version-banner.html
similarity index 100%
rename from layouts/partials/version-banner.html
rename to layouts/_partials/version-banner.html
diff --git a/layouts/shortcodes/added-in.html b/layouts/_shortcodes/added-in.html
similarity index 100%
rename from layouts/shortcodes/added-in.html
rename to layouts/_shortcodes/added-in.html
diff --git a/layouts/shortcodes/boxes/note.html b/layouts/_shortcodes/boxes/note.html
similarity index 100%
rename from layouts/shortcodes/boxes/note.html
rename to layouts/_shortcodes/boxes/note.html
diff --git a/layouts/shortcodes/boxes/rationale.html b/layouts/_shortcodes/boxes/rationale.html
similarity index 100%
rename from layouts/shortcodes/boxes/rationale.html
rename to layouts/_shortcodes/boxes/rationale.html
diff --git a/layouts/shortcodes/boxes/warning.html b/layouts/_shortcodes/boxes/warning.html
similarity index 100%
rename from layouts/shortcodes/boxes/warning.html
rename to layouts/_shortcodes/boxes/warning.html
diff --git a/layouts/shortcodes/changed-in.html b/layouts/_shortcodes/changed-in.html
similarity index 100%
rename from layouts/shortcodes/changed-in.html
rename to layouts/_shortcodes/changed-in.html
diff --git a/layouts/shortcodes/cs-module.html b/layouts/_shortcodes/cs-module.html
similarity index 100%
rename from layouts/shortcodes/cs-module.html
rename to layouts/_shortcodes/cs-module.html
diff --git a/layouts/shortcodes/definition.html b/layouts/_shortcodes/definition.html
similarity index 100%
rename from layouts/shortcodes/definition.html
rename to layouts/_shortcodes/definition.html
diff --git a/layouts/shortcodes/diagram.html b/layouts/_shortcodes/diagram.html
similarity index 100%
rename from layouts/shortcodes/diagram.html
rename to layouts/_shortcodes/diagram.html
diff --git a/layouts/shortcodes/event-fields.html b/layouts/_shortcodes/event-fields.html
similarity index 100%
rename from layouts/shortcodes/event-fields.html
rename to layouts/_shortcodes/event-fields.html
diff --git a/layouts/shortcodes/event-group.html b/layouts/_shortcodes/event-group.html
similarity index 100%
rename from layouts/shortcodes/event-group.html
rename to layouts/_shortcodes/event-group.html
diff --git a/layouts/shortcodes/event.html b/layouts/_shortcodes/event.html
similarity index 100%
rename from layouts/shortcodes/event.html
rename to layouts/_shortcodes/event.html
diff --git a/layouts/shortcodes/http-api.html b/layouts/_shortcodes/http-api.html
similarity index 100%
rename from layouts/shortcodes/http-api.html
rename to layouts/_shortcodes/http-api.html
diff --git a/layouts/shortcodes/msgtypes.html b/layouts/_shortcodes/msgtypes.html
similarity index 100%
rename from layouts/shortcodes/msgtypes.html
rename to layouts/_shortcodes/msgtypes.html
diff --git a/layouts/shortcodes/proposal-tables.html b/layouts/_shortcodes/proposal-tables.html
similarity index 100%
rename from layouts/shortcodes/proposal-tables.html
rename to layouts/_shortcodes/proposal-tables.html
diff --git a/layouts/shortcodes/rver-fragment.html b/layouts/_shortcodes/rver-fragment.html
similarity index 100%
rename from layouts/shortcodes/rver-fragment.html
rename to layouts/_shortcodes/rver-fragment.html
diff --git a/layouts/shortcodes/sas-emojis.html b/layouts/_shortcodes/sas-emojis.html
similarity index 100%
rename from layouts/shortcodes/sas-emojis.html
rename to layouts/_shortcodes/sas-emojis.html
diff --git a/layouts/_default/content.html b/layouts/content.html
similarity index 100%
rename from layouts/_default/content.html
rename to layouts/content.html
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index a167f72b..ef748ab7 100644
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -25,7 +25,9 @@
           </aside>
           <main class="col-12 col-md-9 col-xl-8 ps-md-5" role="main">
             {{ partial "version-banner.html" . }}
-            {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
+            {{ if not (.Param "ui.breadcrumb_disable") -}}
+              {{ partial "breadcrumb.html" . -}}
+            {{ end -}}
             {{ block "main" . }}{{ end }}
           </main>
         </div>
diff --git a/layouts/docs/changelog-index.html b/layouts/docs/changelog-index.html
new file mode 100644
index 00000000..11471498
--- /dev/null
+++ b/layouts/docs/changelog-index.html
@@ -0,0 +1,13 @@
+{{- /*
+
+    Template to the `changelog` section page.
+
+    This redirects the page to the latest version's changelog page.
+
+*/ -}}
+
+{{ define "main" }}
+    {{ with index .RegularPages.ByDate.Reverse 0 -}}
+    <meta http-equiv="refresh" content="0; url={{ .RelPermalink }}">
+    {{ end -}}
+{{ end }}
diff --git a/layouts/docs/changelog.html b/layouts/docs/changelog.html
index 94fa55a3..805d3609 100644
--- a/layouts/docs/changelog.html
+++ b/layouts/docs/changelog.html
@@ -1,14 +1,8 @@
 {{- /*
 
-    Template to render a page with a `changelog` layout or the `changelog`
-    section page. This conflation seems to be a limitation of Hugo currently, it
-    uses this template for both cases.
+    Template to render a page with a `changelog` layout.
 
-    For the `changelog` section page, this redirects the page to the latest
-    version's changelog page.
-
-    For a page with a `changelog` layout, this adds a table at the top of the
-    page with information about the release:
+    This adds a table at the top of the page with information about the release:
 
     * A link to the matrix-spec repository at the time of the release, with the
       version taken from the `linkTitle` in the frontmatter of the page, unless
@@ -21,11 +15,6 @@
 */ -}}
 
 {{ define "main" }}
-{{ if .IsSection -}}
-    {{ with index .RegularPages.ByDate.Reverse 0 -}}
-    <meta http-equiv="refresh" content="0; url={{ .RelPermalink }}">
-    {{ end -}}
-{{ else -}}
     {{ $version := lower .LinkTitle -}}
 <div class="td-content">
     <h1>{{ .Title }}</h1>
@@ -50,5 +39,4 @@
 
     {{ .Content }}
 </div>
-{{ end -}}
 {{ end }}