Squashed 'docs/' changes from 896bad9f4..e161ea09d

e161ea09d Add one more Chinese file to workaround reflect: Zero(nil)
b595b3a21 Add more Chinese translation
56e4e95d9 Use lang.Merge to "fill in the gaps" for untranslated pages
ef079406c Merge commit '650fac3a4e7d256f4505402ab44cfc3c804b8dea'
650fac3a4 Squashed 'themes/gohugoioTheme/' changes from a1768ebb..f31a3dc8
322eff899 Add Chinese language for menus
d90b886e0 Fix Markdown table syntax in previous commit
737f3dfca Update the leaf bundle vs branch bundle table
09fa1bc4e Clarify that `.Now` is obsolete
879ea3f6a Make release notes somewhat more consistent
0113e2051 Move 0.40.2-relnotes into content/en/news
77578f5bf Move content/ into new contentDir content/en/
4dcf7c709 Fix "reflect: Zero(nil)" error in showcase
63dd25505 Release 0.40.2
2076c0d56 releaser: Prepare repository for 0.41-DEV
070fe565e releaser: Add release notes to /docs for release of 0.40.2
4ce52e913 releaser: Bump versions for release of 0.40.2
41907c487 Fix typos in syntax-highlighting.md
91753ef3d Add missing backtick
b77274301 Remove duplicate release notes (0.27, 0.27.1, 0.35)
6e00da316 Remove obsolete content/release-notes/ directory
00a6d8c02 Change en dash back to `--` in 0.38.2-relnotes
51b32dc00 Update archetypes.md
d0e5c2307 Release 0.40.1
4538a6d5b releaser: Prepare repository for 0.41-DEV
91b391d70 releaser: Add release notes to /docs for release of 0.40.1
e0979d143 releaser: Bump versions for release of 0.40.1
7983967c2 Clean images
fe3fdd77d Polish showcase for Flesland Flis
e6dde3989 Showcase - Flesland Flis AS by Absoluttweb
73aa62290 Revive @spf13's special Hugo font
add67b335 Release Hugo 0.40
c0a26e5a6 Merge branch 'temp40'
beeabaaae releaser: Prepare repository for 0.41-DEV
e67d5e985 releaser: Add release notes to /docs for release of 0.40
6cdd95273 releaser: Bump versions for release of 0.40
bee21fb9b Revive the other Hugo logos too
4f45e8fe1 Fix the link type attribute for RSS in examples
8c67dc89a Fix example in delimit doc
e7f6c00d5 Revive the logo used on the forum
82b0cd26e Merge commit 'a215abf70e018f4bf40d6c09d8bd148d8684b33d'
119c8ca58 Merge commit 'd2ec1a06df8ab6b17ad05cb008d5701b40327d47'
db4683bd2 Improve .Get docs
05260b886 .Get function: fix syntax signature

git-subtree-dir: docs
git-subtree-split: e161ea09d33e3199f4998e4d2e9068d5a850f042

config.toml

@@ -70,7 +70,7 @@ twitter = "GoHugoIO"
 [params]
   description = "The world’s fastest framework for building websites"
   ## Used for views in rendered HTML (i.e., rather than using the .Hugo variable)
-  release = "0.39"
+  release = "0.40.2"
   ## Setting this to true will add a "noindex" to *EVERY* page on the site
   removefromexternalsearch = false
   ## Gh repo for site footer (include trailing slash)
@@ -271,3 +271,139 @@ anchor = "smart"
     identifier = "github"
     post = "external"
     url = "https://github.com/gohugoio/hugo"
