common/hugo/version_current.go

@@ -17,7 +17,7 @@ package hugo
 // This should be the only one.
 var CurrentVersion = Version{
 	Major:      0,
-	Minor:      148,
-	PatchLevel: 0,
-	Suffix:     "-DEV",
+	Minor:      146,
+	PatchLevel: 1,
+	Suffix:     "",
 }

common/paths/pathparser.go

@@ -124,15 +124,14 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot i
 	if p.posContainerHigh != -1 {
 		return
 	}
-	mayHaveLang := p.posIdentifierLanguage == -1 && pp.LanguageIndex != nil
+	mayHaveLang := pp.LanguageIndex != nil
 	mayHaveLang = mayHaveLang && (component == files.ComponentFolderContent || component == files.ComponentFolderLayouts)
 	mayHaveOutputFormat := component == files.ComponentFolderLayouts
-	mayHaveKind := p.posIdentifierKind == -1 && mayHaveOutputFormat
-	mayHaveLayout := component == files.ComponentFolderLayouts
+	mayHaveKind := mayHaveOutputFormat
 
 	var found bool
 	var high int
-	if len(p.identifiersKnown) > 0 {
+	if len(p.identifiers) > 0 {
 		high = lastDot
 	} else {
 		high = len(p.s)
@@ -140,9 +139,9 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot i
 	id := types.LowHigh[string]{Low: i + 1, High: high}
 	sid := p.s[id.Low:id.High]
 
-	if len(p.identifiersKnown) == 0 {
+	if len(p.identifiers) == 0 {
 		// The first is always the extension.
-		p.identifiersKnown = append(p.identifiersKnown, id)
+		p.identifiers = append(p.identifiers, id)
 		found = true
 
 		// May also be the output format.
@@ -165,8 +164,8 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot i
 			}
 			found = langFound
 			if langFound {
-				p.identifiersKnown = append(p.identifiersKnown, id)
-				p.posIdentifierLanguage = len(p.identifiersKnown) - 1
+				p.identifiers = append(p.identifiers, id)
+				p.posIdentifierLanguage = len(p.identifiers) - 1
 
 			}
 		}
@@ -178,33 +177,28 @@ func (pp *PathParser) parseIdentifier(component, s string, p *Path, i, lastDot i
 			// false positives on the form css.html.
 			if pp.IsOutputFormat(sid, p.Ext()) {
 				found = true
-				p.identifiersKnown = append(p.identifiersKnown, id)
-				p.posIdentifierOutputFormat = len(p.identifiersKnown) - 1
+				p.identifiers = append(p.identifiers, id)
+				p.posIdentifierOutputFormat = len(p.identifiers) - 1
 			}
 		}
 
 		if !found && mayHaveKind {
 			if kinds.GetKindMain(sid) != "" {
 				found = true
-				p.identifiersKnown = append(p.identifiersKnown, id)
-				p.posIdentifierKind = len(p.identifiersKnown) - 1
+				p.identifiers = append(p.identifiers, id)
+				p.posIdentifierKind = len(p.identifiers) - 1
 			}
 		}
 
 		if !found && sid == identifierBaseof {
 			found = true
-			p.identifiersKnown = append(p.identifiersKnown, id)
-			p.posIdentifierBaseof = len(p.identifiersKnown) - 1
-		}
-
-		if !found && mayHaveLayout {
-			p.identifiersKnown = append(p.identifiersKnown, id)
-			p.posIdentifierLayout = len(p.identifiersKnown) - 1
-			found = true
+			p.identifiers = append(p.identifiers, id)
+			p.posIdentifierBaseof = len(p.identifiers) - 1
 		}
 
 		if !found {
-			p.identifiersUnknown = append(p.identifiersUnknown, id)
+			p.identifiers = append(p.identifiers, id)
+			p.identifiersUnknown = append(p.identifiersUnknown, len(p.identifiers)-1)
 		}
 
 	}
@@ -258,13 +252,13 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
 		}
 	}
 
