releaser: Prepare repository for 0.124.0-DEV

[ci skip]
2026-08-31 10:42:38 +00:00 · 2024-02-28 18:43:16 +00:00
188 changed files with 1212 additions and 4399 deletions
@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
  resource_class: large
  docker:
-      - image: bepsays/ci-hugoreleaser:1.22200.20201
+      - image: bepsays/ci-hugoreleaser:1.22200.20000
 environment: &buildenv
      GOMODCACHE: /root/project/gomodcache
 version: 2
@@ -60,7 +60,7 @@ jobs:
    environment:
        <<: [*buildenv]
    docker:
-    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22200.20201
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22200.20000
    steps:
      - *restore-cache
      - &attach-workspace
@@ -1,13 +1,13 @@
 on:
  push:
-    branches: [master]
+    branches: [ master ]
  pull_request:
 name: TestDartSassV1
 env:
-  GOPROXY: https://proxy.golang.org
-  GO111MODULE: on
-  DART_SASS_VERSION: 1.62.1
-  DART_SASS_SHA_LINUX: 3574da75a7322a539034648b8ff84ff2cca162eb924d72b663d718cd3936f075
+    GOPROXY: https://proxy.golang.org
+    GO111MODULE: on
+    DART_SASS_VERSION: 1.62.1
+    DART_SASS_SHA_LINUX: 3574da75a7322a539034648b8ff84ff2cca162eb924d72b663d718cd3936f075
 permissions:
  contents: read
 jobs:
@@ -18,69 +18,56 @@ jobs:
        os: [ubuntu-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - if: matrix.os == 'ubuntu-latest'
-        name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Install Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
-        with:
-          go-version: ${{ matrix.go-version }}
-          check-latest: true
-          cache: true
-          cache-dependency-path: |
-            **/go.sum
-            **/go.mod
-      - name: Install Ruby
-        uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true #
-      - name: Install Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
-        with:
-          python-version: "3.x"
-      - name: Install Mage
-        run: go install github.com/magefile/mage@v1.15.0
-      - name: Install asciidoctor
-        uses: reitzig/actions-asciidoctor@03fcc74cd74880b697950c4930c9ec8a67c69ecc
-      - name: Install docutils
-        run: |
-          pip install docutils
-          rst2html --version
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install pandoc on Linux
-        run: |
+    - name: Checkout code
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+    - name: Install Go
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+      with:
+        go-version: ${{ matrix.go-version }}
+        check-latest: true
+        cache: true
+        cache-dependency-path: |
+          **/go.sum
+          **/go.mod
+    - name: Install Ruby
+      uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b
+      with:
+        ruby-version: '2.7' 
+        bundler-cache: true #
+    - name: Install Python
+      uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+      with:
+        python-version: '3.x'
+    - name: Install Mage
+      run: go install github.com/magefile/mage@v1.15.0
+    - name: Install asciidoctor
+      uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
+    - name: Install docutils
+      run: |
+        pip install docutils
+        rst2html.py --version
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install pandoc on Linux
+      run: |
          sudo apt-get update -y
          sudo apt-get install -y pandoc
-      - if: matrix.os == 'macos-latest'
-        run: |
-          brew install pandoc
-      - if: matrix.os == 'windows-latest'
-        run: |
-          Choco-Install -PackageName pandoc
-      - run: pandoc -v
-      - name: Install dart-sass-embedded Linux
-        run: |
-          echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
-          echo "${DART_SASS_SHA_LINUX}  sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
-          tar -xvf "sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
-          echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
-      - name: Check
-        run: |
-          dart-sass-embedded --version
-          mage -v check;
-        env:
-          HUGO_BUILD_TAGS: extended
+    - if: matrix.os == 'macos-latest'
+      run: |
+        brew install pandoc
+    - if: matrix.os == 'windows-latest'
+      run: |
+        Choco-Install -PackageName pandoc
+    - run: pandoc -v
+    - name: Install dart-sass-embedded Linux
+      run: |
+        echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
+        echo "${DART_SASS_SHA_LINUX}  sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
+        tar -xvf "sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
+        echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
+    - name: Check
+      run: |
+        dart-sass-embedded --version
+        mage -v check;
+      env:
+        HUGO_BUILD_TAGS: extended
@@ -1,132 +1,119 @@
 on:
  push:
-    branches: [master]
+    branches: [ master ]
  pull_request:
 name: Test
 env:
-  GOPROXY: https://proxy.golang.org
-  GO111MODULE: on
-  SASS_VERSION: 1.63.2
-  DART_SASS_SHA_LINUX: 3ea33c95ad5c35fda6e9a0956199eef38a398f496cfb8750e02479d7d1dd42af
-  DART_SASS_SHA_MACOS: 11c70f259836b250b44a9cb57fed70e030f21f45069b467d371685855f1eb4f0
-  DART_SASS_SHA_WINDOWS: cd8cd36a619dd8e27f93d3186c52d70eb7d69472aa6c85f5094b29693e773f64
+    GOPROXY: https://proxy.golang.org
+    GO111MODULE: on
+    SASS_VERSION: 1.63.2
+    DART_SASS_SHA_LINUX: 3ea33c95ad5c35fda6e9a0956199eef38a398f496cfb8750e02479d7d1dd42af
+    DART_SASS_SHA_MACOS: 11c70f259836b250b44a9cb57fed70e030f21f45069b467d371685855f1eb4f0
+    DART_SASS_SHA_WINDOWS: cd8cd36a619dd8e27f93d3186c52d70eb7d69472aa6c85f5094b29693e773f64
 permissions:
  contents: read
 jobs:
  test:
    strategy:
      matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.21.x,1.22.x]
        os: [ubuntu-latest, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - if: matrix.os == 'ubuntu-latest'
-        name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Install Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
-        with:
-          go-version: ${{ matrix.go-version }}
-          check-latest: true
-          cache: true
-          cache-dependency-path: |
-            **/go.sum
-            **/go.mod
-      - name: Install Ruby
-        uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true #
-      - name: Install Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
-        with:
-          python-version: "3.x"
-      - name: Install Mage
-        run: go install github.com/magefile/mage@v1.15.0
-      - name: Install asciidoctor
-        uses: reitzig/actions-asciidoctor@03fcc74cd74880b697950c4930c9ec8a67c69ecc
-      - name: Install docutils
-        run: |
-          pip install docutils
-          rst2html --version
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install pandoc on Linux
-        run: |
+    - name: Checkout code
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+    - name: Install Go
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+      with:
+        go-version: ${{ matrix.go-version }}
+        check-latest: true
+        cache: true
+        cache-dependency-path: |
+          **/go.sum
+          **/go.mod
+    - name: Install Ruby
+      uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b
+      with:
+        ruby-version: '2.7'
+        bundler-cache: true #
+    - name: Install Python
+      uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+      with:
+        python-version: '3.x'
+    - name: Install Mage
+      run: go install github.com/magefile/mage@v1.15.0
+    - name: Install asciidoctor
+      uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
+    - name: Install docutils
+      run: |
+        pip install docutils
+        rst2html.py --version
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install pandoc on Linux
+      run: |
          sudo apt-get update -y
          sudo apt-get install -y pandoc
-      - if: matrix.os == 'macos-latest'
-        run: |
-          brew install pandoc
-      - if: matrix.os == 'windows-latest'
-        run: |
-          choco install pandoc
-      - run: pandoc -v
-      - if: matrix.os == 'windows-latest'
-        run: |
-          choco install mingw
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install dart-sass Linux
-        run: |
-          echo "Install Dart Sass version ${SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
-          echo "${DART_SASS_SHA_LINUX}  dart-sass-${SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
-          tar -xvf "dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
-          echo "$GOBIN"
-          echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
-      - if: matrix.os == 'macos-latest'
-        name: Install dart-sass MacOS
-        run: |
-          echo "Install Dart Sass version ${SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
-          echo "${DART_SASS_SHA_MACOS}  dart-sass-${SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c;
-          tar -xvf "dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
-          echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
-      - if: matrix.os == 'windows-latest'
-        name: Install dart-sass Windows
-        run: |
-          echo "Install Dart Sass version ${env:SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${env:SASS_VERSION}/dart-sass-${env:SASS_VERSION}-windows-x64.zip";
-          Expand-Archive -Path "dart-sass-${env:SASS_VERSION}-windows-x64.zip" -DestinationPath .;
-          echo  "$env:GITHUB_WORKSPACE/dart-sass/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@latest
-      - if: matrix.os == 'ubuntu-latest'
-        name: Run staticcheck
-        run: staticcheck ./...
-      - if: matrix.os != 'windows-latest'
-        name: Check
-        run: |
-          sass --version;
-          mage -v check;
-        env:
-          HUGO_BUILD_TAGS: extended
-      - if: matrix.os == 'windows-latest'
-        # See issue #11052. We limit the build to regular test (no -race flag) on Windows for now.
-        name: Test
-        run: |
-          mage -v test;
-        env:
-          HUGO_BUILD_TAGS: extended
-      - name: Build tags
-        run: |
-          go install -tags extended,nodeploy
-      - if: matrix.os == 'ubuntu-latest'
-        name: Build for dragonfly
-        run: |
-          go install
-        env:
-          GOARCH: amd64
-          GOOS: dragonfly
+    - if: matrix.os == 'macos-latest'
+      run: |
+        brew install pandoc
+    - if: matrix.os == 'windows-latest'
+      run: |
+        choco install pandoc
+    - run: pandoc -v
+    - if: matrix.os == 'windows-latest'
+      run: |
+        choco install mingw
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install dart-sass Linux
+      run: |
+        echo "Install Dart Sass version ${SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
+        echo "${DART_SASS_SHA_LINUX}  dart-sass-${SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
+        tar -xvf "dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
+        echo "$GOBIN"
+        echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
+    - if: matrix.os == 'macos-latest'
+      name: Install dart-sass MacOS
+      run: |
+        echo "Install Dart Sass version ${SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
+        echo "${DART_SASS_SHA_MACOS}  dart-sass-${SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c;
+        tar -xvf "dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
+        echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
+    - if: matrix.os == 'windows-latest'
+      name: Install dart-sass Windows
+      run: |
+        echo "Install Dart Sass version ${env:SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${env:SASS_VERSION}/dart-sass-${env:SASS_VERSION}-windows-x64.zip";
+        Expand-Archive -Path "dart-sass-${env:SASS_VERSION}-windows-x64.zip" -DestinationPath .;
+        echo  "$env:GITHUB_WORKSPACE/dart-sass/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install staticcheck
+      run: go install honnef.co/go/tools/cmd/staticcheck@latest
+    - if: matrix.os == 'ubuntu-latest'
+      name: Run staticcheck
+      run: staticcheck ./...
+    - if: matrix.os != 'windows-latest'
+      name: Check
+      run: |
+        sass --version;
+        mage -v check;
+      env:
+        HUGO_BUILD_TAGS: extended
+    - if: matrix.os == 'windows-latest'
+      # See issue #11052. We limit the build to regular test (no -race flag) on Windows for now.
+      name: Test
+      run: |
+        mage -v test;
+      env:
+        HUGO_BUILD_TAGS: extended
+    - name: Build tags
+      run: |
+        go install -tags extended,nodeploy
+    - if: matrix.os == 'ubuntu-latest'
+      name: Build for dragonfly
+      run: |
+        go install
+      env:
+        GOARCH: amd64
+        GOOS: dragonfly
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2022 The Hugo Authors.

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -4,4 +4,4 @@

 Please report (suspected) security vulnerabilities to **[bjorn.erik.pedersen@gmail.com](mailto:bjorn.erik.pedersen@gmail.com)**. You will receive a response from us within 48 hours. If we can confirm the issue, we will release a patch as soon as possible depending on the complexity of the issue but historically within days.

-Also see [Hugo's Security Model](https://gohugo.io/about/security/).
+Also see [Hugo's Security Model](https://gohugo.io/about/security-model/).
@@ -140,25 +140,16 @@ func (c *Cache) DrainEvictedIdentities() []identity.Identity {
 }

 // ClearMatching clears all partition for which the predicate returns true.
-func (c *Cache) ClearMatching(predicatePartition func(k string, p PartitionManager) bool, predicateValue func(k, v any) bool) {
-	if predicatePartition == nil {
-		predicatePartition = func(k string, p PartitionManager) bool { return true }
-	}
-	if predicateValue == nil {
-		panic("nil predicateValue")
-	}
+func (c *Cache) ClearMatching(predicate func(k, v any) bool) {
 	g := rungroup.Run[PartitionManager](context.Background(), rungroup.Config[PartitionManager]{
 		NumWorkers: len(c.partitions),
 		Handle: func(ctx context.Context, partition PartitionManager) error {
-			partition.clearMatching(predicateValue)
+			partition.clearMatching(predicate)
 			return nil
 		},
 	})

-	for k, p := range c.partitions {
-		if !predicatePartition(k, p) {
-			continue
-		}
+	for _, p := range c.partitions {
 		g.Enqueue(p)
 	}

@@ -349,7 +340,7 @@ func GetOrCreatePartition[K comparable, V any](c *Cache, name string, opts Optio
 		return p.(*Partition[K, V])
 	}

-	// At this point, we don't know the number of partitions or their configuration, but
+	// At this point, we don't know the the number of partitions or their configuration, but
 	// this will be re-adjusted later.
 	const numberOfPartitionsEstimate = 10
 	maxSize := opts.CalculateMaxSize(c.opts.MaxSize / numberOfPartitionsEstimate)
@@ -365,7 +356,6 @@ func GetOrCreatePartition[K comparable, V any](c *Cache, name string, opts Optio
 		trace:   c.opts.Log.Logger().WithLevel(logg.LevelTrace).WithField("partition", name),
 		opts:    opts,
 	}
-
 	c.partitions[name] = partition

 	return partition
@@ -156,7 +156,7 @@ func TestClear(t *testing.T) {

 	cache = newTestCache(t)

-	cache.ClearMatching(nil, func(k, v any) bool {
+	cache.ClearMatching(func(k, v any) bool {
 		return k.(string) == "clearOnRebuild"
 	})

@@ -48,7 +48,6 @@ import (
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/resources/kinds"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 )
@@ -128,7 +127,6 @@ type rootCommand struct {
 	verbose bool
 	debug   bool
 	quiet   bool
-	devMode bool // Hidden flag.

 	renderToMemory bool

@@ -424,33 +422,29 @@ func (r *rootCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 func (r *rootCommand) createLogger(running bool) (loggers.Logger, error) {
 	level := logg.LevelWarn

-	if r.devMode {
-		level = logg.LevelTrace
+	if r.logLevel != "" {
+		switch strings.ToLower(r.logLevel) {
+		case "debug":
+			level = logg.LevelDebug
+		case "info":
+			level = logg.LevelInfo
+		case "warn", "warning":
+			level = logg.LevelWarn
+		case "error":
+			level = logg.LevelError
+		default:
+			return nil, fmt.Errorf("invalid log level: %q, must be one of debug, warn, info or error", r.logLevel)
+		}
 	} else {
-		if r.logLevel != "" {
-			switch strings.ToLower(r.logLevel) {
-			case "debug":
-				level = logg.LevelDebug
-			case "info":
-				level = logg.LevelInfo
-			case "warn", "warning":
-				level = logg.LevelWarn
-			case "error":
-				level = logg.LevelError
-			default:
-				return nil, fmt.Errorf("invalid log level: %q, must be one of debug, warn, info or error", r.logLevel)
-			}
-		} else {
-			if r.verbose {
-				hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
-				hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
-				level = logg.LevelInfo
-			}
+		if r.verbose {
+			hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
+			hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
+			level = logg.LevelInfo
+		}

-			if r.debug {
-				hugo.Deprecate("--debug", "use --logLevel debug", "v0.114.0")
-				level = logg.LevelDebug
-			}
+		if r.debug {
+			hugo.Deprecate("--debug", "use --logLevel debug", "v0.114.0")
+			level = logg.LevelDebug
 		}
 	}

@@ -488,50 +482,46 @@ Complete documentation is available at https://gohugo.io/.`

 	// Configure persistent flags
 	cmd.PersistentFlags().StringVarP(&r.source, "source", "s", "", "filesystem path to read files relative from")
-	_ = cmd.MarkFlagDirname("source")
+	cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 	cmd.PersistentFlags().StringP("destination", "d", "", "filesystem path to write files to")
-	_ = cmd.MarkFlagDirname("destination")
+	cmd.PersistentFlags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})

 	cmd.PersistentFlags().StringVarP(&r.environment, "environment", "e", "", "build environment")
-	_ = cmd.RegisterFlagCompletionFunc("environment", cobra.NoFileCompletions)
 	cmd.PersistentFlags().StringP("themesDir", "", "", "filesystem path to themes directory")
-	_ = cmd.MarkFlagDirname("themesDir")
 	cmd.PersistentFlags().StringP("ignoreVendorPaths", "", "", "ignores any _vendor for module paths matching the given Glob pattern")
-	_ = cmd.RegisterFlagCompletionFunc("ignoreVendorPaths", cobra.NoFileCompletions)
 	cmd.PersistentFlags().String("clock", "", "set the clock used by Hugo, e.g. --clock 2021-11-06T22:30:00.00+09:00")
-	_ = cmd.RegisterFlagCompletionFunc("clock", cobra.NoFileCompletions)

 	cmd.PersistentFlags().StringVar(&r.cfgFile, "config", "", "config file (default is hugo.yaml|json|toml)")
-	_ = cmd.MarkFlagFilename("config", config.ValidConfigFileExtensions...)
 	cmd.PersistentFlags().StringVar(&r.cfgDir, "configDir", "config", "config dir")
-	_ = cmd.MarkFlagDirname("configDir")
 	cmd.PersistentFlags().BoolVar(&r.quiet, "quiet", false, "build in quiet mode")
 	cmd.PersistentFlags().BoolVar(&r.renderToMemory, "renderToMemory", false, "render to memory (mostly useful when running the server)")

+	// Set bash-completion
+	_ = cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, config.ValidConfigFileExtensions)
+
 	cmd.PersistentFlags().BoolVarP(&r.verbose, "verbose", "v", false, "verbose output")
 	cmd.PersistentFlags().BoolVarP(&r.debug, "debug", "", false, "debug output")
-	cmd.PersistentFlags().BoolVarP(&r.devMode, "devMode", "", false, "only used for internal testing, flag hidden.")
 	cmd.PersistentFlags().StringVar(&r.logLevel, "logLevel", "", "log level (debug|info|warn|error)")
-	_ = cmd.RegisterFlagCompletionFunc("logLevel", cobra.FixedCompletions([]string{"debug", "info", "warn", "error"}, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().BoolVarP(&r.buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")

-	cmd.PersistentFlags().MarkHidden("devMode")
-
 	// Configure local flags
 	applyLocalFlagsBuild(cmd, r)

+	// Set bash-completion.
+	// Each flag must first be defined before using the SetAnnotation() call.
+	_ = cmd.Flags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+
 	return nil
 }

 // A sub set of the complete build flags. These flags are used by new and mod.
 func applyLocalFlagsBuildConfig(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().StringSliceP("theme", "t", []string{}, "themes to use (located in /themes/THEMENAME/)")
-	_ = cmd.MarkFlagDirname("theme")
 	cmd.Flags().StringVarP(&r.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. https://spf13.com/")
 	cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory")
-	_ = cmd.MarkFlagDirname("cacheDir")
+	_ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
 	cmd.Flags().StringP("contentDir", "c", "", "filesystem path to content directory")
-	cmd.Flags().StringSliceP("renderSegments", "", []string{}, "named segments to render (configured in the segments config)")
+	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
 }

 // Flags needed to do a build (used by hugo and hugo server commands)
@@ -544,10 +534,8 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
 	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date, author, and CODEOWNERS info to the pages")
 	cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
-	_ = cmd.MarkFlagDirname("layoutDir")
 	cmd.Flags().BoolVar(&r.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
 	cmd.Flags().StringVar(&r.poll, "poll", "", "set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes")
-	_ = cmd.RegisterFlagCompletionFunc("poll", cobra.NoFileCompletions)
 	cmd.Flags().Bool("panicOnWarning", false, "panic on first WARNING log")
 	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
 	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
@@ -570,8 +558,8 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().MarkHidden("profile-mutex")

 	cmd.Flags().StringSlice("disableKinds", []string{}, "disable different kind of pages (home, RSS etc.)")
-	_ = cmd.RegisterFlagCompletionFunc("disableKinds", cobra.FixedCompletions(kinds.AllKinds, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().Bool("minify", false, "minify any supported output format (HTML, XML etc.)")
+	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
 }

 func (r *rootCommand) timeTrack(start time.Time, name string) {
@@ -28,7 +28,6 @@ import (
 	"github.com/gohugoio/hugo/modules"
 	"github.com/gohugoio/hugo/parser"
 	"github.com/gohugoio/hugo/parser/metadecoders"
-	"github.com/spf13/cobra"
 )

 // newConfigCommand creates a new config command and its subcommands.
@@ -113,9 +112,7 @@ func (c *configCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd.Short = "Print the site configuration"
 	cmd.Long = `Print the site configuration, both default and custom settings.`
 	cmd.Flags().StringVar(&c.format, "format", "toml", "preferred file format (toml, yaml or json)")
-	_ = cmd.RegisterFlagCompletionFunc("format", cobra.FixedCompletions([]string{"toml", "yaml", "json"}, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().StringVar(&c.lang, "lang", "", "the language to display config for. Defaults to the first language defined.")
-	_ = cmd.RegisterFlagCompletionFunc("lang", cobra.NoFileCompletions)
 	applyLocalFlagsBuildConfig(cmd, c.r)

 	return nil
@@ -226,7 +223,6 @@ func (c *configMountsCommand) Init(cd *simplecobra.Commandeer) error {
 	c.r = cd.Root.Command.(*rootCommand)
 	cmd := cd.CobraCommand
 	cmd.Short = "Print the configured file mounts"
-	cmd.ValidArgsFunction = cobra.NoFileCompletions
 	applyLocalFlagsBuildConfig(cmd, c.r)
 	return nil
 }
@@ -46,7 +46,6 @@ to use JSON for the front matter.`,
 					return c.convertContents(metadecoders.JSON)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 			&simpleCommand{
@@ -58,7 +57,6 @@ to use TOML for the front matter.`,
 					return c.convertContents(metadecoders.TOML)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 			&simpleCommand{
@@ -70,7 +68,6 @@ to use YAML for the front matter.`,
 					return c.convertContents(metadecoders.YAML)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 		},
@@ -111,7 +108,6 @@ func (c *convertCommand) Init(cd *simplecobra.Commandeer) error {
 See convert's subcommands toJSON, toTOML and toYAML for more information.`

 	cmd.PersistentFlags().StringVarP(&c.outputDir, "output", "o", "", "filesystem path to write files to")
-	_ = cmd.MarkFlagDirname("output")
 	cmd.PersistentFlags().BoolVar(&c.unsafe, "unsafe", false, "enable less safe operations, please backup first")

 	cmd.RunE = nil
@@ -60,17 +60,13 @@ documentation.
 			return deployer.Deploy(ctx)
 		},
 		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
 			cmd.Flags().String("target", "", "target deployment from deployments section in config file; defaults to the first one")
-			_ = cmd.RegisterFlagCompletionFunc("target", cobra.NoFileCompletions)
 			cmd.Flags().Bool("confirm", false, "ask for confirmation before making changes to the target")
 			cmd.Flags().Bool("dryRun", false, "dry run")
 			cmd.Flags().Bool("force", false, "force upload of all files")
 			cmd.Flags().Bool("invalidateCDN", deployconfig.DefaultConfig.InvalidateCDN, "invalidate the CDN cache listed in the deployment target")
 			cmd.Flags().Int("maxDeletes", deployconfig.DefaultConfig.MaxDeletes, "maximum # of files to delete, or -1 to disable")
-			_ = cmd.RegisterFlagCompletionFunc("maxDeletes", cobra.NoFileCompletions)
 			cmd.Flags().Int("workers", deployconfig.DefaultConfig.Workers, "number of workers to transfer files. defaults to 10")
-			_ = cmd.RegisterFlagCompletionFunc("workers", cobra.NoFileCompletions)
 		},
 	}
 }
@@ -19,7 +19,6 @@ import (

 	"github.com/bep/simplecobra"
 	"github.com/gohugoio/hugo/common/hugo"
-	"github.com/spf13/cobra"
 )

 func newEnvCommand() simplecobra.Commander {
@@ -48,9 +47,6 @@ func newEnvCommand() simplecobra.Commander {
 			}
 			return nil
 		},
-		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
-		},
 	}
 }

@@ -63,8 +59,5 @@ func newVersionCmd() simplecobra.Commander {
 		},
 		short: "Print Hugo version and environment info",
 		long:  "Print Hugo version and environment info. This is useful in Hugo bug reports.",
-		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
-		},
 	}
 }
@@ -45,10 +45,9 @@ func newGenCommand() *genCommand {
 		genmandir string

 		// Chroma flags.
-		style                  string
-		highlightStyle         string
-		lineNumbersInlineStyle string
-		lineNumbersTableStyle  string
+		style          string
+		highlightStyle string
+		linesStyle     string
 	)

 	newChromaStyles := func() simplecobra.Commander {
@@ -64,11 +63,8 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				if highlightStyle != "" {
 					builder.Add(chroma.LineHighlight, highlightStyle)
 				}
-				if lineNumbersInlineStyle != "" {
-					builder.Add(chroma.LineNumbers, lineNumbersInlineStyle)
-				}
-				if lineNumbersTableStyle != "" {
-					builder.Add(chroma.LineNumbersTable, lineNumbersTableStyle)
+				if linesStyle != "" {
+					builder.Add(chroma.LineNumbers, linesStyle)
 				}
 				style, err := builder.Build()
 				if err != nil {
@@ -79,15 +75,9 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&style, "style", "friendly", "highlighter style (see https://xyproto.github.io/splash/docs/)")
-				_ = cmd.RegisterFlagCompletionFunc("style", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&highlightStyle, "highlightStyle", "", `foreground and background colors for highlighted lines, e.g. --highlightStyle "#fff000 bg:#000fff"`)
-				_ = cmd.RegisterFlagCompletionFunc("highlightStyle", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&lineNumbersInlineStyle, "lineNumbersInlineStyle", "", `foreground and background colors for inline line numbers, e.g. --lineNumbersInlineStyle "#fff000 bg:#000fff"`)
-				_ = cmd.RegisterFlagCompletionFunc("lineNumbersInlineStyle", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&lineNumbersTableStyle, "lineNumbersTableStyle", "", `foreground and background colors for table line numbers, e.g. --lineNumbersTableStyle "#fff000 bg:#000fff"`)
-				_ = cmd.RegisterFlagCompletionFunc("lineNumbersTableStyle", cobra.NoFileCompletions)
+				cmd.PersistentFlags().StringVar(&highlightStyle, "highlightStyle", "", "style used for highlighting lines (see https://github.com/alecthomas/chroma)")
+				cmd.PersistentFlags().StringVar(&linesStyle, "linesStyle", "", "style used for line numbers (see https://github.com/alecthomas/chroma)")
 			},
 		}
 	}
@@ -125,9 +115,9 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
-				_ = cmd.MarkFlagDirname("dir")
+				// For bash-completion
+				cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 			},
 		}
 	}
@@ -182,9 +172,9 @@ url: %s
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
-				_ = cmd.MarkFlagDirname("dir")
+				// For bash-completion
+				cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 			},
 		}
 	}
@@ -237,7 +227,6 @@ url: %s
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
 				cmd.Hidden = true
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVarP(&docsHelperTarget, "dir", "", "docs/data", "data dir")
 			},
 		}
@@ -58,7 +58,6 @@ Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root
 					return c.importFromJekyll(args)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					cmd.Flags().BoolVar(&c.force, "force", false, "allow import into non-empty target directory")
 				},
 			},
@@ -26,7 +26,6 @@ import (
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/resources/page"
 	"github.com/gohugoio/hugo/resources/resource"
-	"github.com/spf13/cobra"
 )

 // newListCommand creates a new list command and its subcommands.
@@ -103,9 +102,6 @@ func newListCommand() *listCommand {
 						"buildExpired", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "future",
@@ -123,9 +119,6 @@ func newListCommand() *listCommand {
 						"buildDrafts", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "expired",
@@ -143,9 +136,6 @@ func newListCommand() *listCommand {
 						"buildDrafts", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "all",
@@ -157,9 +147,6 @@ func newListCommand() *listCommand {
 					}
 					return list(cd, r, shouldInclude, "buildDrafts", true, "buildFuture", true, "buildExpired", true)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 		},
 	}
@@ -62,7 +62,6 @@ removed from Hugo, but we need to test this out in "real life" to get a feel of
 so this may/will change in future versions of Hugo.
 `,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -90,7 +89,6 @@ so this may/will change in future versions of Hugo.
 	inside a subfolder on GitHub, as one example.
 	`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -110,7 +108,6 @@ so this may/will change in future versions of Hugo.
 				short: "Verify dependencies.",
 				long:  `Verify checks that the dependencies of the current module, which are stored in a local downloaded source cache, have not been modified since being downloaded.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().BoolVarP(&clean, "clean", "", false, "delete module cache for dependencies that fail verification")
 				},
@@ -130,7 +127,6 @@ so this may/will change in future versions of Hugo.
 Note that for vendored modules, that is the version listed and not the one from go.mod.
 `,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().BoolVarP(&clean, "clean", "", false, "delete module cache for dependencies that fail verification")
 				},
@@ -148,10 +144,8 @@ Note that for vendored modules, that is the version listed and not the one from
 				short: "Delete the Hugo Module cache for the current project.",
 				long:  `Delete the Hugo Module cache for the current project.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().StringVarP(&pattern, "pattern", "", "", `pattern matching module paths to clean (all if not set), e.g. "**hugo*"`)
-					_ = cmd.RegisterFlagCompletionFunc("pattern", cobra.NoFileCompletions)
 					cmd.Flags().BoolVarP(&all, "all", "", false, "clean entire module cache")
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -173,7 +167,6 @@ Note that for vendored modules, that is the version listed and not the one from
 				name:  "tidy",
 				short: "Remove unused entries in go.mod and go.sum.",
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -191,7 +184,6 @@ Note that for vendored modules, that is the version listed and not the one from
 	If a module is vendored, that is where Hugo will look for it's dependencies.
 	`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -233,7 +225,6 @@ Run "go help get" for more information. All flags available for "go get" is also
 ` + commonUsageMod,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.DisableFlagParsing = true
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					// We currently just pass on the flags we get to Go and
@@ -60,15 +60,8 @@ Ensure you run this within the root directory of your site.`,
 					return create.NewContent(h, contentType, args[0], force)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-						if len(args) != 0 {
-							return []string{}, cobra.ShellCompDirectiveNoFileComp
-						}
-						return []string{}, cobra.ShellCompDirectiveNoFileComp | cobra.ShellCompDirectiveFilterDirs
-					}
 					cmd.Flags().StringVarP(&contentType, "kind", "k", "", "content type to create")
 					cmd.Flags().String("editor", "", "edit new content with this editor, if provided")
