Merge branch 'master' of github.com:mojombo/jekyll

* 'master' of github.com:mojombo/jekyll:
  Update history to reflect merge of #1191
  Update history to reflect merge of #1151
  Moving Quick-start guide to own section
  Remove extra parentheses and swapped regex back
  Combined two features into one

History.markdown

@@ -3,6 +3,9 @@
 ### Major Enhancements
 ### Minor Enhancements
 ### Bug Fixes
+### Development Fixes
+  * Merge the theme and layout cucumber steps into one step (#1151)
+
 ### Site Enhancements
   * Add "History" page.
   * Restructured docs sections to include "Meta" section.
@@ -10,6 +13,7 @@
     to use Pygments. (#1182)
   * Update link to the official Maruku repo (#1175)
   * Add documentation about `paginate_path` to "Templates" page in docs (#1129)
+  * Give the quick-start guide its own page (#1191)
 
 ### Development Fixes
 

features/step_definitions/jekyll_steps.rb

@@ -31,14 +31,13 @@ Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
   end
 end
 
-Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
+Given /^I have an? (.*) (layout|theme) that contains "(.*)"$/ do |name, type, text|
-  File.open(File.join('_layouts', layout + '.html'), 'w') do |f|
+  folder = if type == 'layout'
-    f.write(text)
+    '_layouts'
+  else
+    '_theme'
   end
-end
+  File.open(File.join(folder, name + '.html'), 'w') do |f|
-
-Given /^I have a (.*) theme that contains "(.*)"$/ do |layout, text|
-  File.open(File.join('_theme', layout + '.html'), 'w') do |f|
     f.write(text)
   end
 end

site/_includes/docs_contents.html

@@ -5,6 +5,9 @@
       <li class="{% if page.title == "Welcome" %}current{% endif %}">
         <a href="{{ site.url }}/docs/home">Welcome</a>
       </li>
+      <li class="{% if page.title == "Quick-start guide" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/quickstart">Quick-start guide</a>
+      </li>
       <li class="{% if page.title == "Installation" %}current{% endif %}">
         <a href="{{ site.url }}/docs/installation">Installation</a>
       </li>

site/_includes/docs_contents_mobile.html

@@ -3,6 +3,7 @@
     <option value="">Navigate the docs…</option>
     <optgroup label="Getting started">
       <option value="{{ site.url }}/docs/home">Welcome</option>
+      <option value="{{ site.url }}/docs/quickstart">Quick-start guide</option>
       <option value="{{ site.url }}/docs/installation">Installation</option>
       <option value="{{ site.url }}/docs/usage">Basic Usage</option>
       <option value="{{ site.url }}/docs/structure">Directory structure</option>

site/docs/index.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Welcome
-next_section: installation
+next_section: quickstart
 permalink: /docs/home/
 ---
 
@@ -24,22 +24,6 @@ behind [GitHub Pages](http://pages.github.com), which means you can use Jekyll
 to host your project’s page, blog, or website from GitHub’s servers **for
 free**.
 
-## Quick-start guide
-
-For the impatient, here's how to get a boilerplate Jekyll site up and running.
-
-{% highlight bash %}
-~ $ gem install jekyll
-~ $ jekyll new myblog
-~ $ cd myblog
-~/myblog $ jekyll serve
-# => Now browse to http://localhost:4000
-{% endhighlight %}
-
-That's nothing, though. The real magic happens when you start creating blog
-posts, using the front-matter to control templates and layouts, and taking
-advantage of all the awesome configuration options Jekyll makes available.
-
 ## ProTips™, Notes, and Warnings
 
 Throughout this guide there are a number of small-but-handy pieces of

site/docs/installation.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Installation
-prev_section: home
+prev_section: quickstart
 next_section: usage
 permalink: /docs/installation/
 ---

site/docs/quickstart.md

@@ -0,0 +1,21 @@
+---
+layout: docs
+title: Quick-start guide
+prev_section: home
+next_section: installation
+permalink: /docs/quickstart/
+---
+
+For the impatient, here's how to get a boilerplate Jekyll site up and running.
+
+{% highlight bash %}
+~ $ gem install jekyll
+~ $ jekyll new myblog
+~ $ cd myblog
+~/myblog $ jekyll serve
+# => Now browse to http://localhost:4000
+{% endhighlight %}
+
+That's nothing, though. The real magic happens when you start creating blog
+posts, using the front-matter to control templates and layouts, and taking
+advantage of all the awesome configuration options Jekyll makes available.