-	if len(p.identifiersKnown) > 0 {
+	if len(p.identifiers) > 0 {
 		isContentComponent := p.component == files.ComponentFolderContent || p.component == files.ComponentFolderArchetypes
 		isContent := isContentComponent && pp.IsContentExt(p.Ext())
-		id := p.identifiersKnown[len(p.identifiersKnown)-1]
+		id := p.identifiers[len(p.identifiers)-1]
 
-		if id.Low > p.posContainerHigh {
-			b := p.s[p.posContainerHigh : id.Low-1]
+		if id.High > p.posContainerHigh {
+			b := p.s[p.posContainerHigh:id.High]
 			if isContent {
 				switch b {
 				case "index":
@@ -300,16 +294,6 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
 		}
 	}
 
-	if p.pathType == TypeShortcode && p.posIdentifierLayout != -1 {
-		// myshortcode or myshortcode.html, no layout.
-		if len(p.identifiersKnown) <= 2 {
-			p.posIdentifierLayout = -1
-		} else {
-			// First is always the name.
-			p.posIdentifierLayout--
-		}
-	}
-
 	return p, nil
 }
 
@@ -366,14 +350,13 @@ type Path struct {
 	component string
 	pathType  Type
 
-	identifiersKnown   []types.LowHigh[string]
-	identifiersUnknown []types.LowHigh[string]
+	identifiers []types.LowHigh[string]
 
 	posIdentifierLanguage     int
 	posIdentifierOutputFormat int
 	posIdentifierKind         int
-	posIdentifierLayout       int
 	posIdentifierBaseof       int
+	identifiersUnknown        []int
 	disabled                  bool
 
 	trimLeadingSlash bool
@@ -405,11 +388,10 @@ func (p *Path) reset() {
 	p.posSectionHigh = -1
 	p.component = ""
 	p.pathType = 0
-	p.identifiersKnown = p.identifiersKnown[:0]
+	p.identifiers = p.identifiers[:0]
 	p.posIdentifierLanguage = -1
 	p.posIdentifierOutputFormat = -1
 	p.posIdentifierKind = -1
-	p.posIdentifierLayout = -1
 	p.posIdentifierBaseof = -1
 	p.disabled = false
 	p.trimLeadingSlash = false
@@ -497,7 +479,7 @@ func (p *Path) Name() string {
 // Name returns the last element of path without any extension.
 func (p *Path) NameNoExt() string {
 	if i := p.identifierIndex(0); i != -1 {
-		return p.s[p.posContainerHigh : p.identifiersKnown[i].Low-1]
+		return p.s[p.posContainerHigh : p.identifiers[i].Low-1]
 	}
 	return p.s[p.posContainerHigh:]
 }
@@ -509,7 +491,7 @@ func (p *Path) NameNoLang() string {
 		return p.Name()
 	}
 
-	return p.s[p.posContainerHigh:p.identifiersKnown[i].Low-1] + p.s[p.identifiersKnown[i].High:]
+	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).
@@ -528,15 +510,15 @@ func (p *Path) NameNoIdentifier() string {
 }
 
 func (p *Path) nameLowHigh() types.LowHigh[string] {
-	if len(p.identifiersKnown) > 0 {
-		lastID := p.identifiersKnown[len(p.identifiersKnown)-1]
+	if len(p.identifiers) > 0 {
+		lastID := p.identifiers[len(p.identifiers)-1]
 		if p.posContainerHigh == lastID.Low {
 			// The last identifier is the name.
 			return lastID
 		}
 		return types.LowHigh[string]{
 			Low:  p.posContainerHigh,
-			High: p.identifiersKnown[len(p.identifiersKnown)-1].Low - 1,
+			High: p.identifiers[len(p.identifiers)-1].Low - 1,
 		}
 	}
 	return types.LowHigh[string]{
@@ -584,7 +566,7 @@ func (p *Path) PathNoIdentifier() string {
 
 // PathBeforeLangAndOutputFormatAndExt returns the path up to the first identifier that is not a language or output format.
 func (p *Path) PathBeforeLangAndOutputFormatAndExt() string {
-	if len(p.identifiersKnown) == 0 {
+	if len(p.identifiers) == 0 {
 		return p.norm(p.s)
 	}
 	i := p.identifierIndex(0)
@@ -600,7 +582,7 @@ func (p *Path) PathBeforeLangAndOutputFormatAndExt() string {
 		return p.norm(p.s)
 	}
 
-	id := p.identifiersKnown[i]
+	id := p.identifiers[i]
 	return p.norm(p.s[:id.Low-1])
 }
 
@@ -651,11 +633,11 @@ func (p *Path) BaseNoLeadingSlash() string {
 }
 
 func (p *Path) base(preserveExt, isBundle bool) string {
-	if len(p.identifiersKnown) == 0 {
+	if len(p.identifiers) == 0 {
 		return p.norm(p.s)
 	}
 
-	if preserveExt && len(p.identifiersKnown) == 1 {
+	if preserveExt && len(p.identifiers) == 1 {
 		// Preserve extension.
 		return p.norm(p.s)
 	}
@@ -677,7 +659,7 @@ func (p *Path) base(preserveExt, isBundle bool) string {
 	}
 
 	// For txt files etc. we want to preserve the extension.
-	id := p.identifiersKnown[0]
+	id := p.identifiers[0]
 
 	return p.norm(p.s[:high] + p.s[id.Low-1:id.High])
 }
@@ -694,10 +676,6 @@ func (p *Path) Kind() string {
 	return p.identifierAsString(p.posIdentifierKind)
 }
 
-func (p *Path) Layout() string {
-	return p.identifierAsString(p.posIdentifierLayout)
-}
-
 func (p *Path) Lang() string {
 	return p.identifierAsString(p.posIdentifierLanguage)
 }
@@ -711,8 +689,8 @@ func (p *Path) Disabled() bool {
 }
 
 func (p *Path) Identifiers() []string {
-	ids := make([]string, len(p.identifiersKnown))
-	for i, id := range p.identifiersKnown {
+	ids := make([]string, len(p.identifiers))
+	for i, id := range p.identifiers {
 		ids[i] = p.s[id.Low:id.High]
 	}
 	return ids
@@ -721,7 +699,7 @@ func (p *Path) Identifiers() []string {
 func (p *Path) IdentifiersUnknown() []string {
 	ids := make([]string, len(p.identifiersUnknown))
 	for i, id := range p.identifiersUnknown {
-		ids[i] = p.s[id.Low:id.High]
+		ids[i] = p.s[p.identifiers[id].Low:p.identifiers[id].High]
 	}
 	return ids
 }
@@ -746,7 +724,7 @@ func (p *Path) IsContentData() bool {
 	return p.pathType == TypeContentData
 }
 
-func (p Path) ForType(t Type) *Path {
+func (p Path) ForBundleType(t Type) *Path {
 	p.pathType = t
 	return &p
 }
@@ -757,12 +735,12 @@ func (p *Path) identifierAsString(i int) string {
 		return ""
 	}
 
-	id := p.identifiersKnown[i]
+	id := p.identifiers[i]
 	return p.s[id.Low:id.High]
 }
 
 func (p *Path) identifierIndex(i int) int {
-	if i < 0 || i >= len(p.identifiersKnown) {
+	if i < 0 || i >= len(p.identifiers) {
 		return -1
 	}
 	return i

common/paths/pathparser_test.go

@@ -171,25 +171,22 @@ func TestParse(t *testing.T) {
 			"/a/b.a.b.no.txt",
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Name(), qt.Equals, "b.a.b.no.txt")
-				c.Assert(p.NameNoIdentifier(), qt.Equals, "b.a.b")
+				c.Assert(p.NameNoIdentifier(), qt.Equals, "b")
 				c.Assert(p.NameNoLang(), qt.Equals, "b.a.b.txt")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no"})
+				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no", "b", "a", "b"})
 				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"b", "a", "b"})
-				c.Assert(p.Base(), qt.Equals, "/a/b.a.b.txt")
-				c.Assert(p.BaseNoLeadingSlash(), qt.Equals, "a/b.a.b.txt")
+				c.Assert(p.Base(), qt.Equals, "/a/b.txt")
+				c.Assert(p.BaseNoLeadingSlash(), qt.Equals, "a/b.txt")
 				c.Assert(p.Path(), qt.Equals, "/a/b.a.b.no.txt")
-				c.Assert(p.PathNoLang(), qt.Equals, "/a/b.a.b.txt")
+				c.Assert(p.PathNoLang(), qt.Equals, "/a/b.txt")
 				c.Assert(p.Ext(), qt.Equals, "txt")
-				c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b.a.b")
+				c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b")
 			},
 		},
 		{
 			"Home branch cundle",
 			"/_index.md",
 			func(c *qt.C, p *Path) {
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md"})
-				c.Assert(p.IsBranchBundle(), qt.IsTrue)
-				c.Assert(p.IsBundle(), qt.IsTrue)
 				c.Assert(p.Base(), qt.Equals, "/")
 				c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo")
 				c.Assert(p.Path(), qt.Equals, "/_index.md")
@@ -209,8 +206,7 @@ func TestParse(t *testing.T) {
 				c.Assert(p.ContainerDir(), qt.Equals, "")
 				c.Assert(p.Dir(), qt.Equals, "/a")
 				c.Assert(p.Ext(), qt.Equals, "md")
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"index"})
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md"})
+				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "index"})
 				c.Assert(p.IsBranchBundle(), qt.IsFalse)
 				c.Assert(p.IsBundle(), qt.IsTrue)
 				c.Assert(p.IsLeafBundle(), qt.IsTrue)
@@ -232,7 +228,7 @@ func TestParse(t *testing.T) {
 				c.Assert(p.ContainerDir(), qt.Equals, "/a")
 				c.Assert(p.Dir(), qt.Equals, "/a/b")
 				c.Assert(p.Ext(), qt.Equals, "md")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no"})
+				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no", "index"})
 				c.Assert(p.IsBranchBundle(), qt.IsFalse)
 				c.Assert(p.IsBundle(), qt.IsTrue)
 				c.Assert(p.IsLeafBundle(), qt.IsTrue)
@@ -254,7 +250,7 @@ func TestParse(t *testing.T) {
 				c.Assert(p.Container(), qt.Equals, "b")
 				c.Assert(p.ContainerDir(), qt.Equals, "/a")
 				c.Assert(p.Ext(), qt.Equals, "md")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no"})
+				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"md", "no", "_index"})
 				c.Assert(p.IsBranchBundle(), qt.IsTrue)
 				c.Assert(p.IsBundle(), qt.IsTrue)
 				c.Assert(p.IsLeafBundle(), qt.IsFalse)
@@ -293,7 +289,7 @@ func TestParse(t *testing.T) {
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Base(), qt.Equals, "/a/b/index.txt")
 				c.Assert(p.Ext(), qt.Equals, "txt")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no"})
+				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"txt", "no", "index"})
 				c.Assert(p.IsLeafBundle(), qt.IsFalse)
 				c.Assert(p.PathNoIdentifier(), qt.Equals, "/a/b/index")
 			},
@@ -376,7 +372,7 @@ func TestParse(t *testing.T) {
 	}
 	for _, test := range tests {
 		c.Run(test.name, func(c *qt.C) {
-			if test.name != "Home branch cundle" {
+			if test.name != "Basic Markdown file" {
 				// return
 			}
 			test.assert(c, testParser.Parse(files.ComponentFolderContent, test.path))
@@ -405,58 +401,10 @@ func TestParseLayouts(t *testing.T) {
 			"/list.no.html",
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "list"})
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
 				c.Assert(p.Base(), qt.Equals, "/list.html")
 				c.Assert(p.Lang(), qt.Equals, "no")
 			},
 		},
-		{
-			"Kind",
-			"/section.no.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Kind(), qt.Equals, kinds.KindSection)
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section"})
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
-				c.Assert(p.Base(), qt.Equals, "/section.html")
-				c.Assert(p.Lang(), qt.Equals, "no")
-			},
-		},
-		{
-			"Layout",
-			"/list.section.no.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Layout(), qt.Equals, "list")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section", "list"})
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
-				c.Assert(p.Base(), qt.Equals, "/list.html")
-				c.Assert(p.Lang(), qt.Equals, "no")
-			},
-		},
-		{
-			"Layout multiple",
-			"/maylayout.list.section.no.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Layout(), qt.Equals, "maylayout")
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "no", "section", "list", "maylayout"})
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
-				c.Assert(p.Base(), qt.Equals, "/maylayout.html")
-				c.Assert(p.Lang(), qt.Equals, "no")
-			},
-		},
-		{
-			"Layout shortcode",
-			"/_shortcodes/myshort.list.no.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Layout(), qt.Equals, "list")
-			},
-		},
-		{
-			"Layout baseof",
-			"/baseof.list.no.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Layout(), qt.Equals, "list")
-			},
-		},
 		{
 			"Lang and output format",
 			"/list.no.amp.not.html",
@@ -481,20 +429,6 @@ func TestParseLayouts(t *testing.T) {
 				c.Assert(p.OutputFormat(), qt.Equals, "html")
 			},
 		},
-		{
-			"Shortcode with layout",
-			"/_shortcodes/myshortcode.list.html",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Base(), qt.Equals, "/_shortcodes/myshortcode.html")
-				c.Assert(p.Type(), qt.Equals, TypeShortcode)
-				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "list", "myshortcode"})
-				c.Assert(p.PathNoIdentifier(), qt.Equals, "/_shortcodes/myshortcode")
-				c.Assert(p.PathBeforeLangAndOutputFormatAndExt(), qt.Equals, "/_shortcodes/myshortcode.list")
-				c.Assert(p.Lang(), qt.Equals, "")
-				c.Assert(p.Kind(), qt.Equals, "")
-				c.Assert(p.OutputFormat(), qt.Equals, "html")
-			},
-		},
 		{
 			"Sub dir",
 			"/pages/home.html",
@@ -511,7 +445,7 @@ func TestParseLayouts(t *testing.T) {
 			"/pages/baseof.list.section.fr.amp.html",
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Identifiers(), qt.DeepEquals, []string{"html", "amp", "fr", "section", "list", "baseof"})
-				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{})
+				c.Assert(p.IdentifiersUnknown(), qt.DeepEquals, []string{"list"})
 				c.Assert(p.Kind(), qt.Equals, kinds.KindSection)
 				c.Assert(p.Lang(), qt.Equals, "fr")
 				c.Assert(p.OutputFormat(), qt.Equals, "amp")
