Merge commit 'e509cac533600cf4fa8382c9cdab78ddd82db688'

3 files changed, 11 insertions, 10 deletions

diff --git a/docs/archetypes/functions.md b/docs/archetypes/functions.md
index 891458daa..cb0e7c930 100644
--- a/docs/archetypes/functions.md
+++ b/docs/archetypes/functions.md
@@ -1,11 +1,14 @@
 ---
-title: {{ replace .Name "-" " " | title }}
-description: ""
-signature: []
+title: {{ replace .File.ContentBaseName "-" " " | title }}
+description:
 categories: [functions]
 keywords: []
 menu:
   docs:
     parent: functions
-relatedfuncs: []
+function:
+  aliases: []
+  returnType:
+  signatures: []
+relatedFunctions: []
 ---
diff --git a/docs/archetypes/news/index.md b/docs/archetypes/news/index.md
index 42e207e6a..fcc5b5835 100644
--- a/docs/archetypes/news/index.md
+++ b/docs/archetypes/news/index.md
@@ -1,6 +1,5 @@
 ---
-title: "{{ replace .Name "-" " " | title }}"
-description: ""
+title: {{ replace .File.ContentBaseName "-" " " | title }}
+description:
 date: {{ .Date }}
 ---
-
diff --git a/docs/archetypes/showcase/index.md b/docs/archetypes/showcase/index.md
index a21bb9726..04d454575 100644
--- a/docs/archetypes/showcase/index.md
+++ b/docs/archetypes/showcase/index.md
@@ -1,9 +1,9 @@
 ---
 
-title: {{ replace .Name "-" " " | title }}
+title: {{ replace .File.ContentBaseName "-" " " | title }}
 date: {{ now.Format "2006-01-02" }}
 
-description: "A short description of this page."
+description: A short description of this page.
 
 # The URL to the site on the internet.
 siteURL: https://gohugo.io/
@@ -34,4 +34,3 @@ bio.md
 
 featured.png
 : A reasonably sized screenshot of your website. It can be named anything, but the name must start with "featured". The sample image is `1500x750` (2:1 aspect ratio).
-