diff --git a/History.markdown b/History.markdown
index 9f50a6b6..dd9e4bd6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,10 +1,16 @@
## HEAD
### Major Enhancements
### Minor Enhancements
+ * Update pygments.rb version to 0.5.0 (#1061)
+ * Update Kramdown version to 1.0.2 (#1067)
+
### Bug Fixes
* Catching that Redcarpet gem isn't installed (#1059)
### Site Enhancements
+ * Move pages to be Pages for realz (#985)
+ * Updated links to Liquid documentation (#1073)
+
### Development Fixes
## 1.0.1 / 2013-05-08
diff --git a/jekyll.gemspec b/jekyll.gemspec
index f94413a7..1c979018 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('classifier', "~> 1.3")
s.add_runtime_dependency('directory_watcher', "~> 1.4.1")
s.add_runtime_dependency('maruku', "~> 0.5")
- s.add_runtime_dependency('kramdown', "~> 0.14")
- s.add_runtime_dependency('pygments.rb', "~> 0.4.2")
+ s.add_runtime_dependency('kramdown', "~> 1.0.2")
+ s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
s.add_runtime_dependency('commander', "~> 4.1.3")
s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
s.add_runtime_dependency('colorator', "~> 0.1")
diff --git a/site/_config.yml b/site/_config.yml
index 2de2c7ff..a80e7c40 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -1,3 +1,2 @@
-permalink: /docs/:categories/:title
pygments: true
gauges_id: 503c5af6613f5d0f19000027
diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index 6d6556f5..57956ae0 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -3,9 +3,9 @@
Overview
- Docsumentation
+ Docsumentation
View on GitHub
-
\ No newline at end of file
+
diff --git a/site/_posts/2012-07-01-configuration.md b/site/docs/configuration.md
similarity index 99%
rename from site/_posts/2012-07-01-configuration.md
rename to site/docs/configuration.md
index 4c268835..d8da48b4 100644
--- a/site/_posts/2012-07-01-configuration.md
+++ b/site/docs/configuration.md
@@ -3,6 +3,7 @@ layout: docs
title: Configuration
prev_section: structure
next_section: frontmatter
+permalink: /docs/configuration/
---
Jekyll allows you to concoct your sites in any way you can dream up, and it’s
diff --git a/site/_posts/2012-07-01-contributing.md b/site/docs/contributing.md
similarity index 99%
rename from site/_posts/2012-07-01-contributing.md
rename to site/docs/contributing.md
index 90ffe120..8d402e11 100644
--- a/site/_posts/2012-07-01-contributing.md
+++ b/site/docs/contributing.md
@@ -3,6 +3,7 @@ layout: docs
title: Contributing
prev_section: deployment-methods
next_section: troubleshooting
+permalink: /docs/contributing/
---
So you've got an awesome idea to throw into Jekyll. Great! Please keep the
diff --git a/site/_posts/2012-07-01-deployment-methods.md b/site/docs/deployment-methods.md
similarity index 99%
rename from site/_posts/2012-07-01-deployment-methods.md
rename to site/docs/deployment-methods.md
index 80b55ae3..dd4369ce 100644
--- a/site/_posts/2012-07-01-deployment-methods.md
+++ b/site/docs/deployment-methods.md
@@ -3,6 +3,7 @@ layout: docs
title: Deployment methods
prev_section: github-pages
next_section: contributing
+permalink: /docs/deployment-methods/
---
Sites built using Jekyll can be deployed in a large number of ways due to the static nature of the generated output. A few of the most common deployment techniques are described below.
diff --git a/site/_posts/2012-07-01-extras.md b/site/docs/extras.md
similarity index 99%
rename from site/_posts/2012-07-01-extras.md
rename to site/docs/extras.md
index e5f6a227..4e820228 100644
--- a/site/_posts/2012-07-01-extras.md
+++ b/site/docs/extras.md
@@ -3,6 +3,7 @@ layout: docs
title: Extras
prev_section: plugins
next_section: github-pages
+permalink: /docs/extras/
---
There are a number of (optional) extra features that Jekyll supports that you
diff --git a/site/_posts/2012-07-01-frontmatter.md b/site/docs/frontmatter.md
similarity index 99%
rename from site/_posts/2012-07-01-frontmatter.md
rename to site/docs/frontmatter.md
index c8d314ac..6e98b650 100644
--- a/site/_posts/2012-07-01-frontmatter.md
+++ b/site/docs/frontmatter.md
@@ -3,6 +3,7 @@ layout: docs
title: Front-matter
prev_section: configuration
next_section: posts
+permalink: /docs/frontmatter/
---
The front-matter is where Jekyll starts to get really cool. Any file that
diff --git a/site/_posts/2012-07-01-github-pages.md b/site/docs/github-pages.md
similarity index 98%
rename from site/_posts/2012-07-01-github-pages.md
rename to site/docs/github-pages.md
index 5408a2b9..73a6a646 100644
--- a/site/_posts/2012-07-01-github-pages.md
+++ b/site/docs/github-pages.md
@@ -3,6 +3,7 @@ layout: docs
title: GitHub Pages
prev_section: extras
next_section: deployment-methods
+permalink: /docs/github-pages/
---
[GitHub Pages](http://pages.github.com) are public web pages for users,
diff --git a/site/_posts/2012-07-01-heroku.md b/site/docs/heroku.md
similarity index 84%
rename from site/_posts/2012-07-01-heroku.md
rename to site/docs/heroku.md
index 091239c5..84b448b6 100644
--- a/site/_posts/2012-07-01-heroku.md
+++ b/site/docs/heroku.md
@@ -3,6 +3,7 @@ layout: docs
title: Heroku
prev_section: github-pages
next_section: manual-deployment
+permalink: /docs/heroku/
---
Move along, people. Nothing to see here.
diff --git a/site/docs/index.html b/site/docs/index.html
deleted file mode 100644
index 95b00547..00000000
--- a/site/docs/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- Jekyll
-
-
-
-
-
diff --git a/site/_posts/2012-07-01-home.md b/site/docs/index.md
similarity index 95%
rename from site/_posts/2012-07-01-home.md
rename to site/docs/index.md
index b6aaa048..5129643a 100644
--- a/site/_posts/2012-07-01-home.md
+++ b/site/docs/index.md
@@ -2,6 +2,7 @@
layout: docs
title: Welcome
next_section: installation
+permalink: /docs/home/
---
This site aims to be a comprehensive guide to Jekyll. We’ll cover topics such
@@ -15,7 +16,8 @@ development of Jekyll itself.
Jekyll is a simple, blog-aware, static site generator. It takes a template
directory containing raw text files in various formats, runs it through
[Markdown](http://daringfireball.net/projects/markdown/) (or
-[Textile](http://textile.sitemonks.com/)) and [Liquid](http://liquidmarkup.org/)
+[Textile](http://textile.sitemonks.com/)) and
+[Liquid](http://wiki.shopify.com/Liquid)
converters, and spits out a complete, ready-to-publish static website suitable
for serving with your favorite web server. Jekyll also happens to be the engine
behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll
diff --git a/site/_posts/2012-07-01-installation.md b/site/docs/installation.md
similarity index 98%
rename from site/_posts/2012-07-01-installation.md
rename to site/docs/installation.md
index 646b6c5c..8c830b75 100644
--- a/site/_posts/2012-07-01-installation.md
+++ b/site/docs/installation.md
@@ -3,6 +3,7 @@ layout: docs
title: Installation
prev_section: home
next_section: usage
+permalink: /docs/installation/
---
Getting Jekyll installed and ready-to-go should only take a few minutes. If it
diff --git a/site/_posts/2012-07-01-migrations.md b/site/docs/migrations.md
similarity index 99%
rename from site/_posts/2012-07-01-migrations.md
rename to site/docs/migrations.md
index 255fb1bf..b8875e42 100644
--- a/site/_posts/2012-07-01-migrations.md
+++ b/site/docs/migrations.md
@@ -3,6 +3,7 @@ layout: docs
title: Blog migrations
prev_section: variables
next_section: templates
+permalink: /docs/migrations/
---
If you’re switching to Jekyll from another blogging system, Jekyll’s importers
diff --git a/site/_posts/2012-07-01-pages.md b/site/docs/pages.md
similarity index 99%
rename from site/_posts/2012-07-01-pages.md
rename to site/docs/pages.md
index 6a51d133..2949b736 100644
--- a/site/_posts/2012-07-01-pages.md
+++ b/site/docs/pages.md
@@ -3,6 +3,7 @@ layout: docs
title: Creating pages
prev_section: posts
next_section: variables
+permalink: /docs/pages/
---
In addition to [writing posts](../posts), another thing you may want to do with
diff --git a/site/_posts/2012-07-01-pagination.md b/site/docs/pagination.md
similarity index 99%
rename from site/_posts/2012-07-01-pagination.md
rename to site/docs/pagination.md
index fa0e578f..a992cc79 100644
--- a/site/_posts/2012-07-01-pagination.md
+++ b/site/docs/pagination.md
@@ -3,6 +3,7 @@ layout: docs
title: Pagination
prev_section: permalinks
next_section: plugins
+permalink: /docs/pagination/
---
With many websites—especially blogs—it’s very common to break the main listing
diff --git a/site/_posts/2012-07-01-permalinks.md b/site/docs/permalinks.md
similarity index 99%
rename from site/_posts/2012-07-01-permalinks.md
rename to site/docs/permalinks.md
index 817636bb..a77282a8 100644
--- a/site/_posts/2012-07-01-permalinks.md
+++ b/site/docs/permalinks.md
@@ -3,6 +3,7 @@ layout: docs
title: Permalinks
prev_section: templates
next_section: pagination
+permalink: /docs/permalinks/
---
Jekyll supports a flexible way to build your site’s URLs. You can specify the
diff --git a/site/_posts/2012-07-01-plugins.md b/site/docs/plugins.md
similarity index 99%
rename from site/_posts/2012-07-01-plugins.md
rename to site/docs/plugins.md
index 52229a0e..79550fc6 100644
--- a/site/_posts/2012-07-01-plugins.md
+++ b/site/docs/plugins.md
@@ -3,6 +3,7 @@ layout: docs
title: Plugins
prev_section: assets
next_section: extras
+permalink: /docs/plugins/
---
Jekyll has a plugin system with hooks that allow you to create custom generated
diff --git a/site/_posts/2012-07-01-posts.md b/site/docs/posts.md
similarity index 98%
rename from site/_posts/2012-07-01-posts.md
rename to site/docs/posts.md
index 80f6256e..2eaa1566 100644
--- a/site/_posts/2012-07-01-posts.md
+++ b/site/docs/posts.md
@@ -3,6 +3,7 @@ layout: docs
title: Writing posts
prev_section: frontmatter
next_section: pages
+permalink: /docs/posts/
---
One of Jekyll’s best aspects is that it is “blog aware”. What does this mean,
@@ -95,7 +96,7 @@ Linking to a PDF for readers to download:
It’s all well and good to have posts in a folder, but a blog is no use unless
you have a list of posts somewhere. Creating an index of posts on another page
(or in a [template](../templates)) is easy, thanks to the [Liquid template
-language](http://liquidmarkup.org/) and its tags. Here’s a basic example of how
+language](http://wiki.shopify.com/Liquid) and its tags. Here’s a basic example of how
to create a list of links to your blog posts:
{% highlight html %}
diff --git a/site/_posts/2012-07-01-resources.md b/site/docs/resources.md
similarity index 99%
rename from site/_posts/2012-07-01-resources.md
rename to site/docs/resources.md
index 775c4d03..7951087c 100644
--- a/site/_posts/2012-07-01-resources.md
+++ b/site/docs/resources.md
@@ -3,6 +3,7 @@ layout: docs
title: Resources
prev_section: sites
next_section: upgrading
+permalink: /docs/resources/
---
Jekyll’s growing use is producing a wide variety of tutorials, frameworks, extensions, examples, and other resources that can be very helpful. Below is a collection of links to some of the most popular Jekyll resources.
diff --git a/site/_posts/2012-07-01-sites.md b/site/docs/sites.md
similarity index 97%
rename from site/_posts/2012-07-01-sites.md
rename to site/docs/sites.md
index f28c0280..b5f24836 100644
--- a/site/_posts/2012-07-01-sites.md
+++ b/site/docs/sites.md
@@ -3,6 +3,7 @@ layout: docs
title: Sites using Jekyll
prev_section: troubleshooting
next_section: resources
+permalink: /docs/sites/
---
It’s interesting to see what designs and features others have come up
diff --git a/site/_posts/2012-07-01-structure.md b/site/docs/structure.md
similarity index 99%
rename from site/_posts/2012-07-01-structure.md
rename to site/docs/structure.md
index 455c2db9..887d1a00 100644
--- a/site/_posts/2012-07-01-structure.md
+++ b/site/docs/structure.md
@@ -3,6 +3,7 @@ layout: docs
title: Directory structure
prev_section: usage
next_section: configuration
+permalink: /docs/structure/
---
Jekyll is, at its core, a text transformation engine. The concept behind the
diff --git a/site/_posts/2012-07-01-templates.md b/site/docs/templates.md
similarity index 98%
rename from site/_posts/2012-07-01-templates.md
rename to site/docs/templates.md
index 8519090a..1c4d2396 100644
--- a/site/_posts/2012-07-01-templates.md
+++ b/site/docs/templates.md
@@ -3,9 +3,10 @@ layout: docs
title: Templates
prev_section: migrations
next_section: permalinks
+permalink: /docs/templates/
---
-Jekyll uses the [Liquid](http://www.liquidmarkup.org/) templating language to
+Jekyll uses the [Liquid](http://wiki.shopify.com/Liquid) templating language to
process templates. All of the [standard Liquid tags and
filters](http://wiki.github.com/shopify/liquid/liquid-for-designers) are
supported, Jekyll even adds a few handy filters and tags of its own to make
diff --git a/site/_posts/2012-07-01-troubleshooting.md b/site/docs/troubleshooting.md
similarity index 99%
rename from site/_posts/2012-07-01-troubleshooting.md
rename to site/docs/troubleshooting.md
index 1002ca7e..bb4f1b95 100644
--- a/site/_posts/2012-07-01-troubleshooting.md
+++ b/site/docs/troubleshooting.md
@@ -3,6 +3,7 @@ layout: docs
title: Troubleshooting
prev_section: contributing
next_section: sites
+permalink: /docs/troubleshooting/
---
If you ever run into problems installing or using Jekyll, here’s a few tips that might be of help. If the problem you’re experiencing isn’t covered below, please [report an issue](https://github.com/mojombo/jekyll/issues/new) so the Jekyll community can make everyone’s experience better.
diff --git a/site/_posts/2012-07-01-upgrading.md b/site/docs/upgrading.md
similarity index 99%
rename from site/_posts/2012-07-01-upgrading.md
rename to site/docs/upgrading.md
index 7cd663d2..6c5b42d2 100644
--- a/site/_posts/2012-07-01-upgrading.md
+++ b/site/docs/upgrading.md
@@ -2,10 +2,10 @@
layout: docs
title: Upgrading
prev_section: resources
-next_section: changelist
+permalink: /docs/upgrading/
---
-Upgrading from an older version of Jekyll? A few things have changed in 1.0.0
+Upgrading from an older version of Jekyll? A few things have changed in 1.0
that you'll want to know about.
diff --git a/site/_posts/2012-07-01-usage.md b/site/docs/usage.md
similarity index 98%
rename from site/_posts/2012-07-01-usage.md
rename to site/docs/usage.md
index 10f8104d..b62144d1 100644
--- a/site/_posts/2012-07-01-usage.md
+++ b/site/docs/usage.md
@@ -3,6 +3,7 @@ layout: docs
title: Basic Usage
prev_section: installation
next_section: structure
+permalink: /docs/usage/
---
The Jekyll gem makes a `jekyll` executable available to you in your Terminal
diff --git a/site/_posts/2012-07-01-variables.md b/site/docs/variables.md
similarity index 99%
rename from site/_posts/2012-07-01-variables.md
rename to site/docs/variables.md
index 9b969e83..f7882ed0 100644
--- a/site/_posts/2012-07-01-variables.md
+++ b/site/docs/variables.md
@@ -3,6 +3,7 @@ layout: docs
title: Variables
prev_section: pages
next_section: migrations
+permalink: /docs/variables/
---
Jekyll traverses your site looking for files to process. Any files with [YAML
diff --git a/site/index.html b/site/index.html
index 0fd8317d..93203ebd 100644
--- a/site/index.html
+++ b/site/index.html
@@ -18,19 +18,19 @@ overview: true
No more databases, comment moderation, or pesky updates to install—just your content.
- How Jekyll works →
+ How Jekyll works →