From 168d3757841d2064e11f8d122797e2771273d367 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Sun, 18 Feb 2024 20:16:30 +0900 Subject: [PATCH] all: Fix typos and some URLs --- helpers/general.go | 2 +- hugofs/component_fs.go | 2 +- hugolib/content_map_page.go | 8 ++++---- hugolib/dates_test.go | 2 +- hugolib/hugo_sites_build.go | 2 +- hugolib/page__meta.go | 4 ++-- hugolib/page__paths.go | 2 +- hugolib/pagebundler_test.go | 2 +- hugolib/rebuild_test.go | 6 +++--- hugolib/shortcode.go | 4 ++-- hugolib/site.go | 4 ++-- hugolib/site_render.go | 2 +- livereload/connection.go | 2 +- markup/blackfriday/anchors.go | 2 +- modules/client.go | 2 +- parser/pageparser/doc.go | 2 +- resources/transform_test.go | 2 +- watcher/batcher.go | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/helpers/general.go b/helpers/general.go index 859d1ead7..c7d9fcd85 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -188,7 +188,7 @@ func ReaderContains(r io.Reader, subslice []byte) bool { // // - "Go" (strings.Title) // - "AP" (see https://www.apstylebook.com/) -// - "Chicago" (see http://www.chicagomanualofstyle.org/home.html) +// - "Chicago" (see https://www.chicagomanualofstyle.org/home.html) // - "FirstUpper" (only the first character is upper case) // - "None" (no transformation) // diff --git a/hugofs/component_fs.go b/hugofs/component_fs.go index b6eeb89e5..f491d4d0f 100644 --- a/hugofs/component_fs.go +++ b/hugofs/component_fs.go @@ -59,7 +59,7 @@ type componentFsDir struct { fs *componentFs } -// ReadDir reads count entries from this virtual directorie and +// ReadDir reads count entries from this virtual directory and // sorts the entries according to the component filesystem rules. func (f *componentFsDir) ReadDir(count int) ([]iofs.DirEntry, error) { fis, err := f.DirOnlyOps.(iofs.ReadDirFile).ReadDir(-1) diff --git a/hugolib/content_map_page.go b/hugolib/content_map_page.go index d9cbddfba..ae7468b0a 100644 --- a/hugolib/content_map_page.go +++ b/hugolib/content_map_page.go @@ -103,16 +103,16 @@ type pageMap struct { } // pageTrees holds pages and resources in a tree structure for all sites/languages. -// Eeach site gets its own tree set via the Shape method. +// Each site gets its own tree set via the Shape method. type pageTrees struct { // This tree contains all Pages. - // This include regular pages, sections, taxonimies and so on. + // This include regular pages, sections, taxonomies and so on. // Note that all of these trees share the same key structure, // so you can take a leaf Page key and do a prefix search // with key + "/" to get all of its resources. treePages *doctree.NodeShiftTree[contentNodeI] - // This tree contains Resoures bundled in pages. + // This tree contains Resources bundled in pages. treeResources *doctree.NodeShiftTree[contentNodeI] // All pages and resources. @@ -1012,7 +1012,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities( seen := map[string]bool{ change.IdentifierBase(): true, } - // Print the top level dependenies. + // Print the top level dependencies. identity.WalkIdentitiesDeep(change, func(level int, id identity.Identity) bool { if level > 1 { return true diff --git a/hugolib/dates_test.go b/hugolib/dates_test.go index 5443e5852..784fc101c 100644 --- a/hugolib/dates_test.go +++ b/hugolib/dates_test.go @@ -169,7 +169,7 @@ ExpiryDate: 2099-07-13 15:28:01 +0000 UTC` // have date literals. // YAML - // Note: This is with go-yaml v2, I suspect v3 will fail with the unquouted values. + // Note: This is with go-yaml v2, I suspect v3 will fail with the unquoted values. b.AssertFileContent("public/en/short-date-yaml-unqouted/index.html", expectShortDateEn) b.AssertFileContent("public/nn/short-date-yaml-unqouted/index.html", expectShortDateNn) b.AssertFileContent("public/en/short-date-yaml-qouted/index.html", expectShortDateEn) diff --git a/hugolib/hugo_sites_build.go b/hugolib/hugo_sites_build.go index 3a046df3b..93acdbf6b 100644 --- a/hugolib/hugo_sites_build.go +++ b/hugolib/hugo_sites_build.go @@ -236,7 +236,7 @@ func (h *HugoSites) process(ctx context.Context, l logg.LevelLogger, config *Bui return h.processFull(ctx, l, *config) } -// assemble creates missing sections, applies agregate values (e.g. dates, cascading params), +// assemble creates missing sections, applies aggregate values (e.g. dates, cascading params), // removes disabled pages etc. func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *BuildCfg) error { l = l.WithField("step", "assemble") diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go index 34fd096bd..03f4d4d19 100644 --- a/hugolib/page__meta.go +++ b/hugolib/page__meta.go @@ -92,7 +92,7 @@ type pageMetaParams struct { // From page front matter. type pageMetaFrontMatter struct { - configuredOutputFormats output.Formats // outputs defiend in front matter. + configuredOutputFormats output.Formats // outputs defined in front matter. } func (m *pageMetaParams) init(preserveOringal bool) { @@ -333,7 +333,7 @@ func (ps *pageState) setMetaPost(cascade map[page.PageMatcher]maps.Params) error } - // Apply cascades first so they can be overriden later. + // Apply cascades first so they can be overridden later. if cascade != nil { if ps.m.pageConfig.Cascade != nil { for k, v := range cascade { diff --git a/hugolib/page__paths.go b/hugolib/page__paths.go index 6ae68aa25..d89388f81 100644 --- a/hugolib/page__paths.go +++ b/hugolib/page__paths.go @@ -150,7 +150,7 @@ func createTargetPathDescriptor(p *pageState) (page.TargetPathDescriptor, error) opath, _ = url.QueryUnescape(opath) if strings.HasSuffix(opath, "//") { // When rewriting the _index of the section the permalink config is applied to, - // we get douple slashes at the end sometimes; clear them up here + // we get double slashes at the end sometimes; clear them up here opath = strings.TrimSuffix(opath, "/") } diff --git a/hugolib/pagebundler_test.go b/hugolib/pagebundler_test.go index e4d1248a5..9f5255c74 100644 --- a/hugolib/pagebundler_test.go +++ b/hugolib/pagebundler_test.go @@ -516,7 +516,7 @@ baseURL = "https://example.org" disableKinds = ["taxonomy", "term"] disableLiveReload = true [outputs] -# This looks odd, but it triggers the behaviour in #5858 +# This looks odd, but it triggers the behavior in #5858 # The total output formats list gets sorted, so CSS before HTML. home = [ "CSS" ] -- content/mybundle/index.md -- diff --git a/hugolib/rebuild_test.go b/hugolib/rebuild_test.go index 6e43a4570..f599d640d 100644 --- a/hugolib/rebuild_test.go +++ b/hugolib/rebuild_test.go @@ -462,7 +462,7 @@ func TestRebuildVariations(t *testing.T) { files := ` -- hugo.toml -- baseURL = "https://example.com" -disdableKinds = ["term", "taxonomy"] +disableKinds = ["term", "taxonomy"] disableLiveReload = true defaultContentLanguage = "nn" paginate = 20 @@ -597,7 +597,7 @@ Codeblock Include: {{ .Title }}| // - Edit content file direct // - Edit content file transitive shortcode // - Edit content file transitive render hook - // - Rename one languge version of a content file + // - Rename one language version of a content file // - Delete content file, check site.RegularPages and section.RegularPagesRecursive (length) // - Add content file (see above). // - Edit shortcode @@ -1284,7 +1284,7 @@ func benchmarkFilesEdit(count int) string { files := ` -- hugo.toml -- baseURL = "https://example.com" -disdableKinds = ["term", "taxonomy"] +disableKinds = ["term", "taxonomy"] disableLiveReload = true -- layouts/_default/single.html -- Single: {{ .Title }}|{{ .Content }}| diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 0ec5d5ce4..7cc2cba27 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -206,7 +206,7 @@ type shortcode struct { // Before Hug0 0.55 we didn't send any shortcode output to the markup // renderer, and this flag told Hugo to process the {{ .Inner }} content // separately. - // The old behaviour can be had by starting your shortcode template with: + // The old behavior can be had by starting your shortcode template with: // {{ $_hugo_config := `{ "version": 1 }`}} doMarkup bool @@ -422,7 +422,7 @@ func doRenderShortcode( } } - // Pre Hugo 0.55 this was the behaviour even for the outer-most + // Pre Hugo 0.55 this was the behavior even for the outer-most // shortcode. if sc.doMarkup && (level > 0 || sc.configVersion() == 1) { var err error diff --git a/hugolib/site.go b/hugolib/site.go index 8ae09dd0f..5a58e8373 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -479,7 +479,7 @@ func (h *HugoSites) fileEventsContentPaths(p []pathChange) []pathChange { } } - // Remve all files below dir. + // Remove all files below dir. if len(dirs) > 0 { n := 0 for _, d := range dirs { @@ -877,7 +877,7 @@ func (s *Site) render(ctx *siteRenderContext) (err error) { if ctx.outIdx == 0 { // Note that even if disableAliases is set, the aliases themselves are // preserved on page. The motivation with this is to be able to generate - // 301 redirects in a .htacess file and similar using a custom output format. + // 301 redirects in a .htaccess file and similar using a custom output format. if !s.conf.DisableAliases { // Aliases must be rendered before pages. // Some sites, Hugo docs included, have faulty alias definitions that point diff --git a/hugolib/site_render.go b/hugolib/site_render.go index ef3e3aeef..1cf4b9a61 100644 --- a/hugolib/site_render.go +++ b/hugolib/site_render.go @@ -47,7 +47,7 @@ type siteRenderContext struct { } // Whether to render 404.html, robotsTXT.txt and similar. -// These are useually rendered once in the root of public. +// These are usually rendered once in the root of public. func (s siteRenderContext) shouldRenderStandalonePage(kind string) bool { if s.multihost || kind == kinds.KindSitemap { // 1 per site diff --git a/livereload/connection.go b/livereload/connection.go index 4e94e2ee0..0c6c6e108 100644 --- a/livereload/connection.go +++ b/livereload/connection.go @@ -28,7 +28,7 @@ type connection struct { send chan []byte // There is a potential data race, especially visible with large files. - // This is protected by synchronisation of the send channel's close. + // This is protected by synchronization of the send channel's close. closer sync.Once } diff --git a/markup/blackfriday/anchors.go b/markup/blackfriday/anchors.go index 987f46fc6..7b0b41854 100644 --- a/markup/blackfriday/anchors.go +++ b/markup/blackfriday/anchors.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package blackfriday holds some copmpability functions for the old Blackfriday v1 Markdown engine. +// Package blackfriday holds some compability functions for the old Blackfriday v1 Markdown engine. package blackfriday import "unicode" diff --git a/modules/client.go b/modules/client.go index 26117fbcf..c3371e0d4 100644 --- a/modules/client.go +++ b/modules/client.go @@ -141,7 +141,7 @@ type Client struct { goBinaryStatus goBinaryStatus } -// Graph writes a module dependenchy graph to the given writer. +// Graph writes a module dependency graph to the given writer. func (c *Client) Graph(w io.Writer) error { mc, coll := c.collect(true) if coll.err != nil { diff --git a/parser/pageparser/doc.go b/parser/pageparser/doc.go index 43907f3cd..96dfb7ce2 100644 --- a/parser/pageparser/doc.go +++ b/parser/pageparser/doc.go @@ -14,5 +14,5 @@ // Package pageparser provides a parser for Hugo content files (Markdown, HTML etc.) in Hugo. // This implementation is highly inspired by the great talk given by Rob Pike called "Lexical Scanning in Go" // It's on YouTube, Google it!. -// See slides here: http://cuddle.googlecode.com/hg/talk/lex.html +// See slides here: https://go.dev/talks/2011/lex.slide#1 package pageparser diff --git a/resources/transform_test.go b/resources/transform_test.go index fd152a47c..7f91360f1 100644 --- a/resources/transform_test.go +++ b/resources/transform_test.go @@ -185,7 +185,7 @@ func TestTransform(t *testing.T) { spec := newTestResourceSpec(specDescriptor{c: c}) - // Two transformations with same id, different behaviour. + // Two transformations with same id, different behavior. t1 := createContentReplacer("t1", "blue", "green") t2 := createContentReplacer("t1", "color", "car") diff --git a/watcher/batcher.go b/watcher/batcher.go index f293552fe..f88f820d2 100644 --- a/watcher/batcher.go +++ b/watcher/batcher.go @@ -30,7 +30,7 @@ type Batcher struct { } // New creates and starts a Batcher with the given time interval. -// It will fall back to a poll based watcher if native isn's supported. +// It will fall back to a poll based watcher if native isn't supported. // To always use polling, set poll to true. func New(intervalBatcher, intervalPoll time.Duration, poll bool) (*Batcher, error) { var err error