Permalink
Browse files

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

Merge pull request 5744
  • Loading branch information...
2 parents 07d161c + 74e6ef8 commit 9b71cf7556bb4f468959c0325ea3eeb94012ea2f @jekyllbot jekyllbot committed on GitHub Jan 11, 2017
Showing with 16 additions and 102 deletions.
  1. +0 −1 Rakefile
  2. +15 −0 docs/_config.yml
  3. +0 −1 docs/_docs/assets.md
  4. +0 −1 docs/_docs/collections.md
  5. +0 −1 docs/_docs/conduct.md
  6. +0 −1 docs/_docs/configuration.md
  7. +0 −1 docs/_docs/continuous-integration.md
  8. +0 −1 docs/_docs/contributing.md
  9. +0 −1 docs/_docs/datafiles.md
  10. +0 −1 docs/_docs/deployment-methods.md
  11. +0 −1 docs/_docs/drafts.md
  12. +0 −1 docs/_docs/extras.md
  13. +0 −1 docs/_docs/frontmatter.md
  14. +0 −1 docs/_docs/github-pages.md
  15. +0 −1 docs/_docs/history.md
  16. +0 −1 docs/_docs/includes.md
  17. +0 −1 docs/_docs/index.md
  18. +0 −1 docs/_docs/installation.md
  19. +0 −1 docs/_docs/maintaining/affinity-team-captain.md
  20. +0 −1 docs/_docs/maintaining/avoiding-burnout.md
  21. +0 −1 docs/_docs/maintaining/becoming-a-maintainer.md
  22. +0 −1 docs/_docs/maintaining/index.md
  23. +0 −1 docs/_docs/maintaining/merging-a-pull-request.md
  24. +0 −1 docs/_docs/maintaining/reviewing-a-pull-request.md
  25. +0 −1 docs/_docs/maintaining/special-labels.md
  26. +0 −1 docs/_docs/maintaining/triaging-an-issue.md
  27. +0 −1 docs/_docs/migrations.md
  28. +0 −1 docs/_docs/pages.md
  29. +0 −1 docs/_docs/pagination.md
  30. +0 −1 docs/_docs/permalinks.md
  31. +0 −1 docs/_docs/plugins.md
  32. +0 −1 docs/_docs/posts.md
  33. +0 −1 docs/_docs/quickstart.md
  34. +0 −1 docs/_docs/resources.md
  35. +0 −1 docs/_docs/sites.md
  36. +0 −1 docs/_docs/static_files.md
  37. +0 −1 docs/_docs/structure.md
  38. +0 −1 docs/_docs/templates.md
  39. +0 −1 docs/_docs/themes.md
  40. +0 −1 docs/_docs/troubleshooting.md
  41. +0 −1 docs/_docs/upgrading/0-to-2.md
  42. +0 −1 docs/_docs/upgrading/2-to-3.md
  43. +0 −1 docs/_docs/usage.md
  44. +0 −1 docs/_docs/variables.md
  45. +0 −1 docs/_docs/windows.md
  46. +0 −1 docs/_posts/2013-05-06-jekyll-1-0-0-released.markdown
  47. +0 −1 docs/_posts/2013-05-08-jekyll-1-0-1-released.markdown
  48. +0 −1 docs/_posts/2013-05-12-jekyll-1-0-2-released.markdown
  49. +0 −1 docs/_posts/2013-06-07-jekyll-1-0-3-released.markdown
  50. +0 −1 docs/_posts/2013-07-14-jekyll-1-1-0-released.markdown
  51. +0 −1 docs/_posts/2013-07-24-jekyll-1-1-1-released.markdown
  52. +0 −1 docs/_posts/2013-07-25-jekyll-1-0-4-released.markdown
  53. +0 −1 docs/_posts/2013-07-25-jekyll-1-1-2-released.markdown
  54. +0 −1 docs/_posts/2013-09-06-jekyll-1-2-0-released.markdown
  55. +0 −1 docs/_posts/2013-09-14-jekyll-1-2-1-released.markdown
  56. +0 −1 docs/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
  57. +0 −1 docs/_posts/2013-11-04-jekyll-1-3-0-released.markdown
  58. +0 −1 docs/_posts/2013-11-26-jekyll-1-3-1-released.markdown
  59. +0 −1 docs/_posts/2013-12-07-jekyll-1-4-0-released.markdown
  60. +0 −1 docs/_posts/2013-12-09-jekyll-1-4-1-released.markdown
  61. +0 −1 docs/_posts/2013-12-16-jekyll-1-4-2-released.markdown
  62. +0 −1 docs/_posts/2014-01-13-jekyll-1-4-3-released.markdown
  63. +0 −1 docs/_posts/2014-03-24-jekyll-1-5-0-released.markdown
  64. +0 −1 docs/_posts/2014-03-27-jekyll-1-5-1-released.markdown
  65. +0 −1 docs/_posts/2014-05-06-jekyll-turns-2-0-0.markdown
  66. +0 −1 docs/_posts/2014-05-08-jekyll-2-0-3-released.markdown
  67. +0 −1 docs/_posts/2014-06-04-jekyll-stickers-1-dollar-stickermule.markdown
  68. +0 −1 docs/_posts/2014-06-28-jekyll-turns-21-i-mean-2-1-0.markdown
  69. +0 −1 docs/_posts/2014-07-01-jekyll-2-1-1-released.markdown
  70. +0 −1 docs/_posts/2014-07-29-jekyll-2-2-0-released.markdown
  71. +0 −1 docs/_posts/2014-08-10-jekyll-2-3-0-released.markdown
  72. +0 −1 docs/_posts/2014-09-09-jekyll-2-4-0-released.markdown
  73. +0 −1 docs/_posts/2014-11-06-jekylls-midlife-crisis-jekyll-turns-2-5-0.markdown
  74. +0 −1 docs/_posts/2014-11-08-jekyll-2-5-1-released.markdown
  75. +0 −1 docs/_posts/2014-11-12-jekyll-2-5-2-released.markdown
  76. +0 −1 docs/_posts/2014-12-17-alfredxing-welcome-to-jekyll-core.md
  77. +0 −1 docs/_posts/2014-12-22-jekyll-2-5-3-released.markdown
  78. +0 −1 docs/_posts/2015-01-20-jekyll-meet-and-greet.markdown
  79. +0 −1 docs/_posts/2015-01-24-jekyll-3-0-0-beta1-released.markdown
  80. +1 −2 docs/_posts/2015-02-26-introducing-jekyll-talk.markdown
  81. +0 −1 docs/_posts/2015-10-26-jekyll-3-0-released.markdown
  82. +0 −1 docs/_posts/2015-11-17-jekyll-3-0-1-released.markdown
  83. +0 −1 docs/_posts/2016-01-20-jekyll-3-0-2-released.markdown
  84. +0 −1 docs/_posts/2016-01-24-jekyll-3-1-0-released.markdown
  85. +0 −1 docs/_posts/2016-01-28-jekyll-3-1-1-released.markdown
  86. +0 −1 docs/_posts/2016-02-08-jekyll-3-0-3-released.markdown
  87. +0 −1 docs/_posts/2016-02-19-jekyll-3-1-2-released.markdown
  88. +0 −1 docs/_posts/2016-03-10-making-it-easier-to-contribute-to-jekyll.md
  89. +0 −1 docs/_posts/2016-04-19-jekyll-3-0-4-released.markdown
  90. +0 −2 docs/_posts/2016-04-19-jekyll-3-1-3-released.markdown
  91. +0 −1 docs/_posts/2016-04-26-jekyll-3-0-5-released.markdown
  92. +0 −1 docs/_posts/2016-05-18-jekyll-3-1-4-released.markdown
  93. +0 −1 docs/_posts/2016-05-18-jekyll-3-1-5-released.markdown
  94. +0 −1 docs/_posts/2016-05-19-jekyll-3-1-6-released.markdown
  95. +0 −1 docs/_posts/2016-06-03-update-on-jekyll-s-google-summer-of-code-projects.markdown
  96. +0 −1 docs/_posts/2016-07-26-jekyll-3-2-0-released.markdown
  97. +0 −1 docs/_posts/2016-08-02-jekyll-3-2-1-released.markdown
  98. +0 −1 docs/_posts/2016-08-24-jekyll-admin-initial-release.markdown
  99. +0 −1 docs/_posts/2016-10-06-jekyll-3-3-is-here.md
  100. +0 −1 docs/_posts/2016-11-14-jekyll-3-3-1-released.markdown
  101. +0 −1 rake/site.rake