+
+### LANGUAGES ###
+
+[languages]
+  [languages.en]
+    contentDir = "content/en"
+    languageName = "English"
+    weight = 1
+  [languages.zh]
+    contentDir = "content/zh"
+    languageName = "中文"
+    weight = 2
+
+
+### LANGUAGE-SPECIFIC MENUS ###
+
+# Chinese menus
+
+[[languages.zh.menu.docs]]
+  name = "关于 Hugo"
+  weight = 1
+  identifier = "about"
+  url = "/zh/about/"
+
+[[languages.zh.menu.docs]]
+  name = "入门"
+  weight = 5
+  identifier = "getting-started"
+  url = "/zh/getting-started/"
+
+[[languages.zh.menu.docs]]
+  name = "主题"
+  weight = 15
+  identifier = "themes"
+  post = "break"
+  url = "/zh/themes/"
+
+# Core languages.zh.menus
+
+[[languages.zh.menu.docs]]
+  name = "内容管理"
+  weight = 20
+  identifier = "content-management"
+  post = "expanded"
+  url = "/zh/content-management/"
+
+[[languages.zh.menu.docs]]
+  name = "模板"
+  weight = 25
+  identifier = "templates"
+  url = "/zh/templates/"
+
+[[languages.zh.menu.docs]]
+  name = "函数"
+  weight = 30
+  identifier = "functions"
+  url = "/zh/functions/"
+
+[[languages.zh.menu.docs]]
+  name = "变量"
+  weight = 35
+  identifier = "variables"
+  url = "/zh/variables/"
+
+[[languages.zh.menu.docs]]
+  name = "CLI"
+  weight = 40
+  post = "break"
+  identifier = "commands"
+  url = "/commands/"
+
+# LOW LEVEL ITEMS
+[[languages.zh.menu.docs]]
+  name = "故障排除"
+  weight = 60
+  identifier = "troubleshooting"
+  url = "/zh/troubleshooting/"
+
+[[languages.zh.menu.docs]]
+  name = "工具"
+  weight = 70
+  identifier = "tools"
+  url = "/zh/tools/"
+
+[[languages.zh.menu.docs]]
+  name = "托管与部署"
+  weight = 80
+  identifier = "hosting-and-deployment"
+  url = "/zh/hosting-and-deployment/"
+
+[[languages.zh.menu.docs]]
+  name = "贡献"
+  weight = 100
+  post = "break"
+  identifier = "contribute"
+  url = "/zh/contribute/"
+
+[[languages.zh.menu.global]]
+  name = "新闻"
+  weight = 1
+  identifier = "news"
+  url = "/zh/news/"
+
+[[languages.zh.menu.global]]
+  name = "文档"
+  weight = 5
+  identifier = "docs"
+  url = "/zh/documentation/"
+
+[[languages.zh.menu.global]]
+  name = "主题"
+  weight = 10
+  identifier = "themes"
+  url = "https://themes.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "作品展示"
+  weight = 20
+  identifier = "showcase"
+  url = "/zh/showcase/"
+
+# Anything with a weight > 100 gets an external icon
+[[languages.zh.menu.global]]
+  name = "社区"
+  weight = 150
+  icon = true
+  identifier = "community"
+  post = "external"
+  url = "https://discourse.gohugo.io/"
+
+[[languages.zh.menu.global]]
+  name = "GitHub"
+  weight = 200
+  identifier = "github"
+  post = "external"
+  url = "https://github.com/gohugoio/hugo"

content/en/content-management/archetypes.md

@@ -32,8 +32,8 @@ The above will create a new content file in `content/posts/my-first-post.md` usi
 
 1. `archetypes/posts.md`
 2. `archetypes/default.md`
-3. `themes/my-theme/posts.md`
-4. `themes/my-theme/default.md`
+3. `themes/my-theme/archetypes/posts.md`
+4. `themes/my-theme/archetypes/default.md`
 
 The last two list items is only applicable if you use a theme and it uses the `my-theme` theme name as an example.
 

content/en/content-management/formats.md

@@ -29,7 +29,7 @@ Before you begin writing your content in markdown, Blackfriday has a known issue
 
 You can configure multiple aspects of Blackfriday as show in the following list. See the docs on [Configuration][config] for the full list of explicit directions you can give to Hugo when rendering your site.
 
-{{< readfile file="/content/readfiles/bfconfig.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/bfconfig.md" markdown="true" >}}
 
 ## Extend Markdown
 

content/en/content-management/page-bundles.md

@@ -21,13 +21,16 @@ A Page Bundle can be one of:
 -   Leaf Bundle (leaf means it has no children)
 -   Branch Bundle (home page, section, taxonomy terms, taxonomy list)
 