@@ -567,9 +501,6 @@ func TestParseLayouts(t *testing.T) {
 
 	for _, test := range tests {
 		c.Run(test.name, func(c *qt.C) {
-			if test.name != "Baseof" {
-				// return
-			}
 			test.assert(c, testParser.Parse(files.ComponentFolderLayouts, test.path))
 		})
 	}

common/paths/paths_integration_test.go

@@ -78,26 +78,3 @@ disablePathToLower = true
 	b.AssertFileContent("public/en/mysection/mybundle/index.html", "en|Single")
 	b.AssertFileContent("public/fr/MySection/MyBundle/index.html", "fr|Single")
 }
-
-func TestIssue13596(t *testing.T) {
-	t.Parallel()
-
-	files := `
--- hugo.toml --
-disableKinds = ['home','rss','section','sitemap','taxonomy','term']
--- content/p1/index.md --
----
-title: p1
----
--- content/p1/a.1.txt --
--- content/p1/a.2.txt --
--- layouts/all.html --
-{{ range .Resources.Match "*" }}{{ .Name }}|{{ end }}
-`
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/p1/index.html", "a.1.txt|a.2.txt|")
-	b.AssertFileExists("public/p1/a.1.txt", true)
-	b.AssertFileExists("public/p1/a.2.txt", true) // fails
-}

config/allconfig/allconfig.go

