jekyll · jekyllbot · Nov 2, 2016 · Oct 6, 2016 · Oct 6, 2016 · Oct 6, 2016
diff --git a/Rakefile b/Rakefile
@@ -27,6 +27,10 @@ def docs_name
   "#{name}-docs"
 end
 
+def docs_folder
+  "docs"
+end
+
 def gemspec_file
   "#{name}.gemspec"
 end
@@ -102,7 +106,7 @@ def siteify_file(file, overrides_front_matter = {})
     "note"      => "This file is autogenerated. Edit /#{file} instead."
   }.merge(overrides_front_matter)
   contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}"
-  File.write("site/_docs/#{slug}.md", contents)
+  File.write("#{docs_folder}/_docs/#{slug}.md", contents)
 end
 
 def content_for(file)

diff --git a/site/.gitignore → docs/.gitignore b/site/.gitignore → docs/.gitignore
diff --git a/site/404.html → docs/404.html b/site/404.html → docs/404.html
diff --git a/site/CNAME → docs/CNAME b/site/CNAME → docs/CNAME
diff --git a/site/_config.yml → docs/_config.yml b/site/_config.yml → docs/_config.yml
@@ -1,6 +1,5 @@
 markdown: kramdown
 highlighter: rouge
-permalink: /news/:year/:month/:day/:title/
 
 gauges_id: 503c5af6613f5d0f19000027
 google_analytics_id: UA-50755011-1
@@ -14,6 +13,9 @@ timezone: America/Los_Angeles
 collections:
   docs:
     output: true
+  posts:
+    permalink: /news/:year/:month/:day/:title/
+    output: true
 
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs

diff --git a/site/_data/docs.yml → docs/_data/docs.yml b/site/_data/docs.yml → docs/_data/docs.yml
@@ -46,5 +46,6 @@
 - title: Meta
   docs:
   - contributing
+  - maintaining
   - conduct
   - history
diff --git a/site/_data/jekyllconf-talks.yml → docs/_data/jekyllconf-talks.yml b/site/_data/jekyllconf-talks.yml → docs/_data/jekyllconf-talks.yml
diff --git a/site/_docs/assets.md → docs/_docs/assets.md b/site/_docs/assets.md → docs/_docs/assets.md
diff --git a/site/_docs/collections.md → docs/_docs/collections.md b/site/_docs/collections.md → docs/_docs/collections.md
diff --git a/site/_docs/conduct.md → docs/_docs/conduct.md b/site/_docs/conduct.md → docs/_docs/conduct.md
diff --git a/site/_docs/configuration.md → docs/_docs/configuration.md b/site/_docs/configuration.md → docs/_docs/configuration.md
diff --git a/site/_docs/continuous-integration.md → docs/_docs/continuous-integration.md b/site/_docs/continuous-integration.md → docs/_docs/continuous-integration.md
diff --git a/site/_docs/contributing.md → docs/_docs/contributing.md b/site/_docs/contributing.md → docs/_docs/contributing.md
diff --git a/site/_docs/datafiles.md → docs/_docs/datafiles.md b/site/_docs/datafiles.md → docs/_docs/datafiles.md
diff --git a/site/_docs/deployment-methods.md → docs/_docs/deployment-methods.md b/site/_docs/deployment-methods.md → docs/_docs/deployment-methods.md
diff --git a/site/_docs/drafts.md → docs/_docs/drafts.md b/site/_docs/drafts.md → docs/_docs/drafts.md
diff --git a/site/_docs/extras.md → docs/_docs/extras.md b/site/_docs/extras.md → docs/_docs/extras.md
diff --git a/site/_docs/frontmatter.md → docs/_docs/frontmatter.md b/site/_docs/frontmatter.md → docs/_docs/frontmatter.md
diff --git a/site/_docs/github-pages.md → docs/_docs/github-pages.md b/site/_docs/github-pages.md → docs/_docs/github-pages.md
diff --git a/site/_docs/history.md → docs/_docs/history.md b/site/_docs/history.md → docs/_docs/history.md
diff --git a/site/_docs/index.md → docs/_docs/index.md b/site/_docs/index.md → docs/_docs/index.md
diff --git a/site/_docs/installation.md → docs/_docs/installation.md b/site/_docs/installation.md → docs/_docs/installation.md
diff --git a/docs/affinity-team-captain.md → ...docs/maintaining/affinity-team-captain.md b/docs/affinity-team-captain.md → ...docs/maintaining/affinity-team-captain.md
@@ -1,6 +1,10 @@
-# Affinity Team Captains
+---
+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.
+{: .note .info }
 
 ## Affinity teams & their captains
 

diff --git a/docs/avoiding-burnout.md → docs/_docs/maintaining/avoiding-burnout.md b/docs/avoiding-burnout.md → docs/_docs/maintaining/avoiding-burnout.md
@@ -1,6 +1,10 @@
-# Maintainers: Avoiding Burnout
+---
+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.
+{: .note .info }
 
 # 1. Use Jekyll
 

diff --git a/docs/becoming-a-maintainer.md → ...docs/maintaining/becoming-a-maintainer.md b/docs/becoming-a-maintainer.md → ...docs/maintaining/becoming-a-maintainer.md
@@ -1,6 +1,10 @@
-# Contributors: Becoming a Maintainer
+---
+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.
+{: .note .info }
 
 So you want to become a maintainer of a Jekyll project? We'd love to have you! Here are some things we like to see from community members before we promote them to maintainers.
 

diff --git a/docs/_docs/maintaining/index.md b/docs/_docs/maintaining/index.md
@@ -0,0 +1,21 @@
+---
+layout: docs
+title: Maintaining Jekyll
+permalink: /docs/maintaining/
+---
+
+**This guide is for Jekyll contributors and maintainers.** These special people contribute to one or more of Jekyll's repositories or help merge the contributions of others. You may find what is written here interesting, but it’s definitely not for everyone.
+{: .note .info }
+
+Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
+
+1. [Affinity teams & their captains](affinity-team-captain/)
+2. [Triaging and issue](triaging-an-issue/)
+3. [Reviewing a pull request](reviewing-a-pull-request/)
+4. [Merging a pull request](merging-a-pull-request/)
+5. [Avoiding burnout](avoiding-burnout/)
+6. [Special Labels](special-labels/)
+
+Interested in becoming a maintainer? Here is some documentation for **contributors**:
+
+1. [Becoming a maintainer](becoming-a-maintainer/)
diff --git a/docs/merging-a-pull-request.md → ...ocs/maintaining/merging-a-pull-request.md b/docs/merging-a-pull-request.md → ...ocs/maintaining/merging-a-pull-request.md
@@ -1,6 +1,10 @@
-# Maintainers: Merging a Pull Request
+---
+title: "Merging a Pull Request"
+layout: docs
+---
 
 **This guide
10000
 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.
+{: .note .info }
 
 ## Code Review
 

diff --git a/docs/reviewing-a-pull-request.md → ...s/maintaining/reviewing-a-pull-request.md b/docs/reviewing-a-pull-request.md → ...s/maintaining/reviewing-a-pull-request.md
@@ -1,6 +1,10 @@
-# Maintainers: Reviewing a Pull Request
+---
+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.
+{: .note .info }
 
 ## Respond Kindly
 
@@ -41,4 +45,3 @@ A pull request may be merged once two maintainers have reviewed the pull request
 ## Think Security
 
 We owe it to our users to ensure that using a theme from the community or building someone else's site doesn't come with built-in security vulnerabilities. Things like where files may be read from and written to are important to keep secure. Jekyll is also the basis for hosted services such as [GitHub Pages](https://pages.github.com), which cannot upgrade when security issues are introduced.
-
diff --git a/docs/special-labels.md → docs/_docs/maintaining/special-labels.md b/docs/special-labels.md → docs/_docs/maintaining/special-labels.md
@@ -1,6 +1,10 @@
-# Maintainers: Special Labels
+---
+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.
+{: .note .info }
 
 We use a series of "special labels" on GitHub.com to automate handling of some parts of the pull request and issue process. @jekyllbot may automatically apply or remove certain labels based on actions taken by users or maintainers. Below are the labels and how they work:
 

diff --git a/docs/triaging-an-issue.md → docs/_docs/maintaining/triaging-an-issue.md b/docs/triaging-an-issue.md → docs/_docs/maintaining/triaging-an-issue.md
@@ -1,6 +1,10 @@
-# Maintainers: Triaging an Issue
+---
+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.
+{: .note .info }
 
 Before evaluating an issue, it is important to identify if it is a feature
 request or a bug. For the Jekyll project the following definitions are used

diff --git a/site/_docs/migrations.md → docs/_docs/migrations.md b/site/_docs/migrations.md → docs/_docs/migrations.md
diff --git a/site/_docs/pages.md → docs/_docs/pages.md b/site/_docs/pages.md → docs/_docs/pages.md
diff --git a/site/_docs/pagination.md → docs/_docs/pagination.md b/site/_docs/pagination.md → docs/_docs/pagination.md
diff --git a/site/_docs/permalinks.md → docs/_docs/permalinks.md b/site/_docs/permalinks.md → docs/_docs/permalinks.md
diff --git a/site/_docs/plugins.md → docs/_docs/plugins.md b/site/_docs/plugins.md → docs/_docs/plugins.md
diff --git a/site/_docs/posts.md → docs/_docs/posts.md b/site/_docs/posts.md → docs/_docs/posts.md
diff --git a/site/_docs/quickstart.md → docs/_docs/quickstart.md b/site/_docs/quickstart.md → docs/_docs/quickstart.md
diff --git a/site/_docs/resources.md → docs/_docs/resources.md b/site/_docs/resources.md → docs/_docs/resources.md
diff --git a/site/_docs/sites.md → docs/_docs/sites.md b/site/_docs/sites.md → docs/_docs/sites.md
diff --git a/site/_docs/static_files.md → docs/_docs/static_files.md b/site/_docs/static_files.md → docs/_docs/static_files.md
diff --git a/site/_docs/structure.md → docs/_docs/structure.md b/site/_docs/structure.md → docs/_docs/structure.md
diff --git a/site/_docs/templates.md → docs/_docs/templates.md b/site/_docs/templates.md → docs/_docs/templates.md
diff --git a/site/_docs/themes.md → docs/_docs/themes.md b/site/_docs/themes.md → docs/_docs/themes.md
diff --git a/site/_docs/troubleshooting.md → docs/_docs/troubleshooting.md b/site/_docs/troubleshooting.md → docs/_docs/troubleshooting.md
diff --git a/site/_docs/upgrading.md → docs/_docs/upgrading.md b/site/_docs/upgrading.md → docs/_docs/upgrading.md
diff --git a/site/_docs/upgrading/0-to-2.md → docs/_docs/upgrading/0-to-2.md b/site/_docs/upgrading/0-to-2.md → docs/_docs/upgrading/0-to-2.md
diff --git a/site/_docs/upgrading/2-to-3.md → docs/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md → docs/_docs/upgrading/2-to-3.md
diff --git a/site/_docs/usage.md → docs/_docs/usage.md b/site/_docs/usage.md → docs/_docs/usage.md
diff --git a/site/_docs/variables.md → docs/_docs/variables.md b/site/_docs/variables.md → docs/_docs/variables.md
diff --git a/site/_docs/windows.md → docs/_docs/windows.md b/site/_docs/windows.md → docs/_docs/windows.md
@@ -16,8 +16,10 @@ A quick way to install Jekyll is to follow the [installation instructions by Dav
  2. Install Ruby via Chocolatey: `choco install ruby -y`
  3. Reopen a command prompt and install Jekyll: `gem install jekyll`
 
-For a more conventional way of installing Jekyll you can follow the [installation instruction by Julian Thilo][windows-installation]. The instructions were written for Ruby 2.0.0, but should work for later
-versions [prior to 2.2][hitimes-issue].
+For a more conventional way of installing Jekyll you can follow the [installation instructions by Sverrir Sigmundarson][windows-installjekyll3]. These instructions are for newer versions of Ruby 2.2.5 and Jekyll 3.
+
+For instructions for older versions of Ruby 2.0.0 ([prior to 2.2][hitimes-issue]) and Jekyll 2 and older you should follow the [installation instruction by Julian Thilo][windows-installation].
+
 
 ## Encoding
 
@@ -34,6 +36,7 @@ $ chcp 65001
 ```
 
 [windows-installation]: http://jekyll-windows.juthilo.com/
+[windows-installjekyll3]: https://labs.sverrirs.com/jekyll/
 [hitimes-issue]: https://github.com/copiousfreetime/hitimes/issues/40
 
 ## Auto-regeneration

diff --git a/site/_includes/analytics.html → docs/_includes/analytics.html b/site/_includes/analytics.html → docs/_includes/analytics.html
diff --git a/site/_includes/anchor_links.html → docs/_includes/anchor_links.html b/site/_includes/anchor_links.html → docs/_includes/anchor_links.html
diff --git a/site/_includes/docs_contents.html → docs/_includes/docs_contents.html b/site/_includes/docs_contents.html → docs/_includes/docs_contents.html
diff --git a/site/_includes/docs_contents_mobile.html → docs/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html → docs/_includes/docs_contents_mobile.html
diff --git a/site/_includes/docs_option.html → docs/_includes/docs_option.html b/site/_includes/docs_option.html → docs/_includes/docs_option.html
diff --git a/site/_includes/docs_ul.html → docs/_includes/docs_ul.html b/site/_includes/docs_ul.html → docs/_includes/docs_ul.html
diff --git a/site/_includes/footer.html → docs/_includes/footer.html b/site/_includes/footer.html → docs/_includes/footer.html
diff --git a/site/_includes/header.html → docs/_includes/header.html b/site/_includes/header.html → docs/_includes/header.html
diff --git a/site/_includes/news_contents.html → docs/_includes/news_contents.html b/site/_includes/news_contents.html → docs/_includes/news_contents.html
diff --git a/site/_includes/news_contents_mobile.html → docs/_includes/news_contents_mobile.html b/site/_includes/news_contents_mobile.html → docs/_includes/news_contents_mobile.html
diff --git a/site/_includes/news_item.html → docs/_includes/news_item.html b/site/_includes/news_item.html → docs/_includes/news_item.html
diff --git a/site/_includes/primary-nav-items.html → docs/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html → docs/_includes/primary-nav-items.html
diff --git a/site/_includes/section_nav.html → docs/_includes/section_nav.html b/site/_includes/section_nav.html → docs/_includes/section_nav.html
diff --git a/site/_includes/top.html → docs/_includes/top.html b/site/_includes/top.html → docs/_includes/top.html
diff --git a/site/_layouts/default.html → docs/_layouts/default.html b/site/_layouts/default.html → docs/_layouts/default.html
diff --git a/site/_layouts/docs.html → docs/_layouts/docs.html b/site/_layouts/docs.html → docs/_layouts/docs.html
diff --git a/site/_layouts/error.html → docs/_layouts/error.html b/site/_layouts/error.html → docs/_layouts/error.html
diff --git a/site/_layouts/news.html → docs/_layouts/news.html b/site/_layouts/news.html → docs/_layouts/news.html
diff --git a/site/_layouts/news_item.html → docs/_layouts/news_item.html b/site/_layouts/news_item.html → docs/_layouts/news_item.html
diff --git a/site/_layouts/page.html → docs/_layouts/page.html b/site/_layouts/page.html → docs/_layouts/page.html
diff --git a/...2013-05-06-jekyll-1-0-0-released.markdown → ...2013-05-06-jekyll-1-0-0-released.markdown b/...2013-05-06-jekyll-1-0-0-released.markdown → ...2013-05-06-jekyll-1-0-0-released.markdown
diff --git a/...2013-05-08-jekyll-1-0-1-released.markdown → ...2013-05-08-jekyll-1-0-1-released.markdown b/...2013-05-08-jekyll-1-0-1-released.markdown → ...2013-05-08-jekyll-1-0-1-released.markdown
diff --git a/...2013-05-12-jekyll-1-0-2-released.markdown → ...2013-05-12-jekyll-1-0-2-released.markdown b/...2013-05-12-jekyll-1-0-2-released.markdown → ...2013-05-12-jekyll-1-0-2-released.markdown
diff --git a/...2013-06-07-jekyll-1-0-3-released.markdown → ...2013-06-07-jekyll-1-0-3-released.markdown b/...2013-06-07-jekyll-1-0-3-released.markdown → ...2013-06-07-jekyll-1-0-3-released.markdown
diff --git a/...2013-07-14-jekyll-1-1-0-released.markdown → ...2013-07-14-jekyll-1-1-0-released.markdown b/...2013-07-14-jekyll-1-1-0-released.markdown → ...2013-07-14-jekyll-1-1-0-released.markdown
diff --git a/...2013-07-24-jekyll-1-1-1-released.markdown → ...2013-07-24-jekyll-1-1-1-released.markdown b/...2013-07-24-jekyll-1-1-1-released.markdown → ...2013-07-24-jekyll-1-1-1-released.markdown
diff --git a/...2013-07-25-jekyll-1-0-4-released.markdown → ...2013-07-25-jekyll-1-0-4-released.markdown b/...2013-07-25-jekyll-1-0-4-released.markdown → ...2013-07-25-jekyll-1-0-4-released.markdown
diff --git a/...2013-07-25-jekyll-1-1-2-released.markdown → ...2013-07-25-jekyll-1-1-2-released.markdown b/...2013-07-25-jekyll-1-1-2-released.markdown → ...2013-07-25-jekyll-1-1-2-released.markdown
diff --git a/...2013-09-06-jekyll-1-2-0-released.markdown → ...2013-09-06-jekyll-1-2-0-released.markdown b/...2013-09-06-jekyll-1-2-0-released.markdown → ...2013-09-06-jekyll-1-2-0-released.markdown
diff --git a/...2013-09-14-jekyll-1-2-1-released.markdown → ...2013-09-14-jekyll-1-2-1-released.markdown b/...2013-09-14-jekyll-1-2-1-released.markdown → ...2013-09-14-jekyll-1-2-1-released.markdown
diff --git a/...-10-28-jekyll-1-3-0-rc1-released.markdown → ...-10-28-jekyll-1-3-0-rc1-released.markdown b/...-10-28-jekyll-1-3-0-rc1-released.markdown → ...-10-28-jekyll-1-3-0-rc1-released.markdown
diff --git a/...2013-11-04-jekyll-1-3-0-released.markdown → ...2013-11-04-jekyll-1-3-0-released.markdown b/...2013-11-04-jekyll-1-3-0-released.markdown → ...2013-11-04-jekyll-1-3-0-released.markdown
diff --git a/...2013-11-26-jekyll-1-3-1-released.markdown → ...2013-11-26-jekyll-1-3-1-released.markdown b/...2013-11-26-jekyll-1-3-1-released.markdown → ...2013-11-26-jekyll-1-3-1-released.markdown
diff --git a/...2013-12-07-jekyll-1-4-0-released.markdown → ...2013-12-07-jekyll-1-4-0-released.markdown b/...2013-12-07-jekyll-1-4-0-released.markdown → ...2013-12-07-jekyll-1-4-0-released.markdown
diff --git a/...2013-12-09-jekyll-1-4-1-released.markdown → ...2013-12-09-jekyll-1-4-1-released.markdown b/...2013-12-09-jekyll-1-4-1-released.markdown → ...2013-12-09-jekyll-1-4-1-released.markdown
diff --git a/...2013-12-16-jekyll-1-4-2-released.markdown → ...2013-12-16-jekyll-1-4-2-released.markdown b/...2013-12-16-jekyll-1-4-2-released.markdown → ...2013-12-16-jekyll-1-4-2-released.markdown
diff --git a/...2014-01-13-jekyll-1-4-3-released.markdown → ...2014-01-13-jekyll-1-4-3-released.markdown b/...2014-01-13-jekyll-1-4-3-released.markdown → ...2014-01-13-jekyll-1-4-3-released.markdown
diff --git a/...2014-03-24-jekyll-1-5-0-released.markdown → ...2014-03-24-jekyll-1-5-0-released.markdown b/...2014-03-24-jekyll-1-5-0-released.markdown → ...2014-03-24-jekyll-1-5-0-released.markdown
diff --git a/...2014-03-27-jekyll-1-5-1-released.markdown → ...2014-03-27-jekyll-1-5-1-released.markdown b/...2014-03-27-jekyll-1-5-1-released.markdown → ...2014-03-27-jekyll-1-5-1-released.markdown
diff --git a/...ts/2014-05-06-jekyll-turns-2-0-0.markdown → ...ts/2014-05-06-jekyll-turns-2-0-0.markdown b/...ts/2014-05-06-jekyll-turns-2-0-0.markdown → ...ts/2014-05-06-jekyll-turns-2-0-0.markdown
diff --git a/...2014-05-08-jekyll-2-0-3-released.markdown → ...2014-05-08-jekyll-2-0-3-released.markdown b/...2014-05-08-jekyll-2-0-3-released.markdown → ...2014-05-08-jekyll-2-0-3-released.markdown
diff --git a/...ll-stickers-1-dollar-stickermule.markdown → ...ll-stickers-1-dollar-stickermule.markdown b/...ll-stickers-1-dollar-stickermule.markdown → ...ll-stickers-1-dollar-stickermule.markdown
diff --git a/...-28-jekyll-turns-21-i-mean-2-1-0.markdown → ...-28-jekyll-turns-21-i-mean-2-1-0.markdown b/...-28-jekyll-turns-21-i-mean-2-1-0.markdown → ...-28-jekyll-turns-21-i-mean-2-1-0.markdown
diff --git a/...2014-07-01-jekyll-2-1-1-released.markdown → ...2014-07-01-jekyll-2-1-1-released.markdown b/...2014-07-01-jekyll-2-1-1-released.markdown → ...2014-07-01-jekyll-2-1-1-released.markdown
diff --git a/...2014-07-29-jekyll-2-2-0-released.markdown → ...2014-07-29-jekyll-2-2-0-released.markdown b/...2014-07-29-jekyll-2-2-0-released.markdown → ...2014-07-29-jekyll-2-2-0-released.markdown
diff --git a/...2014-08-10-jekyll-2-3-0-released.markdown → ...2014-08-10-jekyll-2-3-0-released.markdown b/...2014-08-10-jekyll-2-3-0-released.markdown → ...2014-08-10-jekyll-2-3-0-released.markdown
diff --git a/...2014-09-09-jekyll-2-4-0-released.markdown → ...2014-09-09-jekyll-2-4-0-released.markdown b/...2014-09-09-jekyll-2-4-0-released.markdown → ...2014-09-09-jekyll-2-4-0-released.markdown
diff --git a/...idlife-crisis-jekyll-turns-2-5-0.markdown → ...idlife-crisis-jekyll-turns-2-5-0.markdown b/...idlife-crisis-jekyll-turns-2-5-0.markdown → ...idlife-crisis-jekyll-turns-2-5-0.markdown
diff --git a/...2014-11-08-jekyll-2-5-1-released.markdown → ...2014-11-08-jekyll-2-5-1-released.markdown b/...2014-11-08-jekyll-2-5-1-released.markdown → ...2014-11-08-jekyll-2-5-1-released.markdown
diff --git a/...2014-11-12-jekyll-2-5-2-released.markdown → ...2014-11-12-jekyll-2-5-2-released.markdown b/...2014-11-12-jekyll-2-5-2-released.markdown → ...2014-11-12-jekyll-2-5-2-released.markdown
diff --git a/...2-17-alfredxing-welcome-to-jekyll-core.md → ...2-17-alfredxing-welcome-to-jekyll-core.md b/...2-17-alfredxing-welcome-to-jekyll-core.md → ...2-17-alfredxing-welcome-to-jekyll-core.md
diff --git a/...2014-12-22-jekyll-2-5-3-released.markdown → ...2014-12-22-jekyll-2-5-3-released.markdown b/...2014-12-22-jekyll-2-5-3-released.markdown → ...2014-12-22-jekyll-2-5-3-released.markdown
diff --git a/...2015-01-20-jekyll-meet-and-greet.markdown → ...2015-01-20-jekyll-meet-and-greet.markdown b/...2015-01-20-jekyll-meet-and-greet.markdown → ...2015-01-20-jekyll-meet-and-greet.markdown
diff --git a/...1-24-jekyll-3-0-0-beta1-released.markdown → ...1-24-jekyll-3-0-0-beta1-released.markdown b/...1-24-jekyll-3-0-0-beta1-released.markdown → ...1-24-jekyll-3-0-0-beta1-released.markdown
diff --git a/...15-02-26-introducing-jekyll-talk.markdown → ...15-02-26-introducing-jekyll-talk.markdown b/...15-02-26-introducing-jekyll-talk.markdown → ...15-02-26-introducing-jekyll-talk.markdown
diff --git a/...s/2015-10-26-jekyll-3-0-released.markdown → ...s/2015-10-26-jekyll-3-0-released.markdown b/...s/2015-10-26-jekyll-3-0-released.markdown → ...s/2015-10-26-jekyll-3-0-released.markdown
diff --git a/...2015-11-17-jekyll-3-0-1-released.markdown → ...2015-11-17-jekyll-3-0-1-released.markdown b/...2015-11-17-jekyll-3-0-1-released.markdown → ...2015-11-17-jekyll-3-0-1-released.markdown
diff --git a/...2016-01-20-jekyll-3-0-2-released.markdown → ...2016-01-20-jekyll-3-0-2-released.markdown b/...2016-01-20-jekyll-3-0-2-released.markdown → ...2016-01-20-jekyll-3-0-2-released.markdown
diff --git a/...2016-01-24-jekyll-3-1-0-released.markdown → ...2016-01-24-jekyll-3-1-0-released.markdown b/...2016-01-24-jekyll-3-1-0-released.markdown → ...2016-01-24-jekyll-3-1-0-released.markdown
diff --git a/...2016-01-28-jekyll-3-1-1-released.markdown → ...2016-01-28-jekyll-3-1-1-released.markdown b/...2016-01-28-jekyll-3-1-1-released.markdown → ...2016-01-28-jekyll-3-1-1-released.markdown
diff --git a/...2016-02-08-jekyll-3-0-3-released.markdown → ...2016-02-08-jekyll-3-0-3-released.markdown b/...2016-02-08-jekyll-3-0-3-released.markdown → ...2016-02-08-jekyll-3-0-3-released.markdown
diff --git a/...2016-02-19-jekyll-3-1-2-released.markdown → ...2016-02-19-jekyll-3-1-2-released.markdown b/...2016-02-19-jekyll-3-1-2-released.markdown → ...2016-02-19-jekyll-3-1-2-released.markdown
diff --git a/...king-it-easier-to-contribute-to-jekyll.md → ...king-it-easier-to-contribute-to-jekyll.md b/...king-it-easier-to-contribute-to-jekyll.md → ...king-it-easier-to-contribute-to-jekyll.md
diff --git a/...2016-04-19-jekyll-3-0-4-released.markdown → ...2016-04-19-jekyll-3-0-4-released.markdown b/...2016-04-19-jekyll-3-0-4-released.markdown → ...2016-04-19-jekyll-3-0-4-released.markdown
diff --git a/...2016-04-19-jekyll-3-1-3-released.markdown → ...2016-04-19-jekyll-3-1-3-released.markdown b/...2016-04-19-jekyll-3-1-3-released.markdown → ...2016-04-19-jekyll-3-1-3-released.markdown
diff --git a/...2016-04-26-jekyll-3-0-5-released.markdown → ...2016-04-26-jekyll-3-0-5-released.markdown b/...2016-04-26-jekyll-3-0-5-released.markdown → ...2016-04-26-jekyll-3-0-5-released.markdown
diff --git a/...2016-05-18-jekyll-3-1-4-released.markdown → ...2016-05-18-jekyll-3-1-4-released.markdown b/...2016-05-18-jekyll-3-1-4-released.markdown → ...2016-05-18-jekyll-3-1-4-released.markdown
diff --git a/...2016-05-18-jekyll-3-1-5-released.markdown → ...2016-05-18-jekyll-3-1-5-released.markdown b/...2016-05-18-jekyll-3-1-5-released.markdown → ...2016-05-18-jekyll-3-1-5-released.markdown
diff --git a/...2016-05-19-jekyll-3-1-6-released.markdown → ...2016-05-19-jekyll-3-1-6-released.markdown b/...2016-05-19-jekyll-3-1-6-released.markdown → ...2016-05-19-jekyll-3-1-6-released.markdown
diff --git a/...s-google-summer-of-code-projects.markdown → ...s-google-summer-of-code-projects.markdown b/...s-google-summer-of-code-projects.markdown → ...s-google-summer-of-code-projects.markdown
diff --git a/...2016-07-26-jekyll-3-2-0-released.markdown → ...2016-07-26-jekyll-3-2-0-released.markdown b/...2016-07-26-jekyll-3-2-0-released.markdown → ...2016-07-26-jekyll-3-2-0-released.markdown
diff --git a/...2016-08-02-jekyll-3-2-1-released.markdown → ...2016-08-02-jekyll-3-2-1-released.markdown b/...2016-08-02-jekyll-3-2-1-released.markdown → ...2016-08-02-jekyll-3-2-1-released.markdown
diff --git a/...-24-jekyll-admin-initial-release.markdown → ...-24-jekyll-admin-initial-release.markdown b/...-24-jekyll-admin-initial-release.markdown → ...-24-jekyll-admin-initial-release.markdown
diff --git a/site/_posts/2016-10-06-jekyll-3-3-is-here.md → docs/_posts/2016-10-06-jekyll-3-3-is-here.md b/site/_posts/2016-10-06-jekyll-3-3-is-here.md → docs/_posts/2016-10-06-jekyll-3-3-is-here.md
diff --git a/site/_sass/_font-awesome.scss → docs/_sass/_font-awesome.scss b/site/_sass/_font-awesome.scss → docs/_sass/_font-awesome.scss
diff --git a/site/_sass/_gridism.scss → docs/_sass/_gridism.scss b/site/_sass/_gridism.scss → docs/_sass/_gridism.scss
diff --git a/site/_sass/_mixins.scss → docs/_sass/_mixins.scss b/site/_sass/_mixins.scss → docs/_sass/_mixins.scss
diff --git a/site/_sass/_normalize.scss → docs/_sass/_normalize.scss b/site/_sass/_normalize.scss → docs/_sass/_normalize.scss
diff --git a/site/_sass/_pygments.scss → docs/_sass/_pygments.scss b/site/_sass/_pygments.scss → docs/_sass/_pygments.scss
diff --git a/site/_sass/_style.scss → docs/_sass/_style.scss b/site/_sass/_style.scss → docs/_sass/_style.scss
diff --git a/site/community/index.md → docs/community/index.md b/site/community/index.md → docs/community/index.md
diff --git a/site/css/screen.scss → docs/css/screen.scss b/site/css/screen.scss → docs/css/screen.scss
diff --git a/site/favicon.ico → docs/favicon.ico b/site/favicon.ico → docs/favicon.ico
diff --git a/site/fonts/fontawesome-webfont.eot → docs/fonts/fontawesome-webfont.eot b/site/fonts/fontawesome-webfont.eot → docs/fonts/fontawesome-webfont.eot
diff --git a/site/fonts/fontawesome-webfont.svg → docs/fonts/fontawesome-webfont.svg b/site/fonts/fontawesome-webfont.svg → docs/fonts/fontawesome-webfont.svg
diff --git a/site/fonts/fontawesome-webfont.ttf → docs/fonts/fontawesome-webfont.ttf b/site/fonts/fontawesome-webfont.ttf → docs/fonts/fontawesome-webfont.ttf
diff --git a/site/fonts/fontawesome-webfont.woff → docs/fonts/fontawesome-webfont.woff b/site/fonts/fontawesome-webfont.woff → docs/fonts/fontawesome-webfont.woff
diff --git a/site/fonts/fontawesome-webfont.woff2 → docs/fonts/fontawesome-webfont.woff2 b/site/fonts/fontawesome-webfont.woff2 → docs/fonts/fontawesome-webfont.woff2
diff --git a/site/freenode.txt → docs/freenode.txt b/site/freenode.txt → docs/freenode.txt
diff --git a/site/help/index.md → docs/help/index.md b/site/help/index.md → docs/help/index.md
diff --git a/site/img/article-footer.png → docs/img/article-footer.png b/site/img/article-footer.png → docs/img/article-footer.png
diff --git a/site/img/footer-arrow.png → docs/img/footer-arrow.png b/site/img/footer-arrow.png → docs/img/footer-arrow.png
diff --git a/site/img/footer-logo.png → docs/img/footer-logo.png b/site/img/footer-logo.png → docs/img/footer-logo.png
diff --git a/site/img/jekyll-sticker.jpg → docs/img/jekyll-sticker.jpg b/site/img/jekyll-sticker.jpg → docs/img/jekyll-sticker.jpg
diff --git a/site/img/logo-2x.png → docs/img/logo-2x.png b/site/img/logo-2x.png → docs/img/logo-2x.png
diff --git a/site/img/logo-rss.png → docs/img/logo-rss.png b/site/img/logo-rss.png → docs/img/logo-rss.png
diff --git a/site/img/octojekyll.png → docs/img/octojekyll.png b/site/img/octojekyll.png → docs/img/octojekyll.png
diff --git a/site/index.html → docs/index.html b/site/index.html → docs/index.html
diff --git a/site/js/html5shiv.min.js → docs/js/html5shiv.min.js b/site/js/html5shiv.min.js → docs/js/html5shiv.min.js
diff --git a/site/js/respond.min.js → docs/js/respond.min.js b/site/js/respond.min.js → docs/js/respond.min.js
diff --git a/site/latest_version.txt → docs/latest_version.txt b/site/latest_version.txt → docs/latest_version.txt
diff --git a/site/news/index.html → docs/news/index.html b/site/news/index.html → docs/news/index.html
diff --git a/site/news/releases/index.html → docs/news/releases/index.html b/site/news/releases/index.html → docs/news/releases/index.html
diff --git a/docs/readme.md b/docs/readme.md
@@ -1,13 +1,16 @@
-# Maintaining Jekyll
+# Jekyll docs site
 
-Hello! This is where we document various processes for maintaining Jekyll. Being a maintainer for any Jekyll project is a big responsibility, so we put together some helpful documentation for various tasks you might do as a maintainer.
+This directory contains the code for the Jekyll docs site, [jekyllrb.com](http://jekyllrb.com/).
 
-1. [Triaging and issue](triaging-an-issue.md)
-2. [Reviewing a pull request](reviewing-a-pull-request.md)
-3. [Merging a pull request](merging-a-pull-request.md)
-4. [Avoiding burnout](avoiding-burnout.md)
-5. [Special Labels](special-labels.md)
+## Contributing
 
-Interested in becoming a maintainer? Here is some documentation for **contributors**:
+For information about contributing, see the [Contributing page](http://jekyllrb.com/docs/contributing/).
 
-1. [Becoming a maintainer](becoming-a-maintainer.md)
+## Running locally
+
+You can preview your contributions before opening a pull request by running from within the directory:
+
+1. `bundle install --without test test_legacy benchmark`
+2. `bundle exec rake site:preview`
+
+It's just a jekyll site, afterall! :wink:
diff --git a/site/redirects/github.html → docs/redirects/github.html b/site/redirects/github.html → docs/redirects/github.html
diff --git a/site/redirects/issues.html → docs/redirects/issues.html b/site/redirects/issues.html → docs/redirects/issues.html
diff --git a/rake/site.rake b/rake/site.rake
@@ -12,19 +12,19 @@ namespace :site do
     require "launchy"
     require "jekyll"
 
-    # Yep, it's a hack! Wait a few seconds for the Jekyll site to generate and
-    # then open it in a browser. Someday we can do better than this, I hope.
-    Thread.new do
-      sleep 4
-      puts "Opening in browser..."
+    browser_launched = false
+    Jekyll::Hooks.register :site, :post_write do |site|
+      next if browser_launched
+      browser_launched = true
+      Jekyll.logger.info "Opening in browser..."
       Launchy.open("http://localhost:4000")
     end
 
     # Generate the site in server mode.
     puts "Running Jekyll..."
     options = {
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site"),
+      "source"      => File.expand_path(docs_folder),
+      "destination" => File.expand_path("#{docs_folder}/_site"),
       "watch"       => true,
       "serving"     => true
     }
@@ -36,70 +36,26 @@ namespace :site do
   task :generate => :generated_pages do
     require "jekyll"
     Jekyll::Commands::Build.process({
-      "profile" => true,
-      "source"      => File.expand_path("site"),
-      "destination" => File.expand_path("site/_site")
+      "profile"     => true,
+      "source"      => File.expand_path(docs_folder),
+      "destination" => File.expand_path("#{docs_folder}/_site")
     })
   end
   task :build => :generate
 
   desc "Update normalize.css library to the latest version and minify"
   task :update_normalize_css do
-    Dir.chdir("site/_sass") do
+    Dir.chdir("#{docs_folder}/_sass") do
       sh 'curl "http://necolas.github.io/normalize.css/latest/normalize.css" -o "normalize.scss"'
       sh 'sass "normalize.scss":"_normalize.scss" --style compressed'
       rm ['normalize.scss', Dir.glob('*.map')].flatten
     end
   end
 
-  desc "Commit the local site to the gh-pages branch and publish to GitHub Pages"
+  desc "Generate generated pages and publish to GitHub Pages"
   task :publish => :generated_pages do
-    # Ensure the gh-pages dir exists so we can generate into it.
-    puts "Checking for gh-pages dir..."
-    unless File.exist?("./gh-pages")
-      puts "Creating gh-pages dir..."
-      sh "git clone git@github.com:jekyll/jekyll gh-pages"
-    end
-
-    # Ensure latest gh-pages branch history.
-    Dir.chdir('gh-pages') do
-      sh "git checkout gh-pages"
-      sh "git pull origin gh-pages"
-    end
-
-    # Proceed to purge all files in case we removed a file in this release.
-    puts "Cleaning gh-pages directory..."
-    purge_exclude = %w[
-      gh-pages/.
-      gh-pages/..
-      gh-pages/.git
-      gh-pages/.gitignore
-    ]
-    FileList["gh-pages/{*,.*}"].exclude(*purge_exclude).each do |path|
-      sh "rm -rf #{path}"
-    end
-
-    # Copy site to gh-pages dir.
-    puts "Building site into gh-pages branch..."
-    ENV['JEKYLL_ENV'] = 'production'
-    require "jekyll"
-    Jekyll::Commands::Build.process({
-      "source"       => File.expand_path("site"),
-      "destination"  => File.expand_path("gh-pages"),
-      "sass"         => { "style" => "compressed" }
-    })
-
-    File.open('gh-pages/.nojekyll', 'wb') { |f| f.puts(":dog: food.") }
-
-    # Commit and push.
-    puts "Committing and pushing to GitHub Pages..."
-    sha = `git rev-parse HEAD`.strip
-    Dir.chdir('gh-pages') do
-      sh "git add ."
-      sh "git commit --allow-empty -m 'Updating to #{sha}.'"
-      sh "git push origin gh-pages"
-    end
-    puts 'Done.'
+    puts "GitHub Pages now compiles our docs site on every push to the `master` branch. Cool, huh?"
+    exit 1
   end
 
   desc "Create a nicely formatted history page for the jekyll site based on the repo history."
@@ -123,7 +79,7 @@ namespace :site do
 
   desc "Write the site latest_version.txt file"
   task :version_file do
-    File.open('site/latest_version.txt', 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i
+    File.open("#{docs_folder}/latest_version.txt", 'wb') { |f| f.puts(version) } unless version =~ /(beta|rc|alpha)/i
   end
 
   namespace :releases do
@@ -132,7 +88,7 @@ namespace :site do
       raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
       today = Time.new.strftime('%Y-%m-%d')
       release = args.version.to_s
-      filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
+      filename = "#{docs_folder}/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
 
       File.open(filename, "wb") do |post|
         post.puts("---")

diff --git a/site/README.md b/site/README.md