Merge pull request #1510 from mojombo/release-1.2

Release v1.2

History.markdown

@@ -1,5 +1,17 @@
 ## HEAD
 
+### Major Enhancements
+
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## v1.2.0 / 2013-09-06
+
 ### Major Enhancements
   * Disable automatically-generated excerpts when `excerpt_separator` is `""`. (#1386)
   * Add checking for URL conflicts when running `jekyll doctor` (#1389)

README.markdown

@@ -33,7 +33,6 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
 * Colorator: Colorizes command line output (Ruby)
 * Classifier: Generating related posts (Ruby)
 * Directory Watcher: Auto-regeneration of sites (Ruby)
-* Kramdown: Markdown-superset converter (Ruby)
 * Liquid: Templating system (Ruby)
 * Maruku: Default markdown engine (Ruby)
 * Pygments.rb: Syntax highlighting (Ruby/Python)
@@ -42,6 +41,7 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
 
 ## Developer Dependencies
 
+* Kramdown: Markdown-superset converter (Ruby)
 * Launchy: Cross-platform file launcher (Ruby)
 * RDiscount: Discount Markdown Processor (Ruby)
 * RedCloth: Textile support (Ruby)

jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.1.2'
+  s.version           = '1.2.0'
   s.license           = 'MIT'
-  s.date              = '2013-07-25'
+  s.date              = '2013-09-06'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
     features/support/env.rb
     jekyll.gemspec
     lib/jekyll.rb
+    lib/jekyll/cleaner.rb
     lib/jekyll/command.rb
     lib/jekyll/commands/build.rb
     lib/jekyll/commands/doctor.rb
@@ -108,6 +109,7 @@ Gem::Specification.new do |s|
     lib/jekyll/tags/highlight.rb
     lib/jekyll/tags/include.rb
     lib/jekyll/tags/post_url.rb
+    lib/jekyll/url.rb
     lib/site_template/.gitignore
     lib/site_template/_config.yml
     lib/site_template/_layouts/default.html
@@ -144,6 +146,7 @@ Gem::Specification.new do |s|
     site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
     site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
     site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
+    site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
@@ -233,6 +236,7 @@ Gem::Specification.new do |s|
     test/source/_posts/2013-04-11-custom-excerpt.markdown
     test/source/_posts/2013-05-10-number-category.textile
     test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
+    test/source/_posts/2013-08-01-mkdn-extension.mkdn
     test/source/_posts/es/2008-11-21-nested.textile
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
@@ -267,6 +271,7 @@ Gem::Specification.new do |s|
     test/test_related_posts.rb
     test/test_site.rb
     test/test_tags.rb
+    test/test_url.rb
   ]
   # = MANIFEST =
 

lib/jekyll.rb

@@ -60,7 +60,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

site/_posts/2013-09-06-jekyll-1-2-0-released.markdown

@@ -0,0 +1,23 @@
+---
+layout: news_item
+title: "Jekyll 1.2 Released"
+date: "2013-09-06 22:02:41 -0400"
+author: parkr
+version: 1.2.0
+categories: [release]
+---
+
+After nearly a month and a half of hard work, the Jekyll team is happy to
+announce the release of v1.2.0. It's chock full of bug fixes and some
+enhancements that we think you'll love.
+
+Here are a few things we think you'll want to know about this release:
+
+* Run `jekyll serve --detatch` to boot up a WEBrick server in the background. **Note:** you'll need to run `kill [server_pid]` to shut the server down.
+* You can now **disable automatically-generated excerpts** if you set `excerpt_separator` to `""`.
+* If you're moving around pages and post, you can now check for **URL conflicts** by running `jekyll doctor`.
+* If you're a fan of the drafts feature, you'll be happy to know we've added `-D`, a shortened version of `--drafts`.
+* Permalinks with special characters should now generate without errors.
+* Expose the current Jekyll version as the `jekyll.version` Liquid variable.
+
+For a full run-down, visit our [change log](../history/)!