Fix some typos

Signed-off-by: cuishuang <imcusg@gmail.com>
[foka@debian.org: Resolve merge conflict and squash 2 commits]
Signed-off-by: Anthony Fok <foka@debian.org>

diff --git a/hugolib/config.go b/hugolib/config.go
index dffecd9a3df0420323a46a929c2d45d7be717e62..b2479cbfea08c232f1c997f54f65a9df14ea08e0 100644 (file)
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -128,7 +128,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
        // they are finalized.
        collectHook := func(m *modules.ModulesConfig) error {
                // We don't need the merge strategy configuration anymore,
-               // remove it so it doesn't accidentaly show up in other settings.
+               // remove it so it doesn't accidentally show up in other settings.
                l.deleteMergeStrategies()
 
                if err := l.loadLanguageSettings(nil); err != nil {

diff --git a/markup/converter/hooks/hooks.go b/markup/converter/hooks/hooks.go
index dc5da5a30115e02195ac4fd1fc3adc1e44d08123..a8666bdf080b371454a267d7ec99b938ab61c936 100644 (file)
--- a/markup/converter/hooks/hooks.go
+++ b/markup/converter/hooks/hooks.go
@@ -93,7 +93,7 @@ type HeadingRenderer interface {
 
 // ElementPositionResolver provides a way to resolve the start Position
 // of a markdown element in the original source document.
-// This may be both slow and aproximate, so should only be
+// This may be both slow and approximate, so should only be
 // used for error logging.
 type ElementPositionResolver interface {
        ResolvePosition(ctx any) text.Position

diff --git a/markup/goldmark/internal/extensions/attributes/attributes.go b/markup/goldmark/internal/extensions/attributes/attributes.go
index e10e7ba79a364be99e142a71b2b1e5cdfba98c0f..22c717b94e94105dbd77e448d831e455dea2d094 100644 (file)
--- a/markup/goldmark/internal/extensions/attributes/attributes.go
+++ b/markup/goldmark/internal/extensions/attributes/attributes.go
@@ -8,7 +8,7 @@ import (
        "github.com/yuin/goldmark/util"
 )
 
-// This extenion is based on/inspired by https://github.com/mdigger/goldmark-attributes
+// This extension is based on/inspired by https://github.com/mdigger/goldmark-attributes
 // MIT License
 // Copyright (c) 2019 Dmitry Sedykh
 

diff --git a/resources/page/page_matcher.go b/resources/page/page_matcher.go
index dc23b13bb86ba751100ec5dddc41634c8721737a..15b8ede8989e3de463c150ce86dbdf7bc62124b3 100644 (file)
--- a/resources/page/page_matcher.go
+++ b/resources/page/page_matcher.go
@@ -70,7 +70,7 @@ func (m PageMatcher) Matches(p Page) bool {
        return true
 }
 
-// DecodeCascade decodes in which could be eiter a map or a slice of maps.
+// DecodeCascade decodes in which could be either a map or a slice of maps.
 func DecodeCascade(in any) (map[PageMatcher]maps.Params, error) {
        m, err := maps.ToSliceStringMap(in)
        if err != nil {

diff --git a/resources/resource_factories/create/remote.go b/resources/resource_factories/create/remote.go
index 0ca2be83432d495766395ddeec3dbca2e3e54621..0beb87195d47114dc528432822648b9fce0475ad 100644 (file)
--- a/resources/resource_factories/create/remote.go
+++ b/resources/resource_factories/create/remote.go
@@ -125,7 +125,7 @@ func (c *Client) FromRemote(uri string, optionsm map[string]any) (resource.Resou
                }
        }
 
-       // Look for a file extention. If it's .txt, look for a more specific.
+       // Look for a file extension. If it's .txt, look for a more specific.
        if extensionHints == nil || extensionHints[0] == ".txt" {
                if ext := path.Ext(filename); ext != "" {
                        extensionHints = []string{ext}