Update from en

Author: peaceiris

commands/hugo_convert.md

@@ -10,10 +10,12 @@ Convert your content to different formats
 
 ### Synopsis
 
-Convert your content (e.g. front matter) to different formats.
+Convert your content files (front matter) to different formats.
 
 See convert's subcommands toJSON, toTOML and toYAML for more information.
 
+**Please Note:** This will convert front matter only. It does not convert theme and configuration files (e.g. config.toml, theme.toml). Those files will need to be manually changed to your preference.
+
 ### Options
 
 ```

content-management/multilingual.md

@@ -49,7 +49,7 @@ linkedin = "https://linkedin.com/fr/whoever"
 help  = "Aide"
 {{< /code-toggle >}}
 
-Anything not defined in a `[languages]` block will fall back to the global value for that key (e.g., `copyright` for the English [`en`] language). This also works for `params`, as demonstrated witgh `help` above: You will get the value `Aide` in French and `Help` in all the languages without this parameter set.
+Anything not defined in a `[languages]` block will fall back to the global value for that key (e.g., `copyright` for the English [`en`] language). This also works for `params`, as demonstrated with `help` above: you will get the value `Aide` in French and `Help` in all the languages without this parameter set.
 
 With the configuration above, all content, sitemap, RSS feeds, paginations,
 and taxonomy pages will be rendered below `/` in English (your default content language) and then below `/fr` in French.

content-management/shortcodes.md

@@ -243,7 +243,7 @@ Using the preceding `instagram` with `hidecaption` example above, the following
 
 ### `param`
 
-Gets a value from the current `Page's` params set in front matter, with a fall back to the site param value. If will log an `ERROR` if the param with the given key could not be found in either.
+Gets a value from the current `Page's` params set in front matter, with a fall back to the site param value. It will log an `ERROR` if the param with the given key could not be found in either.
 
 ```bash
 {{</* param testparam */>}}

contribute/themes.md

@@ -30,7 +30,7 @@ A collection of all themes created by the Hugo community, including screenshots
 4. Add a descriptive `README.md` to the root of the theme source
 5. Add `/images/screenshot.png` and `/images/tn.png`
 
-\* If your theme doesn't fit into the `Hugo Basic Example` site, we encourage theme authors to supply a self-contained Hugo site in `/exampleSite`.
+\* If your theme doesn't fit into the `Hugo Basic Example` site, we encourage theme authors to supply a self-contained Hugo site in `/exampleSite/`, but note that for security reasons the content directory on the Hugo showcase will still be published from the [`Hugo Basic Example`](https://github.com/gohugoio/hugoBasicExample/tree/master/content) repository.  
 
 {{% note %}}
 The folder name here---`exampleSite`---is important, as this folder will be picked up and used by the script that generates the Hugo Theme Site. It mirrors the root directory of a Hugo website and allows you to add custom content, assets, and a `config` file with preset values.
@@ -125,22 +125,7 @@ Additional media may be provided in the same directory.
 Your theme's README file should be written in markdown and saved at the root of your theme's directory structure. Your `README.md` serves as
 
 1. Content for your theme's details page at <https://themes.gohugo.io>
-2. General information about the theme in your GitHub repository (i.e., it's usual purpose)
-
-#### Example `README.md`
-
-You can download the following `README.md` as an outline:
-
-{{< code file="README.md" download="README.md" >}}
-
-# Theme Title
-
-**Need input from @digitalcraftsman on what could be added to this file.**
-
-
-
-
-{{< /code >}}
+2. General information about the theme in your GitHub repository (i.e., it's usual purpose, features and instructions)
 
 {{% note "Screenshots in your `README.md`"%}}
 If you add screenshots to the README, please make use of absolute file paths instead of relative ones like `/images/screenshot.png`. Relative paths work great on GitHub but they don't correspond to the directory structure of [themes.gohugo.io](http://themes.gohugo.io/). Therefore, browsers will not be able to display screenshots on the theme site under the given (relative) path.

getting-started/configuration.md

@@ -114,6 +114,9 @@ defaultContentLanguage ("en")
 defaultContentLanguageInSubdir (false)
 : Render the default content language in subdir, e.g. `content/en/`. The site root `/` will then redirect to `/en/`.
 
+disableAliases (false)
+: Will disable generation of alias redirects. Note that even if `disableAliases` is set, the aliases themselves are preserved on the page. The motivation with this is to be able to generate 301 redirects in an `.htacess`, a Netlify `_redirects` file or similar using a custom output format.
+
 disableHugoGeneratorInject (false)
 : Hugo will, by default, inject a generator meta tag in the HTML head on the _home page only_. You can turn it off, but we would really appreciate if you don't, as this is a good way to watch Hugo's popularity on the rise.
 

variables/files.md

@@ -25,7 +25,7 @@ For information on creating shortcodes and templates that tap into Hugo's file-r
 The `.File` object contains the following fields:
 
 .File.Path
-: the original relative path of the page (e.g., `content/posts/foo.en.md`)
+: the original relative path of the page, relative to the content dir (e.g., `posts/foo.en.md`)
 
 .File.LogicalName
 : the name of the content file that represents a page (e.g., `foo.en.md`)