-					_ = cmd.RegisterFlagCompletionFunc("editor", cobra.NoFileCompletions)
 					cmd.Flags().BoolVarP(&force, "force", "f", false, "overwrite file if it already exists")
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
@@ -110,15 +103,8 @@ Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
 					return nil
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-						if len(args) != 0 {
-							return []string{}, cobra.ShellCompDirectiveNoFileComp
-						}
-						return []string{}, cobra.ShellCompDirectiveNoFileComp | cobra.ShellCompDirectiveFilterDirs
-					}
 					cmd.Flags().BoolVarP(&force, "force", "f", false, "init inside non-empty directory")
 					cmd.Flags().StringVar(&format, "format", "toml", "preferred file format (toml, yaml or json)")
-					_ = cmd.RegisterFlagCompletionFunc("format", cobra.FixedCompletions([]string{"toml", "yaml", "json"}, cobra.ShellCompDirectiveNoFileComp))
 				},
 			},
 			&simpleCommand{
@@ -151,9 +137,6 @@ according to your needs.`,

 					return nil
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 		},
 	}
@@ -43,11 +43,9 @@ func newReleaseCommand() simplecobra.Commander {
 		},
 		withc: func(cmd *cobra.Command, r *rootCommand) {
 			cmd.Hidden = true
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
 			cmd.PersistentFlags().BoolVarP(&skipPush, "skip-push", "", false, "skip pushing to remote")
 			cmd.PersistentFlags().BoolVarP(&try, "try", "", false, "no changes")
 			cmd.PersistentFlags().IntVarP(&step, "step", "", 0, "step to run (1: set new version 2: prepare next dev version)")
-			_ = cmd.RegisterFlagCompletionFunc("step", cobra.FixedCompletions([]string{"1", "2"}, cobra.ShellCompDirectiveNoFileComp))
 		},
 	}
 }
@@ -123,7 +123,6 @@ func newServerCommand() *serverCommand {
 					return mclib.RunMain()
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					cmd.Flags().BoolVar(&uninstall, "uninstall", false, "Uninstall the local CA (but do not delete it).")
 				},
 			},
@@ -237,8 +236,9 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 	listener := f.c.serverPorts[i].ln
 	logger := f.c.r.logger

+	r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment)
+
 	if i == 0 {
-		r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment)
 		mainTarget := "disk"
 		if f.c.r.renderToMemory {
 			mainTarget = "memory"
@@ -307,7 +307,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 			if redirect := serverConfig.MatchRedirect(requestURI); !redirect.IsZero() {
 				// fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
 				doRedirect := true
-				// This matches Netlify's behavior and is needed for SPA behavior.
+				// This matches Netlify's behaviour and is needed for SPA behaviour.
 				// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
 				if !redirect.Force {
 					path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
@@ -512,9 +512,9 @@ func (c *serverCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd.Long = `Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.

-The ` + "`" + `hugo server` + "`" + ` command will by default write and serve files from disk, but
-you can render to memory by using the ` + "`" + `--renderToMemory` + "`" + ` flag. This can be
-faster in some cases, but it will consume more memory.
+'hugo server' will by default write and server files from disk, but you can
+render to memory by using the '--renderToMemory' flag. This can be faster
+in some cases, but it will consume more memory.

 By default hugo will also watch your files for any changes you make and
 automatically rebuild the site. It will then live reload any open browser pages
@@ -523,15 +523,10 @@ of a second, you will be able to save and see your changes nearly instantly.`
 	cmd.Aliases = []string{"serve"}

 	cmd.Flags().IntVarP(&c.serverPort, "port", "p", 1313, "port on which the server will listen")
-	_ = cmd.RegisterFlagCompletionFunc("port", cobra.NoFileCompletions)
 	cmd.Flags().IntVar(&c.liveReloadPort, "liveReloadPort", -1, "port for live reloading (i.e. 443 in HTTPS proxy situations)")
-	_ = cmd.RegisterFlagCompletionFunc("liveReloadPort", cobra.NoFileCompletions)
 	cmd.Flags().StringVarP(&c.serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
-	_ = cmd.RegisterFlagCompletionFunc("bind", cobra.NoFileCompletions)
 	cmd.Flags().StringVarP(&c.tlsCertFile, "tlsCertFile", "", "", "path to TLS certificate file")
-	_ = cmd.MarkFlagFilename("tlsCertFile", "pem")
 	cmd.Flags().StringVarP(&c.tlsKeyFile, "tlsKeyFile", "", "", "path to TLS key file")
-	_ = cmd.MarkFlagFilename("tlsKeyFile", "pem")
 	cmd.Flags().BoolVar(&c.tlsAuto, "tlsAuto", false, "generate and use locally-trusted certificates.")
 	cmd.Flags().BoolVar(&c.pprof, "pprof", false, "enable the pprof server (port 8080)")
 	cmd.Flags().BoolVarP(&c.serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
@@ -543,6 +538,9 @@ of a second, you will be able to save and see your changes nearly instantly.`
 	cmd.Flags().BoolVar(&c.disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
 	cmd.Flags().BoolVar(&c.disableBrowserError, "disableBrowserError", false, "do not show build errors in the browser")

+	cmd.Flags().SetAnnotation("tlsCertFile", cobra.BashCompSubdirsInDir, []string{})
+	cmd.Flags().SetAnnotation("tlsKeyFile", cobra.BashCompSubdirsInDir, []string{})
+
 	r := cd.Root.Command.(*rootCommand)
 	applyLocalFlagsBuild(cmd, r)

@@ -568,7 +566,7 @@ func (c *serverCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 				}
 			}

-			if err := c.setServerInfoInConfig(); err != nil {
+			if err := c.setBaseURLsInConfig(); err != nil {
 				return err
 			}

@@ -613,15 +611,15 @@ func (c *serverCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 	return nil
 }

-func (c *serverCommand) setServerInfoInConfig() error {
+func (c *serverCommand) setBaseURLsInConfig() error {
 	if len(c.serverPorts) == 0 {
 		panic("no server ports set")
 	}
 	return c.withConfE(func(conf *commonConfig) error {
 		for i, language := range conf.configs.Languages {
-			isMultihost := conf.configs.IsMultihost
+			isMultiHost := conf.configs.IsMultihost
 			var serverPort int
-			if isMultihost {
+			if isMultiHost {
 				serverPort = c.serverPorts[i].p
 			} else {
 				serverPort = c.serverPorts[0].p
@@ -640,8 +638,7 @@ func (c *serverCommand) setServerInfoInConfig() error {
 			if c.liveReloadPort != -1 {
 				baseURLLiveReload, _ = baseURLLiveReload.WithPort(c.liveReloadPort)
 			}
-			langConfig.C.SetServerInfo(baseURL, baseURLLiveReload, c.serverInterface)
-
+			langConfig.C.SetBaseURL(baseURL, baseURLLiveReload)
 		}
 		return nil
 	})
@@ -740,9 +737,9 @@ func (c *serverCommand) createServerPorts(cd *simplecobra.Commandeer) error {
 	flags := cd.CobraCommand.Flags()
 	var cerr error
 	c.withConf(func(conf *commonConfig) {
-		isMultihost := conf.configs.IsMultihost
+		isMultiHost := conf.configs.IsMultihost
 		c.serverPorts = make([]serverPortListener, 1)
-		if isMultihost {
+		if isMultiHost {
 			if !c.serverAppend {
 				cerr = errors.New("--appendPort=false not supported when in multihost mode")
 				return
@@ -855,7 +852,7 @@ func (c *serverCommand) serve() error {
 		h        *hugolib.HugoSites
 	)
 	err := c.withConfE(func(conf *commonConfig) error {
-		isMultihost := conf.configs.IsMultihost
+		isMultiHost := conf.configs.IsMultihost
 		var err error
 		h, err = c.r.HugFromConfig(conf)
 		if err != nil {
@@ -865,7 +862,7 @@ func (c *serverCommand) serve() error {
 		// We need the server to share the same logger as the Hugo build (for error counts etc.)
 		c.r.logger = h.Log

-		if isMultihost {
+		if isMultiHost {
 			for _, l := range conf.configs.ConfigLangs() {
 				baseURLs = append(baseURLs, l.BaseURL())
 				roots = append(roots, l.Language().Lang)
@@ -1008,6 +1005,7 @@ func (c *serverCommand) serve() error {
 			}
 		}
 	}()
+
 	if err != nil {
 		c.r.Println("Error:", err)
 	}
@@ -123,20 +123,6 @@ func InSlicEqualFold(arr []string, el string) bool {
 	return false
 }

-// ToString converts the given value to a string.
-// Note that this is a more strict version compared to cast.ToString,
-// as it will not try to convert numeric values to strings,
-// but only accept strings or fmt.Stringer.
-func ToString(v any) (string, bool) {
-	switch vv := v.(type) {
-	case string:
-		return vv, true
-	case fmt.Stringer:
-		return vv.String(), true
-	}
-	return "", false
-}
-
 type Tuple struct {
 	First  string
 	Second string
@@ -111,29 +111,11 @@ func (i HugoInfo) Deps() []*Dependency {
 	return i.deps
 }

-// Deprecated: Use hugo.IsMultihost instead.
-func (i HugoInfo) IsMultiHost() bool {
-	Deprecate("hugo.IsMultiHost", "Use hugo.IsMultihost instead.", "v0.124.0")
-	return i.conf.IsMultihost()
-}
-
-// IsMultihost reports whether each configured language has a unique baseURL.
-func (i HugoInfo) IsMultihost() bool {
-	return i.conf.IsMultihost()
-}
-
-// IsMultilingual reports whether there are two or more configured languages.
-func (i HugoInfo) IsMultilingual() bool {
-	return i.conf.IsMultilingual()
-}
-
 // ConfigProvider represents the config options that are relevant for HugoInfo.
 type ConfigProvider interface {
 	Environment() string
 	Running() bool
 	WorkingDir() string
-	IsMultihost() bool
-	IsMultilingual() bool
 }

 // NewInfo creates a new Hugo Info object.
@@ -1,77 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package hugo_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/gohugoio/hugo/hugolib"
-)
-
-func TestIsMultilingualAndIsMultihost(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-defaultContentLanguageInSubdir = true
-[languages.de]
-baseURL = 'https://de.example.org/'
-[languages.en]
-baseURL = 'https://en.example.org/'
-- content/_index.md --
---
-title: home
---
-- layouts/index.html --
-multilingual={{ hugo.IsMultilingual }}
-multihost={{ hugo.IsMultihost }}
-  `
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/de/index.html",
-		"multilingual=true",
-		"multihost=true",
-	)
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=true",
-		"multihost=true",
-	)
-
-	files = strings.ReplaceAll(files, "baseURL = 'https://de.example.org/'", "")
-	files = strings.ReplaceAll(files, "baseURL = 'https://en.example.org/'", "")
-
-	b = hugolib.Test(t, files)
-
-	b.AssertFileContent("public/de/index.html",
-		"multilingual=true",
-		"multihost=false",
-	)
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=true",
-		"multihost=false",
-	)
-
-	files = strings.ReplaceAll(files, "[languages.de]", "")
-	files = strings.ReplaceAll(files, "[languages.en]", "")
-
-	b = hugolib.Test(t, files)
-
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=false",
-		"multihost=false",
-	)
-}
@@ -65,11 +65,9 @@ func TestDeprecationLogLevelFromVersion(t *testing.T) {
 }

 type testConfig struct {
-	environment  string
-	running      bool
-	workingDir   string
-	multihost    bool
-	multilingual bool
+	environment string
+	running     bool
+	workingDir  string
 }

 func (c testConfig) Environment() string {
@@ -83,11 +81,3 @@ func (c testConfig) Running() bool {
 func (c testConfig) WorkingDir() string {
 	return c.workingDir
 }
-
-func (c testConfig) IsMultihost() bool {
-	return c.multihost
-}
-
-func (c testConfig) IsMultilingual() bool {
-	return c.multilingual
-}
@@ -17,7 +17,7 @@ package hugo
 // This should be the only one.
 var CurrentVersion = Version{
 	Major:      0,
-	Minor:      125,
-	PatchLevel: 2,
-	Suffix:     "",
+	Minor:      124,
+	PatchLevel: 0,
+	Suffix:     "-DEV",
 }
@@ -239,7 +239,7 @@ const (
 	// E.g. /blog/my-post.md
 	PathTypeContentSingle

-	// All below are bundled content files.
+	// All bewlow are bundled content files.

 	// Leaf bundles, e.g. /blog/my-post/index.md
 	PathTypeLeaf
@@ -313,7 +313,7 @@ func (p *Path) norm(s string) string {
 	return s
 }

-// IdentifierBase satisfies identity.Identity.
+// IdentifierBase satifies identity.Identity.
 func (p *Path) IdentifierBase() string {
 	return p.Base()
 }
@@ -368,7 +368,7 @@ func (p *Path) Name() string {
 	return p.s
 }

-// Name returns the last element of path without any extension.
+// Name returns the last element of path withhout any extension.
 func (p *Path) NameNoExt() string {
 	if i := p.identifierIndex(0); i != -1 {
 		return p.s[p.posContainerHigh : p.identifiers[i].Low-1]
@@ -376,7 +376,7 @@ func (p *Path) NameNoExt() string {
 	return p.s[p.posContainerHigh:]
 }

-// Name returns the last element of path without any language identifier.
+// Name returns the last element of path withhout any language identifier.
 func (p *Path) NameNoLang() string {
 	i := p.identifierIndex(p.posIdentifierLanguage)
 	if i == -1 {
@@ -386,7 +386,7 @@ func (p *Path) NameNoLang() string {
 	return p.s[p.posContainerHigh:p.identifiers[i].Low-1] + p.s[p.identifiers[i].High:]
 }

-// BaseNameNoIdentifier returns the logical base name for a resource without any identifier (e.g. no extension).
+// BaseNameNoIdentifier returns the logcical base name for a resource without any idenifier (e.g. no extension).
 // For bundles this will be the containing directory's name, e.g. "blog".
 func (p *Path) BaseNameNoIdentifier() string {
 	if p.IsBundle() {
@@ -395,7 +395,7 @@ func (p *Path) BaseNameNoIdentifier() string {
 	return p.NameNoIdentifier()
 }

-// NameNoIdentifier returns the last element of path without any identifier (e.g. no extension).
+// NameNoIdentifier returns the last element of path withhout any identifier (e.g. no extension).
 func (p *Path) NameNoIdentifier() string {
 	if len(p.identifiers) > 0 {
 		return p.s[p.posContainerHigh : p.identifiers[len(p.identifiers)-1].Low-1]
@@ -435,7 +435,7 @@ func (p *Path) PathNoIdentifier() string {
 	return p.base(false, false)
 }

-// PathRel returns the path relative to the given owner.
+// PathRel returns the path relativeto the given owner.
 func (p *Path) PathRel(owner *Path) string {
 	ob := owner.Base()
 	if !strings.HasSuffix(ob, "/") {
@@ -99,14 +99,6 @@ type Unwrapper interface {
 	Unwrapv() any
 }

-// Unwrap returns the underlying value of v if it implements Unwrapper, otherwise v is returned.
-func Unwrapv(v any) any {
-	if u, ok := v.(Unwrapper); ok {
-		return u.Unwrapv()
-	}
-	return v
-}
-
 // LowHigh is typically used to represent a slice boundary.
 type LowHigh struct {
 	Low  int
@@ -39,7 +39,6 @@ import (
 	"github.com/gohugoio/hugo/config/services"
 	"github.com/gohugoio/hugo/deploy/deployconfig"
 	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/markup/markup_config"
 	"github.com/gohugoio/hugo/media"
@@ -104,11 +103,9 @@ type Config struct {
 	RootConfig

 	// Author information.
-	// Deprecated: Use taxonomies instead.
 	Author map[string]any

 	// Social links.
-	// Deprecated: Use .Site.Params instead.
 	Social map[string]string

 	// The build configuration section contains build-related configuration options.
@@ -140,9 +137,6 @@ type Config struct {
 	// a slice of page matcher and params to apply to those pages.
 	Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, map[page.PageMatcher]maps.Params] `mapstructure:"-"`

-	// The segments defines segments for the site. Used for partial/segmented builds.
-	Segments *config.ConfigNamespace[map[string]segments.SegmentConfig, segments.Segments] `mapstructure:"-"`
-
 	// Menu configuration.
 	// <docsmeta>{"refs": ["config:languages:menus"] }</docsmeta>
 	Menus *config.ConfigNamespace[map[string]navigation.MenuConfig, navigation.Menus] `mapstructure:"-"`
@@ -370,7 +364,6 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
 		CreateTitle:       helpers.GetTitleFunc(c.TitleCaseStyle),
 		IsUglyURLSection:  isUglyURL,
 		IgnoreFile:        ignoreFile,
-		SegmentFilter:     c.Segments.Config.Get(func(s string) { logger.Warnf("Render segment %q not found in configuration", s) }, c.RootConfig.RenderSegments...),
 		MainSections:      c.MainSections,
 		Clock:             clock,
 		transientErr:      transientErr,
@@ -400,7 +393,6 @@ type ConfigCompiled struct {
 	Timeout           time.Duration
 	BaseURL           urls.BaseURL
 	BaseURLLiveReload urls.BaseURL
-	ServerInterface   string
 	KindOutputFormats map[string]output.Formats
 	DisabledKinds     map[string]bool
 	DisabledLanguages map[string]bool
@@ -408,7 +400,6 @@ type ConfigCompiled struct {
 	CreateTitle       func(s string) string
 	IsUglyURLSection  func(section string) bool
 	IgnoreFile        func(filename string) bool
-	SegmentFilter     segments.SegmentFilter
 	MainSections      []string
 	Clock             time.Time

@@ -435,10 +426,9 @@ func (c *ConfigCompiled) IsMainSectionsSet() bool {
 }

 // This is set after the config is compiled by the server command.
-func (c *ConfigCompiled) SetServerInfo(baseURL, baseURLLiveReload urls.BaseURL, serverInterface string) {
+func (c *ConfigCompiled) SetBaseURL(baseURL, baseURLLiveReload urls.BaseURL) {
 	c.BaseURL = baseURL
 	c.BaseURLLiveReload = baseURLLiveReload
-	c.ServerInterface = serverInterface
 }

 // RootConfig holds all the top-level configuration options in Hugo
@@ -482,10 +472,6 @@ type RootConfig struct {
 	// A list of languages to disable.
 	DisableLanguages []string

-	// The named segments to render.
-	// This needs to match the name of the segment in the segments configuration.
-	RenderSegments []string
-
 	// Disable the injection of the Hugo generator tag on the home page.
 	DisableHugoGeneratorInject bool

@@ -840,7 +826,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 	langConfigMap := make(map[string]*Config)

 	languagesConfig := cfg.GetStringMap("languages")
-	var isMultihost bool
+	var isMultiHost bool

 	if err := all.CompileConfig(logger); err != nil {
 		return nil, err
@@ -877,7 +863,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 				}
 				if kk == "baseurl" {
 					// baseURL configure don the language level is a multihost setup.
-					isMultihost = true
+					isMultiHost = true
 				}
 				mergedConfig.Set(kk, vv)
 				rootv := cfg.Get(kk)
@@ -927,7 +913,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 			}

 			// Adjust Goldmark config defaults for multilingual, single-host sites.
-			if len(languagesConfig) > 1 && !isMultihost && !clone.Markup.Goldmark.DuplicateResourceFiles {
+			if len(languagesConfig) > 1 && !isMultiHost && !clone.Markup.Goldmark.DuplicateResourceFiles {
 				if !clone.Markup.Goldmark.DuplicateResourceFiles {
 					if clone.Markup.Goldmark.RenderHooks.Link.EnableDefault == nil {
 						clone.Markup.Goldmark.RenderHooks.Link.EnableDefault = types.NewBool(true)
@@ -957,7 +943,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 		Base:              all,
 		LanguageConfigMap: langConfigMap,
 		LoadingInfo:       res,
-		IsMultihost:       isMultihost,
+		IsMultihost:       isMultiHost,
 	}

 	return cm, nil
@@ -25,13 +25,11 @@ import (
 	"github.com/gohugoio/hugo/config/security"
 	"github.com/gohugoio/hugo/config/services"
 	"github.com/gohugoio/hugo/deploy/deployconfig"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/markup/markup_config"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/minifiers"
 	"github.com/gohugoio/hugo/modules"
-
 	"github.com/gohugoio/hugo/navigation"
 	"github.com/gohugoio/hugo/output"
 	"github.com/gohugoio/hugo/related"
@@ -122,14 +120,6 @@ var allDecoderSetups = map[string]decodeWeight{
 			return err
 		},
 	},
-	"segments": {
-		key: "segments",
-		decode: func(d decodeWeight, p decodeConfig) error {
-			var err error
-			p.c.Segments, err = segments.DecodeSegments(p.p.GetStringMap(d.key))
-			return err
-		},
-	},
 	"server": {
 		key: "server",
 		decode: func(d decodeWeight, p decodeConfig) error {
@@ -52,7 +52,7 @@ func (c ConfigLanguage) LanguagePrefix() string {
 		return c.Language().Lang
 	}

-	if !c.IsMultilingual() || c.DefaultContentLanguage() == c.Language().Lang {
+	if !c.IsMultiLingual() || c.DefaultContentLanguage() == c.Language().Lang {
 		return ""
 	}
 	return c.Language().Lang
@@ -78,7 +78,7 @@ func (c ConfigLanguage) FastRenderMode() bool {
 	return c.config.Internal.FastRenderMode
 }

-func (c ConfigLanguage) IsMultilingual() bool {
+func (c ConfigLanguage) IsMultiLingual() bool {
 	return len(c.m.Languages) > 1
 }

@@ -215,8 +215,6 @@ type SitemapConfig struct {
 	Priority float64
 	// The sitemap filename.
 	Filename string
-	// Whether to disable page inclusion.
-	Disable bool
 }

 func DecodeSitemap(prototype SitemapConfig, input map[string]any) (SitemapConfig, error) {
@@ -35,7 +35,7 @@ type AllProvider interface {
 	PathParser() *paths.PathParser
 	Environment() string
 	IsMultihost() bool
-	IsMultilingual() bool
+	IsMultiLingual() bool
 	NoBuildLock() bool
 	BaseConfig() BaseConfig
 	Dirs() CommonDirs
@@ -44,9 +44,15 @@ type Disqus struct {
 type GoogleAnalytics struct {
 	Service `mapstructure:",squash"`

+	// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
+	UseSessionStorage bool
+
 	// Enabling this will make the GA templates respect the
 	// "Do Not Track" HTTP header. See  https://www.paulfurley.com/google-analytics-dnt/.
 	RespectDoNotTrack bool
+
+	// Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
+	AnonymizeIP bool
 }

 // Instagram holds the privacy configuration settings related to the Instagram shortcode.
@@ -33,6 +33,8 @@ disable = true
 [privacy.googleAnalytics]
 disable = true
 respectDoNotTrack = true
+anonymizeIP = true
+useSessionStorage = true
 [privacy.instagram]
 disable = true
 simple = true
@@ -58,7 +60,8 @@ simple = true

 	got := []bool{
 		pc.Disqus.Disable, pc.GoogleAnalytics.Disable,
-		pc.GoogleAnalytics.RespectDoNotTrack, pc.Instagram.Disable,
+		pc.GoogleAnalytics.RespectDoNotTrack, pc.GoogleAnalytics.AnonymizeIP,
+		pc.GoogleAnalytics.UseSessionStorage, pc.Instagram.Disable,
 		pc.Instagram.Simple, pc.Twitter.Disable, pc.Twitter.EnableDNT,
 		pc.Twitter.Simple, pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
 		pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable,
@@ -2,7 +2,7 @@
 For a given taxonomy, renders a list of terms assigned to the page.

@context {page} page The current page.
-@context {string} taxonomy The taxonomy.
+@context {string} taxonomy The taxonony.

@example: {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
 */}}
@@ -361,7 +361,7 @@ type BuildState struct {

 	mu sync.Mutex // protects state below.

-	// A set of filenames in /public that
+	// A set of ilenames in /public that
 	// contains a post-processing prefix.
 	filenamesWithPostPrefix map[string]bool
 }
@@ -56,7 +56,6 @@ hugo [flags]
      --printPathWarnings          print warnings on duplicate target paths etc.
      --printUnusedTemplates       print warnings on unused templates.
      --quiet                      build in quiet mode
-      --renderSegments strings     named segments to render (configured in the segments config)
      --renderToMemory             render to memory (mostly useful when running the server)
  -s, --source string              filesystem path to read files relative from
      --templateMetrics            display metrics about template executions
@@ -18,14 +18,13 @@ hugo config [command] [flags]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-      --format string            preferred file format (toml, yaml or json) (default "toml")
-  -h, --help                     help for config
-      --lang string              the language to display config for. Defaults to the first language defined.
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+      --format string       preferred file format (toml, yaml or json) (default "toml")
+  -h, --help                help for config
+      --lang string         the language to display config for. Defaults to the first language defined.
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -14,12 +14,11 @@ hugo config mounts [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for mounts
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for mounts
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,11 +20,10 @@ hugo gen chromastyles [flags] [args]
 ### Options

 ```
-  -h, --help                            help for chromastyles
-      --highlightStyle string           foreground and background colors for highlighted lines, e.g. --highlightStyle "#fff000 bg:#000fff"
-      --lineNumbersInlineStyle string   foreground and background colors for inline line numbers, e.g. --lineNumbersInlineStyle "#fff000 bg:#000fff"
-      --lineNumbersTableStyle string    foreground and background colors for table line numbers, e.g. --lineNumbersTableStyle "#fff000 bg:#000fff"
-      --style string                    highlighter style (see https://xyproto.github.io/splash/docs/) (default "friendly")
+  -h, --help                    help for chromastyles
+      --highlightStyle string   style used for highlighting lines (see https://github.com/alecthomas/chroma)
+      --linesStyle string       style used for line numbers (see https://github.com/alecthomas/chroma)
+      --style string            highlighter style (see https://xyproto.github.io/splash/docs/) (default "friendly")
 ```

 ### Options inherited from parent commands
@@ -18,14 +18,13 @@ hugo mod clean [flags] [args]
 ### Options

 ```
-      --all                      clean entire module cache
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for clean
-      --pattern string           pattern matching module paths to clean (all if not set), e.g. "**hugo*"
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+      --all                 clean entire module cache
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for clean
+      --pattern string      pattern matching module paths to clean (all if not set), e.g. "**hugo*"
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,13 +20,12 @@ hugo mod graph [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-      --clean                    delete module cache for dependencies that fail verification
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for graph
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+      --clean               delete module cache for dependencies that fail verification
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for graph
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -25,12 +25,11 @@ hugo mod init [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for init
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for init
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -28,12 +28,11 @@ hugo mod npm pack [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for pack
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for pack
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -14,12 +14,11 @@ hugo mod tidy [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for tidy
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for tidy
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,12 +20,11 @@ hugo mod vendor [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for vendor
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for vendor
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -18,13 +18,12 @@ hugo mod verify [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-      --clean                    delete module cache for dependencies that fail verification
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for verify
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+      --clean               delete module cache for dependencies that fail verification
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for verify
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -25,15 +25,14 @@ hugo new content [path] [flags]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-      --editor string            edit new content with this editor, if provided
-  -f, --force                    overwrite file if it already exists
-  -h, --help                     help for content
-  -k, --kind string              content type to create
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+      --editor string       edit new content with this editor, if provided
+  -f, --force               overwrite file if it already exists
+  -h, --help                help for content
+  -k, --kind string         content type to create
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -12,9 +12,9 @@ A high performance webserver
 Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.

-The `hugo server` command will by default write and serve files from disk, but
-you can render to memory by using the `--renderToMemory` flag. This can be
-faster in some cases, but it will consume more memory.
+'hugo server' will by default write and server files from disk, but you can
+render to memory by using the '--renderToMemory' flag. This can be faster
+in some cases, but it will consume more memory.

 By default hugo will also watch your files for any changes you make and
 automatically rebuild the site. It will then live reload any open browser pages
@@ -28,50 +28,49 @@ hugo server [command] [flags]
 ### Options

 ```
-      --appendPort               append port to baseURL (default true)
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --bind string              interface to which the server will bind (default "127.0.0.1")
-  -D, --buildDrafts              include content marked as draft
-  -E, --buildExpired             include expired content
-  -F, --buildFuture              include content with publishdate in the future
-      --cacheDir string          filesystem path to cache directory
-      --cleanDestinationDir      remove files from destination not found in static directories
-  -c, --contentDir string        filesystem path to content directory
-      --disableBrowserError      do not show build errors in the browser
-      --disableFastRender        enables full re-renders on changes
-      --disableKinds strings     disable different kind of pages (home, RSS etc.)
-      --disableLiveReload        watch without enabling live browser reload on rebuild
-      --enableGitInfo            add Git revision, date, author, and CODEOWNERS info to the pages
-      --forceSyncStatic          copy all files when static is changed.
-      --gc                       enable to run some cleanup tasks (remove unused cache files) after the build
-  -h, --help                     help for server
-      --ignoreCache              ignores the cache directory
-  -l, --layoutDir string         filesystem path to layout directory
-      --liveReloadPort int       port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
-      --minify                   minify any supported output format (HTML, XML etc.)
-      --navigateToChanged        navigate to changed content file on live browser reload
-      --noBuildLock              don't create .hugo_build.lock file
-      --noChmod                  don't sync permission mode of files
-      --noHTTPCache              prevent HTTP caching
-      --noTimes                  don't sync modification time of files
-      --panicOnWarning           panic on first WARNING log
-      --poll string              set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes
-  -p, --port int                 port on which the server will listen (default 1313)
-      --pprof                    enable the pprof server (port 8080)
-      --printI18nWarnings        print missing translations
-      --printMemoryUsage         print memory usage to screen at intervals
-      --printPathWarnings        print warnings on duplicate target paths etc.
-      --printUnusedTemplates     print warnings on unused templates.
-      --renderSegments strings   named segments to render (configured in the segments config)
-      --renderStaticToDisk       serve static files from disk and dynamic files from memory
-      --templateMetrics          display metrics about template executions
-      --templateMetricsHints     calculate some improvement hints when combined with --templateMetrics
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
-      --tlsAuto                  generate and use locally-trusted certificates.
-      --tlsCertFile string       path to TLS certificate file
-      --tlsKeyFile string        path to TLS key file
-      --trace file               write trace to file (not useful in general)
-  -w, --watch                    watch filesystem for changes and recreate as needed (default true)
+      --appendPort             append port to baseURL (default true)
+  -b, --baseURL string         hostname (and path) to the root, e.g. https://spf13.com/
+      --bind string            interface to which the server will bind (default "127.0.0.1")
+  -D, --buildDrafts            include content marked as draft
+  -E, --buildExpired           include expired content
+  -F, --buildFuture            include content with publishdate in the future
+      --cacheDir string        filesystem path to cache directory
+      --cleanDestinationDir    remove files from destination not found in static directories
+  -c, --contentDir string      filesystem path to content directory
+      --disableBrowserError    do not show build errors in the browser
+      --disableFastRender      enables full re-renders on changes
+      --disableKinds strings   disable different kind of pages (home, RSS etc.)
+      --disableLiveReload      watch without enabling live browser reload on rebuild
+      --enableGitInfo          add Git revision, date, author, and CODEOWNERS info to the pages
+      --forceSyncStatic        copy all files when static is changed.
+      --gc                     enable to run some cleanup tasks (remove unused cache files) after the build
+  -h, --help                   help for server
+      --ignoreCache            ignores the cache directory
+  -l, --layoutDir string       filesystem path to layout directory
+      --liveReloadPort int     port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
+      --minify                 minify any supported output format (HTML, XML etc.)
+      --navigateToChanged      navigate to changed content file on live browser reload
+      --noBuildLock            don't create .hugo_build.lock file
+      --noChmod                don't sync permission mode of files
+      --noHTTPCache            prevent HTTP caching
+      --noTimes                don't sync modification time of files
+      --panicOnWarning         panic on first WARNING log
+      --poll string            set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes
+  -p, --port int               port on which the server will listen (default 1313)
+      --pprof                  enable the pprof server (port 8080)
+      --printI18nWarnings      print missing translations
+      --printMemoryUsage       print memory usage to screen at intervals
+      --printPathWarnings      print warnings on duplicate target paths etc.
+      --printUnusedTemplates   print warnings on unused templates.
+      --renderStaticToDisk     serve static files from disk and dynamic files from memory
+      --templateMetrics        display metrics about template executions
+      --templateMetricsHints   calculate some improvement hints when combined with --templateMetrics
+  -t, --theme strings          themes to use (located in /themes/THEMENAME/)
+      --tlsAuto                generate and use locally-trusted certificates.
+      --tlsCertFile string     path to TLS certificate file
+      --tlsKeyFile string      path to TLS key file
+      --trace file             write trace to file (not useful in general)
+  -w, --watch                  watch filesystem for changes and recreate as needed (default true)
 ```

 ### Options inherited from parent commands
@@ -207,10 +207,6 @@ chroma:
  - Aliases:
    - dax
    Name: Dax
-  - Aliases:
-    - desktop
-    - desktop_entry
-    Name: Desktop file
  - Aliases:
    - diff
    - udiff
@@ -447,10 +443,6 @@ chroma:
  - Aliases:
    - mason
    Name: Mason
-  - Aliases:
-    - materialize
-    - mzsql
-    Name: Materialize SQL dialect
  - Aliases:
    - mathematica
    - mma
@@ -501,9 +493,6 @@ chroma:
  - Aliases:
    - natural
    Name: Natural
-  - Aliases:
-    - ndisasm
-    Name: NDISASM
  - Aliases:
    - newspeak
    Name: Newspeak
@@ -618,9 +607,6 @@ chroma:
  - Aliases:
    - prolog
    Name: Prolog
-  - Aliases:
-    - promela
-    Name: Promela
  - Aliases:
    - promql
    Name: PromQL
@@ -687,9 +673,6 @@ chroma:
  - Aliases:
    - registry
    Name: reg
-  - Aliases:
-    - rego
-    Name: Rego
  - Aliases:
    - rst
    - rest
@@ -699,9 +682,6 @@ chroma:
    - rexx
    - arexx
    Name: Rexx
-  - Aliases:
-    - spec
-    Name: RPMSpec
  - Aliases:
    - rb
    - ruby
@@ -966,7 +946,6 @@ config:
      dir: :cacheDir/modules
      maxAge: -1
  canonifyURLs: false
-  capitalizeListTitles: true
  cascade: []
  cleanDestinationDir: false
  contentDir: content
@@ -1557,8 +1536,10 @@ config:
    disqus:
      disable: false
    googleAnalytics:
+      anonymizeIP: false
      disable: false
      respectDoNotTrack: false
+      useSessionStorage: false
    instagram:
      disable: false
      simple: false
@@ -1604,7 +1585,6 @@ config:
    toLower: false
  relativeURLs: false
  removePathAccents: false
-  renderSegments: null
  resourceDir: resources
  sectionPagesMenu: ""
  security:
@@ -1627,7 +1607,6 @@ config:
      - (?i)GET|POST
      urls:
      - .*
-  segments: {}
  server:
    headers: null
    redirects:
@@ -1649,7 +1628,6 @@ config:
      disableInlineCSS: false
  sitemap:
    changeFreq: ""
-    disable: false
    filename: sitemap.xml
    priority: -1
  social: null
@@ -1726,8 +1704,6 @@ config_helpers:
      _merge: none
    security:
      _merge: none
-    segments:
-      _merge: none
    server:
      _merge: none
    services:
@@ -2798,8 +2774,8 @@ tpl:
            {{ $m.Set "Hugo" "Rocks!" }}
            {{ $m.Values | debug.Dump | safeHTML }}
          - |-
-            {
-              "Hugo": "Rocks!"
+            map[string]interface {}{
+              "Hugo": "Rocks!",
            }
      TestDeprecationErr:
        Aliases: null
@@ -2989,21 +2965,6 @@ tpl:
        Args: null
        Description: ""
        Examples: null
-      IsMultiHost:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
-      IsMultihost:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
-      IsMultilingual:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
      IsProduction:
        Aliases: null
        Args: null
@@ -4017,11 +3978,6 @@ tpl:
        - s
        Description: CountWords returns the approximate word count in s.
        Examples: []
-      Diff:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
      FindRE:
        Aliases:
        - findRE
@@ -4586,5 +4542,5 @@ tpl:
        - urlize
        Args:
        - s
-        Description: URLize returns the strings s formatted as an URL.
+        Description: URLize returns the the strings s formatted as an URL.
        Examples: []
@@ -2,10 +2,10 @@ module github.com/gohugoio/hugo

 require (
 	github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
-	github.com/alecthomas/chroma/v2 v2.13.0
+	github.com/alecthomas/chroma/v2 v2.12.0
 	github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c
-	github.com/aws/aws-sdk-go-v2 v1.26.1
-	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4
+	github.com/aws/aws-sdk-go-v2 v1.24.1
+	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6
 	github.com/bep/clocks v0.5.0
 	github.com/bep/debounce v1.2.0
 	github.com/bep/gitmap v1.1.2
@@ -25,17 +25,17 @@ require (
 	github.com/cli/safeexec v1.0.1
 	github.com/disintegration/gift v1.2.1
 	github.com/dustin/go-humanize v1.0.1
-	github.com/evanw/esbuild v0.20.2
+	github.com/evanw/esbuild v0.20.1
 	github.com/fatih/color v1.16.0
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/frankban/quicktest v1.14.6
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/getkin/kin-openapi v0.124.0
+	github.com/getkin/kin-openapi v0.123.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/gobuffalo/flect v1.0.2
 	github.com/gobwas/glob v0.2.3
 	github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e
-	github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0
+	github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0
 	github.com/gohugoio/locales v0.14.0
 	github.com/gohugoio/localescompressed v1.0.1
 	github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95
@@ -55,7 +55,7 @@ require (
 	github.com/niklasfasching/go-org v1.7.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
-	github.com/pelletier/go-toml/v2 v2.2.1
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/rogpeppe/go-internal v1.12.0
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
 	github.com/sanity-io/litter v1.5.5
@@ -64,19 +64,19 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/fsync v0.10.1
 	github.com/spf13/pflag v1.0.5
-	github.com/tdewolff/minify/v2 v2.20.19
+	github.com/tdewolff/minify/v2 v2.20.17
 	github.com/tdewolff/parse/v2 v2.7.12
-	github.com/yuin/goldmark v1.7.1
+	github.com/yuin/goldmark v1.7.0
 	github.com/yuin/goldmark-emoji v1.0.2
 	go.uber.org/automaxprocs v1.5.3
 	gocloud.dev v0.36.0
 	golang.org/x/exp v0.0.0-20221031165847-c99f073a8326
 	golang.org/x/image v0.15.0
-	golang.org/x/mod v0.17.0
-	golang.org/x/net v0.24.0
-	golang.org/x/sync v0.7.0
+	golang.org/x/mod v0.15.0
+	golang.org/x/net v0.21.0
+	golang.org/x/sync v0.6.0
 	golang.org/x/text v0.14.0
-	golang.org/x/tools v0.20.0
+	golang.org/x/tools v0.18.0
 	google.golang.org/api v0.152.0
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -100,8 +100,8 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.16.12 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
@@ -112,9 +112,9 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/smithy-go v1.19.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/go-openapi/jsonpointer v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.8 // indirect
 	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
@@ -142,9 +142,9 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
@@ -152,7 +152,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.0 // indirect
 	software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
@@ -66,16 +66,16 @@ github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZd
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
-github.com/alecthomas/chroma/v2 v2.13.0 h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI=
-github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
+github.com/alecthomas/chroma/v2 v2.12.0 h1:Wh8qLEgMMsN7mgyG8/qIpegky2Hvzr4By6gEF7cmWgw=
+github.com/alecthomas/chroma/v2 v2.12.0/go.mod h1:4TQu7gdfuPjSh76j78ietmqh9LiurGF0EpseFXdKMBw=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
 github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c h1:651/eoCRnQ7YtSjAnSzRucrJz+3iGEFt+ysraELS81M=
 github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go v1.50.7 h1:odKb+uneeGgF2jgAerKjFzpljiyZxleV4SHB7oBK+YA=
 github.com/aws/aws-sdk-go v1.50.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
-github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
-github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
+github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU=
+github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo=
 github.com/aws/aws-sdk-go-v2/config v1.26.1 h1:z6DqMxclFGL3Zfo+4Q0rLnAZ6yVkzCRxhRMsiRQnD1o=
@@ -86,16 +86,16 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6Jk
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7 h1:FnLf60PtjXp8ZOzQfhJVsqF0OtYKQZWQfqOLshh8YXg=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7/go.mod h1:tDVvl8hyU6E9B8TrnNrZQEVkQlB8hjJwcgpPhgtlnNg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4 h1:a4gfRHHCzvV0jEjOUdZOK0oJ4H21x5WT+E4ucWk4jeM=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4/go.mod h1:Pphkts8iBnexoEpcMti5fUvN3/yoGRLtl2heOeppF70=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6 h1:xKbFXea2CIF/Wskauz1TMr//wZ6FyzEafMdSBIQqn80=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6/go.mod h1:iB6PQSb3ULRrrlEiuFfVE318JiBOdk4k46BbuzrrgXc=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9 h1:/90OR2XbSYfXucBMJ4U14wrjlfleq/0SB6dZDPncgmo=
@@ -112,8 +112,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsY
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38=
 github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 h1:5UYvv8JUvllZsRnfrcMQ+hJ9jNICmcgKPAO1CER25Wg=
 github.com/aws/aws-sdk-go-v2/service/sts v1.26.5/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU=
-github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
-github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
+github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
+github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
 github.com/bep/clocks v0.5.0 h1:hhvKVGLPQWRVsBP/UB7ErrHYIO42gINVbvqxvYTPVps=
 github.com/bep/clocks v0.5.0/go.mod h1:SUq3q+OOq41y2lRQqH5fsOoxN8GbxSiT6jvoVVLCVhU=
 github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
@@ -168,8 +168,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc=
 github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
+github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -179,8 +179,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanw/esbuild v0.20.2 h1:E4Y0iJsothpUCq7y0D+ERfqpJmPWrZpNybJA3x3I4p8=
-github.com/evanw/esbuild v0.20.2/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
+github.com/evanw/esbuild v0.20.1 h1:ueyMIL19umCcJTSxiBH/QmPipgGt8hEDM24pdfowgEc=
+github.com/evanw/esbuild v0.20.1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
@@ -193,8 +193,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
-github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
+github.com/getkin/kin-openapi v0.123.0 h1:zIik0mRwFNLyvtXK274Q6ut+dPh6nlxBp0x7mNrPhs8=
+github.com/getkin/kin-openapi v0.123.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -211,8 +211,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e h1:QArsSubW7eDh8APMXkByjQWvuljwPGAGQpJEFn0F0wY=
 github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ=
-github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0 h1:PCtO5l++psZf48yen2LxQ3JiOXxaRC6v0594NeHvGZg=
-github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0/go.mod h1:g9CCh+Ci2IMbPUrVJuXbBTrA+rIIx5+hDQ4EXYaQDoM=
+github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0 h1:oFQ3f1M3Ook6amHmbqVu/uBRrQ6yjMDFkIv4HQr0f1Y=
+github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0/go.mod h1:g9CCh+Ci2IMbPUrVJuXbBTrA+rIIx5+hDQ4EXYaQDoM=
 github.com/gohugoio/locales v0.14.0 h1:Q0gpsZwfv7ATHMbcTNepFd59H7GoykzWJIxi113XGDc=
 github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4=
 github.com/gohugoio/localescompressed v1.0.1 h1:KTYMi8fCWYLswFyJAeOtuk/EkXR/KPTHHNN9OS+RTxo=
@@ -376,8 +376,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
-github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
@@ -417,7 +417,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -426,11 +425,10 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tdewolff/minify/v2 v2.20.19 h1:tX0SR0LUrIqGoLjXnkIzRSIbKJ7PaNnSENLD4CyH6Xo=
-github.com/tdewolff/minify/v2 v2.20.19/go.mod h1:ulkFoeAVWMLEyjuDz1ZIWOA31g5aWOawCFRp9R/MudM=
+github.com/tdewolff/minify/v2 v2.20.17 h1:zGqEDhspr3XjSrQI/56vw9IdAhLAaKTLXWnDBsxNVt8=
+github.com/tdewolff/minify/v2 v2.20.17/go.mod h1:ulkFoeAVWMLEyjuDz1ZIWOA31g5aWOawCFRp9R/MudM=
 github.com/tdewolff/parse/v2 v2.7.12 h1:tgavkHc2ZDEQVKy1oWxwIyh5bP4F5fEh/JmBwPP/3LQ=
 github.com/tdewolff/parse/v2 v2.7.12/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
 github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
@@ -443,8 +441,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
-github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA=
+github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
 github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -468,8 +466,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -510,8 +508,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -547,8 +545,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -572,8 +570,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -617,8 +615,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -687,8 +685,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
+golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -797,8 +795,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -36,6 +36,11 @@ import (
 	"github.com/gohugoio/hugo/config"
 )

+var (
+	openingPTag = []byte("<p>")
+	closingPTag = []byte("</p>")
+)
+
 // ContentSpec provides functionality to render markdown content.
 type ContentSpec struct {
 	Converters          markup.ConverterProvider
@@ -237,26 +242,19 @@ func (c *ContentSpec) TruncateWordsToWholeSentence(s string) (string, bool) {
 	return strings.TrimSpace(s[:endIndex]), endIndex < len(s)
 }

-// TrimShortHTML removes the outer tags from HTML input where (a) the opening
-// tag is present only once with the input, and (b) the opening and closing
-// tags wrap the input after white space removal.
-func (c *ContentSpec) TrimShortHTML(input []byte, markup string) []byte {
-	openingTag := []byte("<p>")
-	closingTag := []byte("</p>")
-
-	if markup == "asciidocext" {
-		openingTag = []byte("<div class=\"paragraph\">\n<p>")
-		closingTag = []byte("</p>\n</div>")
-	}
-
-	if bytes.Count(input, openingTag) == 1 {
+// TrimShortHTML removes the <p>/</p> tags from HTML input in the situation
+// where said tags are the only <p> tags in the input and enclose the content
+// of the input (whitespace excluded).
+func (c *ContentSpec) TrimShortHTML(input []byte) []byte {
+	if bytes.Count(input, openingPTag) == 1 {
 		input = bytes.TrimSpace(input)
-		if bytes.HasPrefix(input, openingTag) && bytes.HasSuffix(input, closingTag) {
-			input = bytes.TrimPrefix(input, openingTag)
-			input = bytes.TrimSuffix(input, closingTag)
+		if bytes.HasPrefix(input, openingPTag) && bytes.HasSuffix(input, closingPTag) {
+			input = bytes.TrimPrefix(input, openingPTag)
+			input = bytes.TrimSuffix(input, closingPTag)
 			input = bytes.TrimSpace(input)
 		}
 	}
+
 	return input
 }

@@ -26,41 +26,30 @@ import (

 func TestTrimShortHTML(t *testing.T) {
 	tests := []struct {
-		markup string
-		input  []byte
-		output []byte
+		input, output []byte
 	}{
-		{"markdown", []byte(""), []byte("")},
-		{"markdown", []byte("Plain text"), []byte("Plain text")},
-		{"markdown", []byte("<p>Simple paragraph</p>"), []byte("Simple paragraph")},
-		{"markdown", []byte("\n  \n \t  <p> \t Whitespace\nHTML  \n\t </p>\n\t"), []byte("Whitespace\nHTML")},
-		{"markdown", []byte("<p>Multiple</p><p>paragraphs</p>"), []byte("<p>Multiple</p><p>paragraphs</p>")},
-		{"markdown", []byte("<p>Nested<p>paragraphs</p></p>"), []byte("<p>Nested<p>paragraphs</p></p>")},
-		{"markdown", []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>"), []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>")},
-		// Issue 11698
-		{"markdown", []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>"), []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>")},
-		// Issue 12369
-		{"markdown", []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>"), []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>")},
-		{"asciidocext", []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>"), []byte("foo")},
+		{[]byte(""), []byte("")},
+		{[]byte("Plain text"), []byte("Plain text")},
+		// This seems wrong. Why touch it if it doesn't have p tag?
+		// {[]byte("  \t\n Whitespace text\n\n"), []byte("Whitespace text")},
+		{[]byte("<p>Simple paragraph</p>"), []byte("Simple paragraph")},
+		{[]byte("\n  \n \t  <p> \t Whitespace\nHTML  \n\t </p>\n\t"), []byte("Whitespace\nHTML")},
+		{[]byte("<p>Multiple</p><p>paragraphs</p>"), []byte("<p>Multiple</p><p>paragraphs</p>")},
+		{[]byte("<p>Nested<p>paragraphs</p></p>"), []byte("<p>Nested<p>paragraphs</p></p>")},
+		{[]byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>"), []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>")},
+		// Issue #11698
+		{[]byte("<h2 id=`a`>b</h2>\n\n<p>c</p>"), []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>")},
 	}

 	c := newTestContentSpec(nil)
 	for i, test := range tests {
-		output := c.TrimShortHTML(test.input, test.markup)
+		output := c.TrimShortHTML(test.input)
 		if !bytes.Equal(test.output, output) {
 			t.Errorf("Test %d failed. Expected %q got %q", i, test.output, output)
 		}
 	}
 }

-func BenchmarkTrimShortHTML(b *testing.B) {
-	c := newTestContentSpec(nil)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		c.TrimShortHTML([]byte("<p>Simple paragraph</p>"), "markdown")
-	}
-}
-
 func TestBytesToHTML(t *testing.T) {
 	c := qt.New(t)
 	c.Assert(helpers.BytesToHTML([]byte("dobedobedo")), qt.Equals, template.HTML("dobedobedo"))
@@ -374,7 +374,7 @@ func cacheDirDefault(cacheDir string) string {
 	// Turns out that Cloudflare also sets NETLIFY=true in its build environment,
 	// but all of these 3 should not give any false positives.
 	if os.Getenv("NETLIFY") == "true" && os.Getenv("PULL_REQUEST") != "" && os.Getenv("DEPLOY_PRIME_URL") != "" {
-		// Netlify's cache behavior is not documented, the currently best example
+		// Netlify's cache behaviour is not documented, the currently best example
 		// is this project:
 		// https://github.com/philhawksworth/content-shards/blob/master/gulpfile.js
 		return "/opt/build/cache/hugo_cache/"
@@ -16,7 +16,6 @@ package hqt
 import (
 	"errors"
 	"fmt"
-	"math"
 	"reflect"
 	"strings"

@@ -39,11 +38,6 @@ var IsSameType qt.Checker = &typeChecker{
 	argNames: []string{"got", "want"},
 }

-// IsSameFloat64 asserts that two float64 values are equal within a small delta.
-var IsSameFloat64 = qt.CmpEquals(cmp.Comparer(func(a, b float64) bool {
-	return math.Abs(a-b) < 0.0001
-}))
-
 type argNames []string

 func (a argNames) ArgNames() []string {
@@ -42,7 +42,7 @@ var LanguageDirsMerger overlayfs.DirsMerger = func(lofi, bofi []fs.DirEntry) []f

 // AppendDirsMerger merges two directories keeping all regular files
 // with the first slice as the base.
-// Duplicate directories in the second slice will be ignored.
+// Duplicate directories in the secnond slice will be ignored.
 // This strategy is used for the i18n and data fs where we need all entries.
 var AppendDirsMerger overlayfs.DirsMerger = func(lofi, bofi []fs.DirEntry) []fs.DirEntry {
 	for _, fi1 := range bofi {
@@ -21,7 +21,6 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"sync/atomic"

 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/paths"
@@ -44,7 +43,6 @@ var _ ReverseLookupProvder = (*RootMappingFs)(nil)
 func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 	rootMapToReal := radix.New()
 	realMapToRoot := radix.New()
-	id := fmt.Sprintf("rfs-%d", rootMappingFsCounter.Add(1))

 	addMapping := func(key string, rm RootMapping, to *radix.Tree) {
 		var mappings []RootMapping
@@ -78,16 +76,6 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 			rm.Meta = NewFileMeta()
 		}

-		if rm.FromBase == "" {
-			panic(" rm.FromBase is empty")
-		}
-
-		rm.Meta.Component = rm.FromBase
-		rm.Meta.Module = rm.Module
-		rm.Meta.ModuleOrdinal = rm.ModuleOrdinal
-		rm.Meta.IsProject = rm.IsProject
-		rm.Meta.BaseDir = rm.ToBase
-
 		if !fi.IsDir() {
 			// We do allow single file mounts.
 			// However, the file system logic will be much simpler with just directories.
@@ -134,9 +122,19 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 			}
 		}

+		if rm.FromBase == "" {
+			panic(" rm.FromBase is empty")
+		}
+
 		// Extract "blog" from "content/blog"
 		rm.path = strings.TrimPrefix(strings.TrimPrefix(rm.From, rm.FromBase), filepathSeparator)
+
 		rm.Meta.SourceRoot = fi.(MetaProvider).Meta().Filename
+		rm.Meta.BaseDir = rm.ToBase
+		rm.Meta.Module = rm.Module
+		rm.Meta.ModuleOrdinal = rm.ModuleOrdinal
+		rm.Meta.Component = rm.FromBase
+		rm.Meta.IsProject = rm.IsProject

 		meta := rm.Meta.Copy()

@@ -158,7 +156,6 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 	}

 	rfs := &RootMappingFs{
-		id:            id,
 		Fs:            fs,
 		rootMapToReal: rootMapToReal,
 		realMapToRoot: realMapToRoot,
@@ -230,14 +227,11 @@ var _ FilesystemUnwrapper = (*RootMappingFs)(nil)
 // is directories only, and they will be returned in Readdir and Readdirnames
 // in the order given.
 type RootMappingFs struct {
-	id string
 	afero.Fs
 	rootMapToReal *radix.Tree
 	realMapToRoot *radix.Tree
 }

-var rootMappingFsCounter atomic.Int32
-
 func (fs *RootMappingFs) Mounts(base string) ([]FileMetaInfo, error) {
 	base = filepathSeparator + fs.cleanName(base)
 	roots := fs.getRootsWithPrefix(base)
@@ -269,10 +263,6 @@ func (fs *RootMappingFs) Mounts(base string) ([]FileMetaInfo, error) {
 	return fss, nil
 }

-func (fs *RootMappingFs) Key() string {
-	return fs.id
-}
-
 func (fs *RootMappingFs) UnwrapFilesystem() afero.Fs {
 	return fs.Fs
 }
@@ -330,16 +320,16 @@ func (c ComponentPath) ComponentPathJoined() string {
 }

 type ReverseLookupProvder interface {
-	ReverseLookup(filename string) ([]ComponentPath, error)
-	ReverseLookupComponent(component, filename string) ([]ComponentPath, error)
+	ReverseLookup(filename string, checkExists bool) ([]ComponentPath, error)
+	ReverseLookupComponent(component, filename string, checkExists bool) ([]ComponentPath, error)
 }

 // func (fs *RootMappingFs) ReverseStat(filename string) ([]FileMetaInfo, error)
-func (fs *RootMappingFs) ReverseLookup(filename string) ([]ComponentPath, error) {
-	return fs.ReverseLookupComponent("", filename)
+func (fs *RootMappingFs) ReverseLookup(filename string, checkExists bool) ([]ComponentPath, error) {
+	return fs.ReverseLookupComponent("", filename, checkExists)
 }

-func (fs *RootMappingFs) ReverseLookupComponent(component, filename string) ([]ComponentPath, error) {
+func (fs *RootMappingFs) ReverseLookupComponent(component, filename string, checkExists bool) ([]ComponentPath, error) {
 	filename = fs.cleanName(filename)
 	key := filepathSeparator + filename

@@ -370,6 +360,14 @@ func (fs *RootMappingFs) ReverseLookupComponent(component, filename string) ([]C
 		} else {
 			// Now we know that this file _could_ be in this fs.
 			filename = filepathSeparator + filepath.Join(first.path, dir, name)
+
+			if checkExists {
+				// Confirm that it exists.
+				_, err := fs.Stat(first.FromBase + filename)
+				if err != nil {
+					continue
+				}
+			}
 		}

 		cps = append(cps, ComponentPath{
@@ -475,11 +473,6 @@ func (fs *RootMappingFs) newUnionFile(fis ...FileMetaInfo) (afero.File, error) {
 		return fis[0].Meta().Open()
 	}

-	if !fis[0].IsDir() {
-		// Pick the last file mount.
-		return fis[len(fis)-1].Meta().Open()
-	}
-
 	openers := make([]func() (afero.File, error), len(fis))
 	for i := len(fis) - 1; i >= 0; i-- {
 		fi := fis[i]
@@ -652,28 +645,6 @@ func (rfs *RootMappingFs) collectDirEntries(prefix string) ([]iofs.DirEntry, err
 }

 func (fs *RootMappingFs) doStat(name string) ([]FileMetaInfo, error) {
-	fis, err := fs.doDoStat(name)
-	if err != nil {
-		return nil, err
-	}
-	// Sanity check. Check that all is either file or directories.
-	var isDir, isFile bool
-	for _, fi := range fis {
-		if fi.IsDir() {
-			isDir = true
-		} else {
-			isFile = true
-		}
-	}
-	if isDir && isFile {
-		// For now.
-		return nil, os.ErrNotExist
-	}
-
-	return fis, nil
-}
-
-func (fs *RootMappingFs) doDoStat(name string) ([]FileMetaInfo, error) {
 	name = fs.cleanName(name)
 	key := filepathSeparator + name

@@ -822,7 +793,7 @@ func (f *rootMappingDir) ReadDir(count int) ([]iofs.DirEntry, error) {
 	return f.fs.collectDirEntries(f.name)
 }

-// Sentinel error to signal that a file is a directory.
+// Sentinal error to signal that a file is a directory.
 var errIsDir = errors.New("isDir")

 func (f *rootMappingDir) Stat() (iofs.FileInfo, error) {
@@ -276,20 +276,20 @@ func TestRootMappingFsMount(t *testing.T) {

 	// Test ReverseLookup.
 	// Single file mounts.
-	cps, err := rfs.ReverseLookup(filepath.FromSlash("singlefiles/no.txt"))
+	cps, err := rfs.ReverseLookup(filepath.FromSlash("singlefiles/no.txt"), true)
 	c.Assert(err, qt.IsNil)
 	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "singles/p1.md", Lang: "no"},
 	})

-	cps, err = rfs.ReverseLookup(filepath.FromSlash("singlefiles/sv.txt"))
+	cps, err = rfs.ReverseLookup(filepath.FromSlash("singlefiles/sv.txt"), true)
 	c.Assert(err, qt.IsNil)
 	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "singles/p1.md", Lang: "sv"},
 	})

 	// File inside directory mount.
-	cps, err = rfs.ReverseLookup(filepath.FromSlash("mynoblogcontent/test.txt"))
+	cps, err = rfs.ReverseLookup(filepath.FromSlash("mynoblogcontent/test.txt"), true)
 	c.Assert(err, qt.IsNil)
 	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "blog/test.txt", Lang: "no"},
@@ -490,10 +490,11 @@ name = "menu-theme"
 			got := b.Configs.Base

 			if mergeStrategy == "none" {
-				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "", Disable: false, Priority: -1, Filename: "sitemap.xml"})
+				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "", Priority: -1, Filename: "sitemap.xml"})
+
 				b.AssertFileContent("public/sitemap.xml", "schemas/sitemap")
 			} else {
-				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "monthly", Disable: false, Priority: -1, Filename: "sitemap.xml"})
+				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "monthly", Priority: -1, Filename: "sitemap.xml"})
 				b.AssertFileContent("public/sitemap.xml", "<changefreq>monthly</changefreq>")
 			}
 		})
@@ -507,12 +508,12 @@ func TestLoadConfigFromThemeDir(t *testing.T) {
 theme = "test-theme"

 [params]
-m1 = "mv1"
+m1 = "mv1"	
 `

 	themeConfig := `
 [params]
-t1 = "tv1"
+t1 = "tv1"	
 t2 = "tv2"
 `

@@ -884,9 +885,9 @@ ThisIsAParam: {{ site.Params.thisIsAParam }}
 	).BuildE()

 	b.Assert(err, qt.IsNil)
-	b.AssertFileContent("public/index.html", `
+	b.AssertFileContent("public/index.html", `		
 MyParam: enParamValue
-ThisIsAParam: thisIsAParamValue
+ThisIsAParam: thisIsAParamValue	
 `)
 }

@@ -918,7 +919,7 @@ title: "My Swedish Section"
 -- layouts/index.html --
 LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Language.LanguageCode }}|
 {{ range $i, $e := (slice site .Site) }}
-{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultilingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
+{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultiLingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
 {{ end }}


@@ -938,9 +939,9 @@ LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Lang
 	b.AssertFileContent("public/index.html", `
 AllPages: 4|
 Sections: true|
-Param: enParamValue
-Param: enParamValue
-IsMultilingual: true
+Param: enParamValue	
+Param: enParamValue	
+IsMultiLingual: true
 LanguageCode: true|en-US|
 `)

@@ -1061,7 +1062,7 @@ Home
 	).BuildE()

 	b.Assert(err, qt.IsNil)
-	b.AssertFileContent("public/index.html", `
+	b.AssertFileContent("public/index.html", `		
 Home
 `)

@@ -1094,7 +1095,7 @@ HTML.
 HTACCESS.


-
+	
 `
 	b := Test(t, files)

@@ -1110,7 +1111,7 @@ languageCode = "en-US"
 -- layouts/index.html --
 LanguageCode: {{ .Site.LanguageCode }}|{{ site.Language.LanguageCode }}|

-
+	
 `
 	b := Test(t, files)

@@ -1136,7 +1137,7 @@ suffixes = ["bar"]
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1163,8 +1164,8 @@ func TestConfigMiscPanics(t *testing.T) {
 params:
 -- layouts/index.html --
 Foo: {{ site.Params.foo }}|
-
-
+	
+		
 	`
 		b := Test(t, files)

@@ -1187,8 +1188,8 @@ defaultContentLanguage = "en"
 	weight = 1
 -- layouts/index.html --
 Foo: {{ site.Params.foo }}|
-
-
+	
+		
 	`
 		b, err := NewIntegrationTestBuilder(
 			IntegrationTestConfig{
@@ -1214,8 +1215,8 @@ languageCode = "en"
 languageName = "English"
 weight = 1

-
-
+	
+		
 	`
 		b, err := NewIntegrationTestBuilder(
 			IntegrationTestConfig{
@@ -1240,7 +1241,7 @@ contentDir = "mycontent"
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1342,7 +1343,7 @@ disabled = true
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1437,7 +1438,7 @@ home = ["html"]
 -- hugo.toml --
 baseURL = "https://example.com"
 disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
-
+		
 		`

 		runVariant(t, files, nil)
@@ -181,7 +181,7 @@ func (m *pageMap) AddFi(fi hugofs.FileMetaInfo) error {

 		var rs *resourceSource
 		if pi.IsContent() {
-			// Create the page now as we need it at assembly time.
+			// Create the page now as we need it at assemembly time.
 			// The other resources are created if needed.
 			pageResource, pi, err := m.s.h.newPage(
 				&pageMeta{
@@ -93,8 +93,7 @@ type pageMap struct {
 	// Used for simple page lookups by name, e.g. "mypage.md" or "mypage".
 	pageReverseIndex *contentTreeReverseIndex

-	cachePages1            *dynacache.Partition[string, page.Pages]
-	cachePages2            *dynacache.Partition[string, page.Pages]
+	cachePages             *dynacache.Partition[string, page.Pages]
 	cacheResources         *dynacache.Partition[string, resource.Resources]
 	cacheContentRendered   *dynacache.Partition[string, *resources.StaleValue[contentSummary]]
 	cacheContentPlain      *dynacache.Partition[string, *resources.StaleValue[contentPlainPlainWords]]
@@ -133,7 +132,7 @@ type pageTrees struct {
 func (t *pageTrees) collectAndMarkStaleIdentities(p *paths.Path) []identity.Identity {
 	key := p.Base()
 	var ids []identity.Identity
-	// We need only one identity sample per dimension.
+	// We need only one identity sample per dimensio.
 	nCount := 0
 	cb := func(n contentNodeI) bool {
 		if n == nil {
@@ -325,19 +324,15 @@ func (m *pageMap) forEeachPageIncludingBundledPages(include predicate.P[*pageSta
 }

 func (m *pageMap) getOrCreatePagesFromCache(
-	cache *dynacache.Partition[string, page.Pages],
 	key string, create func(string) (page.Pages, error),
 ) (page.Pages, error) {
-	if cache == nil {
-		cache = m.cachePages1
-	}
-	return cache.GetOrCreate(key, create)
+	return m.cachePages.GetOrCreate(key, create)
 }

 func (m *pageMap) getPagesInSection(q pageMapQueryPagesInSection) page.Pages {
 	cacheKey := q.Key()

-	pages, err := m.getOrCreatePagesFromCache(nil, cacheKey, func(string) (page.Pages, error) {
+	pages, err := m.getOrCreatePagesFromCache(cacheKey, func(string) (page.Pages, error) {
 		prefix := paths.AddTrailingSlash(q.Path)

 		var (
@@ -402,7 +397,7 @@ func (m *pageMap) getPagesInSection(q pageMapQueryPagesInSection) page.Pages {
 func (m *pageMap) getPagesWithTerm(q pageMapQueryPagesBelowPath) page.Pages {
 	key := q.Key()

-	v, err := m.cachePages1.GetOrCreate(key, func(string) (page.Pages, error) {
+	v, err := m.cachePages.GetOrCreate(key, func(string) (page.Pages, error) {
 		var pas page.Pages
 		include := q.Include
 		if include == nil {
@@ -439,7 +434,7 @@ func (m *pageMap) getPagesWithTerm(q pageMapQueryPagesBelowPath) page.Pages {
 func (m *pageMap) getTermsForPageInTaxonomy(path, taxonomy string) page.Pages {
 	prefix := paths.AddLeadingSlash(taxonomy)

-	v, err := m.cachePages1.GetOrCreate(prefix+path, func(string) (page.Pages, error) {
+	v, err := m.cachePages.GetOrCreate(prefix+path, func(string) (page.Pages, error) {
 		var pas page.Pages

 		err := m.treeTaxonomyEntries.WalkPrefix(
@@ -489,17 +484,12 @@ func (m *pageMap) forEachResourceInPage(

 	rw.Handle = func(resourceKey string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
 		if isBranch {
-			// A resourceKey always represents a filename with extension.
-			// A page key points to the logical path of a page, which when sourced from the filesystem
-			// may represent a directory (bundles) or a single content file (e.g. p1.md).
-			// So, to avoid any overlapping ambiguity, we start looking from the owning directory.
-			ownerKey, _ := m.treePages.LongestPrefixAll(path.Dir(resourceKey))
+			ownerKey, _ := m.treePages.LongestPrefixAll(resourceKey)
 			if ownerKey != keyPage {
 				// Stop walking downwards, someone else owns this resource.
 				rw.SkipPrefix(ownerKey + "/")
 				return false, nil
 			}
-
 		}
 		return handle(resourceKey, n, match)
 	}
@@ -871,8 +861,7 @@ func newPageMap(i int, s *Site, mcache *dynacache.Cache, pageTrees *pageTrees) *

 	m = &pageMap{
 		pageTrees:              pageTrees.Shape(0, i),
-		cachePages1:            dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pag1/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
-		cachePages2:            dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pag2/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
+		cachePages:             dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pags/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
 		cacheResources:         dynacache.GetOrCreatePartition[string, resource.Resources](mcache, fmt.Sprintf("/ress/%d", i), dynacache.OptionsPartition{Weight: 60, ClearWhen: dynacache.ClearOnRebuild}),
 		cacheContentRendered:   dynacache.GetOrCreatePartition[string, *resources.StaleValue[contentSummary]](mcache, fmt.Sprintf("/cont/ren/%d", i), dynacache.OptionsPartition{Weight: 70, ClearWhen: dynacache.ClearOnChange}),
 		cacheContentPlain:      dynacache.GetOrCreatePartition[string, *resources.StaleValue[contentPlainPlainWords]](mcache, fmt.Sprintf("/cont/pla/%d", i), dynacache.OptionsPartition{Weight: 70, ClearWhen: dynacache.ClearOnChange}),
@@ -1084,7 +1073,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 				return b
 			}

-			h.MemCache.ClearMatching(nil, shouldDelete)
+			h.MemCache.ClearMatching(shouldDelete)

 			return ll, nil
 		}); err != nil {
@@ -1092,7 +1081,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 		}
 	}

-	// Drain the cache eviction stack.
+	// Drain the the cache eviction stack.
 	evicted := h.Deps.MemCache.DrainEvictedIdentities()
 	if len(evicted) < 200 {
 		changes = append(changes, evicted...)
@@ -1511,6 +1500,13 @@ func (sa *sitePagesAssembler) assembleTermsAndTranslations() error {
 				return false, nil
 			}

+			// This is a little out of place, but is conveniently put here.
+			// Check if translationKey is set by user.
+			// This is to support the manual way of setting the translationKey in front matter.
+			if ps.m.pageConfig.TranslationKey != "" {
+				sa.s.h.translationKeyPages.Append(ps.m.pageConfig.TranslationKey, ps)
+			}
+
 			if sa.pageMap.cfg.taxonomyTermDisabled {
 				return false, nil
 			}
@@ -1591,19 +1587,12 @@ func (sa *sitePagesAssembler) assembleResources() error {
 		Handle: func(s string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
 			ps := n.(*pageState)

-			// This is a little out of place, but is conveniently put here.
-			// Check if translationKey is set by user.
-			// This is to support the manual way of setting the translationKey in front matter.
-			if ps.m.pageConfig.TranslationKey != "" {
-				sa.s.h.translationKeyPages.Append(ps.m.pageConfig.TranslationKey, ps)
-			}
-
 			// Prepare resources for this page.
 			ps.shiftToOutputFormat(true, 0)
 			targetPaths := ps.targetPaths()
 			baseTarget := targetPaths.SubResourceBaseTarget
 			duplicateResourceFiles := true
-			if ps.m.pageConfig.IsGoldmark {
+			if ps.s.ContentSpec.Converters.IsGoldmark(ps.m.pageConfig.Markup) {
 				duplicateResourceFiles = ps.s.ContentSpec.Converters.GetMarkupConfig().Goldmark.DuplicateResourceFiles
 			}

@@ -1689,11 +1678,6 @@ func (sa *sitePagesAssembler) assemblePagesStep2() error {
 	if err := sa.applyAggregatesToTaxonomiesAndTerms(); err != nil {
 		return err
 	}
-
-	return nil
-}
-
-func (sa *sitePagesAssembler) assemblePagesStepFinal() error {
 	if err := sa.assembleResources(); err != nil {
 		return err
 	}
@@ -1780,7 +1764,7 @@ func (sa *sitePagesAssembler) addStandalonePages() error {

 	if s.conf.EnableRobotsTXT {
 		if m.i == 0 || s.Conf.IsMultihost() {
-			addStandalone("/_robots", kinds.KindRobotsTXT, output.RobotsTxtFormat)
+			addStandalone("/robots", kinds.KindRobotsTXT, output.RobotsTxtFormat)
 		}
 	}

@@ -1793,11 +1777,11 @@ func (sa *sitePagesAssembler) addStandalonePages() error {
 	}

 	if sitemapEnabled {
-		addStandalone("/_sitemap", kinds.KindSitemap, output.SitemapFormat)
-		skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultilingual())
+		addStandalone("/sitemap", kinds.KindSitemap, output.SitemapFormat)
+		skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultiLingual())

 		if !skipSitemapIndex {
-			addStandalone("/_sitemapindex", kinds.KindSitemapIndex, output.SitemapIndexFormat)
+			addStandalone("/sitemapindex", kinds.KindSitemapIndex, output.SitemapIndexFormat)
 		}
 	}

@@ -1830,14 +1814,6 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
 				return false, nil
 			}

-			switch ps.Kind() {
-			case kinds.KindPage, kinds.KindSection:
-				// OK
-			default:
-				// Skip taxonomy nodes etc.
-				return false, nil
-			}
-
 			p := ps.m.pathInfo
 			section := p.Section()
 			if section == "" || seen[section] {
@@ -326,35 +326,3 @@ R: {{ with $r }}{{ .Content }}{{ end }}|Len: {{ len $bundle.Resources }}|$
 		b.AssertFileContent("public/index.html", "R: Data 1.txt|", "Len: 1|")
 	}
 }
-
-func TestBundleResourcesNoPublishedIssue12198(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['home','rss','sitemap','taxonomy','term']
-- content/s1/p1.md --
---
-title: p1
---
-- content/s1/foo.txt --
-foo.txt
-- content/s1/p1.txt --
-p1.txt
-- content/s1/p1-foo.txt --
-p1-foo.txt
-- layouts/_default/list.html --
-{{.Title }}|
-- layouts/_default/single.html --
-{{.Title }}|
-	`
-
-	b := Test(t, files)
-	b.Build()
-
-	b.AssertFileExists("public/s1/index.html", true)
-	b.AssertFileExists("public/s1/foo.txt", true)
-	b.AssertFileExists("public/s1/p1.txt", true)     // failing test
-	b.AssertFileExists("public/s1/p1-foo.txt", true) // failing test
-	b.AssertFileExists("public/s1/p1/index.html", true)
-}
@@ -14,7 +14,6 @@
 package hugolib

 import (
-	"fmt"
 	"strings"
 	"testing"
 )
@@ -242,52 +241,3 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
 			"p1|<p><a href=\"p2\">P2</a>", "<img src=\"pixel.png\" alt=\"Pixel\">")
 	})
 }
-
-func TestRenderHooksDefaultEscape(t *testing.T) {
-	files := `
-- hugo.toml --
-[markup.goldmark.renderHooks]
-[markup.goldmark.renderHooks.image]
-  enableDefault = ENABLE
-[markup.goldmark.renderHooks.link]
-enableDefault = ENABLE
-[markup.goldmark.parser]
-wrapStandAloneImageWithinParagraph = false
-[markup.goldmark.parser.attribute]
-block = true
-title = true
-- content/_index.md --
---
-title: "Home"
---
-Link: [text-"<>&](/destination-"<> 'title-"<>&')
-
-Image: ![alt-"<>&](/destination-"<> 'title-"<>&')
-{class="><script>alert()</script>" id="baz"}
-
-- layouts/index.html --
-{{ .Content }}
-`
-
-	for _, enabled := range []bool{true, false} {
-		enabled := enabled
-		t.Run(fmt.Sprint(enabled), func(t *testing.T) {
-			t.Parallel()
-			b := Test(t, strings.ReplaceAll(files, "ENABLE", fmt.Sprint(enabled)))
-
-			// The escaping is slightly different between the two.
-			if enabled {
-				b.AssertFileContent("public/index.html",
-					"Link: <a href=\"/destination-%22%3C%3E\" title=\"title-&#34;&lt;&gt;&amp;\">text-&quot;&lt;&gt;&amp;</a>",
-					"img alt=\"alt-&quot;&lt;&gt;&amp;\" src=\"/destination-%22%3C%3E\" title=\"title-&#34;&lt;&gt;&amp;\">",
-					"&gt;&lt;script&gt;",
-				)
-			} else {
-				b.AssertFileContent("public/index.html",
-					"Link: <a href=\"/destination-%22%3C%3E\" title=\"title-&quot;&lt;&gt;&amp;\">text-&quot;&lt;&gt;&amp;</a>",
-					"Image: <img src=\"/destination-%22%3C%3E\" alt=\"alt-&quot;&lt;&gt;&amp;\" title=\"title-&quot;&lt;&gt;&amp;\">",
-				)
-			}
-		})
-	}
-}
@@ -67,7 +67,7 @@ package main

 ## YouTube

-{{< youtube 0RKpf3rK57I >}}
+{{< youtube PArFPgHrNZM >}}

 ## Param

@@ -83,7 +83,7 @@ Content: {{ .Content }}|
 https://gist.github.com/spf13/7896402.js
 <span style="color:#a6e22e">main</span></span>
 https://t.co/X94FmYDEZJ
-https://www.youtube.com/embed/0RKpf3rK57I
+https://www.youtube.com/embed/PArFPgHrNZM
 Foo: bar


@@ -15,6 +15,8 @@ package hugolib

 import (
 	"testing"
+
+	qt "github.com/frankban/quicktest"
 )

 func TestInternalTemplatesImage(t *testing.T) {
@@ -60,41 +62,78 @@ title: My Site
 	b.Build(BuildCfg{})

 	b.AssertFileContent("public/mybundle/index.html", `
-<meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta name="twitter:title" content="My Bundle">
-<meta property="og:title" content="My Bundle">
-<meta property="og:url" content="https://example.org/mybundle/">
-<meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta property="article:published_time" content="2021-02-26T18:02:00-01:00">
-<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00">
+<meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta name="twitter:title" content="My Bundle"/>
+<meta property="og:title" content="My Bundle" />
+<meta property="og:url" content="https://example.org/mybundle/" />
+<meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta property="article:published_time" content="2021-02-26T18:02:00-01:00" />
+<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00" />
 <meta itemprop="name" content="My Bundle">
-<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00">
-<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00">
+<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00" />
+<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00" />

 `)
 	b.AssertFileContent("public/mypage/index.html", `
-<meta name="twitter:image" content="https://example.org/pageimg1.jpg">
-<meta property="og:image" content="https://example.org/pageimg1.jpg">
-<meta property="og:image" content="https://example.org/pageimg2.jpg">
-<meta property="og:image" content="https://example.local/logo.png">
-<meta property="og:image" content="https://example.org/mypage/sample.jpg">
-<meta property="article:published_time" content="2021-02-26T18:02:00+01:00">
-<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00">
-<meta itemprop="image" content="https://example.org/pageimg1.jpg">
-<meta itemprop="image" content="https://example.org/pageimg2.jpg">
-<meta itemprop="image" content="https://example.local/logo.png">
-<meta itemprop="image" content="https://example.org/mypage/sample.jpg">
-<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00">
-<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00">
+<meta name="twitter:image" content="https://example.org/pageimg1.jpg" />
+<meta property="og:image" content="https://example.org/pageimg1.jpg" />
+<meta property="og:image" content="https://example.org/pageimg2.jpg" />
+<meta property="og:image" content="https://example.local/logo.png" />
+<meta property="og:image" content="https://example.org/mypage/sample.jpg" />
+<meta property="article:published_time" content="2021-02-26T18:02:00+01:00" />
+<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00" />
+<meta itemprop="image" content="https://example.org/pageimg1.jpg" />
+<meta itemprop="image" content="https://example.org/pageimg2.jpg" />
+<meta itemprop="image" content="https://example.local/logo.png" />
+<meta itemprop="image" content="https://example.org/mypage/sample.jpg" />
+<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00" />
+<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00" />
 `)
 	b.AssertFileContent("public/mysite/index.html", `
-<meta name="twitter:image" content="https://example.org/siteimg1.jpg">
-<meta property="og:image" content="https://example.org/siteimg1.jpg">
-<meta itemprop="image" content="https://example.org/siteimg1.jpg">
+<meta name="twitter:image" content="https://example.org/siteimg1.jpg" />
+<meta property="og:image" content="https://example.org/siteimg1.jpg" />
+<meta itemprop="image" content="https://example.org/siteimg1.jpg" />
 `)
 }

+// Just some simple test of the embedded templates to avoid
+// https://github.com/gohugoio/hugo/issues/4757 and similar.
+func TestEmbeddedTemplates(t *testing.T) {
+	t.Parallel()
+
+	c := qt.New(t)
+	c.Assert(true, qt.Equals, true)
+
+	home := []string{"index.html", `
+GA:
+{{ template "_internal/google_analytics.html" . }}
+
+GA async:
+
+{{ template "_internal/google_analytics_async.html" . }}
+
+Disqus:
+
+{{ template "_internal/disqus.html" . }}
+
+`}
+
+	b := newTestSitesBuilder(t)
+	b.WithSimpleConfigFile().WithTemplatesAdded(home...)
+
+	b.Build(BuildCfg{})
+
+	// Gheck GA regular and async
+	b.AssertFileContent("public/index.html",
+		"'anonymizeIp', true",
+		"'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'UA-ga_id', 'auto')",
+		"<script async src='https://www.google-analytics.com/analytics.js'>")
+
+	// Disqus
+	b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
+}
+
 func TestEmbeddedPaginationTemplate(t *testing.T) {
 	t.Parallel()

@@ -265,9 +265,6 @@ type SourceFilesystem struct {
 	// This is a virtual composite filesystem. It expects path relative to a context.
 	Fs afero.Fs

-	// The source filesystem (usually the OS filesystem).
-	SourceFs afero.Fs
-
 	// When syncing a source folder to the target (e.g. /public), this may
 	// be set to publish into a subfolder. This is used for static syncing
 	// in multihost mode.
@@ -323,10 +320,10 @@ func (s SourceFilesystems) IsContent(filename string) bool {
 }

 // ResolvePaths resolves the given filename to a list of paths in the filesystems.
-func (s *SourceFilesystems) ResolvePaths(filename string) []hugofs.ComponentPath {
+func (s *SourceFilesystems) ResolvePaths(filename string, checkExists bool) []hugofs.ComponentPath {
 	var cpss []hugofs.ComponentPath
 	for _, rfs := range s.RootFss {
-		cps, err := rfs.ReverseLookup(filename)
+		cps, err := rfs.ReverseLookup(filename, checkExists)
 		if err != nil {
 			panic(err)
 		}
@@ -365,17 +362,7 @@ func (d *SourceFilesystem) ReverseLookup(filename string, checkExists bool) ([]h
 	var cps []hugofs.ComponentPath
 	hugofs.WalkFilesystems(d.Fs, func(fs afero.Fs) bool {
 		if rfs, ok := fs.(hugofs.ReverseLookupProvder); ok {
-			if c, err := rfs.ReverseLookupComponent(d.Name, filename); err == nil {
-				if checkExists {
-					n := 0
-					for _, cp := range c {
-						if _, err := d.Fs.Stat(filepath.FromSlash(cp.Path)); err == nil {
-							c[n] = cp
-							n++
-						}
-					}
-					c = c[:n]
-				}
+			if c, err := rfs.ReverseLookupComponent(d.Name, filename, checkExists); err == nil {
 				cps = append(cps, c...)
 			}
 		}
@@ -392,12 +379,11 @@ func (d *SourceFilesystem) mounts() []hugofs.FileMetaInfo {
 			if err == nil {
 				m = append(m, mounts...)
 			}
+
 		}
 		return false
 	})
-
 	// Filter out any mounts not belonging to this filesystem.
-	// TODO(bep) I think this is superflous.
 	n := 0
 	for _, mm := range m {
 		if mm.Meta().Component == d.Name {
@@ -406,7 +392,6 @@ func (d *SourceFilesystem) mounts() []hugofs.FileMetaInfo {
 		}
 	}
 	m = m[:n]
-
 	return m
 }

@@ -443,8 +428,10 @@ func (d *SourceFilesystem) RealDirs(from string) []string {
 		if !m.IsDir() {
 			continue
 		}
-		dirname := filepath.Join(m.Meta().Filename, from)
-		if _, err := d.SourceFs.Stat(dirname); err == nil {
+		meta := m.Meta()
+		_, err := d.Fs.Stat(from)
+		if err == nil {
+			dirname := filepath.Join(meta.Filename, from)
 			dirnames = append(dirnames, dirname)
 		}
 	}
@@ -532,9 +519,8 @@ func newSourceFilesystemsBuilder(p *paths.Paths, logger loggers.Logger, b *BaseF

 func (b *sourceFilesystemsBuilder) newSourceFilesystem(name string, fs afero.Fs) *SourceFilesystem {
 	return &SourceFilesystem{
-		Name:     name,
-		Fs:       fs,
-		SourceFs: b.sourceFs,
+		Name: name,
+		Fs:   fs,
 	}
 }

@@ -315,7 +315,7 @@ func TestStaticFs(t *testing.T) {
 	checkFileContent(sfs, "f2.txt", c, "Hugo Themes Still Rocks!")
 }

-func TestStaticFsMultihost(t *testing.T) {
+func TestStaticFsMultiHost(t *testing.T) {
 	c := qt.New(t)
 	v := config.New()
 	workDir := "mywork"
@@ -509,40 +509,6 @@ l2
 	}
 }

-func TestAssetsIssue12175(t *testing.T) {
-	files := `
-- hugo.toml --
-baseURL = "https://example.com/"
-[module]
-[[module.mounts]]
-source = "node_modules/@foo/core/assets"
-target = "assets"
-[[module.mounts]]
-source = "assets"
-target = "assets"
-- node_modules/@foo/core/assets/js/app.js --
-JS.
-- node_modules/@foo/core/assets/scss/app.scss --
-body { color: red; }
-- assets/scss/app.scss --
-body { color: blue; }
-- layouts/index.html --
-Home.
-SCSS: {{ with resources.Get "scss/app.scss" }}{{ .RelPermalink }}|{{ .Content }}{{ end }}|
-# Note that the pattern below will match 2 resources, which doesn't make much sense,
-# but is how the current (and also < v0.123.0) merge logic works, and for most practical purposes, it doesn't matter.
-SCSS Match: {{ with resources.Match "**.scss" }}{{ . | len }}|{{ range .}}{{ .RelPermalink }}|{{ end }}{{ end }}|
-
-`
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/index.html", `
-SCSS: /scss/app.scss|body { color: blue; }|
-SCSS Match: 2|
-`)
-}
-
 func TestStaticComposite(t *testing.T) {
 	files := `
 -- hugo.toml --
@@ -269,7 +269,7 @@ func (h *HugoSites) pickOneAndLogTheRest(errors []error) error {
 	return errors[i]
 }

-func (h *HugoSites) isMultilingual() bool {
+func (h *HugoSites) isMultiLingual() bool {
 	return len(h.Sites) > 1
 }

@@ -410,10 +410,6 @@ type BuildCfg struct {

 // shouldRender returns whether this output format should be rendered or not.
 func (cfg *BuildCfg) shouldRender(p *pageState) bool {
-	if p.skipRender() {
-		return false
-	}
-
 	if !p.renderOnce {
 		return true
 	}
@@ -23,22 +23,21 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"sync"
 	"time"

 	"github.com/bep/logg"
 	"github.com/gohugoio/hugo/cache/dynacache"
 	"github.com/gohugoio/hugo/deps"
-	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugofs/files"
 	"github.com/gohugoio/hugo/hugofs/glob"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/output"
 	"github.com/gohugoio/hugo/publisher"
 	"github.com/gohugoio/hugo/source"
 	"github.com/gohugoio/hugo/tpl"

+	"github.com/gohugoio/hugo/hugofs"
+
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/loggers"
 	"github.com/gohugoio/hugo/common/para"
@@ -47,7 +46,6 @@ import (
 	"github.com/gohugoio/hugo/resources/page"
 	"github.com/gohugoio/hugo/resources/page/siteidentities"
 	"github.com/gohugoio/hugo/resources/postpub"
-	"github.com/gohugoio/hugo/resources/resource"

 	"github.com/spf13/afero"

@@ -284,6 +282,11 @@ func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *Buil
 			return err
 		}
 	}
+	h.renderFormats = output.Formats{}
+	for _, s := range h.Sites {
+		s.s.initRenderFormats()
+		h.renderFormats = append(h.renderFormats, s.renderFormats...)
+	}

 	for _, s := range assemblers {
 		if err := s.assemblePagesStep2(); err != nil {
@@ -293,16 +296,9 @@ func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *Buil

 	h.renderFormats = output.Formats{}
 	for _, s := range h.Sites {
-		s.s.initRenderFormats()
 		h.renderFormats = append(h.renderFormats, s.renderFormats...)
 	}

-	for _, s := range assemblers {
-		if err := s.assemblePagesStepFinal(); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }

@@ -322,20 +318,9 @@ func (h *HugoSites) render(l logg.LevelLogger, config *BuildCfg) error {

 	i := 0
 	for _, s := range h.Sites {
-		segmentFilter := s.conf.C.SegmentFilter
-		if segmentFilter.ShouldExcludeCoarse(segments.SegmentMatcherFields{Lang: s.language.Lang}) {
-			l.Logf("skip language %q not matching segments set in --renderSegments", s.language.Lang)
-			continue
-		}
-
 		siteRenderContext.languageIdx = s.languagei
 		h.currentSite = s
 		for siteOutIdx, renderFormat := range s.renderFormats {
-			if segmentFilter.ShouldExcludeCoarse(segments.SegmentMatcherFields{Output: renderFormat.Name, Lang: s.language.Lang}) {
-				l.Logf("skip output format %q for language %q not matching segments set in --renderSegments", renderFormat.Name, s.language.Lang)
-				continue
-			}
-
 			siteRenderContext.outIdx = siteOutIdx
 			siteRenderContext.sitesOutIdx = i
 			i++
@@ -610,10 +595,8 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		return sb.String()
 	}))

-	// For a list of events for the different OSes, see the test output in https://github.com/bep/fsnotifyeventlister/.
 	events = h.fileEventsFilter(events)
-	events = h.fileEventsTrim(events)
-	eventInfos := h.fileEventsApplyInfo(events)
+	events = h.fileEventsTranslate(events)

 	logger := h.Log

@@ -648,12 +631,36 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		addedContentPaths []*paths.Path
 	)

-	for _, ev := range eventInfos {
-		cpss := h.BaseFs.ResolvePaths(ev.Name)
+	for _, ev := range events {
+		removed := false
+		added := false
+
+		if ev.Op&fsnotify.Remove == fsnotify.Remove {
+			removed = true
+		}
+
+		fi, statErr := h.Fs.Source.Stat(ev.Name)
+
+		// Some editors (Vim) sometimes issue only a Rename operation when writing an existing file
+		// Sometimes a rename operation means that file has been renamed other times it means
+		// it's been updated.
+		if ev.Op.Has(fsnotify.Rename) {
+			// If the file is still on disk, it's only been updated, if it's not, it's been moved
+			if statErr != nil {
+				removed = true
+			}
+		}
+		if ev.Op.Has(fsnotify.Create) {
+			added = true
+		}
+
+		isChangedDir := statErr == nil && fi.IsDir()
+
+		cpss := h.BaseFs.ResolvePaths(ev.Name, !removed)
 		pss := make([]*paths.Path, len(cpss))
 		for i, cps := range cpss {
 			p := cps.Path
-			if ev.removed && !paths.HasExt(p) {
+			if removed && !paths.HasExt(p) {
 				// Assume this is a renamed/removed directory.
 				// For deletes, we walk up the tree to find the container (e.g. branch bundle),
 				// so we will catch this even if it is a file without extension.
@@ -664,7 +671,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			}

 			pss[i] = h.Configs.ContentPathParser.Parse(cps.Component, p)
-			if ev.added && !ev.isChangedDir && cps.Component == files.ComponentFolderContent {
+			if added && !isChangedDir && cps.Component == files.ComponentFolderContent {
 				addedContentPaths = append(addedContentPaths, pss[i])
 			}

@@ -676,9 +683,9 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			}
 		}

-		if ev.removed {
+		if removed {
 			changedPaths.deleted = append(changedPaths.deleted, pss...)
-		} else if ev.isChangedDir {
+		} else if isChangedDir {
 			changedPaths.changedDirs = append(changedPaths.changedDirs, pss...)
 		} else {
 			changedPaths.changedFiles = append(changedPaths.changedFiles, pss...)
@@ -732,7 +739,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf

 		case files.ComponentFolderLayouts:
 			tmplChanged = true
-			templatePath := pathInfo.Unnormalized().TrimLeadingSlash().PathNoLang()
+			templatePath := pathInfo.TrimLeadingSlash().PathNoLang()
 			if !h.Tmpl().HasTemplate(templatePath) {
 				tmplAdded = true
 			}
@@ -760,45 +767,15 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 				}
 			}
 		case files.ComponentFolderAssets:
-			p := pathInfo.Path()
-			logger.Println("Asset changed", p)
-
-			var matches []any
-			var mu sync.Mutex
-
-			h.MemCache.ClearMatching(
-				func(k string, pm dynacache.PartitionManager) bool {
-					// Avoid going through everything.
-					return strings.HasPrefix(k, "/res")
-				},
-				func(k, v any) bool {
-					if strings.Contains(k.(string), p) {
-						mu.Lock()
-						defer mu.Unlock()
-						switch vv := v.(type) {
-						case resource.Resources:
-							// GetMatch/Match.
-							for _, r := range vv {
-								matches = append(matches, r)
-							}
-							return true
-						default:
-							matches = append(matches, vv)
-							return true
-
-						}
-					}
-					return false
-				})
+			logger.Println("Asset changed", pathInfo.Path())

 			var hasID bool
-			for _, r := range matches {
-				identity.WalkIdentitiesShallow(r, func(level int, rid identity.Identity) bool {
-					hasID = true
-					changes = append(changes, rid)
-					return false
-				})
-			}
+			r, _ := h.ResourceSpec.ResourceCache.Get(context.Background(), dynacache.CleanKey(pathInfo.Base()))
+			identity.WalkIdentitiesShallow(r, func(level int, rid identity.Identity) bool {
+				hasID = true
+				changes = append(changes, rid)
+				return false
+			})
 			if !hasID {
 				changes = append(changes, pathInfo)
 			}
@@ -815,8 +792,6 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			// It's hard to determine the exact change set of this,
 			// so be very coarse grained for now.
 			changes = append(changes, identity.GenghisKhan)
-		case files.ComponentFolderArchetypes:
-			// Ignore for now.
 		default:
 			panic(fmt.Sprintf("unknown component: %q", pathInfo.Component()))
 		}
@@ -951,22 +926,9 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		}
 	}

-	h.logServerAddresses()
-
 	return nil
 }

-func (h *HugoSites) logServerAddresses() {
-	if h.hugoInfo.IsMultihost() {
-		for _, s := range h.Sites {
-			h.Log.Printf("Web Server is available at %s (bind address %s) %s\n", s.conf.C.BaseURL, s.conf.C.ServerInterface, s.Language().Lang)
-		}
-	} else {
-		s := h.Sites[0]
-		h.Log.Printf("Web Server is available at %s (bind address %s)\n", s.conf.C.BaseURL, s.conf.C.ServerInterface)
-	}
-}
-
 func (h *HugoSites) processFull(ctx context.Context, l logg.LevelLogger, config BuildCfg) (err error) {
 	if err = h.processFiles(ctx, l, config); err != nil {
 		err = fmt.Errorf("readAndProcessContent: %w", err)
@@ -66,12 +66,12 @@ robots|{{ site.Language.Lang }}
 404|{{ site.Language.Lang }}


-
+	
 `

 	b := Test(t, files)

-	b.Assert(b.H.Conf.IsMultilingual(), qt.Equals, true)
+	b.Assert(b.H.Conf.IsMultiLingual(), qt.Equals, true)
 	b.Assert(b.H.Conf.IsMultihost(), qt.Equals, true)

 	// helpers.PrintFs(b.H.Fs.PublishDir, "", os.Stdout)
@@ -10,7 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -184,13 +183,6 @@ type lockingBuffer struct {
 	bytes.Buffer
 }

-func (b *lockingBuffer) ReadFrom(r io.Reader) (n int64, err error) {
-	b.Lock()
-	n, err = b.Buffer.ReadFrom(r)
-	b.Unlock()
-	return
-}
-
 func (b *lockingBuffer) Write(p []byte) (n int, err error) {
 	b.Lock()
 	n, err = b.Buffer.Write(p)
@@ -686,17 +678,8 @@ func (s *IntegrationTestBuilder) build(cfg BuildCfg) error {
 	return nil
 }

-// We simulate the fsnotify events.
-// See the test output in https://github.com/bep/fsnotifyeventlister for what events gets produced
-// by the different OSes.
 func (s *IntegrationTestBuilder) changeEvents() []fsnotify.Event {
-	var (
-		events    []fsnotify.Event
-		isLinux   = runtime.GOOS == "linux"
-		isMacOs   = runtime.GOOS == "darwin"
-		isWindows = runtime.GOOS == "windows"
-	)
-
+	var events []fsnotify.Event
 	for _, v := range s.removedFiles {
 		events = append(events, fsnotify.Event{
 			Name: v,
@@ -723,32 +706,12 @@ func (s *IntegrationTestBuilder) changeEvents() []fsnotify.Event {
 			Name: v,
 			Op:   fsnotify.Write,
 		})
-		if isLinux || isWindows {
-			// Duplicate write events, for some reason.
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Write,
-			})
-		}
-		if isMacOs {
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Chmod,
-			})
-		}
 	}
 	for _, v := range s.createdFiles {
 		events = append(events, fsnotify.Event{
 			Name: v,
 			Op:   fsnotify.Create,
 		})
-		if isLinux || isWindows {
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Write,
-			})
-		}
-
 	}

 	// Shuffle events.
@@ -636,77 +636,3 @@ Menu Item: {{ $i }}|{{ .URL }}|
 Menu Item: 0|/foo/posts|
 `)
 }
-
-func TestSectionPagesMenuMultilingualWarningIssue12306(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['section','rss','sitemap','taxonomy','term']
-defaultContentLanguageInSubdir = true
-sectionPagesMenu = "main"
-[languages.en]
-[languages.fr]
-- layouts/_default/home.html --
-{{- range site.Menus.main -}}
-  <a href="{{ .URL }}">{{ .Name }}</a>
-{{- end -}}
-- layouts/_default/single.html --
-{{ .Title }}
-- content/p1.en.md --
---
-title: p1
-menu: main
---
-- content/p1.fr.md --
---
-title: p1
-menu: main
---
-- content/p2.en.md --
---
-title: p2
-menu: main
---
-`
-
-	b := Test(t, files, TestOptWarn())
-
-	b.AssertFileContent("public/en/index.html", `<a href="/en/p1/">p1</a><a href="/en/p2/">p2</a>`)
-	b.AssertFileContent("public/fr/index.html", `<a href="/fr/p1/">p1</a>`)
-	b.AssertLogNotContains("WARN")
-}
-
-func TestSectionPagesIssue12399(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','sitemap','taxonomy','term']
-capitalizeListTitles = false
-pluralizeListTitles = false
-sectionPagesMenu = 'main'
-- content/p1.md --
---
-title: p1
---
-- content/s1/p2.md --
---
-title: p2
-menus: main
---
-- content/s1/p3.md --
---
-title: p3
---
-- layouts/_default/list.html --
-{{ range site.Menus.main }}<a href="{{ .URL }}">{{ .Name }}</a>{{ end }}
-- layouts/_default/single.html --
-{{ .Title }}
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/index.html", true)
-	b.AssertFileContent("public/index.html", `<a href="/s1/p2/">p2</a><a href="/s1/">s1</a>`)
-}
@@ -22,7 +22,6 @@ import (

 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib/doctree"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/output"
@@ -37,7 +36,6 @@ import (

 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/maps"
-	"github.com/gohugoio/hugo/common/types"

 	"github.com/gohugoio/hugo/source"

@@ -153,19 +151,6 @@ func (p *pageState) reusePageOutputContent() bool {
 	return p.pageOutputTemplateVariationsState.Load() == 1
 }

-func (p *pageState) skipRender() bool {
-	b := p.s.conf.C.SegmentFilter.ShouldExcludeFine(
-		segments.SegmentMatcherFields{
-			Path:   p.Path(),
-			Kind:   p.Kind(),
-			Lang:   p.Lang(),
-			Output: p.pageOutput.f.Name,
-		},
-	)
-
-	return b
-}
-
 func (po *pageState) isRenderedAny() bool {
 	for _, o := range po.pageOutputs {
 		if o.isRendered() {
@@ -380,9 +365,7 @@ func (p *pageState) TranslationKey() string {
 // AllTranslations returns all translations, including the current Page.
 func (p *pageState) AllTranslations() page.Pages {
 	key := p.Path() + "/" + "translations-all"
-	// This is called from Translations, so we need to use a different partition, cachePages2,
-	// to avoid potential deadlocks.
-	pages, err := p.s.pageMap.getOrCreatePagesFromCache(p.s.pageMap.cachePages2, key, func(string) (page.Pages, error) {
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
 		if p.m.pageConfig.TranslationKey != "" {
 			// translationKey set by user.
 			pas, _ := p.s.h.translationKeyPages.Get(p.m.pageConfig.TranslationKey)
@@ -415,7 +398,7 @@ func (p *pageState) AllTranslations() page.Pages {
 // Translations returns the translations excluding the current Page.
 func (p *pageState) Translations() page.Pages {
 	key := p.Path() + "/" + "translations"
-	pages, err := p.s.pageMap.getOrCreatePagesFromCache(nil, key, func(string) (page.Pages, error) {
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
 		var pas page.Pages
 		for _, pp := range p.AllTranslations() {
 			if !pp.Eq(p) {
@@ -748,9 +731,3 @@ func (p pageWithWeight0) Weight0() int {
 func (p pageWithWeight0) page() page.Page {
 	return p.pageState
 }
-
-var _ types.Unwrapper = (*pageWithWeight0)(nil)
-
-func (p pageWithWeight0) Unwrapv() any {
-	return p.pageState
-}
@@ -522,7 +522,6 @@ func (c *cachedContent) contentRendered(ctx context.Context, cp *pageContentOutp
 			if err != nil {
 				return nil, err
 			}
-
 			if !ok {
 				return nil, errors.New("invalid state: astDoc is set but RenderContent returned false")
 			}
@@ -627,10 +626,8 @@ func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (
 			return nil, err
 		}

-		// Callback called from below (e.g. in .RenderString)
+		// Callback called from above (e.g. in .RenderString)
 		ctxCallback := func(cp2 *pageContentOutput, ct2 contentTableOfContents) {
-			cp.otherOutputs[cp2.po.p.pid] = cp2
-
 			// Merge content placeholders
 			for k, v := range ct2.contentPlaceholders {
 				ct.contentPlaceholders[k] = v
@@ -773,7 +770,7 @@ func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput)
 			result.readingTime = (result.wordCount + 212) / 213
 		}

-		if c.pi.hasSummaryDivider || rendered.summary != "" {
+		if rendered.summary != "" {
 			result.summary = rendered.summary
 			result.summaryTruncated = rendered.summaryTruncated
 		} else if cp.po.p.m.pageConfig.Summary != "" {
@@ -781,7 +778,7 @@ func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput)
 			if err != nil {
 				return nil, err
 			}
-			html := cp.po.p.s.ContentSpec.TrimShortHTML(b.Bytes(), cp.po.p.m.pageConfig.Markup)
+			html := cp.po.p.s.ContentSpec.TrimShortHTML(b.Bytes())
 			result.summary = helpers.BytesToHTML(html)
 		} else {
 			var summary string
@@ -106,9 +106,9 @@ func (p *pageMeta) Aliases() []string {
 	return p.pageConfig.Aliases
 }

-// Deprecated: Use taxonomies instead.
+// Deprecated: use taxonomies.
 func (p *pageMeta) Author() page.Author {
-	hugo.Deprecate(".Page.Author", "Use taxonomies instead.", "v0.98.0")
+	hugo.Deprecate(".Author", "Use taxonomies.", "v0.98.0")
 	authors := p.Authors()

 	for _, author := range authors {
@@ -117,9 +117,9 @@ func (p *pageMeta) Author() page.Author {
 	return page.Author{}
 }

-// Deprecated: Use taxonomies instead.
+// Deprecated: use taxonomies.
 func (p *pageMeta) Authors() page.AuthorList {
-	hugo.Deprecate(".Page.Authors", "Use taxonomies instead.", "v0.112.0")
+	hugo.Deprecate(".Author", "Use taxonomies.", "v0.112.0")
 	return nil
 }

@@ -676,7 +676,7 @@ params:
 }

 // shouldList returns whether this page should be included in the list of pages.
-// global indicates site.Pages etc.
+// glogal indicates site.Pages etc.
 func (p *pageMeta) shouldList(global bool) bool {
 	if p.isStandalone() {
 		// Never list 404, sitemap and similar.
@@ -737,8 +737,6 @@ func (p *pageMeta) applyDefaultValues() error {
 		}
 	}

-	p.pageConfig.IsGoldmark = p.s.ContentSpec.Converters.IsGoldmark(p.pageConfig.Markup)
-
 	if p.pageConfig.Title == "" && p.f == nil {
 		switch p.Kind() {
 		case kinds.KindHome:
@@ -796,26 +794,12 @@ func (p *pageMeta) newContentConverter(ps *pageState, markup string) (converter.
 		path = p.Path()
 	}

-	doc := newPageForRenderHook(ps)
-
-	documentLookup := func(id uint64) any {
-		if id == ps.pid {
-			// This prevents infinite recursion in some cases.
-			return doc
-		}
-		if v, ok := ps.pageOutput.pco.otherOutputs[id]; ok {
-			return v.po.p
-		}
-		return nil
-	}
-
 	cpp, err := cp.New(
 		converter.DocumentContext{
-			Document:       doc,
-			DocumentLookup: documentLookup,
-			DocumentID:     id,
-			DocumentName:   path,
-			Filename:       filename,
+			Document:     newPageForRenderHook(ps),
+			DocumentID:   id,
+			DocumentName: path,
+			Filename:     filename,
 		},
 	)
 	if err != nil {
@@ -145,11 +145,9 @@ func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 					// Either a taxonomy or a term.
 					if tc.pluralTreeKey == m.Path() {
 						m.pageConfig.Kind = kinds.KindTaxonomy
-						m.singular = tc.singular
 					} else {
 						m.pageConfig.Kind = kinds.KindTerm
 						m.term = m.pathInfo.Unnormalized().BaseNameNoIdentifier()
-						m.singular = tc.singular
 					}
 				}
 			} else if m.f != nil {
@@ -30,7 +30,6 @@ import (
 	"github.com/spf13/cast"

 	"github.com/gohugoio/hugo/markup/converter/hooks"
-	"github.com/gohugoio/hugo/markup/goldmark/hugocontext"
 	"github.com/gohugoio/hugo/markup/highlight/chromalexers"
 	"github.com/gohugoio/hugo/markup/tableofcontents"

@@ -69,9 +68,8 @@ var (

 func newPageContentOutput(po *pageOutput) (*pageContentOutput, error) {
 	cp := &pageContentOutput{
-		po:           po,
-		renderHooks:  &renderHooks{},
-		otherOutputs: make(map[uint64]*pageContentOutput),
+		po:          po,
+		renderHooks: &renderHooks{},
 	}
 	return cp, nil
 }
@@ -85,10 +83,6 @@ type renderHooks struct {
 type pageContentOutput struct {
 	po *pageOutput

-	// Other pages involved in rendering of this page,
-	// typically included with .RenderShortcodes.
-	otherOutputs map[uint64]*pageContentOutput
-
 	contentRenderedVersion int  // Incremented on reset.
 	contentRendered        bool // Set on content render.

@@ -171,13 +165,6 @@ func (pco *pageContentOutput) RenderShortcodes(ctx context.Context) (template.HT
 		cb(pco, ct)
 	}

-	if tpl.Context.IsInGoldmark.Get(ctx) {
-		// This content will be parsed and rendered by Goldmark.
-		// Wrap it in a special Hugo markup to assign the correct Page from
-		// the stack.
-		return template.HTML(hugocontext.Wrap(c, pco.po.p.pid)), nil
-	}
-
 	return helpers.BytesToHTML(c), nil
 }

@@ -376,11 +363,9 @@ func (pco *pageContentOutput) RenderString(ctx context.Context, args ...any) (te
 	}

 	if opts.Display == "inline" {
-		markup := pco.po.p.m.pageConfig.Markup
-		if opts.Markup != "" {
-			markup = pco.po.p.s.ContentSpec.ResolveMarkup(opts.Markup)
-		}
-		rendered = pco.po.p.s.ContentSpec.TrimShortHTML(rendered, markup)
+		// We may have to rethink this in the future when we get other
+		// renderers.
+		rendered = pco.po.p.s.ContentSpec.TrimShortHTML(rendered)
 	}

 	return template.HTML(string(rendered)), nil
@@ -124,16 +124,11 @@ func (pt pageTree) Parent() page.Page {
 		return pt.p.s.home
 	}

-	for {
-		_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, true, nil)
-		if n == nil {
-			return pt.p.s.home
-		}
-		if pt.p.m.bundled || n.isContentNodeBranch() {
-			return n.(page.Page)
-		}
-		dir = paths.Dir(dir)
+	_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, true, nil)
+	if n != nil {
+		return n.(page.Page)
 	}
+	return nil
 }

 func (pt pageTree) Ancestors() page.Pages {
@@ -63,15 +63,6 @@ Summary Next Line

 <!--more-->
 Some more text
-`
-
-	simplePageWithBlankSummary = `---
-title: SimpleWithBlankSummary
---
-
-<!--more-->
-
-Some text.
 `

 	simplePageWithSummaryParameter = `---
@@ -360,9 +351,6 @@ func normalizeExpected(ext, str string) string {

 		return expected
 	case "rst":
-		if str == "" {
-			return "<div class=\"document\"></div>"
-		}
 		return fmt.Sprintf("<div class=\"document\">\n\n\n%s</div>", str)
 	}
 }
@@ -590,7 +578,7 @@ date: 2012-01-12
 	b.Assert(s.getPageOldVersion("/with-index-no-date").Date().IsZero(), qt.Equals, true)
 	checkDate(s.getPageOldVersion("/with-index-date"), 2018)

-	b.Assert(s.Site().Lastmod().Year(), qt.Equals, 2018)
+	b.Assert(s.Site().LastChange().Year(), qt.Equals, 2018)
 }

 func TestCreateNewPage(t *testing.T) {
@@ -642,19 +630,6 @@ func TestPageWithDelimiter(t *testing.T) {
 	testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiter)
 }

-func TestPageWithBlankSummary(t *testing.T) {
-	t.Parallel()
-	assertFunc := func(t *testing.T, ext string, pages page.Pages) {
-		p := pages[0]
-		checkPageTitle(t, p, "SimpleWithBlankSummary")
-		checkPageContent(t, p, normalizeExpected(ext, "<p>Some text.</p>\n"), ext)
-		checkPageSummary(t, p, normalizeExpected(ext, ""), ext)
-		checkPageType(t, p, "page")
-	}
-
-	testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithBlankSummary)
-}
-
 func TestPageWithSummaryParameter(t *testing.T) {
 	t.Parallel()
 	assertFunc := func(t *testing.T, ext string, pages page.Pages) {
@@ -734,7 +709,7 @@ func TestPageWithShortCodeInSummary(t *testing.T) {
 	assertFunc := func(t *testing.T, ext string, pages page.Pages) {
 		p := pages[0]
 		checkPageTitle(t, p, "Simple")
-		checkPageContent(t, p, normalizeExpected(ext, "<p>Summary Next Line. <figure><img src=\"/not/real\"> </figure> . More text here.</p><p>Some more text</p>"))
+		checkPageContent(t, p, normalizeExpected(ext, "<p>Summary Next Line. <figure><img src=\"/not/real\"/> </figure> . More text here.</p><p>Some more text</p>"))
 		checkPageSummary(t, p, "Summary Next Line.  . More text here. Some more text")
 		checkPageType(t, p, "page")
 	}
@@ -798,7 +773,7 @@ func TestSummaryManualSplit(t *testing.T) {
 title: Simple
 ---
 This is **summary**.
-<!--more-->
+<!--more--> 
 This is **content**.
 -- layouts/_default/single.html --
 Summary: {{ .Summary }}|Truncated: {{ .Truncated }}|
@@ -1375,51 +1350,6 @@ AllTranslations: {{ range .AllTranslations }}{{ .Language.Lang }}|{{ end }}|
 	)
 }

-func TestTranslationKeyTermPages(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['home','rss','section','sitemap','taxonomy']
-defaultContentLanguage = 'en'
-defaultContentLanguageInSubdir = true
-[languages.en]
-weight = 1
-[languages.pt]
-weight = 2
-[taxonomies]
-category = 'categories'
-- layouts/_default/list.html --
-{{ .IsTranslated }}|{{ range .Translations }}{{ .RelPermalink }}|{{ end }}
-- layouts/_default/single.html --
-{{ .Title }}|
-- content/p1.en.md --
---
-title: p1 (en)
-categories: [music]
---
-- content/p1.pt.md --
---
-title: p1 (pt)
-categories: [música]
---
-- content/categories/music/_index.en.md --
---
-title: music
-translationKey: foo
---
-- content/categories/música/_index.pt.md --
---
-title: música
-translationKey: foo
---
-`
-
-	b := Test(t, files)
-	b.AssertFileContent("public/en/categories/music/index.html", "true|/pt/categories/m%C3%BAsica/|")
-	b.AssertFileContent("public/pt/categories/música/index.html", "true|/en/categories/music/|")
-}
-
 // Issue #11540.
 func TestTranslationKeyResourceSharing(t *testing.T) {
 	files := `
@@ -919,42 +919,3 @@ GetMatch: {{ with .Resources.GetMatch "f1.*" }}{{ .Name }}: {{ .Content }}|{{ en

 	b.AssertFileContent("public/mybundle/index.html", "GetMatch: f1.en.txt: F1.|")
 }
-
-func TestBundleBranchIssue12320(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','sitemap','taxonomy','term']
-defaultContentLanguage = 'en'
-defaultContentLanguageInSubdir = true
-[languages.en]
-baseURL = "https://en.example.org/"
-contentDir = "content/en"
-[languages.fr]
-baseURL = "https://fr.example.org/"
-contentDir = "content/fr"
-- content/en/s1/p1.md --
---
-title: p1
---
-- content/en/s1/p1.txt --
---
-p1.txt
---
-- layouts/_default/single.html --
-{{ .Title }}|
-- layouts/_default/list.html --
-{{ .Title }}|
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/en/s1/index.html", true)
-	b.AssertFileExists("public/en/s1/p1/index.html", true)
-	b.AssertFileExists("public/en/s1/p1.txt", true)
-
-	b.AssertFileExists("public/fr/s1/index.html", false)
-	b.AssertFileExists("public/fr/s1/p1/index.html", false)
-	b.AssertFileExists("public/fr/s1/p1.txt", false) // failing test
-}
@@ -161,7 +161,7 @@ func (c *pagesCollector) Collect() (collectErr error) {
 				// We always start from a directory.
 				collectErr = c.collectDir(id.p, id.isDir, func(fim hugofs.FileMetaInfo) bool {
 					if id.delete || id.isDir {
-						if id.isDir && fim.Meta().PathInfo.IsLeafBundle() {
+						if id.isDir {
 							return strings.HasPrefix(fim.Meta().PathInfo.Path(), paths.AddTrailingSlash(id.p.Path()))
 						}

@@ -11,7 +11,6 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/htesting"
-	"github.com/gohugoio/hugo/markup/asciidocext"
 	"github.com/gohugoio/hugo/resources/resource_transformers/tocss/dartsass"
 	"github.com/gohugoio/hugo/resources/resource_transformers/tocss/scss"
 )
@@ -1473,107 +1472,3 @@ all: {{ $ab.RelPermalink }}
 	b.AddFiles("assets/common/c3.css", "c3").Build()
 	b.AssertFileContent("public/ab.css", "abc1c2 editedc3")
 }
-
-func TestRebuildEditArchetypeFile(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.com"
-disableLiveReload = true
-- archetypes/default.md --
---
-title: "Default"
---
-`
-
-	b := TestRunning(t, files)
-	// Just make sure that it doesn't panic.
-	b.EditFileReplaceAll("archetypes/default.md", "Default", "Default Edited").Build()
-}
-
-func TestRebuildEditMixedCaseTemplateFileIssue12165(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.com"
-disableLiveReload = true
-- layouts/partials/MyTemplate.html --
-MyTemplate
-- layouts/index.html --
-MyTemplate: {{ partial "MyTemplate.html" . }}|
-
-
-`
-
-	b := TestRunning(t, files)
-
-	b.AssertFileContent("public/index.html", "MyTemplate: MyTemplate")
-
-	b.EditFileReplaceAll("layouts/partials/MyTemplate.html", "MyTemplate", "MyTemplate Edited").Build()
-
-	b.AssertFileContent("public/index.html", "MyTemplate: MyTemplate Edited")
-}
-
-func TestRebuildEditAsciidocContentFile(t *testing.T) {
-	if !asciidocext.Supports() {
-		t.Skip("skip asciidoc")
-	}
-	files := `
-- hugo.toml --
-baseURL = "https://example.com"
-disableLiveReload = true
-disableKinds = ["taxonomy", "term", "sitemap", "robotsTXT", "404", "rss", "home", "section"]
-[security]
-[security.exec]
-allow = ['^python$', '^rst2html.*', '^asciidoctor$']
-- content/posts/p1.adoc --
---
-title: "P1"
---
-P1 Content.
-- content/posts/p2.adoc --
---
-title: "P2"
---
-P2 Content.
-- layouts/_default/single.html --
-Single: {{ .Title }}|{{ .Content }}|
-`
-	b := TestRunning(t, files)
-	b.AssertFileContent("public/posts/p1/index.html",
-		"Single: P1|<div class=\"paragraph\">\n<p>P1 Content.</p>\n</div>\n|")
-	b.AssertRenderCountPage(2)
-	b.AssertRenderCountContent(2)
-
-	b.EditFileReplaceAll("content/posts/p1.adoc", "P1 Content.", "P1 Content Edited.").Build()
-
-	b.AssertFileContent("public/posts/p1/index.html", "Single: P1|<div class=\"paragraph\">\n<p>P1 Content Edited.</p>\n</div>\n|")
-	b.AssertRenderCountPage(1)
-	b.AssertRenderCountContent(1)
-}
-
-func TestRebuildEditSingleListChangeUbuntuIssue12362(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','section','sitemap','taxonomy','term']
-disableLiveReload = true
-- layouts/_default/list.html --
-{{ range .Pages }}{{ .Title }}|{{ end }}
-- layouts/_default/single.html --
-{{ .Title }}
-- content/p1.md --
---
-title: p1
---
-`
-
-	b := TestRunning(t, files)
-	b.AssertFileContent("public/index.html", "p1|")
-
-	b.AddFiles("content/p2.md", "---\ntitle: p2\n---").Build()
-	b.AssertFileContent("public/index.html", "p1|p2|") // this test passes, which doesn't match reality
-}
@@ -200,99 +200,3 @@ Myshort Original.
 	b.Build()
 	b.AssertFileContent("public/p1/index.html", "Edited")
 }
-
-func TestRenderShortcodesNestedPageContextIssue12356(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ["taxonomy", "term", "rss", "sitemap", "robotsTXT", "404"]
-- layouts/_default/_markup/render-image.html --
-{{- with .PageInner.Resources.Get .Destination -}}Image: {{ .RelPermalink }}|{{- end -}}
-- layouts/_default/_markup/render-link.html --
-{{- with .PageInner.GetPage .Destination -}}Link: {{ .RelPermalink }}|{{- end -}}
-- layouts/_default/_markup/render-heading.html --
-Heading: {{ .PageInner.Title }}: {{ .PlainText }}|
-- layouts/_default/_markup/render-codeblock.html --
-CodeBlock: {{ .PageInner.Title }}: {{ .Type }}|
-- layouts/_default/list.html --
-Content:{{ .Content }}|
-Fragments: {{ with .Fragments }}{{.Identifiers }}{{ end }}|
-- layouts/_default/single.html --
-Content:{{ .Content }}|
-- layouts/shortcodes/include.html --
-{{ with site.GetPage (.Get 0) }}
-  {{ .RenderShortcodes }}
-{{ end }}
-- content/markdown/_index.md --
---
-title: "Markdown"
---
-# H1
-|{{% include "/posts/p1" %}}|
-![kitten](pixel3.png "Pixel 3")
-
-§§§go
-fmt.Println("Hello")
-§§§
-
-- content/markdown2/_index.md --
---
-title: "Markdown 2"
---
-|{{< include "/posts/p1" >}}|
-- content/html/_index.html --
---
-title: "HTML"
---
-|{{% include "/posts/p1" %}}|
-
-- content/posts/p1/index.md --
---
-title: "p1"
---
-## H2-p1
-![kitten](pixel1.png "Pixel 1")
-![kitten](pixel2.png "Pixel 2")
-[p2](p2)
-
-§§§bash
-echo "Hello"
-§§§
-
-- content/posts/p2/index.md --
---
-title: "p2"
---
-- content/posts/p1/pixel1.png --
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- content/posts/p1/pixel2.png --
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- content/markdown/pixel3.png --
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- content/html/pixel4.png --
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-
-`
-
-	b := Test(t, files)
-
-	b.AssertFileContent("public/markdown/index.html",
-		// Images.
-		"Image: /posts/p1/pixel1.png|\nImage: /posts/p1/pixel2.png|\n|\nImage: /markdown/pixel3.png|</p>\n|",
-		// Links.
-		"Link: /posts/p2/|",
-		// Code blocks
-		"CodeBlock: p1: bash|", "CodeBlock: Markdown: go|",
-		// Headings.
-		"Heading: Markdown: H1|", "Heading: p1: H2-p1|",
-		// Fragments.
-		"Fragments: [h1 h2-p1]|",
-		// Check that the special context markup is not rendered.
-		"! hugo_ctx",
-	)
-
-	b.AssertFileContent("public/markdown2/index.html", "! hugo_ctx", "Content:<p>|\n  ![kitten](pixel1.png \"Pixel 1\")\n![kitten](pixel2.png \"Pixel 2\")\n|</p>\n|")
-
-	b.AssertFileContent("public/html/index.html", "! hugo_ctx")
-}
@@ -1,257 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package segments
-
-import (
-	"fmt"
-
-	"github.com/gobwas/glob"
-	"github.com/gohugoio/hugo/common/maps"
-	"github.com/gohugoio/hugo/common/predicate"
-	"github.com/gohugoio/hugo/config"
-	hglob "github.com/gohugoio/hugo/hugofs/glob"
-	"github.com/mitchellh/mapstructure"
-)
-
-// Segments is a collection of named segments.
-type Segments struct {
-	s map[string]excludeInclude
-}
-
-type excludeInclude struct {
-	exclude predicate.P[SegmentMatcherFields]
-	include predicate.P[SegmentMatcherFields]
-}
-
-// ShouldExcludeCoarse returns whether the given fields should be excluded.
-// This is used for the coarser grained checks, e.g. language and output format.
-// Note that ShouldExcludeCoarse(fields) == ShouldExcludeFine(fields) may
-// not always be true, but ShouldExcludeCoarse(fields) == true == ShouldExcludeFine(fields)
-// will always be truthful.
-func (e excludeInclude) ShouldExcludeCoarse(fields SegmentMatcherFields) bool {
-	return e.exclude != nil && e.exclude(fields)
-}
-
-// ShouldExcludeFine returns whether the given fields should be excluded.
-// This is used for the finer grained checks, e.g. on invididual pages.
-func (e excludeInclude) ShouldExcludeFine(fields SegmentMatcherFields) bool {
-	if e.exclude != nil && e.exclude(fields) {
-		return true
-	}
-	return e.include != nil && !e.include(fields)
-}
-
-type SegmentFilter interface {
-	// ShouldExcludeCoarse returns whether the given fields should be excluded on a coarse level.
-	ShouldExcludeCoarse(SegmentMatcherFields) bool
-
-	// ShouldExcludeFine returns whether the given fields should be excluded on a fine level.
-	ShouldExcludeFine(SegmentMatcherFields) bool
-}
-
-type segmentFilter struct {
-	coarse predicate.P[SegmentMatcherFields]
-	fine   predicate.P[SegmentMatcherFields]
-}
-
-func (f segmentFilter) ShouldExcludeCoarse(field SegmentMatcherFields) bool {
-	return f.coarse(field)
-}
-
-func (f segmentFilter) ShouldExcludeFine(fields SegmentMatcherFields) bool {
-	return f.fine(fields)
-}
-
-var (
-	matchAll     = func(SegmentMatcherFields) bool { return true }
-	matchNothing = func(SegmentMatcherFields) bool { return false }
-)
-
-// Get returns a SegmentFilter for the given segments.
-func (sms Segments) Get(onNotFound func(s string), ss ...string) SegmentFilter {
-	if ss == nil {
-		return segmentFilter{coarse: matchNothing, fine: matchNothing}
-	}
-	var sf segmentFilter
-	for _, s := range ss {
-		if seg, ok := sms.s[s]; ok {
-			if sf.coarse == nil {
-				sf.coarse = seg.ShouldExcludeCoarse
-			} else {
-				sf.coarse = sf.coarse.Or(seg.ShouldExcludeCoarse)
-			}
-			if sf.fine == nil {
-				sf.fine = seg.ShouldExcludeFine
-			} else {
-				sf.fine = sf.fine.Or(seg.ShouldExcludeFine)
-			}
-		} else if onNotFound != nil {
-			onNotFound(s)
-		}
-	}
-
-	if sf.coarse == nil {
-		sf.coarse = matchAll
-	}
-	if sf.fine == nil {
-		sf.fine = matchAll
-	}
-
-	return sf
-}
-
-type SegmentConfig struct {
-	Excludes []SegmentMatcherFields
-	Includes []SegmentMatcherFields
-}
-
-// SegmentMatcherFields is a matcher for a segment include or exclude.
-// All of these are Glob patterns.
-type SegmentMatcherFields struct {
-	Kind   string
-	Path   string
-	Lang   string
-	Output string
-}
-
-func getGlob(s string) (glob.Glob, error) {
-	if s == "" {
-		return nil, nil
-	}
-	g, err := hglob.GetGlob(s)
-	if err != nil {
-		return nil, fmt.Errorf("failed to compile Glob %q: %w", s, err)
-	}
-	return g, nil
-}
-
-func compileSegments(f []SegmentMatcherFields) (predicate.P[SegmentMatcherFields], error) {
-	if f == nil {
-		return func(SegmentMatcherFields) bool { return false }, nil
-	}
-	var (
-		result  predicate.P[SegmentMatcherFields]
-		section predicate.P[SegmentMatcherFields]
-	)
-
-	addToSection := func(matcherFields SegmentMatcherFields, f func(fields SegmentMatcherFields) string) error {
-		s1 := f(matcherFields)
-		g, err := getGlob(s1)
-		if err != nil {
-			return err
-		}
-		matcher := func(fields SegmentMatcherFields) bool {
-			s2 := f(fields)
-			if s2 == "" {
-				return false
-			}
-			return g.Match(s2)
-		}
-		if section == nil {
-			section = matcher
-		} else {
-			section = section.And(matcher)
-		}
-		return nil
-	}
-
-	for _, fields := range f {
-		if fields.Kind != "" {
-			if err := addToSection(fields, func(fields SegmentMatcherFields) string { return fields.Kind }); err != nil {
-				return result, err
-			}
-		}
-		if fields.Path != "" {
-			if err := addToSection(fields, func(fields SegmentMatcherFields) string { return fields.Path }); err != nil {
-				return result, err
-			}
-		}
-		if fields.Lang != "" {
-			if err := addToSection(fields, func(fields SegmentMatcherFields) string { return fields.Lang }); err != nil {
-				return result, err
-			}
-		}
-		if fields.Output != "" {
-			if err := addToSection(fields, func(fields SegmentMatcherFields) string { return fields.Output }); err != nil {
-				return result, err
-			}
-		}
-
-		if result == nil {
-			result = section
-		} else {
-			result = result.Or(section)
-		}
-		section = nil
-
-	}
-
-	return result, nil
-}
-
-func DecodeSegments(in map[string]any) (*config.ConfigNamespace[map[string]SegmentConfig, Segments], error) {
-	buildConfig := func(in any) (Segments, any, error) {
-		sms := Segments{
-			s: map[string]excludeInclude{},
-		}
-		m, err := maps.ToStringMapE(in)
-		if err != nil {
-			return sms, nil, err
-		}
-		if m == nil {
-			m = map[string]any{}
-		}
-		m = maps.CleanConfigStringMap(m)
-
-		var scfgm map[string]SegmentConfig
-		if err := mapstructure.Decode(m, &scfgm); err != nil {
-			return sms, nil, err
-		}
-
-		for k, v := range scfgm {
-			var (
-				include predicate.P[SegmentMatcherFields]
-				exclude predicate.P[SegmentMatcherFields]
-				err     error
-			)
-			if v.Excludes != nil {
-				exclude, err = compileSegments(v.Excludes)
-				if err != nil {
-					return sms, nil, err
-				}
-			}
-			if v.Includes != nil {
-				include, err = compileSegments(v.Includes)
-				if err != nil {
-					return sms, nil, err
-				}
-			}
-
-			ei := excludeInclude{
-				exclude: exclude,
-				include: include,
-			}
-			sms.s[k] = ei
-
-		}
-
-		return sms, nil, nil
-	}
-
-	ns, err := config.DecodeNamespace[map[string]SegmentConfig](in, buildConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode segments: %w", err)
-	}
-	return ns, nil
-}
@@ -1,76 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package segments_test
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/hugolib"
-)
-
-func TestSegments(t *testing.T) {
-	files := `
-- hugo.toml --
-baseURL = "https://example.org/"
-renderSegments = ["docs"]
-[languages]
-[languages.en]
-weight = 1
-[languages.no]
-weight = 2
-[languages.nb]
-weight = 3
-[segments]
-[segments.docs]
-[[segments.docs.includes]]
-kind = "{home,taxonomy,term}"
-[[segments.docs.includes]]
-path = "{/docs,/docs/**}"
-[[segments.docs.excludes]]
-path = "/blog/**"
-[[segments.docs.excludes]]
-lang = "n*"
-output = "rss"
-[[segments.docs.excludes]]
-output = "json"
-- layouts/_default/single.html --
-Single: {{ .Title }}|{{ .RelPermalink }}|
-- layouts/_default/list.html --
-List: {{ .Title }}|{{ .RelPermalink }}|
-- content/docs/_index.md --
-- content/docs/section1/_index.md --
-- content/docs/section1/page1.md --
---
-title: "Docs Page 1"
-tags: ["tag1", "tag2"]
---
-- content/blog/_index.md --
-- content/blog/section1/page1.md --
---
-title: "Blog Page 1"
-tags: ["tag1", "tag2"]
---
-`
-
-	b := hugolib.Test(t, files)
-	b.Assert(b.H.Configs.Base.RootConfig.RenderSegments, qt.DeepEquals, []string{"docs"})
-
-	b.AssertFileContent("public/docs/section1/page1/index.html", "Docs Page 1")
-	b.AssertFileExists("public/blog/section1/page1/index.html", false)
-	b.AssertFileExists("public/index.html", true)
-	b.AssertFileExists("public/index.xml", true)
-	b.AssertFileExists("public/no/index.html", true)
-	b.AssertFileExists("public/no/index.xml", false)
-}
@@ -1,115 +0,0 @@
-package segments
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestCompileSegments(t *testing.T) {
-	c := qt.New(t)
-
-	c.Run("excludes", func(c *qt.C) {
-		fields := []SegmentMatcherFields{
-			{
-				Lang:   "n*",
-				Output: "rss",
-			},
-		}
-
-		match, err := compileSegments(fields)
-		c.Assert(err, qt.IsNil)
-
-		check := func() {
-			c.Assert(match, qt.IsNotNil)
-			c.Assert(match(SegmentMatcherFields{Lang: "no"}), qt.Equals, false)
-			c.Assert(match(SegmentMatcherFields{Lang: "no", Kind: "page"}), qt.Equals, false)
-			c.Assert(match(SegmentMatcherFields{Lang: "no", Output: "rss"}), qt.Equals, true)
-			c.Assert(match(SegmentMatcherFields{Lang: "no", Output: "html"}), qt.Equals, false)
-			c.Assert(match(SegmentMatcherFields{Kind: "page"}), qt.Equals, false)
-			c.Assert(match(SegmentMatcherFields{Lang: "no", Output: "rss", Kind: "page"}), qt.Equals, true)
-		}
-
-		check()
-
-		fields = []SegmentMatcherFields{
-			{
-				Path: "/blog/**",
-			},
-			{
-				Lang:   "n*",
-				Output: "rss",
-			},
-		}
-
-		match, err = compileSegments(fields)
-		c.Assert(err, qt.IsNil)
-		check()
-		c.Assert(match(SegmentMatcherFields{Path: "/blog/foo"}), qt.Equals, true)
-	})
-
-	c.Run("includes", func(c *qt.C) {
-		fields := []SegmentMatcherFields{
-			{
-				Path: "/docs/**",
-			},
-			{
-				Lang:   "no",
-				Output: "rss",
-			},
-		}
-
-		match, err := compileSegments(fields)
-		c.Assert(err, qt.IsNil)
-		c.Assert(match, qt.IsNotNil)
-		c.Assert(match(SegmentMatcherFields{Lang: "no"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Kind: "page"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Kind: "page", Path: "/blog/foo"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Lang: "en"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Lang: "no", Output: "rss"}), qt.Equals, true)
-		c.Assert(match(SegmentMatcherFields{Lang: "no", Output: "html"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Kind: "page", Path: "/docs/foo"}), qt.Equals, true)
-	})
-
-	c.Run("includes variant1", func(c *qt.C) {
-		c.Skip()
-
-		fields := []SegmentMatcherFields{
-			{
-				Kind: "home",
-			},
-			{
-				Path: "{/docs,/docs/**}",
-			},
-		}
-
-		match, err := compileSegments(fields)
-		c.Assert(err, qt.IsNil)
-		c.Assert(match, qt.IsNotNil)
-		c.Assert(match(SegmentMatcherFields{Path: "/blog/foo"}), qt.Equals, false)
-		c.Assert(match(SegmentMatcherFields{Kind: "page", Path: "/docs/foo"}), qt.Equals, true)
-		c.Assert(match(SegmentMatcherFields{Kind: "home", Path: "/"}), qt.Equals, true)
-	})
-}
-
-func BenchmarkSegmentsMatch(b *testing.B) {
-	fields := []SegmentMatcherFields{
-		{
-			Path: "/docs/**",
-		},
-		{
-			Lang:   "no",
-			Output: "rss",
-		},
-	}
-
-	match, err := compileSegments(fields)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		match(SegmentMatcherFields{Lang: "no", Output: "rss"})
-	}
-}
@@ -321,16 +321,10 @@ func prepareShortcode(

 	// Allow the caller to delay the rendering of the shortcode if needed.
 	var fn shortcodeRenderFunc = func(ctx context.Context) ([]byte, bool, error) {
-		if p.m.pageConfig.IsGoldmark && sc.doMarkup {
-			// Signal downwards that the content rendered will be
-			// parsed and rendered by Goldmark.
-			ctx = tpl.Context.IsInGoldmark.Set(ctx, true)
-		}
 		r, err := doRenderShortcode(ctx, level, s, tplVariants, sc, parent, p, isRenderString)
 		if err != nil {
 			return nil, false, toParseErr(err)
 		}
-
 		b, hasVariants, err := r.renderShortcode(ctx)
 		if err != nil {
 			return nil, false, toParseErr(err)
@@ -19,7 +19,6 @@ import (
 	"io"
 	"mime"
 	"net/url"
-	"os"
 	"path/filepath"
 	"runtime"
 	"sort"
@@ -298,6 +297,7 @@ func (s *siteRefLinker) refLink(ref string, source any, relative bool, outputFor
 	ref = filepath.ToSlash(ref)

 	refURL, err = url.Parse(ref)
+
 	if err != nil {
 		return s.notFoundURL, err
 	}
@@ -424,115 +424,44 @@ func (h *HugoSites) fileEventsFilter(events []fsnotify.Event) []fsnotify.Event {
 		events[n] = ev
 		n++
 	}
-	events = events[:n]
-
-	eventOrdinal := func(e fsnotify.Event) int {
-		// Pull the structural changes to the top.
-		if e.Op.Has(fsnotify.Create) {
-			return 1
-		}
-		if e.Op.Has(fsnotify.Remove) {
-			return 2
-		}
-		if e.Op.Has(fsnotify.Rename) {
-			return 3
-		}
-		if e.Op.Has(fsnotify.Write) {
-			return 4
-		}
-		return 5
-	}
-
-	sort.Slice(events, func(i, j int) bool {
-		// First sort by event type.
-		if eventOrdinal(events[i]) != eventOrdinal(events[j]) {
-			return eventOrdinal(events[i]) < eventOrdinal(events[j])
-		}
-		// Then sort by name.
-		return events[i].Name < events[j].Name
-	})
-
-	return events
+	return events[:n]
 }

-type fileEventInfo struct {
-	fsnotify.Event
-	fi           os.FileInfo
-	added        bool
-	removed      bool
-	isChangedDir bool
-}
+func (h *HugoSites) fileEventsTranslate(events []fsnotify.Event) []fsnotify.Event {
+	eventMap := make(map[string][]fsnotify.Event)

-func (h *HugoSites) fileEventsApplyInfo(events []fsnotify.Event) []fileEventInfo {
-	var infos []fileEventInfo
+	// We often get a Remove etc. followed by a Create, a Create followed by a Write.
+	// Remove the superfluous events to make the update logic simpler.
 	for _, ev := range events {
-		removed := false
-		added := false
-
-		if ev.Op&fsnotify.Remove == fsnotify.Remove {
-			removed = true
-		}
-
-		fi, statErr := h.Fs.Source.Stat(ev.Name)
-
-		// Some editors (Vim) sometimes issue only a Rename operation when writing an existing file
-		// Sometimes a rename operation means that file has been renamed other times it means
-		// it's been updated.
-		if ev.Op.Has(fsnotify.Rename) {
-			// If the file is still on disk, it's only been updated, if it's not, it's been moved
-			if statErr != nil {
-				removed = true
-			}
-		}
-		if ev.Op.Has(fsnotify.Create) {
-			added = true
-		}
-
-		isChangedDir := statErr == nil && fi.IsDir()
-
-		infos = append(infos, fileEventInfo{
-			Event:        ev,
-			fi:           fi,
-			added:        added,
-			removed:      removed,
-			isChangedDir: isChangedDir,
-		})
+		eventMap[ev.Name] = append(eventMap[ev.Name], ev)
 	}

 	n := 0
+	for _, ev := range events {
+		mapped := eventMap[ev.Name]

-	for _, ev := range infos {
-		// Remove any directories that's also represented by a file.
-		keep := true
-		if ev.isChangedDir {
-			for _, ev2 := range infos {
-				if ev2.fi != nil && !ev2.fi.IsDir() && filepath.Dir(ev2.Name) == ev.Name {
-					keep = false
-					break
-				}
+		// Keep one
+		found := false
+		var kept fsnotify.Event
+		for i, ev2 := range mapped {
+			if i == 0 {
+				kept = ev2
+			}
+
+			if ev2.Op&fsnotify.Write == fsnotify.Write {
+				kept = ev2
+				found = true
+			}
+
+			if !found && ev2.Op&fsnotify.Create == fsnotify.Create {
+				kept = ev2
 			}
 		}
-		if keep {
-			infos[n] = ev
-			n++
-		}
-	}
-	infos = infos[:n]

-	return infos
-}
-
-func (h *HugoSites) fileEventsTrim(events []fsnotify.Event) []fsnotify.Event {
-	seen := make(map[string]bool)
-	n := 0
-	for _, ev := range events {
-		if seen[ev.Name] {
-			continue
-		}
-		seen[ev.Name] = true
-		events[n] = ev
+		events[n] = kept
 		n++
 	}
+
 	return events
 }

@@ -602,13 +531,18 @@ func (h *HugoSites) fileEventsContentPaths(p []pathChange) []pathChange {
 	return keepers
 }

-// SitemapAbsURL is a convenience method giving the absolute URL to the sitemap.
-func (s *Site) SitemapAbsURL() string {
+// HomeAbsURL is a convenience method giving the absolute URL to the home page.
+func (s *Site) HomeAbsURL() string {
 	base := ""
-	if len(s.conf.Languages) > 1 || s.Conf.DefaultContentLanguageInSubdir() {
+	if len(s.conf.Languages) > 1 {
 		base = s.Language().Lang
 	}
-	p := s.AbsURL(base, false)
+	return s.AbsURL(base, false)
+}
+
+// SitemapAbsURL is a convenience method giving the absolute URL to the sitemap.
+func (s *Site) SitemapAbsURL() string {
+	p := s.HomeAbsURL()
 	if !strings.HasSuffix(p, "/") {
 		p += "/"
 	}
@@ -659,16 +593,11 @@ func (s *Site) assembleMenus() error {

 	if sectionPagesMenu != "" {
 		if err := s.pageMap.forEachPage(pagePredicates.ShouldListGlobal, func(p *pageState) (bool, error) {
-			if p.Kind() != kinds.KindSection || !p.m.shouldBeCheckedForMenuDefinitions() {
+			if p.IsHome() || !p.m.shouldBeCheckedForMenuDefinitions() {
 				return false, nil
 			}
-
 			// The section pages menus are attached to the top level section.
 			id := p.Section()
-			if id == "" {
-				id = "/"
-			}
-
 			if _, ok := flat[twoD{sectionPagesMenu, id}]; ok {
 				return false, nil
 			}
@@ -680,7 +609,6 @@ func (s *Site) assembleMenus() error {
 				},
 				Page: p,
 			}
-
 			navigation.SetPageValues(&me, p)
 			flat[twoD{sectionPagesMenu, me.KeyName()}] = &me
 			return false, nil
@@ -688,7 +616,6 @@ func (s *Site) assembleMenus() error {
 			return err
 		}
 	}
-
 	// Add menu entries provided by pages
 	if err := s.pageMap.forEachPage(pagePredicates.ShouldListGlobal, func(p *pageState) (bool, error) {
 		for name, me := range p.pageMenus.menus() {
@@ -754,7 +681,7 @@ func (s *Site) getLanguagePermalinkLang(alwaysInSubDir bool) string {
 		return ""
 	}

-	if s.h.Conf.IsMultilingual() && alwaysInSubDir {
+	if s.h.Conf.IsMultiLingual() && alwaysInSubDir {
 		return s.Language().Lang
 	}

@@ -361,7 +361,8 @@ func newHugoSites(cfg deps.DepsCfg, d *deps.Deps, pageTrees *pageTrees, sites []
 	return h, nil
 }

-// Deprecated: Use hugo.IsServer instead.
+// Returns true if we're running in a server.
+// Deprecated: use hugo.IsServer instead
 func (s *Site) IsServer() bool {
 	hugo.Deprecate(".Site.IsServer", "Use hugo.IsServer instead.", "v0.120.0")
 	return s.conf.Internal.Running
@@ -381,9 +382,8 @@ func (s *Site) Copyright() string {
 	return s.conf.Copyright
 }

-// Deprecated: Use .Site.Home.OutputFormats.Get "rss" instead.
 func (s *Site) RSSLink() template.URL {
-	hugo.Deprecate(".Site.RSSLink", "Use the Output Format's Permalink method instead, e.g. .OutputFormats.Get \"RSS\".Permalink", "v0.114.0")
+	hugo.Deprecate("Site.RSSLink", "Use the Output Format's Permalink method instead, e.g. .OutputFormats.Get \"RSS\".Permalink", "v0.114.0")
 	rssOutputFormat := s.home.OutputFormats().Get("rss")
 	return template.URL(rssOutputFormat.Permalink())
 }
@@ -431,9 +431,9 @@ func (s *Site) BaseURL() string {
 	return s.conf.C.BaseURL.WithPath
 }

-// Deprecated: Use .Site.Lastmod instead.
+// Returns the last modification date of the content.
+// Deprecated: Use .Lastmod instead.
 func (s *Site) LastChange() time.Time {
-	hugo.Deprecate(".Site.LastChange", "Use .Site.Lastmod instead.", "v0.123.0")
 	return s.lastmod
 }

@@ -447,33 +447,25 @@ func (s *Site) Params() maps.Params {
 	return s.conf.Params
 }

-// Deprecated: Use taxonomies instead.
 func (s *Site) Author() map[string]any {
-	if len(s.conf.Author) != 0 {
-		hugo.Deprecate(".Site.Author", "Use taxonomies instead.", "v0.124.0")
-	}
 	return s.conf.Author
 }

-// Deprecated: Use taxonomies instead.
 func (s *Site) Authors() page.AuthorList {
-	hugo.Deprecate(".Site.Authors", "Use taxonomies instead.", "v0.124.0")
 	return page.AuthorList{}
 }

-// Deprecated: Use .Site.Params instead.
 func (s *Site) Social() map[string]string {
-	hugo.Deprecate(".Site.Social", "Use .Site.Params instead.", "v0.124.0")
 	return s.conf.Social
 }

-// Deprecated: Use .Site.Config.Services.Disqus.Shortname instead.
+// Deprecated: Use .Site.Config.Services.Disqus.Shortname instead
 func (s *Site) DisqusShortname() string {
 	hugo.Deprecate(".Site.DisqusShortname", "Use .Site.Config.Services.Disqus.Shortname instead.", "v0.120.0")
 	return s.Config().Services.Disqus.Shortname
 }

-// Deprecated: Use .Site.Config.Services.GoogleAnalytics.ID instead.
+// Deprecated: Use .Site.Config.Services.GoogleAnalytics.ID instead
 func (s *Site) GoogleAnalytics() string {
 	hugo.Deprecate(".Site.GoogleAnalytics", "Use .Site.Config.Services.GoogleAnalytics.ID instead.", "v0.120.0")
 	return s.Config().Services.GoogleAnalytics.ID
@@ -492,10 +484,8 @@ func (s *Site) BuildDrafts() bool {
 	return s.conf.BuildDrafts
 }

-// Deprecated: Use hugo.IsMultilingual instead.
 func (s *Site) IsMultiLingual() bool {
-	hugo.Deprecate(".Site.IsMultiLingual", "Use hugo.IsMultilingual instead.", "v0.124.0")
-	return s.h.isMultilingual()
+	return s.h.isMultiLingual()
 }

 func (s *Site) LanguagePrefix() string {
@@ -646,40 +646,3 @@ WordCount: {{ .WordCount }}
 	b.AssertFileContent("public/outputs-empty/index.html", "HTML:", "Word1. Word2.")
 	b.AssertFileContent("public/outputs-string/index.html", "O1:", "Word1. Word2.")
 }
-
-func TestOuputFormatFrontMatterTermIssue12275(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['home','page','rss','section','sitemap','taxonomy']
-- content/p1.md --
---
-title: p1
-tags:
-  - tag-a
-  - tag-b
---
-- content/tags/tag-a/_index.md --
---
-title: tag-a
-outputs:
-  - html
-  - json
---
-- content/tags/tag-b/_index.md --
---
-title: tag-b
---
-- layouts/_default/term.html --
-{{ .Title }}
-- layouts/_default/term.json --
-{{ jsonify (dict "title" .Title) }}
-`
-
-	b := Test(t, files)
-
-	b.AssertFileContent("public/tags/tag-a/index.html", "tag-a")
-	b.AssertFileContent("public/tags/tag-b/index.html", "tag-b")
-	b.AssertFileContent("public/tags/tag-a/index.json", `{"title":"tag-a"}`) // failing test
-}
@@ -271,7 +271,7 @@ func (s *Site) renderAliases() error {
 			p := n.(*pageState)

 			// We cannot alias a page that's not rendered.
-			if p.m.noLink() || p.skipRender() {
+			if p.m.noLink() {
 				return false, nil
 			}

@@ -334,7 +334,7 @@ func (s *Site) renderAliases() error {
 // renderMainLanguageRedirect creates a redirect to the main language home,
 // depending on if it lives in sub folder (e.g. /en) or not.
 func (s *Site) renderMainLanguageRedirect() error {
-	if s.h.Conf.IsMultihost() || !(s.h.Conf.DefaultContentLanguageInSubdir() || s.h.Conf.IsMultilingual()) {
+	if s.h.Conf.IsMultihost() || !(s.h.Conf.DefaultContentLanguageInSubdir() || s.h.Conf.IsMultiLingual()) {
 		// No need for a redirect
 		return nil
 	}
@@ -398,26 +398,3 @@ Kind: {{ .Kind }}|RelPermalink: {{ .RelPermalink }}|SectionsPath: {{ .SectionsPa
 	b.AssertFileContent("public/a/b/c/mybundle/index.html", "Kind: page|RelPermalink: /a/b/c/mybundle/|SectionsPath: /a/b/c|SectionsEntries: [a b c]|Len: 3")
 	b.AssertFileContent("public/index.html", "Kind: home|RelPermalink: /|SectionsPath: /|SectionsEntries: []|Len: 0")
 }
-
-func TestParentWithPageOverlap(t *testing.T) {
-	files := `
-- hugo.toml --
-baseURL = "https://example.com/"
-- content/docs/_index.md --
-- content/docs/logs/_index.md --
-- content/docs/logs/sdk.md --
-- content/docs/logs/sdk_exporters/stdout.md --
-- layouts/_default/list.html --
-{{ .RelPermalink }}|{{ with .Parent}}{{ .RelPermalink }}{{ end }}|
-- layouts/_default/single.html --
-{{ .RelPermalink }}|{{ with .Parent}}{{ .RelPermalink }}{{ end }}|
-
-`
-	b := Test(t, files)
-
-	b.AssertFileContent("public/index.html", "/||")
-	b.AssertFileContent("public/docs/index.html", "/docs/|/|")
-	b.AssertFileContent("public/docs/logs/index.html", "/docs/logs/|/docs/|")
-	b.AssertFileContent("public/docs/logs/sdk/index.html", "/docs/logs/sdk/|/docs/logs/|")
-	b.AssertFileContent("public/docs/logs/sdk_exporters/stdout/index.html", "/docs/logs/sdk_exporters/stdout/|/docs/logs/|")
-}
@@ -15,7 +15,6 @@ package hugolib

 import (
 	"reflect"
-	"strings"
 	"testing"

 	"github.com/gohugoio/hugo/config"
@@ -108,12 +107,11 @@ outputs: [ "html", "amp" ]

 func TestParseSitemap(t *testing.T) {
 	t.Parallel()
-	expected := config.SitemapConfig{ChangeFreq: "3", Disable: true, Filename: "doo.xml", Priority: 3.0}
+	expected := config.SitemapConfig{Priority: 3.0, Filename: "doo.xml", ChangeFreq: "3"}
 	input := map[string]any{
 		"changefreq": "3",
-		"disable":    true,
-		"filename":   "doo.xml",
 		"priority":   3.0,
+		"filename":   "doo.xml",
 		"unknown":    "ignore",
 	}
 	result, err := config.DecodeSitemap(config.SitemapConfig{}, input)
@@ -129,7 +127,7 @@ func TestParseSitemap(t *testing.T) {
 func TestSitemapShouldNotUseListXML(t *testing.T) {
 	t.Parallel()

-	files := `
+	files := `		
 -- hugo.toml --
 baseURL = "https://example.com"
 disableKinds = ["term", "taxonomy"]
@@ -150,79 +148,3 @@ Home.

 	b.AssertFileContent("public/sitemap.xml", "https://example.com/en/sitemap.xml")
 }
-
-func TestSitemapAndContentBundleNamedSitemap(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['home','rss','section','taxonomy','term']
-- layouts/_default/single.html --
-layouts/_default/single.html
-- layouts/sitemap/single.html --
-layouts/sitemap/single.html
-- content/sitemap/index.md --
---
-title: My sitemap
-type: sitemap
---
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/sitemap.xml", true)
-}
-
-// Issue 12266
-func TestSitemapIssue12266(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = 'https://example.org/'
-disableKinds = ['rss','taxonomy','term']
-defaultContentLanguage = 'en'
-defaultContentLanguageInSubdir = true
-[languages.de]
-[languages.en]
-  `
-
-	// Test A: multilingual with defaultContentLanguageInSubdir = true
-	b := Test(t, files)
-
-	b.AssertFileContent("public/sitemap.xml",
-		"<loc>https://example.org/de/sitemap.xml</loc>",
-		"<loc>https://example.org/en/sitemap.xml</loc>",
-	)
-	b.AssertFileContent("public/de/sitemap.xml", "<loc>https://example.org/de/</loc>")
-	b.AssertFileContent("public/en/sitemap.xml", "<loc>https://example.org/en/</loc>")
-
-	// Test B: multilingual with defaultContentLanguageInSubdir = false
-	files = strings.ReplaceAll(files, "defaultContentLanguageInSubdir = true", "defaultContentLanguageInSubdir = false")
-
-	b = Test(t, files)
-
-	b.AssertFileContent("public/sitemap.xml",
-		"<loc>https://example.org/de/sitemap.xml</loc>",
-		"<loc>https://example.org/en/sitemap.xml</loc>",
-	)
-	b.AssertFileContent("public/de/sitemap.xml", "<loc>https://example.org/de/</loc>")
-	b.AssertFileContent("public/en/sitemap.xml", "<loc>https://example.org/</loc>")
-
-	// Test C: monolingual with defaultContentLanguageInSubdir = false
-	files = strings.ReplaceAll(files, "[languages.de]", "")
-	files = strings.ReplaceAll(files, "[languages.en]", "")
-
-	b = Test(t, files)
-
-	b.AssertFileExists("public/en/sitemap.xml", false)
-	b.AssertFileContent("public/sitemap.xml", "<loc>https://example.org/</loc>")
-
-	// Test D: monolingual with defaultContentLanguageInSubdir = true
-	files = strings.ReplaceAll(files, "defaultContentLanguageInSubdir = false", "defaultContentLanguageInSubdir = true")
-
-	b = Test(t, files)
-
-	b.AssertFileContent("public/sitemap.xml", "<loc>https://example.org/en/sitemap.xml</loc>")
-	b.AssertFileContent("public/en/sitemap.xml", "<loc>https://example.org/en/</loc>")
-}
@@ -911,62 +911,3 @@ title: tag-a-title-override

 	b.AssertFileContent("public/tags/a/index.html", "Tag: tag-a-title-override|")
 }
-
-func TestTaxonomyLookupIssue12193(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['page','rss','section','sitemap']
-[taxonomies]
-author = 'authors'
-- layouts/_default/list.html --
-{{ .Title }}|
-- layouts/_default/author.terms.html --
-layouts/_default/author.terms.html
-- content/authors/_index.md --
---
-title: Authors Page
---
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/index.html", true)
-	b.AssertFileExists("public/authors/index.html", true)
-	b.AssertFileContent("public/authors/index.html", "layouts/_default/author.terms.html") // failing test
-}
-
-func TestTaxonomyNestedEmptySectionsIssue12188(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','sitemap']
-defaultContentLanguage = 'en'
-defaultContentLanguageInSubdir = true
-[languages.en]
-weight = 1
-[languages.ja]
-weight = 2
-[taxonomies]
-'s1/category' = 's1/category'
-- layouts/_default/single.html --
-{{ .Title }}|
-- layouts/_default/list.html --
-{{ .Title }}|
-- content/s1/p1.en.md --
---
-title: p1
---
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/en/s1/index.html", true)
-	b.AssertFileExists("public/en/s1/p1/index.html", true)
-	b.AssertFileExists("public/en/s1/category/index.html", true)
-
-	b.AssertFileExists("public/ja/s1/index.html", false) // failing test
-	b.AssertFileExists("public/ja/s1/category/index.html", true)
-}
@@ -258,6 +258,7 @@ id = "UA-ga_id"
 disable = false
 [privacy.googleAnalytics]
 respectDoNotTrack = true
+anonymizeIP = true
 [privacy.instagram]
 simple = true
 [privacy.twitter]
@@ -1,12 +1,7 @@
 # Release env. 
 # These will be replaced by script before release.
-HUGORELEASER_TAG=v0.125.1
-HUGORELEASER_COMMITISH=68c5ad638c2072969e47262926b912e80fd71a77
-
-
-
-
-
+HUGORELEASER_TAG=v0.123.6
+HUGORELEASER_COMMITISH=92684f9a26838a46d1a81e3c250fef5207bcb735



@@ -355,7 +355,7 @@ func (im *identityManager) String() string {
 }

 func (im *identityManager) forEeachIdentity(fn func(id Identity) bool) bool {
-	// The absence of a lock here is deliberate. This is currently only used on server reloads
+	// The absense of a lock here is debliberate. This is currently opnly used on server reloads
 	// in a single-threaded context.
 	for id := range im.ids {
 		if fn(id) {
@@ -87,7 +87,7 @@ func (t Translator) initFuncs(bndl *i18n.Bundle) {
 						// the context.Context.
 						// A common pattern is to pass Page to i18n, and use .ReadingTime etc.
 						// We need to improve this, but that requires some upstream changes.
-						// For now, just create a wrapper.
+						// For now, just creata a wrepper.
 						templateData = page.PageWithContext{Page: p, Ctx: ctx}
 					}
 				}
@@ -134,7 +134,7 @@ var commonTestScriptsParam = testscript.Params{
 				fmt.Fprintf(ts.Stdout(), "%s %04o %s %s\n", fi.Mode(), fi.Mode().Perm(), fi.ModTime().Format(time.RFC3339Nano), fi.Name())
 			}
 		},
-		// append appends to a file with a leading newline.
+		// append appends to a file with a leaading newline.
 		"append": func(ts *testscript.TestScript, neg bool, args []string) {
 			if len(args) < 2 {
 				ts.Fatalf("usage: append FILE TEXT")
@@ -266,7 +266,7 @@ func TestAsciidoctorAttributes(t *testing.T) {
 trace = false
 [markup.asciidocext.attributes]
 my-base-url = "https://gohugo.io/"
-my-attribute-name = "my value"
+my-attribute-name = "my value" 
 `)
 	conf := testconfig.GetTestConfig(nil, cfg)
 	p, err := asciidocext.Provider.New(
@@ -301,7 +301,7 @@ func getProvider(c *qt.C, mConfStr string) converter.Provider {
 	confStr := `
 [security]
 [security.exec]
-allow = ['asciidoctor']
+allow = ['asciidoctor']  
 `
 	confStr += mConfStr

@@ -368,13 +368,6 @@ testContent
 	c.Assert(ok, qt.Equals, true)

 	c.Assert(toc.TableOfContents().Identifiers, qt.DeepEquals, collections.SortedStringSlice{"_introduction", "_section_1", "_section_1_1", "_section_1_1_1", "_section_1_2", "_section_2"})
-	// Although "Introduction" has a level 3 markup heading, AsciiDoc treats the first heading as level 2.
-	c.Assert(toc.TableOfContents().HeadingsMap["_introduction"].Level, qt.Equals, 2)
-	c.Assert(toc.TableOfContents().HeadingsMap["_section_1"].Level, qt.Equals, 2)
-	c.Assert(toc.TableOfContents().HeadingsMap["_section_1_1"].Level, qt.Equals, 3)
-	c.Assert(toc.TableOfContents().HeadingsMap["_section_1_1_1"].Level, qt.Equals, 4)
-	c.Assert(toc.TableOfContents().HeadingsMap["_section_1_2"].Level, qt.Equals, 3)
-	c.Assert(toc.TableOfContents().HeadingsMap["_section_2"].Level, qt.Equals, 2)
 	c.Assert(string(r.Bytes()), qt.Not(qt.Contains), "<div id=\"toc\" class=\"toc\">")
 }

--- a/Show More
+++ b/Show More