Merge commit 'b6b37a1f00f808f3c0d2715f65ca2d3091f36495'

This commit is contained in:
Bjørn Erik Pedersen
2018-07-18 11:05:58 +02:00
106 changed files with 307 additions and 279 deletions

View File

@@ -193,7 +193,7 @@ sitemap
: Default [sitemap configuration](/templates/sitemap-template/#configure-sitemap-xml).
staticDir ("static")
: Relative directory from where Hugo reads static files.
: A directory or a list of directories from where Hugo reads [static files][static-files].
stepAnalysis (false)
: Display memory and timing of different steps of the program.
@@ -405,3 +405,4 @@ Hugo v0.20 introduced the ability to render your content to multiple output form
[templates]: /templates/
[toml]: https://github.com/toml-lang/toml
[yaml]: http://yaml.org/spec/
[static-files]: /content-management/static-files/