Use defaults in config

All docs stored in _docs inherit from docs layout
All news items stored in _posts inherit from news-item layout

Rakefile

@@ -101,7 +101,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)

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/

docs/_docs/assets.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Assets
 permalink: /docs/assets/
 ---

docs/_docs/collections.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Collections
 permalink: /docs/collections/
 ---

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"

docs/_docs/configuration.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Configuration
 permalink: /docs/configuration/
 ---

docs/_docs/continuous-integration.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Continuous Integration
 permalink: /docs/continuous-integration/
 ---

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.
 ---

docs/_docs/datafiles.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Data Files
 permalink: /docs/datafiles/
 ---

docs/_docs/deployment-methods.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Deployment methods
 permalink: /docs/deployment-methods/
 ---

docs/_docs/drafts.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Working with drafts
 permalink: /docs/drafts/
 ---

docs/_docs/extras.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Extras
 permalink: /docs/extras/
 ---

docs/_docs/frontmatter.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Front Matter
 permalink: /docs/frontmatter/
 ---

docs/_docs/github-pages.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: GitHub Pages
 permalink: /docs/github-pages/
 ---

docs/_docs/history.md

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

docs/_docs/includes.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Includes
 permalink: /docs/includes/
 ---

docs/_docs/index.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Welcome
 permalink: /docs/home/
 redirect_from: /docs/index.html

docs/_docs/installation.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Installation
 permalink: /docs/installation/
 ---

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.

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.

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.

docs/_docs/maintaining/index.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Maintaining Jekyll
 permalink: /docs/maintaining/
 ---

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.

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.

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.

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.

docs/_docs/migrations.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Blog migrations
 permalink: /docs/migrations/
 ---

docs/_docs/pages.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Creating pages
 permalink: /docs/pages/
 ---

docs/_docs/pagination.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Pagination
 permalink: /docs/pagination/
 ---

docs/_docs/permalinks.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Permalinks
 permalink: /docs/permalinks/
 ---

docs/_docs/plugins.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Plugins
 permalink: /docs/plugins/
 ---

docs/_docs/posts.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Writing posts
 permalink: /docs/posts/
 ---

docs/_docs/quickstart.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Quick-start guide
 permalink: /docs/quickstart/
 ---

docs/_docs/resources.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Resources
 permalink: /docs/resources/
 ---

docs/_docs/sites.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Sites using Jekyll
 permalink: /docs/sites/
 ---

docs/_docs/static_files.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Static Files
 permalink: /docs/static-files/
 ---

docs/_docs/structure.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Directory structure
 permalink: /docs/structure/
 ---

docs/_docs/templates.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Templates
 permalink: /docs/templates/
 ---

docs/_docs/themes.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Themes
 permalink: /docs/themes/
 ---

docs/_docs/troubleshooting.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Troubleshooting
 permalink: /docs/troubleshooting/
 ---

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/
 ---

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/
 ---

docs/_docs/usage.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Basic Usage
 permalink: /docs/usage/
 ---

docs/_docs/variables.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Variables
 permalink: /docs/variables/
 ---

docs/_docs/windows.md

@@ -1,5 +1,4 @@
 ---
-layout: docs
 title: Jekyll on Windows
 permalink: /docs/windows/
 ---

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

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

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

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

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

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

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-

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

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

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

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-

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-

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-

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-

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-

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

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

docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.5.0 Released'
 date: 2014-03-24 20:37:59 -0400
 author: parkr

docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 1.5.1 Released'
 date: 2014-03-27 22:43:48 -0400
 author: parkr

docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll turns 2.0.0'
 author: parkr
 version: 2.0.0

docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.0.3 Released'
 date: 2014-05-08 22:43:17 -0400
 author: parkr

docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Pick Up your $1 Jekyll Sticker'
 date: 2014-06-04 15:46:53 -0400
 author: parkr

docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll Turns 21! Err... I mean 2.1.0.'
 date: 2014-06-28 17:26:59 -0400
 author: parkr

docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.1.1 Released'
 date: 2014-07-01 20:16:43 -0400
 author: parkr

docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.2.0 Released'
 date: 2014-07-29 18:59:13 -0400
 author: parkr

docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.3.0 Released'
 date: 2014-08-10 20:38:34 -0400
 author: parkr

docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'A Wild Jekyll 2.4.0 Appeared!'
 date: 2014-09-09 21:10:33 -0700
 author: parkr

docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll's Mid-Life Crisis (Or, Jekyll turns 2.5.0)"
 date: 2014-11-05 10:48:22 -0800
 author: parkr

docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.5.1 Released'
 date: 2014-11-09 09:47:52 -0800
 author: parkr

docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 2.5.2 Released'
 date: 2014-11-12 18:49:08 -0800
 author: parkr

docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Alfred Xing has joined the Jekyll core team'
 date: 2014-12-17 11:16:21 -0800
 author: parkr

docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll Release for the Holidays! v2.5.3 Out'
 date: 2014-12-22 09:03:30 -0500
 author: parkr

docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll Meet & Greet at GitHub HQ"
 date: "2015-01-20 19:23:12 -0800"
 author: parkr

docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.0.beta1 Released'
 date: 2015-01-24 00:42:31 -0800
 author: parkr

docs/_posts/2015-02-26-introducing-jekyll-talk.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Join the Discussion at Jekyll Talk'
 date: 2015-02-26 21:06:51 -0800
 author: alfredxing

docs/_posts/2015-10-26-jekyll-3-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0 Released'
 date: 2015-10-26 15:37:30 -0700
 author: parkr

docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.1 Released'
 date: 2015-11-17 22:04:39 -0800
 author: parkr

docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.2 Released'
 date: 2016-01-20 14:08:18 -0800
 author: parkr

docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.0 Released'
 date: 2016-01-24 13:16:12 -0800
 author: parkr

docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.1 Released'
 date: 2016-01-28 17:21:50 -0800
 author: parkr

docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.3 Released'
 date: 2016-02-08 10:39:08 -0800
 author: parkr

docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.2 Released!'
 date: 2016-02-19 15:24:00 -0800
 author: parkr

docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md

@@ -1,7 +1,6 @@
 ---
 title: Making it easier to contribute to Jekyll
 description: We've made it easier to contribute to Jekyll by updating our contributing documentation and introducing Jekyll Affinity Teams, teams dedicated to specific aspects of the project.
-layout: news_item
 author: benbalter
 categories: [community]
 ---

docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.4 Released'
 date: 2016-04-19 10:26:12 -0700
 author: parkr

docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.3 Released'
 date: 2016-04-19 10:26:16 -0700
 author: parkr
@@ -15,4 +14,3 @@ v3.1.3 is a patch release which fixes the follow two issues:
 Both of these issues have been resolved. For more information, check out [the full history](/docs/history/#v3-1-3).
 
 Happy Jekylling!
-

docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.0.5 Released'
 date: 2016-04-26 17:40:44 -0700
 author: parkr

docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.4 "Stability Sam" Released'
 date: 2016-05-18 16:50:37 -0700
 author: parkr

docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.5 Released'
 date: 2016-05-18 21:35:27 -0700
 author: parkr

docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.1.6 Released'
 date: 2016-05-19 12:48:14 -0700
 author: parkr

docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll's Google Summer of Code Project: The CMS You Always Wanted"
 date: "2016-06-03 13:21:02 -0700"
 author: parkr

docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll turns 3.2'
 date: 2016-07-26 15:06:49 -0700
 author: parkr

docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.2.1 Released with Fix for Windows'
 date: 2016-08-02 13:20:11 -0700
 author: parkr

docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: "Jekyll Admin Initial Release"
 date: "2016-08-25 09:50:00 +0300"
 author: mertkahyaoglu

docs/_posts/2016-10-06-jekyll-3-3-is-here.md

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.3 is here with better theme support, new URL filters, and tons more'
 date: 2016-10-06 11:10:38 -0700
 author: parkr

docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown

@@ -1,5 +1,4 @@
 ---
-layout: news_item
 title: 'Jekyll 3.3.1 Released'
 date: 2016-11-14 14:29:59 -0800
 author: parkr