Merge commit 'cf591b7c0c598d34896709db6d28598da37e3ff6'

docs/content/en/getting-started/configuration-markup.md

@@ -32,7 +32,7 @@ For details on the extensions, refer to [this section](https://github.com/yuin/g
 
 Some settings explained:
 
-hardWrap
+hardWraps
 : By default, Goldmark ignores newlines within a paragraph. Set to `true` to render newlines as `<br>` elements.
 
 unsafe

docs/content/en/getting-started/configuration.md

@@ -37,6 +37,12 @@ Multiple site config files can be specified as a comma-separated string to the `
 
 {{< todo >}}TODO: distinct config.toml and others (the root object files){{< /todo >}}
 
+## hugo.toml vs config.toml
+
+In Hugo 0.110.0 we changed the default config base filename to `hugo`, e.g. `hugo.toml`. We will still look for `config.toml` etc., but we recommend you eventually rename it (but you need to wait if you want to support older Hugo versions). The main reason we're doing this is to make it easier code editors and build tools to identify this as a Hugo configuration file and project. 
+
+{{< new-in "0.110.0" >}}
+
 ## Configuration Directory
 
 In addition to using a single site config file, one can use the `configDir` directory (default to `config/`) to maintain easier organization and environment specific settings.
@@ -117,8 +123,7 @@ Note that you don't need to be so verbose as in the default setup below; a `_mer
 
 ## All Configuration Settings
 
-The following is the full list of Hugo-defined variables with their default
-value in parentheses. Users may choose to override those values in their site
+The following is the full list of Hugo-defined variables. Users may choose to override those values in their site
 config file(s).
 
 ### archetypeDir

docs/content/en/getting-started/external-learning-resources/index.md

@@ -34,7 +34,7 @@ Hugo in Action is a step-by-step guide to using Hugo to create static websites.
 
 ### Hugo tutorial by CloudCannon
 
-[Step-by-step written tutorial](https://cloudcannon.com/community/learn/hugo-101/) to teach you the basics of creating a Hugo site.
+[Step-by-step written tutorial](https://cloudcannon.com/community/learn/hugo-beginner-tutorial/) to teach you the basics of creating a Hugo site.
 
 ## Video tutorials