@@ -800,58 +800,30 @@ func (c *Configs) IsZero() bool {
 
 func (c *Configs) Init() error {
 	var languages langs.Languages
-
-	var langKeys []string
-	var hasEn bool
-
-	const en = "en"
-
-	for k := range c.LanguageConfigMap {
-		langKeys = append(langKeys, k)
-		if k == en {
-			hasEn = true
-		}
-	}
-
-	// Sort the LanguageConfigSlice by language weight (if set) or lang.
-	sort.Slice(langKeys, func(i, j int) bool {
-		ki := langKeys[i]
-		kj := langKeys[j]
-		lki := c.LanguageConfigMap[ki]
-		lkj := c.LanguageConfigMap[kj]
-		li := lki.Languages[ki]
-		lj := lkj.Languages[kj]
-		if li.Weight != lj.Weight {
-			return li.Weight < lj.Weight
-		}
-		return ki < kj
-	})
-
-	// See issue #13646.
-	defaultConfigLanguageFallback := en
-	if !hasEn {
-		// Pick the first one.
-		defaultConfigLanguageFallback = langKeys[0]
-	}
-
-	if c.Base.DefaultContentLanguage == "" {
-		c.Base.DefaultContentLanguage = defaultConfigLanguageFallback
-	}
-
-	for _, k := range langKeys {
-		v := c.LanguageConfigMap[k]
-		if v.DefaultContentLanguage == "" {
-			v.DefaultContentLanguage = defaultConfigLanguageFallback
-		}
-		c.LanguageConfigSlice = append(c.LanguageConfigSlice, v)
+	defaultContentLanguage := c.Base.DefaultContentLanguage
+	for k, v := range c.LanguageConfigMap {
 		languageConf := v.Languages[k]
-		language, err := langs.NewLanguage(k, c.Base.DefaultContentLanguage, v.TimeZone, languageConf)
+		language, err := langs.NewLanguage(k, defaultContentLanguage, v.TimeZone, languageConf)
 		if err != nil {
 			return err
 		}
 		languages = append(languages, language)
 	}
 
+	// Sort the sites by language weight (if set) or lang.
+	sort.Slice(languages, func(i, j int) bool {
+		li := languages[i]
+		lj := languages[j]
+		if li.Weight != lj.Weight {
+			return li.Weight < lj.Weight
+		}
+		return li.Lang < lj.Lang
+	})
+
+	for _, l := range languages {
+		c.LanguageConfigSlice = append(c.LanguageConfigSlice, c.LanguageConfigMap[l.Lang])
+	}
+
 	// Filter out disabled languages.
 	var n int
 	for _, l := range languages {
@@ -864,12 +836,12 @@ func (c *Configs) Init() error {
 
 	var languagesDefaultFirst langs.Languages
 	for _, l := range languages {
-		if l.Lang == c.Base.DefaultContentLanguage {
+		if l.Lang == defaultContentLanguage {
 			languagesDefaultFirst = append(languagesDefaultFirst, l)
 		}
 	}
 	for _, l := range languages {
-		if l.Lang != c.Base.DefaultContentLanguage {
+		if l.Lang != defaultContentLanguage {
 			languagesDefaultFirst = append(languagesDefaultFirst, l)
 		}
 	}
@@ -955,48 +927,17 @@ func (c Configs) GetByLang(lang string) config.AllProvider {
 	return nil
 }
 
-func newDefaultConfig() *Config {
-	return &Config{
-		Taxonomies: map[string]string{"tag": "tags", "category": "categories"},
-		Sitemap:    config.SitemapConfig{Priority: -1, Filename: "sitemap.xml"},
-		RootConfig: RootConfig{
-			Environment:          hugo.EnvironmentProduction,
-			TitleCaseStyle:       "AP",
-			PluralizeListTitles:  true,
-			CapitalizeListTitles: true,
-			StaticDir:            []string{"static"},
-			SummaryLength:        70,
-			Timeout:              "60s",
-
-			CommonDirs: config.CommonDirs{
-				ArcheTypeDir: "archetypes",
-				ContentDir:   "content",
-				ResourceDir:  "resources",
-				PublishDir:   "public",
-				ThemesDir:    "themes",
-				AssetDir:     "assets",
-				LayoutDir:    "layouts",
-				I18nDir:      "i18n",
-				DataDir:      "data",
-			},
-		},
-	}
-}
-
 // fromLoadConfigResult creates a new Config from res.
 func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadConfigResult) (*Configs, error) {
 	if !res.Cfg.IsSet("languages") {
 		// We need at least one
 		lang := res.Cfg.GetString("defaultContentLanguage")
-		if lang == "" {
-			lang = "en"
-		}
 		res.Cfg.Set("languages", maps.Params{lang: maps.Params{}})
 	}
 	bcfg := res.BaseConfig
 	cfg := res.Cfg
 
-	all := newDefaultConfig()
+	all := &Config{}
 
 	err := decodeConfigFromParams(fs, logger, bcfg, cfg, all, nil)
 	if err != nil {
@@ -1006,7 +947,6 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 	langConfigMap := make(map[string]*Config)
 
 	languagesConfig := cfg.GetStringMap("languages")
-
 	var isMultihost bool
 
 	if err := all.CompileConfig(logger); err != nil {

config/allconfig/allconfig_integration_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/common/hugo"
 	"github.com/gohugoio/hugo/config/allconfig"
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/media"
@@ -235,62 +234,3 @@ baseURL = "https://example.com"
 	b.Assert(c.IsContentFile("foo.md"), qt.Equals, true)
 	b.Assert(len(s), qt.Equals, 6)
 }
-
-func TestMergeDeep(t *testing.T) {
-	t.Parallel()
-
-	files := `
--- hugo.toml --
-baseURL = "https://example.com"
-theme = ["theme1", "theme2"]
-_merge = "deep"
--- themes/theme1/hugo.toml --
-[sitemap]
-filename = 'mysitemap.xml'
-[services]
-[services.googleAnalytics]
-id = 'foo bar'
-[taxonomies]
-  foo = 'bars'
--- themes/theme2/config/_default/hugo.toml --
-[taxonomies]
-  bar = 'baz'
--- layouts/home.html --
-GA ID: {{ site.Config.Services.GoogleAnalytics.ID }}.
-
-`
-
-	b := hugolib.Test(t, files)
-
-	conf := b.H.Configs
-	base := conf.Base
-
-	b.Assert(base.Environment, qt.Equals, hugo.EnvironmentProduction)
-	b.Assert(base.BaseURL, qt.Equals, "https://example.com")
-	b.Assert(base.Sitemap.Filename, qt.Equals, "mysitemap.xml")
-	b.Assert(base.Taxonomies, qt.DeepEquals, map[string]string{"bar": "baz", "foo": "bars"})
-
-	b.AssertFileContent("public/index.html", "GA ID: foo bar.")
-}
-
-func TestDefaultConfigLanguageBlankWhenNoEnglishExists(t *testing.T) {
-	t.Parallel()
-
-	files := `
--- hugo.toml --
-baseURL = "https://example.com"
-[languages]
-[languages.nn]
-weight = 20
-[languages.sv]
-weight = 10
-[languages.sv.taxonomies]
-  tag = "taggar"
--- layouts/all.html --
-All.
-`
-
-	b := hugolib.Test(t, files)
-
-	b.Assert(b.H.Conf.DefaultContentLanguage(), qt.Equals, "sv")
-}

config/allconfig/alldecoders.go

@@ -249,18 +249,14 @@ var allDecoderSetups = map[string]decodeWeight{
 		key: "sitemap",
 		decode: func(d decodeWeight, p decodeConfig) error {
 			var err error
-			if p.p.IsSet(d.key) {
-				p.c.Sitemap, err = config.DecodeSitemap(p.c.Sitemap, p.p.GetStringMap(d.key))
-			}
+			p.c.Sitemap, err = config.DecodeSitemap(config.SitemapConfig{Priority: -1, Filename: "sitemap.xml"}, p.p.GetStringMap(d.key))
 			return err
 		},
 	},
 	"taxonomies": {
 		key: "taxonomies",
 		decode: func(d decodeWeight, p decodeConfig) error {
-			if p.p.IsSet(d.key) {
-				p.c.Taxonomies = maps.CleanConfigStringMapString(p.p.GetStringMapString(d.key))
-			}
+			p.c.Taxonomies = maps.CleanConfigStringMapString(p.p.GetStringMapString(d.key))
 			return nil
 		},
 	},
@@ -310,18 +306,16 @@ var allDecoderSetups = map[string]decodeWeight{
 			}
 
 			// Validate defaultContentLanguage.
-			if p.c.DefaultContentLanguage != "" {
-				var found bool
-				for lang := range p.c.Languages {
-					if lang == p.c.DefaultContentLanguage {
-						found = true
-						break
-					}
-				}
-				if !found {
-					return fmt.Errorf("config value %q for defaultContentLanguage does not match any language definition", p.c.DefaultContentLanguage)
+			var found bool
+			for lang := range p.c.Languages {
+				if lang == p.c.DefaultContentLanguage {
+					found = true
+					break
 				}
 			}
+			if !found {
+				return fmt.Errorf("config value %q for defaultContentLanguage does not match any language definition", p.c.DefaultContentLanguage)
+			}
 
 			return nil
 		},

config/allconfig/load.go

@@ -159,9 +159,63 @@ func (l configLoader) applyConfigAliases() error {
 
 func (l configLoader) applyDefaultConfig() error {
 	defaultSettings := maps.Params{
-		// These dirs are used early/before we build the config struct.
-		"themesDir": "themes",
-		"configDir": "config",
+		"baseURL":                              "",
+		"cleanDestinationDir":                  false,
+		"watch":                                false,
+		"contentDir":                           "content",
+		"resourceDir":                          "resources",
+		"publishDir":                           "public",
+		"publishDirOrig":                       "public",
+		"themesDir":                            "themes",
+		"assetDir":                             "assets",
+		"layoutDir":                            "layouts",
+		"i18nDir":                              "i18n",
+		"dataDir":                              "data",
+		"archetypeDir":                         "archetypes",
+		"configDir":                            "config",
+		"staticDir":                            "static",
+		"buildDrafts":                          false,
+		"buildFuture":                          false,
+		"buildExpired":                         false,
+		"params":                               maps.Params{},
+		"environment":                          hugo.EnvironmentProduction,
+		"uglyURLs":                             false,
+		"verbose":                              false,
+		"ignoreCache":                          false,
+		"canonifyURLs":                         false,
+		"relativeURLs":                         false,
+		"removePathAccents":                    false,
+		"titleCaseStyle":                       "AP",
+		"taxonomies":                           maps.Params{"tag": "tags", "category": "categories"},
+		"permalinks":                           maps.Params{},
+		"sitemap":                              maps.Params{"priority": -1, "filename": "sitemap.xml"},
+		"menus":                                maps.Params{},
+		"disableLiveReload":                    false,
+		"pluralizeListTitles":                  true,
+		"capitalizeListTitles":                 true,
+		"forceSyncStatic":                      false,
+		"footnoteAnchorPrefix":                 "",
+		"footnoteReturnLinkContents":           "",
+		"newContentEditor":                     "",
+		"paginate":                             0,  // Moved into the paginator struct in Hugo v0.128.0.
+		"paginatePath":                         "", // Moved into the paginator struct in Hugo v0.128.0.
+		"summaryLength":                        70,
+		"rssLimit":                             -1,
+		"sectionPagesMenu":                     "",
+		"disablePathToLower":                   false,
+		"hasCJKLanguage":                       false,
+		"enableEmoji":                          false,
+		"defaultContentLanguage":               "en",
+		"defaultContentLanguageInSubdir":       false,
+		"enableMissingTranslationPlaceholders": false,
+		"enableGitInfo":                        false,
+		"ignoreFiles":                          make([]string, 0),
+		"disableAliases":                       false,
+		"debug":                                false,
+		"disableFastRender":                    false,
+		"timeout":                              "30s",
+		"timeZone":                             "",
+		"enableInlineShortcodes":               false,
 	}
 
 	l.cfg.SetDefaults(defaultSettings)

config/commonConfig.go

@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
-	"slices"
 	"sort"
 	"strings"
 
@@ -29,6 +28,7 @@ import (
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/cast"
+	"slices"
 )
 
 type BaseConfig struct {

config/configProvider.go

@@ -76,7 +76,7 @@ type AllProvider interface {
 }
 
 // We cannot import the media package as that would create a circular dependency.
-// This interface defines a subset of what media.ContentTypes provides.
+// This interface defineds a sub set of what media.ContentTypes provides.
 type ContentTypesProvider interface {
 	IsContentSuffix(suffix string) bool
 	IsContentFile(filename string) bool

config/services/servicesConfig.go

@@ -101,9 +101,6 @@ func DecodeConfig(cfg config.Provider) (c Config, err error) {
 
 	if c.RSS.Limit == 0 {
 		c.RSS.Limit = cfg.GetInt(rssLimitKey)
-		if c.RSS.Limit == 0 {
-			c.RSS.Limit = -1
-		}
 	}
 
 	return

docs/content/en/configuration/introduction.md

@@ -249,7 +249,7 @@ HUGO_FILE_LOG_FORMAT
 
 HUGO_MEMORYLIMIT
 : {{< new-in 0.123.0 />}}
-: (`int`) The maximum amount of system memory, in gigabytes, that Hugo can use while rendering your site. Default is 25% of total system memory. Note that `HUGO_MEMORYLIMIT` is a "best effort" setting. Don't expect Hugo to build a million pages with only 1 GB of memory. You can get more information about how this behaves during the build by building with `hugo --logLevel info` and look for the `dynacache` label.
+: (`int`) The maximum amount of system memory, in gigabytes, that Hugo can use while rendering your site. Default is 25% of total system memory. Note that The `HUGO_MEMORYLIMIT` is a “best effort” setting. Don't expect Hugo to build a million pages with only 1 GB memory. You can get more information about how this behaves during the build by building with `hugo --logLevel info` and look for the `dynacache` label.
 
 HUGO_NUMWORKERMULTIPLIER
 : (`int`) The number of workers used in parallel processing. Default is the number of logical CPUs.

docs/content/en/content-management/menus.md

@@ -11,7 +11,7 @@ aliases: [/extras/menus/]
 To create a menu for your site:
 
 1. Define the menu entries
-1. [Localize](multilingual/#menus) each entry
+1. [Localize] each entry
 1. Render the menu with a [template]
 
 Create multiple menus, either flat or nested. For example, create a main menu for the header, and a separate menu for the footer.

docs/content/en/contribute/documentation.md

@@ -112,7 +112,7 @@ Yes → Hugo is fast.
 
 ### Function and method descriptions
 
-Start descriptions in the functions and methods sections with "Returns", or for boolean values, "Reports whether".
+Start descriptions in the functions and methods sections with "Returns", of for booelan values, "Reports whether".
 
 ### File paths and names
 

docs/content/en/functions/collections/Where.md

@@ -87,6 +87,7 @@ Use any of the following logical operators:
 : (`bool`) Reports whether the given field value (a slice) contains one or more elements in common with `VALUE`. See [details](/functions/collections/intersect).
 
 `like`
+: {{< new-in 0.116.0 />}}
 : (`bool`) Reports whether the given field value matches the [regular expression](g) specified in `VALUE`. Use the `like` operator to compare `string` values. The `like` operator returns `false` when comparing other data types to the regular expression.
 
 > [!note]
@@ -166,6 +167,8 @@ For example, to return a collection of pages where any of the terms in the "genr
 
 ## Regular expression comparison
 
+{{< new-in 0.116.0 />}}
+
 To return a collection of pages where the "author" page parameter begins with either "victor" or "Victor":
 
 ```go-html-template

docs/content/en/functions/css/Sass.md

@@ -12,66 +12,13 @@ params:
 
 {{< new-in 0.128.0 />}}
 
-Transpile Sass to CSS using the LibSass transpiler included in Hugo's extended and extended/deploy editions, or [install Dart Sass](#dart-sass) to use the latest features of the Sass language.
-
-Sass has two forms of syntax: [SCSS] and [indented]. Hugo supports both.
-
-[scss]: https://sass-lang.com/documentation/syntax#scss
-[indented]: https://sass-lang.com/documentation/syntax#the-indented-syntax
-
-## Options
-
-enableSourceMap
-: (`bool`) Whether to generate a source map. Default is `false`.
-
-includePaths
-: (`slice`) A slice of paths, relative to the project root, that the transpiler will use when resolving `@use` and `@import` statements.
-
-outputStyle
-: (`string`) The output style of the resulting CSS. With LibSass, one of `nested` (default), `expanded`, `compact`, or `compressed`. With Dart Sass, either `expanded` (default) or `compressed`.
-
-precision
-: (`int`) The precision of floating point math. Applicable to LibSass. Default is `8`.
-
-silenceDeprecations
-: {{< new-in 0.139.0 />}}
-: (`slice`) A slice of deprecation IDs to silence. IDs are enclosed in brackets within Dart Sass warning messages (e.g., `import` in `WARN Dart Sass: DEPRECATED [import]`). Applicable to Dart Sass. Default is `false`.
-
-silenceDependencyDeprecations
-: {{< new-in 0.146.0 />}}
-: (`bool`) Whether to silence deprecation warnings from dependencies, where a dependency is considered any file transitively imported through a load path. This does not apply to `@warn` or `@debug` rules.Default is `false`.
-
-sourceMapIncludeSources
-: (`bool`) Whether to embed sources in the generated source map. Applicable to Dart Sass. Default is `false`.
-
-targetPath
-: (`string`) The publish path for the transformed resource, relative to the[`publishDir`]. If unset, the target path defaults to the asset's original path with a `.css` extension.
-
-transpiler
-: (`string`) The transpiler to use, either `libsass` or `dartsass`. Hugo's extended and extended/deploy editions include the LibSass transpiler. To use the Dart Sass transpiler, see the [installation instructions](#dart-sass). Default is `libsass`.
-
-vars
-: (`map`) A map of key-value pairs that will be available in the `hugo:vars` namespace. Useful for [initializing Sass variables from Hugo templates](https://discourse.gohugo.io/t/42053/).
-
-  ```scss
-  // LibSass
-  @import "hugo:vars";
-
-  // Dart Sass
-  @use "hugo:vars" as v;
-  ```
-
-## Example
-
-```go-html-template {copy=true}
+```go-html-template
 {{ with resources.Get "sass/main.scss" }}
   {{ $opts := dict
     "enableSourceMap" (not hugo.IsProduction)
     "outputStyle" (cond hugo.IsProduction "compressed" "expanded")
     "targetPath" "css/main.css"
-    "transpiler" "dartsass"
-    "vars" site.Params.styles
-    "includePaths" (slice "node_modules/bootstrap/scss")
+    "transpiler" "libsass"
   }}
   {{ with . | toCSS $opts }}
     {{ if hugo.IsProduction }}
@@ -85,6 +32,63 @@ vars
 {{ end }}
 ```
 
+Transpile Sass to CSS using the LibSass transpiler included in Hugo's extended and extended/deploy editions, or [install Dart Sass](#dart-sass) to use the latest features of the Sass language.
+
+Sass has two forms of syntax: [SCSS] and [indented]. Hugo supports both.
+
+[scss]: https://sass-lang.com/documentation/syntax#scss
+[indented]: https://sass-lang.com/documentation/syntax#the-indented-syntax
+
+## Options
+
+transpiler
+: (`string`) The transpiler to use, either `libsass` (default) or `dartsass`. Hugo's extended and extended/deploy editions include the LibSass transpiler. To use the Dart Sass transpiler, see the [installation instructions](#dart-sass) below.
+
+targetPath
+: (`string`) If not set, the transformed resource's target path will be the original path of the asset file with its extension replaced by `.css`.
+
+vars
+: (`map`) A map of key-value pairs that will be available in the `hugo:vars` namespace. Useful for [initializing Sass variables from Hugo templates](https://discourse.gohugo.io/t/42053/).
+
+```scss
+// LibSass
+@import "hugo:vars";
+
+// Dart Sass
+@use "hugo:vars" as v;
+```
+
+outputStyle
+: (`string`) Output styles available to LibSass include `nested` (default), `expanded`, `compact`, and `compressed`. Output styles available to Dart Sass include `expanded` (default) and `compressed`.
+
+precision
+: (`int`) Precision of floating point math. Not applicable to Dart Sass.
+
+enableSourceMap
+: (`bool`) Whether to generate a source map. Default is `false`.
+
+sourceMapIncludeSources
+: (`bool`) Whether to embed sources in the generated source map. Not applicable to LibSass. Default is `false`.
+
+includePaths
+: (`slice`) A slice of paths, relative to the project root, that the transpiler will use when resolving `@use` and `@import` statements.
+
+```go-html-template
+{{ $opts := dict
+  "transpiler" "dartsass"
+  "targetPath" "css/style.css"
+  "vars" site.Params.styles
+  "enableSourceMap" (not hugo.IsProduction)
+  "includePaths" (slice "node_modules/bootstrap/scss")
+}}
+{{ with resources.Get "sass/main.scss" | toCSS $opts | minify | fingerprint }}
+  <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+{{ end }}
+```
+
+silenceDeprecations
+: (`slice`) {{< new-in 0.139.0 />}} A slice of deprecation IDs to silence. The deprecation IDs are printed to in the warning message, e.g "import" in `WARN  Dart Sass: DEPRECATED [import] ...`. This is for Dart Sass only.
+
 ## Dart Sass
 
 Hugo's extended and extended/deploy editions include [LibSass] to transpile Sass to CSS. In 2020, the Sass team deprecated LibSass in favor of [Dart Sass].
@@ -117,9 +121,6 @@ You may also install [prebuilt binaries] for Linux, macOS, and Windows.
 
 Run `hugo env` to list the active transpilers.
 
-> [!note]
-> If you build Hugo from source and run `mage test -v`, the test will fail if you install Dart Sass as a Snap package. This is due to the Snap package's strict confinement model.
-
 ### Installing in a production environment
 
 For [CI/CD](g) deployments (e.g., GitHub Pages, GitLab Pages, Netlify, etc.) you must edit the workflow to install Dart Sass before Hugo builds the site[^2]. Some providers allow you to use one of the package managers above, or you can download and extract one of the prebuilt binaries.
@@ -135,6 +136,8 @@ To install Dart Sass for your builds on GitHub Pages, add this step to the GitHu
   run: sudo snap install dart-sass
 ```
 
+If you are using GitHub Pages for the first time with your repository, GitHub provides a [starter workflow] for Hugo that includes Dart Sass. This is the simplest way to get started.
+
 #### GitLab Pages
 
 To install Dart Sass for your builds on GitLab Pages, the `.gitlab-ci.yml` file should look something like this:
@@ -191,6 +194,34 @@ command = """\
   """
 ```
 
+### Example
+
+To transpile with Dart Sass, set `transpiler` to `dartsass` in the options map passed to `css.Sass`. For example:
+
+```go-html-template
+{{ with resources.Get "sass/main.scss" }}
+  {{ $opts := dict
+    "enableSourceMap" (not hugo.IsProduction)
+    "outputStyle" (cond hugo.IsProduction "compressed" "expanded")
+    "targetPath" "css/main.css"
+    "transpiler" "dartsass"
+  }}
+  {{ with . | toCSS $opts }}
+    {{ if hugo.IsProduction }}
+      {{ with . | fingerprint }}
+        <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+      {{ end }}
+    {{ else }}
+      <link rel="stylesheet" href="{{ .RelPermalink }}">
+    {{ end }}
+  {{ end }}
+{{ end }}
+```
+
+### Miscellaneous
+
+If you build Hugo from source and run `mage test -v`, the test will fail if you install Dart Sass as a Snap package. This is due to the Snap package's strict confinement model.
+
 [brew.sh]: https://brew.sh/
 [chocolatey.org]: https://community.chocolatey.org/packages/sass
 [dart sass]: https://sass-lang.com/dart-sass
@@ -201,4 +232,3 @@ command = """\
 [snap package]: /installation/linux/#snap
 [snapcraft.io]: https://snapcraft.io/dart-sass
 [starter workflow]: https://github.com/actions/starter-workflows/blob/main/pages/hugo.yml
-[`publishDir`]: /configuration/all/#publishdir

docs/content/en/functions/go-template/template.md

@@ -10,18 +10,7 @@ params:
     signatures: ['template NAME [CONTEXT]']
 ---
 
-Use the `template` function to execute any of these [embedded templates](g):
-
-- [`disqus.html`]
-- [`google_analytics.html`]
-- [`opengraph.html`]
-- [`pagination.html`]
-- [`schema.html`]
-- [`twitter_cards.html`]
-
-
-
-For example:
+Use the `template` function to execute [embedded templates]. For example:
 
 ```go-html-template
 {{ range (.Paginate .Pages).Pages }}
@@ -50,21 +39,8 @@ The example above can be rewritten using an [inline partial] template:
 {{ end }}
 ```
 
-The key distinctions between the preceding two examples are:
-
-1. Inline partials are globally scoped. That means that an inline partial defined in _one_ template may be called from _any_ template.
-2. Leveraging the [`partialCached`] function when calling an inline partial allows for performance optimization through result caching.
-3. An inline partial can [`return`] a value of any data type instead of rendering a string.
-
 {{% include "/_common/functions/go-template/text-template.md" %}}
 
-[`disqus.html`]: /templates/embedded/#disqus
-[`google_analytics.html`]: /templates/embedded/#google-analytics
-[`opengraph.html`]: /templates/embedded/#open-graph
-[`pagination.html`]: /templates/embedded/#pagination
-[`partialCached`]: /functions/partials/includecached/
 [`partial`]: /functions/partials/include/
-[`return`]: /functions/go-template/return/
-[`schema.html`]: /templates/embedded/#schema
-[`twitter_cards.html`]: /templates/embedded/#x-twitter-cards
 [inline partial]: /templates/partial/#inline-partials
+[embedded templates]: /templates/embedded/

docs/content/en/functions/images/Text.md

@@ -18,9 +18,6 @@ alignx
 : {{< new-in 0.141.0 />}}
 : (`string`) The horizontal alignment of the text relative to the horizontal offset, one of `left`, `center`, or `right`. Default is `left`.
 
-aligny
-: (`string`) The vertical alignment of the text relative to the vertical offset, one of `top`, `center`, or `bottom`. Default is `top`.
-
 color
 : (`string`) The font color, either a 3-digit or 6-digit hexadecimal color code. Default is `#ffffff` (white).
 

docs/content/en/functions/templates/Current.md

@@ -1,155 +0,0 @@
----
-title: templates.Current
-description: Returns information about the currently executing template.
-categories: []
-keywords: []
-params:
-  functions_and_methods:
-    aliases: []
-    returnType: tpl.CurrentTemplateInfo
-    signatures: [templates.Current]
----
-
-> [!note]
-> This function is experimental and subject to change.
-
-{{< new-in 0.146.0 />}}
-
-The `templates.Current` function provides introspection capabilities, allowing you to access details about the currently executing templates. This is useful for debugging complex template hierarchies and understanding the flow of execution during rendering.
-
-## Methods
-
-Ancestors
-: (`tpl.CurrentTemplateInfos`) Returns a slice containing information about each template in the current execution chain, starting from the parent of the current template and going up towards the initial template called. It excludes any base template applied via `define` and `block`. You can chain the `Reverse` method to this result to get the slice in chronological execution order.
-
-Base
-: (`tpl.CurrentTemplateInfoCommonOps`) Returns an object representing the base template that was applied to the current template, if any. This may be `nil`.
-
-Filename
-: (`string`) Returns the absolute path of the current template. This will be empty for embedded templates.
-
-Name
-: (`string`) Returns the name of the current template. This is usually the path relative to the layouts directory.
-
-Parent
-: (`tpl.CurrentTemplateInfo`) Returns an object representing the parent of the current template, if any. This may be `nil`.
-
-## Examples
-
-The examples below help visualize template execution and require a `debug` parameter set to `true` in your site configuration:
-
-{{< code-toggle file=hugo >}}
-[params]
-debug = true
-{{< /code-toggle >}}
-
-### Boundaries
-
-To visually mark where a template begins and ends execution:
-
-```go-html-template {file="layouts/_default/single.html"}
-{{ define "main" }}
-  {{ if site.Params.debug }}
-    <div class="debug">[entering {{ templates.Current.Filename }}]</div>
-  {{ end }}
-
-  <h1>{{ .Title }}</h1>
-  {{ .Content }}
-
-  {{ if site.Params.debug }}
-    <div class="debug">[leaving {{ templates.Current.Filename }}]</div>
-  {{ end }}
-{{ end }}
-```
-
-### Call stack
-
-To display the chain of templates that led to the current one, create a partial template that iterates through its ancestors:
-
-```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
-{{ with templates.Current }}
-  <div class="debug">
-    {{ range .Ancestors }}
-      {{ .Filename }}<br>
-      {{ with .Base }}
-        {{ .Filename }}<br>
-      {{ end }}
-    {{ end }}
-  </div>
-{{ end }}
-```
-
-Then call the partial from any template:
-
-```go-html-template {file="layouts/partials/footer/copyright.html" copy=true}
-{{ if site.Params.debug }}
-  {{ partial "template-call-stack.html" . }}
-{{ end }}
-```
-
-The rendered template stack would look something like this:
-
-```text
-/home/user/project/layouts/partials/footer/copyright.html
-/home/user/project/themes/foo/layouts/partials/footer.html
-/home/user/project/layouts/_default/single.html
-/home/user/project/themes/foo/layouts/_default/baseof.html
-```
-
-To reverse the order of the entries, chain the `Reverse` method to the `Ancestors` method:
-
-```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
-{{ with templates.Current }}
-  <div class="debug">
-    {{ range .Ancestors.Reverse }}
-      {{ with .Base }}
-        {{ .Filename }}<br>
-      {{ end }}
-      {{ .Filename }}<br>
-    {{ end }}
-  </div>
-{{ end }}
-```
-
-### VS Code
-
-To render links that, when clicked, will open the template in Microsoft Visual Studio Code, create a partial template with anchor elements that use the `vscode` URI scheme:
-
-```go-html-template {file="layouts/partials/template-open-in-vs-code.html" copy=true}
-{{ with templates.Current.Parent }}
-  <div class="debug">
-    <a href="vscode://file/{{ .Filename }}">{{ .Name }}</a>
-    {{ with .Base }}
-      <a href="vscode://file/{{ .Filename }}">{{ .Name }}</a>
-    {{ end }}
-  </div>
-{{ end }}
-```
-
-Then call the partial from any template:
-
-```go-html-template {file="layouts/_default/single.html" copy=true}
-{{ define "main" }}
-  <h1>{{ .Title }}</h1>
-  {{ .Content }}
-
-  {{ if site.Params.debug }}
-    {{ partial "template-open-in-vs-code.html" . }}
-  {{ end }}
-{{ end }}
-```
-
-Use the same approach to render the entire call stack as links:
-
-```go-html-template {file="layouts/partials/template-call-stack.html" copy=true}
-{{ with templates.Current }}
-  <div class="debug">
-    {{ range .Ancestors }}
-      <a href="vscode://file/{{ .Filename }}">{{ .Filename }}</a><br>
-      {{ with .Base }}
-        <a href="vscode://file/{{ .Filename }}">{{ .Filename }}</a><br>
-      {{ end }}
-    {{ end }}
-  </div>
-{{ end }}
-```

docs/content/en/functions/time/In.md

@@ -1,30 +0,0 @@
----
-title: time.In
-description: Returns the given date/time as represented in the specified IANA time zone.
-categories: []
-keywords: []
-params:
-  functions_and_methods:
-    aliases: []
-    returnType: time.Time
-    signatures: [time.In TIMEZONE INPUT]
----
-
-{{< new-in 0.146.0 />}}
-
-The `time.In` function returns the given date/time as represented in the specified [IANA](g) time zone.
-
-- If the time zone is an empty string or `UTC`, the time is returned in [UTC](g).
-- If the time zone is `Local`, the time is returned in the system's local time zone.
-- Otherwise, the time zone must be a valid IANA [time zone name].
-
-[time zone name]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
-
-```go-html-template
-{{ $layout := "2006-01-02T15:04:05-07:00" }}
-{{ $t := time.AsTime "2025-03-31T14:45:00-00:00" }}
-
-{{ $t | time.In "America/Denver" | time.Format $layout }}     → 2025-03-31T08:45:00-06:00
-{{ $t | time.In "Australia/Adelaide" | time.Format $layout }} → 2025-04-01T01:15:00+10:30
-{{ $t | time.In "Europe/Oslo" | time.Format $layout }}        → 2025-03-31T16:45:00+02:00
-```

docs/content/en/functions/transform/Unmarshal.md

@@ -114,14 +114,12 @@ A remote resource is a file on a remote server, accessible via HTTP or HTTPS.
 >
 > `{{ $data = .Content | transform.Unmarshal }}`
 
-## Working with CSV
-
-### Options
+## Options
 
 When unmarshaling a CSV file, provide an optional map of options.
 
 delimiter
-: (`string`) The delimiter used. Default is `,`.
+: (`string`) The delimiter used, default is `,`.
 
 comment
 : (`string`) The comment character used in the CSV. If set, lines beginning with the comment character without preceding whitespace are ignored.
@@ -130,85 +128,8 @@ lazyQuotes
 : {{< new-in 0.122.0 />}}
 : (`bool`) Whether to allow a quote in an unquoted field, or to allow a non-doubled quote in a quoted field. Default is `false`.
 
-targetType
-: {{< new-in 0.146.7 />}}
-: (`string`) The target data type, either `slice` or `map`. Default is `slice`.
-
-### Examples
-
-The examples below use this CSV file:
-
-```csv
-"name","type","breed","age"
-"Spot","dog","Collie",3
-"Rover","dog","Boxer",5
-"Felix","cat","Calico",7
-```
-
-To render an HTML table from a CSV file:
-
 ```go-html-template
-{{ $data := slice }}
-{{ $file := "pets.csv" }}
-{{ with or (.Resources.Get $file) (resources.Get $file) }}
-  {{ $opts := dict "targetType" "slice" }}
-  {{ $data = transform.Unmarshal $opts . }}
-{{ end }}
-
-{{ with $data }}
-  <table>
-    <thead>
-      <tr>
-        {{ range index . 0 }}
-          <th>{{ . }}</th>
-        {{ end }}
-      </tr>
-    </thead>
-    <tbody>
-      {{ range . | after 1 }}
-        <tr>
-          {{ range . }}
-            <td>{{ . }}</td>
-          {{ end }}
-        </tr>
-      {{ end }}
-    </tbody>
-  </table>
-{{ end }}
-```
-
-To extract a subset of the data, or to sort the data, unmarshal to a map instead of a slice:
-
-```go-html-template
-{{ $data := slice }}
-{{ $file := "pets.csv" }}
-{{ with or (.Resources.Get $file) (resources.Get $file) }}
-  {{ $opts := dict "targetType" "map" }}
-  {{ $data = transform.Unmarshal $opts . }}
-{{ end }}
-
-{{ with sort (where $data "type" "dog") "name" "asc" }}
-  <table>
-    <thead>
-      <tr>
-        <th>name</th>
-        <th>type</th>
-        <th>breed</th>
-        <th>age</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{ range . }}
-        <tr>
-          <td>{{ .name }}</td>
-          <td>{{ .type }}</td>
-          <td>{{ .breed }}</td>
-          <td>{{ .age }}</td>
-        </tr>
-      {{ end }}
-    </tbody>
-  </table>
-{{ end }}
+{{ $csv := "a;b;c" | transform.Unmarshal (dict "delimiter" ";") }}
 ```
 
 ## Working with XML

docs/content/en/host-and-deploy/host-on-github-pages/index.md

@@ -136,8 +136,6 @@ jobs:
           key: hugo-${{ github.run_id }}
           restore-keys:
             hugo-
-      - name: Configure Git
-        run: git config core.quotepath false
       - name: Build with Hugo
         run: |
           hugo \

docs/content/en/host-and-deploy/host-on-gitlab-pages.md

@@ -23,15 +23,15 @@ Define your [CI/CD](g) jobs by creating a `.gitlab-ci.yml` file in the root of y
 
 ```yaml {file=".gitlab-ci.yml" copy=true}
 variables:
-  DART_SASS_VERSION: 1.87.0
+  DART_SASS_VERSION: 1.85.0
   GIT_DEPTH: 0
   GIT_STRATEGY: clone
   GIT_SUBMODULE_STRATEGY: recursive
-  HUGO_VERSION: 0.146.7
-  NODE_VERSION: 22.x
+  HUGO_VERSION: 0.144.2
+  NODE_VERSION: 23.x
   TZ: America/Los_Angeles
 image:
-  name: golang:1.24.2-bookworm
+  name: golang:1.23.4-bookworm
 
 pages:
   script:
@@ -53,8 +53,6 @@ pages:
     - apt-get install -y nodejs
     # Install Node.js dependencies
     - "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
-    # Configure Git
-    - git config core.quotepath false
     # Build
     - hugo --gc --minify --baseURL ${CI_PAGES_URL}
     # Compress

docs/content/en/host-and-deploy/host-on-netlify/index.md

@@ -113,23 +113,21 @@ Create a new file named netlify.toml in the root of your project directory. In i
 
 ```toml {file="netlify.toml"}
 [build.environment]
-GO_VERSION = "1.24"
-HUGO_VERSION = "0.146.7"
+HUGO_VERSION = "0.144.2"
 NODE_VERSION = "22"
 TZ = "America/Los_Angeles"
 
 [build]
 publish = "public"
-command = "git config core.quotepath false && hugo --gc --minify"
+command = "hugo --gc --minify"
 ```
 
 If your site requires Dart Sass to transpile Sass to CSS, the configuration file should look something like this:
 
 ```toml {file="netlify.toml"}
 [build.environment]
-DART_SASS_VERSION = "1.87.0"
-GO_VERSION = "1.24"
-HUGO_VERSION = "0.146.7"
+HUGO_VERSION = "0.144.2"
+DART_SASS_VERSION = "1.85.0"
 NODE_VERSION = "22"
 TZ = "America/Los_Angeles"
 
@@ -140,7 +138,6 @@ command = """\
   tar -xf dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \
   rm dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz && \
   export PATH=/opt/build/repo/dart-sass:$PATH && \
-  git config core.quotepath false && \
   hugo --gc --minify \
   """
 ```

docs/content/en/installation/linux.md

@@ -30,33 +30,17 @@ To install the extended edition of Hugo:
 sudo snap install hugo
 ```
 
-To control automatic updates:
+To enable or revoke access to removable media:
 
 ```sh
-# disable automatic updates
-sudo snap refresh --hold hugo
-
-# enable automatic updates
-sudo snap refresh --unhold hugo
-```
-
-To control access to removable media:
-
-```sh
-# allow access
 sudo snap connect hugo:removable-media
-
-# revoke access
 sudo snap disconnect hugo:removable-media
 ```
 
-To control access to SSH keys:
+To enable or revoke access to SSH keys:
 
 ```sh
-# allow access
 sudo snap connect hugo:ssh-keys
-
-# revoke access
 sudo snap disconnect hugo:ssh-keys
 ```
 

docs/content/en/news/_content.gotmpl

@@ -23,8 +23,7 @@
     "dates" $dates
     "kind" "page"
     "params" $params
-    "path" (strings.Replace .name "." "-")
-    "slug" .name
+    "path" .name
     "title" (printf "Release %s" .name)
   }}
   {{ $.AddPage $page }}

docs/content/en/quick-reference/glossary/iana.md

@@ -1,6 +0,0 @@
----
-title: IANA
-reference: https://www.iana.org/about
----
-
-_IANA_ is an abbreviation for the Internet Assigned Numbers Authority, a non-profit organization that manages the allocation of global IP addresses, autonomous system numbers, DNS root zone, media types, and other Internet Protocol-related resources.

docs/content/en/quick-reference/glossary/utc.md

@@ -1,6 +0,0 @@
----
-title: UTC
-reference: https://en.wikipedia.org/wiki/Coordinated_Universal_Time
----
-
-_UTC_ is an abbreviation for Coordinated Universal Time, the primary time standard used worldwide to regulate clocks and time. It is the basis for civil time and time zones across the globe.

docs/content/en/shortcodes/ref.md

@@ -10,7 +10,7 @@ keywords: []
 > To override Hugo's embedded `ref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory.
 
 > [!note]
-> When working with Markdown, this shortcode is obsolete. Instead, use a [link render hook] that resolves the link destination using the `GetPage` method on the `Page` object. You can either create your own, or simply enable the [embedded link render hook]. The embedded link render hook is automatically enabled for multilingual single-host projects.
+> When working with the Markdown [content format], this shortcode has become largely redundant. Its functionality is now primarily handled by [link render hooks], specifically the embedded one provided by Hugo. This hook effectively addresses all the use cases previously covered by this shortcode.
 
 ## Usage
 
@@ -56,7 +56,6 @@ Rendered:
 {{% include "_common/ref-and-relref-error-handling.md" %}}
 
 [content format]: /content-management/formats/
-[embedded link render hook]: /render-hooks/links/#default
-[link render hook]: /render-hooks/links/
+[link render hooks]: /render-hooks/images/#default
 [Markdown notation]: /content-management/shortcodes/#notation
-[source code]: {{% eturl relref %}}
+[source code]: {{% eturl ref %}}

docs/content/en/shortcodes/relref.md

@@ -10,7 +10,7 @@ keywords: []
 > To override Hugo's embedded `relref` shortcode, copy the [source code] to a file with the same name in the `layouts/shortcodes` directory.
 
 > [!note]
-> When working with Markdown, this shortcode is obsolete. Instead, use a [link render hook] that resolves the link destination using the `GetPage` method on the `Page` object. You can either create your own, or simply enable the [embedded link render hook]. The embedded link render hook is automatically enabled for multilingual single-host projects.
+> When working with the Markdown [content format], this shortcode has become largely redundant. Its functionality is now primarily handled by [link render hooks], specifically the embedded one provided by Hugo. This hook effectively addresses all the use cases previously covered by this shortcode.
 
 ## Usage
 
@@ -56,7 +56,6 @@ Rendered:
 {{% include "_common/ref-and-relref-error-handling.md" %}}
 
 [content format]: /content-management/formats/
-[embedded link render hook]: /render-hooks/links/#default
-[link render hook]: /render-hooks/links/
+[link render hooks]: /render-hooks/links/
 [Markdown notation]: /content-management/shortcodes/#notation
 [source code]: {{% eturl relref %}}

docs/content/en/shortcodes/vimeo.md

@@ -29,27 +29,19 @@ Hugo renders this to:
 
 ## Arguments
 
-id
-: (string) The video `id`. Optional if the `id` is provided as a positional argument as shown in the example above.
-
-allowFullScreen
-: {{< new-in 0.146.0 />}}
-: (`bool`) Whether the `iframe` element can activate full screen mode. Default is `true`.
-
 class
 : (`string`) The `class` attribute of the wrapping `div` element. Adding one or more CSS classes disables inline styling.
 
-loading
-: {{< new-in 0.146.0 />}}
-: (`string`) The loading attribute of the `iframe` element, either `eager` or `lazy`. Default is `eager`.
+id
+: (`string`) The `id` of the Vimeo video
 
 title
 : (`string`) The `title` attribute of the `iframe` element.
 
-Here's an example using some of the available arguments:
+If you provide a `class` or `title` you must use a named parameter for the `id`.
 
 ```text
-{{</* vimeo id=55073825 allowFullScreen=false loading=lazy */>}}
+{{</* vimeo id=55073825 class="foo bar" title="My Video" */>}}
 ```
 
 ## Privacy

docs/content/en/shortcodes/youtube.md

@@ -70,7 +70,7 @@ start
 title
 : (`string`) The `title` attribute of the `iframe` element. Defaults to "YouTube video".
 
-Here's an example using some of the available arguments:
+Example using some of the above:
 
 ```text
 {{</* youtube id=0RKpf3rK57I start=30 end=60 loading=lazy */>}}

docs/content/en/templates/embedded.md

@@ -1,6 +1,6 @@
 ---
-title: Embedded partial templates
-description: Hugo provides embedded partial templates for common use cases.
+title: Embedded templates
+description: Hugo provides embedded templates for common use cases.
 categories: []
 keywords: []
 weight: 170
@@ -145,10 +145,6 @@ Various optional metadata can also be set:
 
 If using YouTube this will produce a og:video tag like `<meta property="og:video" content="url">`. Use the `https://youtu.be/<id>` format with YouTube videos (example: `https://youtu.be/qtIqKaDlqXo`).
 
-## Pagination
-
-See [details](/templates/pagination/).
-
 ## Schema
 
 > [!note]

docs/content/en/templates/partial.md

@@ -49,7 +49,7 @@ As shown in the above example directory structure, you can nest your directories
 
 ### Variable scoping
 
-The second argument in a partial call is the variable being passed down. The above examples are passing the dot (`.`), which tells the template receiving the partial to apply the current [context][context].
+The second argument in a partial call is the variable being passed down. The above examples are passing the `.`, which tells the template receiving the partial to apply the current [context][context].
 
 This means the partial will *only* be able to access those variables. The partial is isolated and cannot access the outer scope. From within the partial, `$.Var` is equivalent to `.Var`.
 

docs/content/en/templates/shortcode.md

@@ -329,7 +329,7 @@ You can use the `HasShortcode` method in your base template to conditionally loa
 [`with`]: /functions/go-template/with/
 [content management]: /content-management/shortcodes/
 [embedded shortcodes]: /shortcodes/
-[GitHub]: https://github.com/gohugoio/hugo/tree/master/tpl/tplimpl/embedded/templates/_shortcodes
+[GitHub]: https://github.com/gohugoio/hugo/tree/master/tpl/tplimpl/embedded/templates/shortcodes
 [introduction to templating]: /templates/introduction/
 [Markdown notation]: /content-management/shortcodes/#markdown-notation
 [named or positional]: /content-management/shortcodes/#arguments

docs/content/en/troubleshooting/inspection.md

@@ -34,11 +34,6 @@ Use the [`printf`] function (render) or [`warnf`] function (log to console) to i
 {{ printf "%[1]v (%[1]T)" $value }} → 42 (int)
 ```
 
-{{< new-in 0.146.0 />}}
-
-Use the [`templates.Current`] function to visually mark template execution boundaries or to display the template call stack.
-
 [`debug.Dump`]: /functions/debug/dump/
 [`printf`]: /functions/fmt/printf/
 [`warnf`]: /functions/fmt/warnf/
-[`templates.Current`]: /functions/templates/current/

docs/data/embedded_template_urls.toml

@@ -4,39 +4,39 @@
 # BaseURL
 'base_url' = 'https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates'
 
-# Partials
-'disqus' = '_partials/disqus.html'
-'google_analytics' = '_partials/google_analytics.html'
-'opengraph' = '_partials/opengraph.html'
-'pagination' = '_partials/pagination.html'
-'schema' = '_partials/schema.html'
-'twitter_cards' = '_partials/twitter_cards.html'
+# Templates
+'alias' = 'alias.html'
+'disqus' = 'disqus.html'
+'google_analytics' = 'google_analytics.html'
+'opengraph' = 'opengraph.html'
+'pagination' = 'pagination.html'
+'robots' = '_default/robots.txt'
+'rss' = '_default/rss.xml'
+'schema' = 'schema.html'
+'sitemap' = '_default/sitemap.xml'
+'sitemapindex' = '_default/sitemapindex.xml'
+'twitter_cards' = 'twitter_cards.html'
 
 # Render hooks
-'render-codeblock-goat' = '_markup/render-codeblock-goat.html'
-'render-image' = '_markup/render-image.html'
-'render-link' = '_markup/render-link.html'
-'render-table' = '_markup/render-table.html'
+'render-codeblock-goat' = '_default/_markup/render-codeblock-goat.html'
+'render-image' = '_default/_markup/render-image.html'
+'render-link' = '_default/_markup/render-link.html'
+'render-table' = '_default/_markup/render-table.html'
 
 # Shortcodes
-'details' = '_shortcodes/details.html'
-'figure' = '_shortcodes/figure.html'
-'gist' = '_shortcodes/gist.html'
-'highlight' = '_shortcodes/highlight.html'
-'instagram' = '_shortcodes/instagram.html'
-'param' = '_shortcodes/param.html'
-'qr' = '_shortcodes/qr.html'
-'ref' = '_shortcodes/ref.html'
-'relref' = '_shortcodes/relref.html'
-'vimeo' = '_shortcodes/vimeo.html'
-'vimeo_simple' = '_shortcodes/vimeo_simple.html'
-'x' = '_shortcodes/x.html'
-'x_simple' = '_shortcodes/x_simple.html'
-'youtube' = '_shortcodes/youtube.html'
-
-# Other
-'alias' = 'alias.html'
-'robots' = 'robots.txt'
-'rss' = 'rss.xml'
-'sitemap' = 'sitemap.xml'
-'sitemapindex' = 'sitemapindex.xml'
+'details' = 'shortcodes/details.html'
+'figure' = 'shortcodes/figure.html'
+'gist' = 'shortcodes/gist.html'
+'highlight' = 'shortcodes/highlight.html'
+'instagram' = 'shortcodes/instagram.html'
+'param' = 'shortcodes/param.html'
+'qr' = 'shortcodes/qr.html'
+'ref' = 'shortcodes/ref.html'
+'relref' = 'shortcodes/relref.html'
+'twitter' = 'shortcodes/twitter.html'
+'twitter_simple' = 'shortcodes/twitter_simple.html'
+'vimeo' = 'shortcodes/vimeo.html'
+'vimeo_simple' = 'shortcodes/vimeo_simple.html'
+'x' = 'shortcodes/x.html'
+'x_simple' = 'shortcodes/x_simple.html'
+'youtube' = 'shortcodes/youtube.html'

docs/layouts/_default/_markup/render-link.html

@@ -196,7 +196,7 @@ either of these shortcodes in conjunction with this render hook.
   >{{ .Text }}</a
 >
 
-{{- define "_partials/inline/h-rh-l/validate-fragment.html" }}
+{{- define "partials/inline/h-rh-l/validate-fragment.html" }}
   {{- /*
     Validates the fragment portion of a link destination.
 
@@ -248,7 +248,7 @@ either of these shortcodes in conjunction with this render hook.
   {{- end }}
 {{- end }}
 
-{{- define "_partials/inline/h-rh-l/get-glossary-link-attributes.html" }}
+{{- define "partials/inline/h-rh-l/get-glossary-link-attributes.html" }}
   {{- /*
     Returns the anchor element attributes for a link to the given glossary term.
 

docs/layouts/_default/baseof.html

@@ -44,8 +44,6 @@
     {{ block "header" . }}
       {{ partial "layouts/header/header.html" . }}
     {{ end }}
-    {{ block "subheader" . }}
-    {{ end }}
     {{ block "hero" . }}
     {{ end }}
     <div class="flex w-full xl:w-6xl h-full flex-auto mx-auto">

docs/layouts/partials/helpers/picture.html

@@ -5,7 +5,6 @@
 {{ $image1x := $image.Resize (printf "%dx" $width1x) }}
 {{ $image1xWebp := $image.Resize (printf "%dx webp" $width1x) }}
 {{ $class := .class | default "h-64 tablet:h-96 lg:h-full w-full object-cover lg:absolute" }}
-{{ $loading := .loading | default "eager" }}
 <picture>
   <source
     srcset="{{ $imageWebp.RelPermalink }}"
@@ -21,7 +20,6 @@
     class="{{ $class }}"
     src="{{ $image1x.RelPermalink }}"
     alt=""
-    loading="{{ $loading }}"
     width="{{ $image1x.Width }}"
     height="{{ $image1x.Height }}">
 </picture>

docs/layouts/partials/layouts/header/qr.html

@@ -10,7 +10,7 @@
   {{ partial "layouts/blocks/modal.html"  (dict "modal_button" $qr "modal_content" $qrBig "modal_title" (printf "QR code linking to %s" $.Permalink )) }}
 </div>
 
-{{ define "_partials/_inline/qr" }}
+{{ define "partials/_inline/qr" }}
   {{ $img_class := .img_class | default "w-10" }}
   {{ with images.QR $.page.Permalink (dict "targetDir" "images/qr") }}