Merge commit '3a44bf182fed5f34621f450114083a6dd7e88a07'

15 files changed, 14 insertions, 18 deletions

diff --git a/docs/content/en/about/features.md b/docs/content/en/about/features.md
index e6ab6eea4..4176c60df 100644
--- a/docs/content/en/about/features.md
+++ b/docs/content/en/about/features.md
@@ -12,7 +12,6 @@ menu:
 weight: 20
 sections_weight: 20
 draft: false
-aliases: [/about/features]
 toc: true
 ---
 
diff --git a/docs/content/en/content-management/multilingual.md b/docs/content/en/content-management/multilingual.md
index 32eeb7799..fab9c17bf 100644
--- a/docs/content/en/content-management/multilingual.md
+++ b/docs/content/en/content-management/multilingual.md
@@ -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
 ---
 
diff --git a/docs/content/en/content-management/toc.md b/docs/content/en/content-management/toc.md
index 681416a72..a500bcf66 100644
--- a/docs/content/en/content-management/toc.md
+++ b/docs/content/en/content-management/toc.md
@@ -13,7 +13,7 @@ menu:
     weight: 130
 weight: 130	#rem
 draft: false
-aliases: [/extras/toc/,/content-management/toc/]
+aliases: [/extras/toc/]
 toc: true
 ---
 
diff --git a/docs/content/en/functions/cond.md b/docs/content/en/functions/cond.md
index 72a9c0a9a..a5e534426 100644
--- a/docs/content/en/functions/cond.md
+++ b/docs/content/en/functions/cond.md
@@ -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 %}}
\ No newline at end of file
+{{% /warning %}}
diff --git a/docs/content/en/functions/countrunes.md b/docs/content/en/functions/countrunes.md
index 8fdbdadb6..a52829a1c 100644
--- a/docs/content/en/functions/countrunes.md
+++ b/docs/content/en/functions/countrunes.md
@@ -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.
diff --git a/docs/content/en/functions/countwords.md b/docs/content/en/functions/countwords.md
index 44f9360c9..40a7b39e5 100644
--- a/docs/content/en/functions/countwords.md
+++ b/docs/content/en/functions/countwords.md
@@ -15,7 +15,6 @@ workson: []
 hugoversion:
 relatedfuncs: [countrunes]
 deprecated: false
-aliases: [/functions/countwords/]
 ---
 
 The template function works similar to the [.WordCount page variable][pagevars].
diff --git a/docs/content/en/functions/default.md b/docs/content/en/functions/default.md
index 4f34ed37a..1b5a9fb6f 100644
--- a/docs/content/en/functions/default.md
+++ b/docs/content/en/functions/default.md
@@ -18,7 +18,7 @@ hugoversion:
 relatedfuncs: []
 deprecated: false
 draft: false
-aliases: [/functions/default/]
+aliases: []
 needsexamples: false
 ---
 
diff --git a/docs/content/en/news/0.46-relnotes/featured-hugo-46-poster.png b/docs/content/en/news/0.46-relnotes/featured-hugo-46-poster.png
new file mode 100644
index 000000000..c00622e04
--- /dev/null
+++ b/docs/content/en/news/0.46-relnotes/featured-hugo-46-poster.png
diff --git a/docs/content/en/news/0.46-relnotes/index.md b/docs/content/en/news/0.46-relnotes/index.md
index c793d7edc..8b065c2ef 100644
--- a/docs/content/en/news/0.46-relnotes/index.md
+++ b/docs/content/en/news/0.46-relnotes/index.md
@@ -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"]
 ---
 
diff --git a/docs/content/en/templates/404.md b/docs/content/en/templates/404.md
index 64ebe1694..eba2d95df 100644
--- a/docs/content/en/templates/404.md
+++ b/docs/content/en/templates/404.md
@@ -13,7 +13,7 @@ menu:
     weight: 120
 weight: 120	#rem
 draft: false
-aliases: [/templates/404/]
+aliases: []
 toc: false
 ---
 
diff --git a/docs/content/en/templates/introduction.md b/docs/content/en/templates/introduction.md
index 7f3a862ef..0b9ad051b 100644
--- a/docs/content/en/templates/introduction.md
+++ b/docs/content/en/templates/introduction.md
@@ -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
 ---
 
diff --git a/docs/content/en/templates/rss.md b/docs/content/en/templates/rss.md
index 834cb1277..715bc2a48 100644
--- a/docs/content/en/templates/rss.md
+++ b/docs/content/en/templates/rss.md
@@ -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 -}}
 ```
 
diff --git a/docs/content/en/tools/_index.md b/docs/content/en/tools/_index.md
index 47cfeb1e3..5781f5c0c 100644
--- a/docs/content/en/tools/_index.md
+++ b/docs/content/en/tools/_index.md
@@ -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.
diff --git a/docs/content/en/tools/migrations.md b/docs/content/en/tools/migrations.md
index 737b6209b..054e9984a 100644
--- a/docs/content/en/tools/migrations.md
+++ b/docs/content/en/tools/migrations.md
@@ -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.
\ No newline at end of file
+- [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.
diff --git a/docs/content/en/variables/page.md b/docs/content/en/variables/page.md
index a5de1b442..7be94a67b 100644
--- a/docs/content/en/variables/page.md
+++ b/docs/content/en/variables/page.md
@@ -15,7 +15,7 @@ menu:
     weight: 20
 weight: 20
 sections_weight: 20
-aliases: [/variables/page/]
+aliases: []
 toc: true
 ---