View
@@ -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)
View
@@ -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/
@@ -1,5 +1,4 @@
---
-layout: docs
title: Assets
permalink: /docs/assets/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Collections
permalink: /docs/collections/
---
@@ -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"
@@ -1,5 +1,4 @@
---
-layout: docs
title: Configuration
permalink: /docs/configuration/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Continuous Integration
permalink: /docs/continuous-integration/
---
@@ -1,6 +1,5 @@
---
title: Contributing
-layout: docs
permalink: "/docs/contributing/"
note: This file is autogenerated. Edit /.github/CONTRIBUTING.markdown instead.
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Data Files
permalink: /docs/datafiles/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Deployment methods
permalink: /docs/deployment-methods/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Working with drafts
permalink: /docs/drafts/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Extras
permalink: /docs/extras/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Front Matter
permalink: /docs/frontmatter/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: GitHub Pages
permalink: /docs/github-pages/
---
@@ -1,6 +1,5 @@
---
title: History
-layout: docs
permalink: "/docs/history/"
note: This file is autogenerated. Edit /History.markdown instead.
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Includes
permalink: /docs/includes/
---
View
@@ -1,5 +1,4 @@
---
-layout: docs
title: Welcome
permalink: /docs/home/
redirect_from: /docs/index.html
@@ -1,5 +1,4 @@
---
-layout: docs
title: Installation
permalink: /docs/installation/
---
@@ -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.
@@ -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.
@@ -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.
@@ -1,5 +1,4 @@
---
-layout: docs
title: Maintaining Jekyll
permalink: /docs/maintaining/
---
@@ -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.
@@ -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.
@@ -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.
@@ -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.
@@ -1,5 +1,4 @@
---
-layout: docs
title: Blog migrations
permalink: /docs/migrations/
---
View
@@ -1,5 +1,4 @@
---
-layout: docs
title: Creating pages
permalink: /docs/pages/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Pagination
permalink: /docs/pagination/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Permalinks
permalink: /docs/permalinks/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Plugins
permalink: /docs/plugins/
---
View
@@ -1,5 +1,4 @@
---
-layout: docs
title: Writing posts
permalink: /docs/posts/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Quick-start guide
permalink: /docs/quickstart/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Resources
permalink: /docs/resources/
---
View
@@ -1,5 +1,4 @@
---
-layout: docs
title: Sites using Jekyll
permalink: /docs/sites/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Static Files
permalink: /docs/static-files/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Directory structure
permalink: /docs/structure/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Templates
permalink: /docs/templates/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Themes
permalink: /docs/themes/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Troubleshooting
permalink: /docs/troubleshooting/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Upgrading from 0.x to 2.x
permalink: /docs/upgrading/0-to-2/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Upgrading from 2.x to 3.x
permalink: /docs/upgrading/2-to-3/
---
View
@@ -1,5 +1,4 @@
---
-layout: docs
title: Basic Usage
permalink: /docs/usage/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Variables
permalink: /docs/variables/
---
@@ -1,5 +1,4 @@
---
-layout: docs
title: Jekyll on Windows
permalink: /docs/windows/
---
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.0.0 Released"
date: "2013-05-06 02:12:52 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.0.1 Released"
date: "2013-05-08 23:46:11 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.0.2 Released"
date: "2013-05-12 14:45:00 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.0.3 Released"
date: "2013-06-07 21:02:13 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.1.0 Released"
date: "2013-07-14 19:38:02 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.1.1 Released"
date: "2013-07-24 22:24:14 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.0.4 Released"
date: "2013-07-25 09:08:38 +0200"
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.1.2 Released"
date: "2013-07-25 09:08:38 +0200"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: "Jekyll 1.2.0 Released"
date: "2013-09-06 22:02:41 -0400"
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.2.1 Released'
date: 2013-09-14 20:46:50 -0400
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.3.0.rc1 Released'
date: 2013-10-28 20:14:39 -0500
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.3.0 Released'
date: 2013-11-04 21:46:02 -0600
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.3.1 Released'
date: 2013-11-26 19:52:20 -0600
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.4.0 Released'
date: 2013-12-07 13:55:28 -0600
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.4.1 Released'
date: 2013-12-09 20:44:13 -0600
author: mattr-
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.4.2 Released'
date: 2013-12-16 19:48:13 -0500
author: parkr
@@ -1,5 +1,4 @@
---
-layout: news_item
title: 'Jekyll 1.4.3 Released'
date: 2014-01-13 17:43:32 -0800
author: benbalter
Oops, something went wrong.

0 comments on commit 9b71cf7

Please sign in to comment.