-|                 | Leaf Bundle                                            | Branch Bundle                                           |
-|-----------------|--------------------------------------------------------|---------------------------------------------------------|
-| Usage           | Collection of resources (pages, images etc.) for single pages    | Collection of non-page resources (images etc.)for list pages |
-| Index file name | `index.md` [^fn:1]                                     | `_index.md` [^fn:1]                                     |
-| Layout type     | `single`                                               | `list`                                                  |
-| Nesting         | Doesn't allow nesting of more bundles under it         | Allows nesting of leaf/branch bundles under it          |
-| Example         | `content/posts/my-post/index.md`                       | `content/posts/_index.md`                               |
+|                                     | Leaf Bundle                                              | Branch Bundle                                                                                                                                                                                                      |
+|-------------------------------------|----------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------  |
+| Usage                               | Collection of content and attachments for single pages   | Collection of attachments for section pages (home page, section, taxonomy terms, taxonomy list)                                                                                                                    |
+| Index file name                     | `index.md` [^fn:1]                                       | `_index.md` [^fn:1]                                                                                                                                                                                                |
+| Allowed Resources                   | Page and non-page (like images, pdf, etc.) types         | Only non-page (like images, pdf, etc.) types                                                                                                                                                                       |
+| Where can the Resources live?       | At any directory level within the leaf bundle directory. | Only in the directory level **of** the branch bundle directory i.e. the directory containing the `_index.md` ([ref](https://discourse.gohugo.io/t/question-about-content-folder-structure/11822/4?u=kaushalmodi)). |
+| Layout type                         | `single`                                                 | `list`                                                                                                                                                                                                             |
+| Nesting                             | Does not allow nesting of more bundles under it          | Allows nesting of leaf or branch bundles under it                                                                                                                                                                  |
+| Example                             | `content/posts/my-post/index.md`                         | `content/posts/_index.md`                                                                                                                                                                                          |
+| Content from non-index page files .. | Accessed only as page resources                          | Accessed only as regular pages                                                                                                                                                                                     |
 
 
 ## Leaf Bundles {#leaf-bundles}

content/en/content-management/sections.md

@@ -81,7 +81,7 @@ With the available [section variables and methods](#section-page-variables-and-m
 
 Also see [Page Variables](/variables/page/).
 
-{{< readfile file="/content/readfiles/sectionvars.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/sectionvars.md" markdown="true" >}}
 
 ## Content Section Lists
 

content/en/content-management/shortcodes.md

@@ -235,7 +235,7 @@ By adding the preceding `hidecaption` example, the following HTML will be added
 
 #### Example `instagram` Display
 
-Using the preceding `instagram` with hidecaption` example above, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.
+Using the preceding `instagram` with `hidecaption` example above, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.
 
 {{< instagram BWNjjyYFxVx hidecaption >}}
 

content/en/content-management/syntax-highlighting.md

@@ -1,6 +1,6 @@
 ---
 title: Syntax Highlighting
-description: Hugo comes with reallly fast syntax highlighting from Chroma.
+description: Hugo comes with really fast syntax highlighting from Chroma.
 date: 2017-02-01
 publishdate: 2017-02-01
 keywords: [highlighting,pygments,chroma,code blocks,syntax]
@@ -18,7 +18,7 @@ toc: true
 
 From Hugo 0.28, the default syntax hightlighter in Hugo is [Chroma](https://github.com/alecthomas/chroma); it is built in Go and is really, really fast -- and for the most important parts compatible with Pygments.
 
-If you want to continue to use Pygments (see below), set `pygmentsUseClassic=true` in your site config.
+If you want to continue to use Pygments (see below), set `pygmentsUseClasses=true` in your site config.
 
 The example below shows a simple code snippet from the Hugo source highlighted with the `highlight` shortcode. Note that the gohugo.io site is generated with `pygmentsUseClasses=true` (see [Generate Syntax Highlighter CSS](#generate-syntax-highlighter-css)).
 

content/en/functions/delimit.md

@@ -36,7 +36,7 @@ The examples of `delimit` that follow all use the same front matter:
 {{< code file="delimit-example-front-matter.toml" nocopy="true" >}}
 +++
 title: I love Delimit
-keywords: [ "tag1", "tag2", "tag3" ]
+tags: [ "tag1", "tag2", "tag3" ]
 +++
 {{< /code >}}
 

content/en/functions/get.md

@@ -0,0 +1,35 @@
+---
+title: .Get
+description: Accesses positional and ordered parameters in shortcode declaration.
+godocref:
+date: 2017-02-01
+publishdate: 2017-02-01
+lastmod: 2017-02-01
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+keywords: [shortcodes]
+signature: [".Get INDEX", ".Get KEY"]
+workson: []
+hugoversion:
+relatedfuncs: []
+deprecated: false
+aliases: []
+needsexample: true
+---
+
+
+`.Get` is specifically used when creating your own [shortcode template][sc], to access the [positional and named](/templates/shortcode-templates/#positional-vs-named-parameters) parameters passed to it. When used with a numeric INDEX, it queries positional parameters (starting with 0). With a string KEY, it queries named parameters.
+
+When accessing a named parameter that does not exist, `.Get` returns an empty string instead of interrupting the build. The same goes with positional parameters in hugo version 0.40 and after. This allows you to chain `.Get` with `if`, `with`, `default` or `cond` to check for parameter existence. For example, you may now use:
+
+```
+{{ $quality := default "100" (.Get 1) }}
+```
+
+[sc]: /templates/shortcode-templates/
+
+
+
+