diff --git a/config/services/servicesConfig.go b/config/services/servicesConfig.go index bc321141a..17664407e 100644 --- a/config/services/servicesConfig.go +++ b/config/services/servicesConfig.go @@ -66,7 +66,7 @@ func DecodeConfig(cfg config.Provider) (c Config, err error) { err = mapstructure.WeakDecode(m, &c) - // Keep backwards compability. + // Keep backwards compatibility. if c.GoogleAnalytics.ID == "" { // Try the global config c.GoogleAnalytics.ID = cfg.GetString(googleAnalyticsKey) diff --git a/docs/content/en/getting-started/code-toggle.md b/docs/content/en/getting-started/code-toggle.md index 3e6b7da0d..b304d2c5b 100644 --- a/docs/content/en/getting-started/code-toggle.md +++ b/docs/content/en/getting-started/code-toggle.md @@ -12,7 +12,7 @@ toc: true ## The Config Toggler! -This is an exemple for the Config Toggle shortcode. +This is an example for the Config Toggle shortcode. Its purpose is to let users choose a Config language by clicking on its corresponding tab. Upon doing so, every Code toggler on the page will be switched to the target language. Also, target language will be saved in user's `localStorage` so when they go to a different pages, Code Toggler display their last "toggled" config language. ## That Config Toggler diff --git a/docs/content/en/news/0.35-relnotes/index.md b/docs/content/en/news/0.35-relnotes/index.md index 80b4afd7b..104cbd222 100644 --- a/docs/content/en/news/0.35-relnotes/index.md +++ b/docs/content/en/news/0.35-relnotes/index.md @@ -82,7 +82,7 @@ Hugo now has: * Add a `GetPage` to the site benchmarks [a1956391](https://github.com/gohugoio/hugo/commit/a19563910eec5fed08f3b02563b9a7b38026183d) [@bep](https://github.com/bep) * Add headless bundle support [0432c64d](https://github.com/gohugoio/hugo/commit/0432c64dd22e4610302162678bb93661ba68d758) [@bep](https://github.com/bep) [#4311](https://github.com/gohugoio/hugo/issues/4311) * Merge matching resources params maps [5a0819b9](https://github.com/gohugoio/hugo/commit/5a0819b9b5eb9e79826cfa0a65f235d9821b1ac4) [@bep](https://github.com/bep) [#4315](https://github.com/gohugoio/hugo/issues/4315) -* Add some general code contribution criterias [78c86330](https://github.com/gohugoio/hugo/commit/78c863305f337ed4faf3cf0a23675f28b0ae5641) [@bep](https://github.com/bep) +* Add some general code contribution criteria [78c86330](https://github.com/gohugoio/hugo/commit/78c863305f337ed4faf3cf0a23675f28b0ae5641) [@bep](https://github.com/bep) * Tighten page kind logic, introduce tests [8125b4b0](https://github.com/gohugoio/hugo/commit/8125b4b03d10eb73f8aea3f9ea41172aba8df082) [@vassudanagunta](https://github.com/vassudanagunta) ## Fixes diff --git a/docs/content/en/news/0.36.1-relnotes/index.md b/docs/content/en/news/0.36.1-relnotes/index.md index 59bf56297..00a5b346c 100644 --- a/docs/content/en/news/0.36.1-relnotes/index.md +++ b/docs/content/en/news/0.36.1-relnotes/index.md @@ -25,7 +25,7 @@ You would experience errors of type: png: invalid format: not enough pixel data ``` -This commit fixes that by adding a mutex per image. This should also improve the performance, sligthly, as it avoids duplicate work. +This commit fixes that by adding a mutex per image. This should also improve the performance, slightly, as it avoids duplicate work. The current workaround before this fix is to always operate on the original: diff --git a/docs/data/articles.toml b/docs/data/articles.toml index 379ae5562..c2dda2914 100644 --- a/docs/data/articles.toml +++ b/docs/data/articles.toml @@ -107,7 +107,7 @@ date = "2016-10-22" [[article]] - title = "通过 Gitlab-cl 将 Hugo blog 自动部署至 GitHub (Chinese, Continious integration)" + title = "通过 Gitlab-cl 将 Hugo blog 自动部署至 GitHub (Chinese, Continuous integration)" url = "https://zetaoyang.github.io/post/2016/10/17/gitlab-cl.html" author = "Zetao Yang" date = "2016-10-17" diff --git a/docs/themes/gohugoioTheme/src/js/tabs.js b/docs/themes/gohugoioTheme/src/js/tabs.js index dd90fdfa4..a689d474e 100644 --- a/docs/themes/gohugoioTheme/src/js/tabs.js +++ b/docs/themes/gohugoioTheme/src/js/tabs.js @@ -37,7 +37,7 @@ function toggleTabs(event) { for (i = 0; i < allTabs.length; i++) { allTabs[i].addEventListener("click", toggleTabs) } -// Upon page load, if user has a prefered language in its localStorage, tabs are set to it. +// Upon page load, if user has a preferred language in its localStorage, tabs are set to it. if(window.localStorage.getItem('configLangPref')) { toggleTabs(window.localStorage.getItem('configLangPref')) } diff --git a/docs/themes/gohugoioTheme/static/dist/app.bundle.js b/docs/themes/gohugoioTheme/static/dist/app.bundle.js index 7ea75e36f..d623c80ef 100644 --- a/docs/themes/gohugoioTheme/static/dist/app.bundle.js +++ b/docs/themes/gohugoioTheme/static/dist/app.bundle.js @@ -399,7 +399,7 @@ function toggleTabs(event) { for (i = 0; i < allTabs.length; i++) { allTabs[i].addEventListener("click", toggleTabs); } -// Upon page load, if user has a prefered language in its localStorage, tabs are set to it. +// Upon page load, if user has a preferred language in its localStorage, tabs are set to it. if (window.localStorage.getItem('configLangPref')) { toggleTabs(window.localStorage.getItem('configLangPref')); } @@ -2083,7 +2083,7 @@ function defaultClearTimeout () { } ()) function runTimeout(fun) { if (cachedSetTimeout === setTimeout) { - //normal enviroments in sane situations + //normal environments in sane situations return setTimeout(fun, 0); } // if setTimeout wasn't available but was latter defined @@ -2108,7 +2108,7 @@ function runTimeout(fun) { } function runClearTimeout(marker) { if (cachedClearTimeout === clearTimeout) { - //normal enviroments in sane situations + //normal environments in sane situations return clearTimeout(marker); } // if clearTimeout wasn't available but was latter defined @@ -2190,7 +2190,7 @@ process.nextTick = function (fun) { } }; -// v8 likes predictible objects +// v8 likes predictable objects function Item(fun, array) { this.fun = fun; this.array = array; @@ -4181,7 +4181,7 @@ AlgoliaSearchCore.prototype._jsonRequest = function(initialOpts) { return client._promise.reject(err); } - // When a timeout occured, retry by raising timeout + // When a timeout occurred, retry by raising timeout if (err instanceof errors.RequestTimeout) { return retryRequestWithHigherTimeout(); } @@ -4892,7 +4892,7 @@ IndexCore.prototype._search = function(params, url, callback, additionalUA) { * @param attrs (optional) if set, contains the array of attribute names to retrieve * @param callback (optional) the result callback called with two arguments * error: null or Error('message') -* content: the object to retrieve or the error message if a failure occured +* content: the object to retrieve or the error message if a failure occurred */ IndexCore.prototype.getObject = function(objectID, attrs, callback) { var indexObj = this; @@ -6701,7 +6701,7 @@ function Typeahead(o) { if (_.isMsie() && ($menu[0] === active || $menu[0].contains(active))) { $e.preventDefault(); // stop immediate in order to prevent Input#_onBlur from - // getting exectued + // getting executed $e.stopImmediatePropagation(); _.defer(function() { $input.focus(); }); } @@ -10431,7 +10431,7 @@ while (++i < len) { break; } } -// v8 likes predictible objects +// v8 likes predictable objects function Item(fun, array) { this.fun = fun; this.array = array; diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go index d4a7fcde7..f453e411e 100644 --- a/hugolib/filesystems/basefs.go +++ b/hugolib/filesystems/basefs.go @@ -238,7 +238,7 @@ func (d *SourceFilesystem) Contains(filename string) bool { return false } -// RealDirs gets a list of absolute paths to directorys starting from the given +// RealDirs gets a list of absolute paths to directories starting from the given // path. func (d *SourceFilesystem) RealDirs(from string) []string { var dirnames []string diff --git a/hugolib/page.go b/hugolib/page.go index 6e21d75ae..4c31eca4e 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -275,8 +275,8 @@ type Page struct { targetPathDescriptorPrototype *targetPathDescriptor } -func stackTrace(lenght int) string { - trace := make([]byte, lenght) +func stackTrace(length int) string { + trace := make([]byte, length) runtime.Stack(trace, true) return string(trace) } diff --git a/langs/language.go b/langs/language.go index 6f3e1de64..5eb09e10c 100644 --- a/langs/language.go +++ b/langs/language.go @@ -47,7 +47,7 @@ type Language struct { // If set per language, this tells Hugo that all content files without any // language indicator (e.g. my-page.en.md) is in this language. // This is usually a path relative to the working dir, but it can be an - // absolute directory referenece. It is what we get. + // absolute directory reference. It is what we get. ContentDir string Cfg config.Provider diff --git a/resource/transform.go b/resource/transform.go index 6a100ddc4..4b6663d0c 100644 --- a/resource/transform.go +++ b/resource/transform.go @@ -481,7 +481,7 @@ func contentReadSeekerCloser(r Resource) (ReadSeekCloser, error) { } return rc, nil default: - return nil, fmt.Errorf("cannot tranform content of Resource of type %T", r) + return nil, fmt.Errorf("cannot transform content of Resource of type %T", r) } }