mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3a44bf182fed5f34621f450114083a6dd7e88a07'

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2018-08-08 13:54:42 +02:00
parent c2a6741394 3a44bf182f
commit 1639fd20d8
19 changed files with 257 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/content/en/about/features.md
View File

@@ -12,7 +12,6 @@ menu:
weight: 20
sections_weight: 20
draft: false
aliases: [/about/features]
toc: true
---

2
docs/content/en/content-management/multilingual.md
View File

@@ -13,7 +13,7 @@ menu:
weight: 150
weight: 150 #rem
draft: false
aliases: [/content/multilingual/,/content-management/multilingual/,/tutorials/create-a-multilingual-site/]
aliases: [/content/multilingual/,/tutorials/create-a-multilingual-site/]
toc: true
---

2
docs/content/en/content-management/toc.md
View File

@@ -13,7 +13,7 @@ menu:
weight: 130
weight: 130 #rem
draft: false
aliases: [/extras/toc/,/content-management/toc/]
aliases: [/extras/toc/]
toc: true
---

3
docs/content/en/functions/cond.md
View File

@@ -7,7 +7,6 @@ menu:
docs:
parent: "functions"
signature: ["cond CONTROL VAR1 VAR2"]
aliases: [/functions/cond/]
hugoversion: 0.27
relatedfuncs: [default]
toc: false
@@ -29,4 +28,4 @@ Would emit "goose" if the `$geese` array has exactly 1 item, or "geese" otherwis
Whenever you use a `cond` function, *both* variable expressions are *always* evaluated. This means that a usage like `cond false (div 1 0) 27` will throw an error because `div 1 0` will be evaluated *even though the condition is false*.
In other words, the `cond` function does *not* provide [short-circuit evaluation](https://en.wikipedia.org/wiki/Short-circuit_evaluation) and does *not* work like a normal [ternary operator](https://en.wikipedia.org/wiki/%3F:) that will pass over the first expression if the condition returns `false`.
{{% /warning %}}
{{% /warning %}}

1
docs/content/en/functions/countrunes.md
View File

@@ -15,7 +15,6 @@ workson: []
hugoversion:
relatedfuncs: []
deprecated: false
aliases: [/functions/countrunes/]
---
In contrast with `countwords` function, which counts every word in a string, the `countrunes` function determines the number of runes in the content and excludes any whitespace. This has specific utility if you are dealing with CJK-like languages.

1
docs/content/en/functions/countwords.md
View File

@@ -15,7 +15,6 @@ workson: []
hugoversion:
relatedfuncs: [countrunes]
deprecated: false
aliases: [/functions/countwords/]
---
The template function works similar to the [.WordCount page variable][pagevars].

2
docs/content/en/functions/default.md
View File

@@ -18,7 +18,7 @@ hugoversion:
relatedfuncs: []
deprecated: false
draft: false
aliases: [/functions/default/]
aliases: []
needsexamples: false
---

BIN
docs/content/en/news/0.46-relnotes/featured-hugo-46-poster.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

4
docs/content/en/news/0.46-relnotes/index.md
View File

@@ -1,8 +1,8 @@
---
date: 2018-08-01
title: "0.46"
description: "0.46"
title: "The Summer of Hugo"
description: "Hugo 0.46: Full SCSS/SASS import inheritance support, rework of Hugo Pipes vs. multilingual, and more …"
categories: ["Releases"]
---

2
docs/content/en/templates/404.md
View File

@@ -13,7 +13,7 @@ menu:
weight: 120
weight: 120 #rem
draft: false
aliases: [/templates/404/]
aliases: []
toc: false
---

2
docs/content/en/templates/introduction.md
View File

@@ -15,7 +15,7 @@ menu:
weight: 10
sections_weight: 10
draft: false
aliases: [/templates/introduction/,/layouts/introduction/,/layout/introduction/, /templates/go-templates/]
aliases: [/layouts/introduction/,/layout/introduction/, /templates/go-templates/]
toc: true
---

5
docs/content/en/templates/rss.md
View File

@@ -14,7 +14,6 @@ menu:
weight: 150
sections_weight: 150
draft: false
aliases: [/templates/rss/]
toc: true
---
@@ -100,7 +99,7 @@ In your `header.html` template, you can specify your RSS feed in your `<head></h
```go-html-template
{{ range .AlternativeOutputFormats -}}
{{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
{{ end -}}
```
@@ -108,7 +107,7 @@ If you only want the RSS link, you can query the formats:
```go-html-template
{{ with .OutputFormats.Get "rss" -}}
{{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
{{ end -}}
```

1
docs/content/en/tools/_index.md
View File

@@ -14,7 +14,6 @@ menu:
weight: 01
sections_weight: 01
draft: false
aliases: [/tools/]
---
One of Hugo's greatest strengths is it's passionate---and always evolving---developer community. With the exception of the `highlight` shortcode mentioned in [Syntax Highlighting][syntax], the tools and other projects featured in this section are offerings from both commercial services and open-source projects, many of which are developed by Hugo developers just like you.

4
docs/content/en/tools/migrations.md
View File

@@ -47,6 +47,7 @@ Alternatively, you can use the new [Jekyll import command](/commands/hugo_import
## WordPress
- [wordpress-to-hugo-exporter](https://github.com/SchumacherFM/wordpress-to-hugo-exporter) - A one-click WordPress plugin that converts all posts, pages, taxonomies, metadata, and settings to Markdown and YAML which can be dropped into Hugo. (Note: If you have trouble using this plugin, you can [export your site for Jekyll](https://wordpress.org/plugins/jekyll-exporter/) and use Hugo's built in Jekyll converter listed above.)
- [blog2md](https://github.com/palaniraja/blog2md) - Works with [exported xml](https://en.support.wordpress.com/export/) file of your free YOUR-TLD.wordpress.com website. It also saves approved comments to `YOUR-POST-NAME-comments.md` file along with posts.
## Tumblr
@@ -66,6 +67,7 @@ Alternatively, you can use the new [Jekyll import command](/commands/hugo_import
- [blogimport](https://github.com/natefinch/blogimport) - A tool to import from Blogger posts to Hugo.
- [blogger-to-hugo](https://bitbucket.org/petraszd/blogger-to-hugo) - Another tool to import Blogger posts to Hugo. It also downloads embedded images so they will be stored locally.
- [blog2md](https://github.com/palaniraja/blog2md) - Works with [exported xml](https://support.google.com/blogger/answer/41387?hl=en) file of your YOUR-TLD.blogspot.com website. It also saves comments to `YOUR-POST-NAME-comments.md` file along with posts.
## Contentful
@@ -74,4 +76,4 @@ Alternatively, you can use the new [Jekyll import command](/commands/hugo_import
## BlogML
- [BlogML2Hugo](https://github.com/jijiechen/BlogML2Hugo) - A tool that helps you convert BlogML xml file to Hugo markdown files. Users need to take care of links to attachments and images by themselves. This helps the blogs that export BlogML files (e.g. BlogEngine.NET) tramsform to hugo sites easily.
- [BlogML2Hugo](https://github.com/jijiechen/BlogML2Hugo) - A tool that helps you convert BlogML xml file to Hugo markdown files. Users need to take care of links to attachments and images by themselves. This helps the blogs that export BlogML files (e.g. BlogEngine.NET) tramsform to hugo sites easily.

2
docs/content/en/variables/page.md
View File

@@ -15,7 +15,7 @@ menu:
weight: 20
weight: 20
sections_weight: 20
aliases: [/variables/page/]
aliases: []
toc: true
---