Merge pull request jekyll#5744 from DirtyF/pull/docs-use-defaults

Merge pull request 5744
markdownGO · Jan 11, 2017 · 9b71cf7 · 9b71cf7
2 parents 07d161c + 74e6ef8
commit 9b71cf7
Show file tree

Hide file tree

Showing 101 changed files with 16 additions and 102 deletions.
diff --git a/Rakefile b/Rakefile
@@ -105,7 +105,6 @@ def siteify_file(file, overrides_front_matter = {})
   slug  = File.basename(file, ".markdown").downcase
   front_matter = {
     "title"     => title,
-    "layout"    => "docs",
     "permalink" => "/docs/#{slug}/",
     "note"      => "This file is autogenerated. Edit /#{file} instead."
   }.merge(overrides_front_matter)

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -10,6 +10,21 @@ help_url: https://github.com/jekyll/jekyll-help
 
 timezone: America/Los_Angeles
 
+defaults:
+  -
+    scope:
+      path: "_docs"
+      type: "docs"
+    values:
+      layout: "docs"
+  -
+    scope:
+      path: "_posts"
+      type: "posts"
+    values:
+      layout: "news_item"
+
+
 collections:
   docs:
     permalink: /:collection/:path/

diff --git a/docs/_docs/assets.md b/docs/_docs/assets.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Assets
 permalink: /docs/assets/
 ---

diff --git a/docs/_docs/collections.md b/docs/_docs/collections.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Collections
 permalink: /docs/collections/
 ---

diff --git a/docs/_docs/conduct.md b/docs/_docs/conduct.md
@@ -1,6 +1,5 @@
 ---
 title: Code of Conduct
-layout: docs
 permalink: "/docs/conduct/"
 note: This file is autogenerated. Edit /CONDUCT.markdown instead.
 redirect_from: "/conduct/index.html"

diff --git a/docs/_docs/configuration.md b/docs/_docs/configuration.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Configuration
 permalink: /docs/configuration/
 ---

diff --git a/docs/_docs/continuous-integration.md b/docs/_docs/continuous-integration.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Continuous Integration
 permalink: /docs/continuous-integration/
 ---

diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
@@ -1,6 +1,5 @@
 ---
 title: Contributing
-layout: docs
 permalink: "/docs/contributing/"
 note: This file is autogenerated. Edit /.github/CONTRIBUTING.markdown instead.
 ---

diff --git a/docs/_docs/datafiles.md b/docs/_docs/datafiles.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Data Files
 permalink: /docs/datafiles/
 ---

diff --git a/docs/_docs/deployment-methods.md b/docs/_docs/deployment-methods.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Deployment methods
 permalink: /docs/deployment-methods/
 ---

diff --git a/docs/_docs/drafts.md b/docs/_docs/drafts.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Working with drafts
 permalink: /docs/drafts/
 ---

diff --git a/docs/_docs/extras.md b/docs/_docs/extras.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Extras
 permalink: /docs/extras/
 ---

diff --git a/docs/_docs/frontmatter.md b/docs/_docs/frontmatter.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Front Matter
 permalink: /docs/frontmatter/
 ---

diff --git a/docs/_docs/github-pages.md b/docs/_docs/github-pages.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: GitHub Pages
 permalink: /docs/github-pages/
 ---

diff --git a/docs/_docs/history.md b/docs/_docs/history.md
@@ -1,6 +1,5 @@
 ---
 title: History
-layout: docs
 permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---

diff --git a/docs/_docs/includes.md b/docs/_docs/includes.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Includes
 permalink: /docs/includes/
 ---

diff --git a/docs/_docs/index.md b/docs/_docs/index.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Welcome
 permalink: /docs/home/
 redirect_from: /docs/index.html

diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Installation
 permalink: /docs/installation/
 ---

diff --git a/docs/_docs/maintaining/affinity-team-captain.md b/docs/_docs/maintaining/affinity-team-captain.md
@@ -1,6 +1,5 @@
 ---
 title: Affinity Team Captains
-layout: docs
 ---
 
 **This guide is for affinity team captains.** These special people are **team maintainers** of one of our [affinity teams][] and help triage and evaluate the issues and contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/avoiding-burnout.md b/docs/_docs/maintaining/avoiding-burnout.md
@@ -1,6 +1,5 @@
 ---
 title: "Avoiding Burnout"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/becoming-a-maintainer.md b/docs/_docs/maintaining/becoming-a-maintainer.md
@@ -1,6 +1,5 @@
 ---
 title: "Becoming a Maintainer"
-layout: docs
 ---
 
 **This guide is for contributors.** These special people have contributed to one or more of Jekyll's repositories, but do not yet have write access to any. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Maintaining Jekyll
 permalink: /docs/maintaining/
 ---

diff --git a/docs/_docs/maintaining/merging-a-pull-request.md b/docs/_docs/maintaining/merging-a-pull-request.md
@@ -1,6 +1,5 @@
 ---
 title: "Merging a Pull Request"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/reviewing-a-pull-request.md b/docs/_docs/maintaining/reviewing-a-pull-request.md
@@ -1,6 +1,5 @@
 ---
 title: "Reviewing a Pull Request"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/special-labels.md b/docs/_docs/maintaining/special-labels.md
