Merge commit '30c0d485eaff6d70df1be0353911ddca485d52bf'

This commit is contained in:
Bjørn Erik Pedersen 2017-11-20 11:19:16 +01:00
commit 14786c4d8f
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
31 changed files with 286 additions and 177 deletions

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo"
slug: hugo
url: /commands/hugo/
@ -37,7 +37,7 @@ hugo [flags]
--debug debug output
-d, --destination string filesystem path to write files to
--disable404 do not render 404 page
--disableKinds strings disable different kind of pages (home, RSS etc.)
--disableKinds stringSlice disable different kind of pages (home, RSS etc.)
--disableRSS do not build RSS files
--disableSitemap do not build Sitemap file
--enableGitInfo add Git revision, date and author info to the pages
@ -80,4 +80,4 @@ hugo [flags]
* [hugo undraft](/commands/hugo_undraft/) - Undraft resets the content's draft status
* [hugo version](/commands/hugo_version/) - Print the version number of Hugo
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo benchmark"
slug: hugo_benchmark
url: /commands/hugo_benchmark/
@ -33,7 +33,7 @@ hugo benchmark [flags]
--cpuprofile string path/filename for the CPU profile file
-d, --destination string filesystem path to write files to
--disable404 do not render 404 page
--disableKinds strings disable different kind of pages (home, RSS etc.)
--disableKinds stringSlice disable different kind of pages (home, RSS etc.)
--disableRSS do not build RSS files
--disableSitemap do not build Sitemap file
--enableGitInfo add Git revision, date and author info to the pages
@ -72,4 +72,4 @@ hugo benchmark [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo check"
slug: hugo_check
url: /commands/hugo_check/
@ -35,4 +35,4 @@ Contains some verification checks
* [hugo](/commands/hugo/) - hugo builds your site
* [hugo check ulimit](/commands/hugo_check_ulimit/) - Check system ulimit settings
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo check ulimit"
slug: hugo_check_ulimit
url: /commands/hugo_check_ulimit/
@ -39,4 +39,4 @@ hugo check ulimit [flags]
### SEE ALSO
* [hugo check](/commands/hugo_check/) - Contains some verification checks
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo config"
slug: hugo_config
url: /commands/hugo_config/
@ -38,4 +38,4 @@ hugo config [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo convert"
slug: hugo_convert
url: /commands/hugo_convert/
@ -42,4 +42,4 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
* [hugo convert toTOML](/commands/hugo_convert_totoml/) - Convert front matter to TOML
* [hugo convert toYAML](/commands/hugo_convert_toyaml/) - Convert front matter to YAML
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo convert toJSON"
slug: hugo_convert_toJSON
url: /commands/hugo_convert_tojson/
@ -42,4 +42,4 @@ hugo convert toJSON [flags]
### SEE ALSO
* [hugo convert](/commands/hugo_convert/) - Convert your content to different formats
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo convert toTOML"
slug: hugo_convert_toTOML
url: /commands/hugo_convert_totoml/
@ -42,4 +42,4 @@ hugo convert toTOML [flags]
### SEE ALSO
* [hugo convert](/commands/hugo_convert/) - Convert your content to different formats
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo convert toYAML"
slug: hugo_convert_toYAML
url: /commands/hugo_convert_toyaml/
@ -42,4 +42,4 @@ hugo convert toYAML [flags]
### SEE ALSO
* [hugo convert](/commands/hugo_convert/) - Convert your content to different formats
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo env"
slug: hugo_env
url: /commands/hugo_env/
@ -38,4 +38,4 @@ hugo env [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo gen"
slug: hugo_gen
url: /commands/hugo_gen/
@ -38,4 +38,4 @@ A collection of several useful generators.
* [hugo gen doc](/commands/hugo_gen_doc/) - Generate Markdown documentation for the Hugo CLI.
* [hugo gen man](/commands/hugo_gen_man/) - Generate man pages for the Hugo CLI
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo gen autocomplete"
slug: hugo_gen_autocomplete
url: /commands/hugo_gen_autocomplete/
@ -56,4 +56,4 @@ hugo gen autocomplete [flags]
### SEE ALSO
* [hugo gen](/commands/hugo_gen/) - A collection of several useful generators.
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo gen chromastyles"
slug: hugo_gen_chromastyles
url: /commands/hugo_gen_chromastyles/
@ -43,4 +43,4 @@ hugo gen chromastyles [flags]
### SEE ALSO
* [hugo gen](/commands/hugo_gen/) - A collection of several useful generators.
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo gen doc"
slug: hugo_gen_doc
url: /commands/hugo_gen_doc/
@ -45,4 +45,4 @@ hugo gen doc [flags]
### SEE ALSO
* [hugo gen](/commands/hugo_gen/) - A collection of several useful generators.
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo gen man"
slug: hugo_gen_man
url: /commands/hugo_gen_man/
@ -41,4 +41,4 @@ hugo gen man [flags]
### SEE ALSO
* [hugo gen](/commands/hugo_gen/) - A collection of several useful generators.
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo import"
slug: hugo_import
url: /commands/hugo_import/
@ -37,4 +37,4 @@ Import requires a subcommand, e.g. `hugo import jekyll jekyll_root_path target_p
* [hugo](/commands/hugo/) - hugo builds your site
* [hugo import jekyll](/commands/hugo_import_jekyll/) - hugo import from Jekyll
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo import jekyll"
slug: hugo_import_jekyll
url: /commands/hugo_import_jekyll/
@ -41,4 +41,4 @@ hugo import jekyll [flags]
### SEE ALSO
* [hugo import](/commands/hugo_import/) - Import your site from others.
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo list"
slug: hugo_list
url: /commands/hugo_list/
@ -40,4 +40,4 @@ List requires a subcommand, e.g. `hugo list drafts`.
* [hugo list expired](/commands/hugo_list_expired/) - List all posts already expired
* [hugo list future](/commands/hugo_list_future/) - List all posts dated in the future
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo list drafts"
slug: hugo_list_drafts
url: /commands/hugo_list_drafts/
@ -39,4 +39,4 @@ hugo list drafts [flags]
### SEE ALSO
* [hugo list](/commands/hugo_list/) - Listing out various types of content
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo list expired"
slug: hugo_list_expired
url: /commands/hugo_list_expired/
@ -40,4 +40,4 @@ hugo list expired [flags]
### SEE ALSO
* [hugo list](/commands/hugo_list/) - Listing out various types of content
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo list future"
slug: hugo_list_future
url: /commands/hugo_list_future/
@ -40,4 +40,4 @@ hugo list future [flags]
### SEE ALSO
* [hugo list](/commands/hugo_list/) - Listing out various types of content
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo new"
slug: hugo_new
url: /commands/hugo_new/
@ -48,4 +48,4 @@ hugo new [path] [flags]
* [hugo new site](/commands/hugo_new_site/) - Create a new site (skeleton)
* [hugo new theme](/commands/hugo_new_theme/) - Create a new theme
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo new site"
slug: hugo_new_site
url: /commands/hugo_new_site/
@ -43,4 +43,4 @@ hugo new site [path] [flags]
### SEE ALSO
* [hugo new](/commands/hugo_new/) - Create new content for your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo new theme"
slug: hugo_new_theme
url: /commands/hugo_new_theme/
@ -42,4 +42,4 @@ hugo new theme [name] [flags]
### SEE ALSO
* [hugo new](/commands/hugo_new/) - Create new content for your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo server"
slug: hugo_server
url: /commands/hugo_server/
@ -44,7 +44,7 @@ hugo server [flags]
-d, --destination string filesystem path to write files to
--disable404 do not render 404 page
--disableFastRender enables full re-renders on changes
--disableKinds strings disable different kind of pages (home, RSS etc.)
--disableKinds stringSlice disable different kind of pages (home, RSS etc.)
--disableLiveReload watch without enabling live browser reload on rebuild
--disableRSS do not build RSS files
--disableSitemap do not build Sitemap file
@ -90,4 +90,4 @@ hugo server [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo undraft"
slug: hugo_undraft
url: /commands/hugo_undraft/
@ -40,4 +40,4 @@ hugo undraft path/to/content [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -1,5 +1,5 @@
---
date: 2017-10-15T10:19:48+02:00
date: 2017-11-18T10:28:35+01:00
title: "hugo version"
slug: hugo_version
url: /commands/hugo_version/
@ -38,4 +38,4 @@ hugo version [flags]
### SEE ALSO
* [hugo](/commands/hugo/) - hugo builds your site
###### Auto generated by spf13/cobra on 15-Oct-2017
###### Auto generated by spf13/cobra on 18-Nov-2017

View file

@ -59,6 +59,52 @@ If you want all of the languages to be put below their respective language code,
Only the obvious non-global options can be overridden per language. Examples of global options are `baseURL`, `buildDrafts`, etc.
## Configure Multilingual Multihost
From **Hugo 0.31** we support multiple languages in a multihost configuration. See [this issue](https://github.com/gohugoio/hugo/issues/4027) for details.
This means that you can now confugre a `baseURL` per `language`:
> If a `baseURL` is set on the `language` level, then all languages must have one and they must all be different.
Example:
```bash
[languages]
[languages.no]
baseURL = "https://example.no"
languageName = "Norsk"
weight = 1
title = "På norsk"
[languages.en]
baseURL = "https://example.com"
languageName = "English"
weight = 2
title = "In English"
```
With the above, the two sites will be generated into `public` with their own root:
```bash
public
├── en
└── no
```
**All URLs (i.e `.Permalink` etc.) will be generated from that root. So the English home page above will have its `.Permalink` set to `https://example.com/`.**
When you run `hugo server` we will start multiple HTTP servers. You will typlically see something like this in the console:
```bash
Web Server is available at 127.0.0.1:1313 (bind address 127.0.0.1)
Web Server is available at 127.0.0.1:1314 (bind address 127.0.0.1)
Press Ctrl+C to stop
```
Live reload and `--navigateToChanged` between the servers work as expected.
## Taxonomies and Blackfriday
Taxonomies and [Blackfriday configuration][config] can also be set per language:
@ -102,22 +148,28 @@ In this example, the `about.md` will be assigned the configured `defaultContentL
This way, you can slowly start to translate your current content without having to rename everything. If left unspecified, the default value for `defaultContentLanguage` is `en`.
By having the same *base filename*, the content pieces are linked together as translated pieces.
By having the same **directory and base filename**, the content pieces are linked together as translated pieces.
You can also set the key used to link the translations explicitly in front matter:
```yaml
translationKey: "my-story"
```
{{% note %}}
**Before Hugo 0.31**, the file's directory was not considered when looking for translations. This did not work when you named all of your content files, say, `index.md`. Now we use the full content path.
{{% /note %}}
If you need distinct URLs per language, you can set the slug in the non-default language file. For example, you can define a custom slug for a French translation in the front matter of `content/about.fr.md` as follows:
```
```yaml
slug: "a-propos"
```
At render, Hugo will build both `/about/` and `/a-propos/` as properly linked translated pages.
{{%note %}}
Hugo currently uses the base filename as the translation key, which can be an issue with identical filenames in different sections.
We will fix this in https://github.com/gohugoio/hugo/issues/2699
{{% /note %}}
{{< todo >}}Rewrite/remove the above one issue is fixed.{{< /todo >}}
## Link to Translated Content
@ -146,6 +198,13 @@ Hugo uses [go-i18n][] to support string translations. [See the project's source
Translations are collected from the `themes/<THEME>/i18n/` folder (built into the theme), as well as translations present in `i18n/` at the root of your project. In the `i18n`, the translations will be merged and take precedence over what is in the theme folder. Language files should be named according to [RFC 5646][] with names such as `en-US.toml`, `fr.toml`, etc.
{{% note %}}
From **Hugo 0.31** you no longer need to use a valid language code. It _can be_ anything.
See https://github.com/gohugoio/hugo/issues/3564
{{% /note %}}
From within your templates, use the `i18n` function like this:
```

View file

@ -0,0 +1,45 @@
---
title: Static Files
description: "The `static` folder is where you place all your **static files**."
date: 2017-11-18
categories: [content management]
keywords: [source, directories]
menu:
docs:
parent: "content-management"
weight: 130
weight: 130 #rem
aliases: [/static-files]
toc: true
---
The `static` folder is where you place all your **static files**, e.g. stylesheets, JavaScript, images etc.
You can set the name of the static folder to use in your configuration file, for example `config.toml`. From **Hugo 0.31** you can configure as many static directories as you need. All the files in all the static directories will form a union filesystem.
Example:
```toml
staticDir = ["static1", "static2"]
[languages]
[languages.no]
staticDir = ["staticDir_override", "static_no"]
baseURL = "https://example.no"
languageName = "Norsk"
weight = 1
title = "På norsk"
[languages.en]
staticDir2 = "static_en"
baseURL = "https://example.com"
languageName = "English"
weight = 2
title = "In English"
```
In the above, with no theme used:
* The English site will get its static files as a union of "static1", "static2" and "static_en". On file duplicates, the right-most version will win.
* The Norwegian site will get its static files as a union of "staticDir_override" and "static_no".
**Note:** The example above is a [multihost setup](/content-management/multilingual/#configure-multilingual-multihost). In a regular setup, all the static directories will be available to all sites.

View file

@ -57,9 +57,13 @@ used by Hugo when generating your website. You can write these files in YAML, JS
[`layouts`][]
: Stores templates in the form of `.html` files that specify how views of your content will be rendered into a static website. Templates include [list pages][lists], your [homepage][], [taxonomy templates][], [partials][], [single page templates][singles], and more.
`static`
[`static`][]
: stores all the static content for your future website: images, CSS, JavaScript, etc. When Hugo builds your site, all assets inside your static directory are copied over as-is. A good example of using the `static` folder is for [verifying site ownership on Google Search Console][searchconsole], where you want Hugo to copy over a complete HTML file without modifying its content.
{{% note %}}
From **Hugo 0.31** you can have multiple static directories.
{{% /note %}}
{{% note %}}
Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/gohugoio/hugo/issues/3207)). You can solicit support from the community in the [Hugo forums](https://discourse.gohugo.io) or check out a few of the [Hugo starter kits](/tools/starter-kits/) for examples of how Hugo developers are managing static assets.
{{% /note %}}
@ -73,6 +77,7 @@ Hugo does not currently ship with an asset pipeline ([#3207](https://github.com/
[data templates]: /templates/data-templates/
[homepage]: /templates/homepage/
[`layouts`]: /templates/
[`static`]: /content-management/static-files/
[lists]: /templates/list/
[pagevars]: /variables/page/
[partials]: /templates/partials/

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB