Merge pull request #5544 from jekyll/revert-5532-perma-docs

Merge pull request 5544

docs/_config.yml

@@ -12,6 +12,7 @@ timezone: America/Los_Angeles
 
 collections:
   docs:
+    permalink: /:collection/:path/
     output: true
   posts:
     permalink: /news/:year/:month/:day/:title/

docs/_docs/github-pages.md

@@ -138,6 +138,12 @@ for Jekyll, however the Jekyll website (that you’re looking at right now) is
 contained in the [docs folder]({{ site.repository }}/tree/master/docs) of the
 same repository.
 
+The Jekyll project repository itself is a perfect example of this branch
+structure—the [master branch]({{ site.repository }}) contains the
+actual software project for Jekyll, and the Jekyll website that you’re
+looking at right now is contained in the [docs
+folder]({{ site.repository }}/tree/master/docs) of the same repository.
+
 Please refer to GitHub official documentation on
 [user, organization and projets pages](https://help.github.com/articles/user-organization-and-project-pages/)
 to see more detailed examples.

docs/_docs/maintaining/affinity-team-captain.md

@@ -1,7 +1,6 @@
 ---
 title: Affinity Team Captains
 layout: docs
-permalink: /docs/maintaining/affinity-team-captain/
 ---
 
 **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,7 +1,6 @@
 ---
 title: "Avoiding Burnout"
 layout: docs
-permalink: /docs/maintaining/avoiding-burnout/
 ---
 
 **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,7 +1,6 @@
 ---
 title: "Becoming a Maintainer"
 layout: docs
-permalink: /docs/maintaining/becoming-a-maintainer/
 ---
 
 **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.
@@ -37,4 +36,4 @@ We would love to expand the team and look forward to many more community members
 
 # Helping Out Elsewhere
 
-In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to https://talk.jekyllrb.com and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.
+In addition to maintainers of our core and plugin code, the Jekyll team is comprised of moderators for our forums. These helpful community members take a look at the topics posted to [https://talk.jekyllrb.com](https://talk.jekyllrb.com) and ensure they are properly categorized and are acceptable under our Code of Conduct. If you would like to be a moderator, email one of the maintainers with links to where you have answered questions and a request to be added as a moderator. More help is always welcome.

docs/_docs/maintaining/merging-a-pull-request.md

@@ -1,7 +1,6 @@
 ---
 title: "Merging a Pull Request"
 layout: docs
-permalink: /docs/maintaining/merging-a-pull-request/
 ---
 
 **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,7 +1,6 @@
 ---
 title: "Reviewing a Pull Request"
 layout: docs
-permalink: /docs/maintaining/reviewing-a-pull-request/
 ---
 
 **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,7 +1,6 @@
 ---
 title: "Special Labels"
 layout: docs
-permalink: /docs/maintaining/special-labels/
 ---
 
 **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,7 +1,6 @@
 ---
 title: "Triaging an Issue"
 layout: docs
-permalink: /docs/maintaining/triaging-an-issue/
 ---
 
 **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/plugins.md

@@ -771,7 +771,6 @@ LESS.js files during generation.
 - [Markdown References by Olov Lassus](https://github.com/olov/jekyll-references): Keep all your markdown reference-style link definitions in one \_references.md file.
 - [Stylus Converter](https://gist.github.com/988201): Convert .styl to .css.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
-- [Jekyll-pandoc-plugin](https://github.com/dsanson/jekyll-pandoc-plugin): Use pandoc for rendering markdown.
 - [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
 - [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
 - [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.