@@ -1,6 +1,5 @@
 ---
 title: "Special Labels"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/maintaining/triaging-an-issue.md b/docs/_docs/maintaining/triaging-an-issue.md
@@ -1,6 +1,5 @@
 ---
 title: "Triaging an Issue"
-layout: docs
 ---
 
 **This guide is for maintainers.** These special people have **write access** to one or more of Jekyll's repositories and help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.

diff --git a/docs/_docs/migrations.md b/docs/_docs/migrations.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Blog migrations
 permalink: /docs/migrations/
 ---

diff --git a/docs/_docs/pages.md b/docs/_docs/pages.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Creating pages
 permalink: /docs/pages/
 ---

diff --git a/docs/_docs/pagination.md b/docs/_docs/pagination.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Pagination
 permalink: /docs/pagination/
 ---

diff --git a/docs/_docs/permalinks.md b/docs/_docs/permalinks.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Permalinks
 permalink: /docs/permalinks/
 ---

diff --git a/docs/_docs/plugins.md b/docs/_docs/plugins.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Plugins
 permalink: /docs/plugins/
 ---

diff --git a/docs/_docs/posts.md b/docs/_docs/posts.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Writing posts
 permalink: /docs/posts/
 ---

diff --git a/docs/_docs/quickstart.md b/docs/_docs/quickstart.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Quick-start guide
 permalink: /docs/quickstart/
 ---

diff --git a/docs/_docs/resources.md b/docs/_docs/resources.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Resources
 permalink: /docs/resources/
 ---

diff --git a/docs/_docs/sites.md b/docs/_docs/sites.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Sites using Jekyll
 permalink: /docs/sites/
 ---

diff --git a/docs/_docs/static_files.md b/docs/_docs/static_files.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Static Files
 permalink: /docs/static-files/
 ---

diff --git a/docs/_docs/structure.md b/docs/_docs/structure.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Directory structure
 permalink: /docs/structure/
 ---

diff --git a/docs/_docs/templates.md b/docs/_docs/templates.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Templates
 permalink: /docs/templates/
 ---

diff --git a/docs/_docs/themes.md b/docs/_docs/themes.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Themes
 permalink: /docs/themes/
 ---

diff --git a/docs/_docs/troubleshooting.md b/docs/_docs/troubleshooting.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Troubleshooting
 permalink: /docs/troubleshooting/
 ---

diff --git a/docs/_docs/upgrading/0-to-2.md b/docs/_docs/upgrading/0-to-2.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Upgrading from 0.x to 2.x
 permalink: /docs/upgrading/0-to-2/
 ---

diff --git a/docs/_docs/upgrading/2-to-3.md b/docs/_docs/upgrading/2-to-3.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Upgrading from 2.x to 3.x
 permalink: /docs/upgrading/2-to-3/
 ---

diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Basic Usage
 permalink: /docs/usage/
 ---

diff --git a/docs/_docs/variables.md b/docs/_docs/variables.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Variables
 permalink: /docs/variables/
 ---

diff --git a/docs/_docs/windows.md b/docs/_docs/windows.md
@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Jekyll on Windows
 permalink: /docs/windows/
 ---

diff --git a/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown b/docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.0 Released"
 date: "2013-05-06 02:12:52 +0200"
 author: parkr

diff --git a/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown b/docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.1 Released"
 date: "2013-05-08 23:46:11 +0200"
 author: parkr

diff --git a/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown b/docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.2 Released"
 date: "2013-05-12 14:45:00 +0200"
 author: parkr

diff --git a/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown b/docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.3 Released"
 date: "2013-06-07 21:02:13 +0200"
 author: parkr

diff --git a/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown b/docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.0 Released"
 date: "2013-07-14 19:38:02 +0200"
 author: parkr

diff --git a/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown b/docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.1 Released"
 date: "2013-07-24 22:24:14 +0200"
 author: parkr

diff --git a/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.0.4 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: mattr-

diff --git a/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.1.2 Released"
 date: "2013-07-25 09:08:38 +0200"
 author: parkr

diff --git a/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown b/docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll 1.2.0 Released"
 date: "2013-09-06 22:02:41 -0400"
 author: parkr

diff --git a/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.2.1 Released'
 date: 2013-09-14 20:46:50 -0400
 author: parkr

diff --git a/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.0.rc1 Released'
 date: 2013-10-28 20:14:39 -0500
 author: mattr-

diff --git a/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown b/docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.0 Released'
 date: 2013-11-04 21:46:02 -0600
 author: mattr-

diff --git a/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown b/docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.3.1 Released'
 date: 2013-11-26 19:52:20 -0600
 author: mattr-

diff --git a/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown b/docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.0 Released'
 date: 2013-12-07 13:55:28 -0600
 author: mattr-

diff --git a/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.1 Released'
 date: 2013-12-09 20:44:13 -0600
 author: mattr-

diff --git a/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown b/docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.2 Released'
 date: 2013-12-16 19:48:13 -0500
 author: parkr

diff --git a/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.4.3 Released'
 date: 2014-01-13 17:43:32 -0800
 author: benbalter