jekyll 1.0.0.beta3 → 1.0.0.beta4

data/CONTRIBUTING.md

@@ -15,9 +15,10 @@ following in mind:
   would be appreciated, and once merged it will be transferred over to the main
   wiki.
 * If your contribution changes any Jekyll behavior, make sure to update the
-  documentation. It lives in site/_posts. If the docs are missing information,
+  documentation. It lives in `site/_posts`. If the docs are missing information,
   please feel free to add it in. Great docs make a great project!
-* Please follow the [Github Ruby Styleguide](https://github.com/styleguide/ruby) when modifying Ruby code.
+* Please follow the [GitHub Ruby Styleguide](https://github.com/styleguide/ruby)
+  when modifying Ruby code.
 
 Test Dependencies
 -----------------

data/History.txt

@@ -4,7 +4,13 @@
     * Refactored jekyll commands into subcommands: build, serve, and migrate. (#690)
     * Removed importers/migrators from main project, migrated to jekyll-import sub-gem (#793)
     * Added ability to render drafts in _drafts folder via command line (#833)
+    * Add ordinal date permalink style (/:categories/:year/:y_day/:title.html) (#928)
   * Minor Enhancements
+    * Add paginator.previous_page_path and paginator.next_page_path (#942)
+    * Backwards compatibility for 'auto' (#821, #934)
+    * Added date_to_rfc822 used on RSS feeds (#892)
+    * Upgrade version of pygments.rb to 0.4.2 (#927)
+    * Added short month (e.g. "Sep") to permalink style options for posts (#890)
     * Expose site.baseurl to Liquid templates (#869)
     * Adds excerpt attribute to posts which contains first paragraph of content (#837)
     * Accept custom configuration file via CLI (#863)
@@ -30,6 +36,8 @@
     * Add source and destination directory protection (#535)
     * Better YAML error message (#718)
   * Bug Fixes
+    * Fix cascade problem with site.baseurl, site.port and site.host. (#935)
+    * Filter out directories with valid post names (#875)
     * Fix symlinked static files not being correctly built in unsafe mode (#909)
     * Fix integration with directory_watcher 1.4.x (#916)
     * Accepting strings as arguments to jekyll-import command (#910)
@@ -48,9 +56,11 @@
     * Add SVG support to Jekyll/WEBrick. (#407, #406)
     * Prevent custom destination from causing continuous regen on watch (#528, #820, #862)
   * Site Enhancements
+    * Clean up site docs to prepare for 1.0 release (#918)
     * Bring site into master branch with better preview/deploy (#709)
     * Redesigned site (#583)
   * Development fixes
+    * Exclude Cucumber 1.2.4, which causes tests to fail in 1.9.2 (#938)
     * Added "features:html" rake task for debugging purposes, cleaned up
       cucumber profiles (#832)
     * Explicitly require HTTPS rubygems source in Gemfile (#826)

data/README.textile

@@ -31,7 +31,6 @@ h2. Runtime Dependencies
 * Kramdown: Markdown-superset converter (Ruby)
 * Liquid: Templating system (Ruby)
 * Maruku: Default markdown engine (Ruby)
-* Pygments: Syntax highlighting (Python)
 
 h2. Developer Dependencies
 
@@ -43,4 +42,4 @@ h2. Developer Dependencies
 
 h2. License
 
-See LICENSE.
+See "LICENSE":https://github.com/mojombo/jekyll/blob/master/LICENSE.

data/bin/jekyll

@@ -75,10 +75,7 @@ command :serve do |c|
   c.option '-b', '--baseurl [URL]', 'Base URL'
 
   c.action do |args, options|
-    options.default :port => '4000',
-                    :host => '0.0.0.0',
-                    :baseurl => '/',
-                    :serving => true
+    options.default :serving => true
 
     options = normalize_options(options.__hash__)
     options = Jekyll.configuration(options)

data/features/step_definitions/jekyll_steps.rb

@@ -21,28 +21,24 @@ Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |
 ---
 #{text}
 EOF
-    f.close
   end
 end
 
 Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
   File.open(file, 'w') do |f|
     f.write(text)
-    f.close
   end
 end
 
 Given /^I have a (.*) layout that contains "(.*)"$/ do |layout, text|
   File.open(File.join('_layouts', layout + '.html'), 'w') do |f|
     f.write(text)
-    f.close
   end
 end
 
 Given /^I have a (.*) theme that contains "(.*)"$/ do |layout, text|
   File.open(File.join('_theme', layout + '.html'), 'w') do |f|
     f.write(text)
-    f.close
   end
 end
 
@@ -87,7 +83,6 @@ Given /^I have the following (draft|post)s?(?: (.*) "(.*)")?:$/ do |status, dire
 ---
 #{content}
 EOF
-      f.close
     end
   end
 end
@@ -95,7 +90,6 @@ end
 Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value|
   File.open('_config.yml', 'w') do |f|
     f.write("#{key}: #{value}\n")
-    f.close
   end
 end
 
@@ -104,7 +98,6 @@ Given /^I have a configuration file with:$/ do |table|
     table.hashes.each do |row|
       f.write("#{row["key"]}: #{row["value"]}\n")
     end
-    f.close
   end
 end
 
@@ -114,7 +107,6 @@ Given /^I have a configuration file with "([^\"]*)" set to:$/ do |key, table|
     table.hashes.each do |row|
       f.write("- #{row["value"]}\n")
     end
-    f.close
   end
 end
 

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.0.0.beta3'
+  s.version           = '1.0.0.beta4'
   s.license           = 'MIT'
-  s.date              = '2013-04-04'
+  s.date              = '2013-04-09'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   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.3.2")
+  s.add_runtime_dependency('pygments.rb', "~> 0.4.2")
   s.add_runtime_dependency('commander', "~> 4.1.3")
   s.add_runtime_dependency('safe_yaml', "~> 0.7.0")
 
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('redgreen', "~> 1.2")
   s.add_development_dependency('shoulda', "~> 3.3.2")
   s.add_development_dependency('rr', "~> 1.0")
-  s.add_development_dependency('cucumber', "~> 1.2.1")
+  s.add_development_dependency('cucumber', "~> 1.2.1", '!= 1.2.4')
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('rdiscount', "~> 1.6")
   s.add_development_dependency('redcarpet', "~> 2.2.2")
@@ -192,6 +192,7 @@ Gem::Specification.new do |s|
     test/source/_posts/2013-01-02-post-excerpt.markdown
     test/source/_posts/2013-01-12-nil-layout.textile
     test/source/_posts/2013-01-12-no-layout.textile
+    test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
     test/source/about.html
     test/source/category/_posts/2008-9-23-categories.textile
     test/source/contacts.html

data/lib/jekyll.rb

@@ -52,7 +52,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.0.0.beta3'
+  VERSION = '1.0.0.beta4'
 
   # Default options. Overriden by values in _config.yml.
   # Strings rather than symbols are used for compatability with YAML.
@@ -64,17 +64,20 @@ module Jekyll
     'keep_files'   => ['.git','.svn'],
 
     'future'        => true,           # remove and make true just default
-    'pygments'      => true,          # remove and make true just default
+    'pygments'      => true,           # remove and make true just default
 
     'markdown'      => 'maruku',
     'permalink'     => 'date',
-    'baseurl'       => '',
+    'baseurl'       => '/',
     'include'       => ['.htaccess'],
     'paginate_path' => 'page:num',
 
     'markdown_ext'  => 'markdown,mkd,mkdn,md',
     'textile_ext'   => 'textile',
 
+    'port'          => '4000',
+    'host'          => '0.0.0.0',
+
     'excerpt_separator' => "\n\n",
 
     'maruku' => {
@@ -152,6 +155,13 @@ module Jekyll
       config = {}
     end
 
+    # Provide backwards-compatibility
+    if config['auto']
+      $stderr.puts "Deprecation: ".rjust(20) + "'auto' has been changed to " +
+                   "'watch'. Please update your configuration to use 'watch'."
+      config['watch'] = config['auto']
+    end
+
     # Merge DEFAULTS < _config.yml < override
     Jekyll::DEFAULTS.deep_merge(config).deep_merge(override)
   end

data/lib/jekyll/filters.rb

@@ -56,6 +56,20 @@ module Jekyll
       date.xmlschema
     end
 
+    # Format a date according to RFC-822
+    #
+    # date - The Time to format.
+    #
+    # Examples
+    #
+    #   date_to_rfc822(Time.now)
+    #   # => "Sun, 24 Apr 2011 12:34:46 +0000"
+    #
+    # Returns the formatted String.
+    def date_to_rfc822(date)
+      date.rfc822
+    end
+
     # XML escape a string for use. Replaces any special characters with
     # appropriate HTML entity replacements.
     #

data/lib/jekyll/generators/pagination.rb

@@ -37,7 +37,7 @@ module Jekyll
           if num_page > 1
             newpage = Page.new(site, site.source, page.dir, page.name)
             newpage.pager = pager
-            newpage.dir = File.join(page.dir, paginate_path(site, num_page))
+            newpage.dir = File.join(page.dir, Pager.paginate_path(site.config, num_page))
             site.pages << newpage
           else
             page.pager = pager
@@ -45,16 +45,12 @@ module Jekyll
         end
       end
 
-      private
-        def paginate_path(site, num_page)
-          format = site.config['paginate_path']
-          format.sub(':num', num_page.to_s)
-        end
     end
   end
 
   class Pager
-    attr_reader :page, :per_page, :posts, :total_posts, :total_pages, :previous_page, :next_page
+    attr_reader :page, :per_page, :posts, :total_posts, :total_pages,
+      :previous_page, :previous_page_path, :next_page, :next_page_path
 
     # Calculate the number of pages.
     #
@@ -76,6 +72,18 @@ module Jekyll
       file == 'index.html' && !config['paginate'].nil?
     end
 
+    # Static: Return the pagination path of the page
+    #
+    # site_config - the site config
+    # num_page - the pagination page number
+    #
+    # Returns the pagination path as a string
+    def self.paginate_path(site_config, num_page)
+      return nil if num_page.nil? || num_page <= 1
+      format = site_config['paginate_path']
+      format.sub(':num', num_page.to_s)
+    end
+
     # Initialize a new Pager.
     #
     # config    - The Hash configuration of the site.
@@ -98,7 +106,9 @@ module Jekyll
       @total_posts = all_posts.size
       @posts = all_posts[init..offset]
       @previous_page = @page != 1 ? @page - 1 : nil
+      @previous_page_path = Pager.paginate_path(config, @previous_page)
       @next_page = @page != @total_pages ? @page + 1 : nil
+      @next_page_path = Pager.paginate_path(config, @next_page)
     end
 
     # Convert this Pager's data to a Hash suitable for use by Liquid.
@@ -112,7 +122,9 @@ module Jekyll
         'total_posts' => total_posts,
         'total_pages' => total_pages,
         'previous_page' => previous_page,
-        'next_page' => next_page
+        'previous_page_path' => previous_page_path,
+        'next_page' => next_page,
+        'next_page_path' => next_page_path
       }
     end
   end

data/lib/jekyll/post.rb

@@ -146,6 +146,8 @@ module Jekyll
         "/:categories/:title.html"
       when :date
         "/:categories/:year/:month/:day/:title.html"
+      when :ordinal
+        "/:categories/:year/:y_day/:title.html"
       else
         self.site.permalink_style.to_s
       end
@@ -169,6 +171,8 @@ module Jekyll
           "i_day"      => date.strftime("%d").to_i.to_s,
           "i_month"    => date.strftime("%m").to_i.to_s,
           "categories" => categories.map { |c| URI.escape(c.to_s) }.join('/'),
+          "short_month" => date.strftime("%b"),
+          "y_day"      => date.strftime("%j"),
           "output_ext" => self.output_ext
         }.inject(template) { |result, token|
           result.gsub(/:#{Regexp.escape token.first}/, token.last)

data/lib/jekyll/site.rb

@@ -405,6 +405,7 @@ module Jekyll
       base = File.join(self.source, dir, subfolder)
       return [] unless File.exists?(base)
       entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
+      entries.delete_if { |e| File.directory?(File.join(base, e)) }
     end
 
     # Aggregate post information

data/site/_posts/2012-07-01-configuration.md

@@ -5,68 +5,80 @@ prev_section: structure
 next_section: frontmatter
 ---
 
-Jekyll allows you to concoct your sites in any way you can dream up, and it’s thanks to the powerful and flexible configuration options that this is possible. These options can either be specified in a `_config.yml` file placed in your site’s root directory, or can be specified as flags for the `jekyll` executable in the terminal.
+Jekyll allows you to concoct your sites in any way you can dream up, and it’s
+thanks to the powerful and flexible configuration options that this is possible.
+These options can either be specified in a `_config.yml` file placed in your
+site’s root directory, or can be specified as flags for the `jekyll` executable
+in the terminal.
 
 ## Configuration Settings
 
 ### Global Configuration
 
-The table below lists the available settings for Jekyll, and the various <code class="option">options</code> (specifed in the configuration file) and <code class="flag">flags</code> (specified on the command-line) that control them.
+The table below lists the available settings for Jekyll, and the various <code
+class="option">options</code> (specifed in the configuration file) and <code
+class="flag">flags</code> (specified on the command-line) that control them.
 
 <table>
   <thead>
     <tr>
       <th>Setting</th>
-      <th><span class="option">Options</span> and <span class="flag">Flags</span></th>
+      <th>
+        <span class="option">Options</span> and <span class="flag">Flags</span>
+      </th>
     </tr>
   </thead>
   <tbody>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Site Source</strong></p>
-        <p class='description'>Changes the directory where Jekyll will look to transform files</p>
+        <p class='description'>Change the directory where Jekyll will read files</p>
       </td>
       <td class="align-center">
-        <p><code class="option">source: [string]</code></p>
-        <p><code class="flag">--source [source]</code></p>
+        <p><code class="option">source: DIR</code></p>
+        <p><code class="flag">-s, --source DIR</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Site Destination</strong></p>
-        <p class='description'>Changes the directory where Jekyll will write files to</p>
+        <p class='description'>Change the directory where Jekyll will write files</p>
       </td>
       <td class="align-center">
-        <p><code class="option">destination: [string]</code></p>
-        <p><code class="flag">--destination</code></p>
+        <p><code class="option">destination: DIR</code></p>
+        <p><code class="flag">-d, --destination DIR</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Safe</strong></p>
-        <p class='description'>Disables <a href="../plugins">custom plugins</a>.</p>
+        <p class='description'>Disable <a href="../plugins">custom plugins</a>.</p>
       </td>
       <td class="align-center">
-        <p><code class="option">safe: [boolean]</code></p>
+        <p><code class="option">safe: BOOL</code></p>
         <p><code class="flag">--safe</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Exclude</strong></p>
-        <p class="description">A list of directories and files to exclude from the conversion</p>
+        <p class="description">Exclude directories and/or files from the conversion</p>
       </td>
       <td class='align-center'>
-        <p><code class="option">exclude: [dir1, file1, dir2]</code></p>
+        <p><code class="option">exclude: [DIR, FILE, ...]</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Include</strong></p>
-        <p class="description">A list of directories and files to specifically include in the conversion. <code>.htaccess</code> is a good example since dotfiles are excluded by default.</p>
+        <p class="description">
+          Force inclusion of directories and/or files in the conversion.
+          <code>.htaccess</code> is a good example since dotfiles are excluded
+          by default.
+        </p>
       </td>
       <td class='align-center'>
-        <p><code class="option">include: [dir1, file1, dir2]</code></p>
+        <p><code class="option">include: [DIR, FILE, ...]</code></p>
       </td>
     </tr>
   </tbody>
@@ -85,90 +97,58 @@ The table below lists the available settings for Jekyll, and the various <code c
     <tr class='setting'>
       <td>
         <p class='name'><strong>Regeneration</strong></p>
-        <p class='description'>Enables auto-regeneration of the site when files are modified. Off by default.</p>
-      </td>
-      <td class="align-center">
-        <p><code class="flag">--watch</code></p>
-      </td>
-    </tr>
-    <tr class='setting'>
-      <td>
-        <p class='name'><strong>URL</strong></p>
-        <p class='description'>Sets <code>site.url</code>, useful for environment switching</p>
+        <p class='description'>Enable auto-regeneration of the site when files are modified.</p>
       </td>
       <td class="align-center">
-        <p><code class="option">url: [URL]</code></p>
-        <p><code class="flag">--url [URL]</code></p>
+        <p><code class="flag">-w, --watch</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
-        <p class='name'><strong>Markdown</strong></p>
-        <p class="description">Uses RDiscount or <code>[engine]</code> instead of Maruku.</p>
+        <p class='name'><strong>Configuration</strong></p>
+        <p class="description">Specify a config file. Overrides settings in <code>_config.yml</code></p>
       </td>
       <td class='align-center'>
-        <p><code class="option">markdown: [engine]</code></p>
-        <p><code class="flag">--markdown [rdiscount|kramdown|redcarpet]</code></p>
+        <p><code class="flag">--config FILE</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
-        <p class='name'><strong>Pygments</strong></p>
-        <p class="description">Enables highlight tag with Pygments.</p>
+        <p class='name'><strong>Drafts</strong></p>
+        <p class="description">Process and render draft posts.</p>
       </td>
       <td class='align-center'>
-        <p><code class="option">pygments: [boolean]</code></p>
-        <p><code class="flag">--pygments</code></p>
+        <p><code class="flag">--drafts</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Future</strong></p>
-        <p class="description">Publishes posts with a future date</p>
+        <p class="description">Publish posts with a future date.</p>
       </td>
       <td class='align-center'>
-        <p><code class="option">future: [boolean]</code></p>
+        <p><code class="option">future: BOOL</code></p>
         <p><code class="flag">--future</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>LSI</strong></p>
-        <p class="description">Produces an index for related posts.</p>
+        <p class="description">Produce an index for related posts.</p>
       </td>
       <td class='align-center'>
-        <p><code class="option">lsi: [boolean]</code></p>
+        <p><code class="option">lsi: BOOL</code></p>
         <p><code class="flag">--lsi</code></p>
       </td>
     </tr>
-    <tr class='setting'>
-      <td>
-        <p class='name'><strong>Permalink</strong></p>
-        <p class="description">Controls the URLs that posts are generated with. Please refer to the <a href="../permalinks">Permalinks</a> page for more info.</p>
-      </td>
-      <td class='align-center'>
-        <p><code class="option">permalink: [style]</code></p>
-        <p><code class="flag">--permalink [style]</code></p>
-      </td>
-    </tr>
-    <tr class='setting'>
-      <td>
-        <p class='name'><strong>Pagination</strong></p>
-        <p class="description">Splits your posts up over multiple subdirectories called "page2", "page3", ... "pageN"</p>
-      </td>
-      <td class='align-center'>
-        <p><code class="option">paginate: [per_page]</code></p>
-        <p><code class="flag">--paginate [per_page]</code></p>
-      </td>
-    </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Limit Posts</strong></p>
-        <p class="description">Limits the number of posts to parse and publish</p>
+        <p class="description">Limit the number of posts to parse and publish.</p>
       </td>
       <td class='align-center'>
-        <p><code class="option">limit_posts: [max_posts]</code></p>
-        <p><code class="flag">--limit_posts [max_posts]</code></p>
+        <p><code class="option">limit_posts: NUM</code></p>
+        <p><code class="flag">--limit_posts NUM</code></p>
       </td>
     </tr>
   </tbody>
@@ -191,31 +171,31 @@ before your site is served.
     <tr class='setting'>
       <td>
         <p class='name'><strong>Local Server Port</strong></p>
-        <p class='description'>Changes the port that the Jekyll server will run on</p>
+        <p class='description'>Listen on the given port.</p>
       </td>
       <td class="align-center">
-        <p><code class="option">port: [integer]</code></p>
-        <p><code class="flag">--port [port]</code></p>
+        <p><code class="option">port: PORT</code></p>
+        <p><code class="flag">--port PORT</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Local Server Hostname</strong></p>
-        <p class='description'>Changes the hostname that the Jekyll server will run on</p>
+        <p class='description'>Listen at the given hostname.</p>
       </td>
       <td class="align-center">
-        <p><code class="option">host: [string]</code></p>
-        <p><code class="flag">--host [hostname]</code></p>
+        <p><code class="option">host: HOSTNAME</code></p>
+        <p><code class="flag">--host HOSTNAME</code></p>
       </td>
     </tr>
     <tr class='setting'>
       <td>
         <p class='name'><strong>Base URL</strong></p>
-        <p class='description'>Serve website from a given base URL</p>
+        <p class='description'>Serve website with the given base URL</p>
       </td>
       <td class="align-center">
-        <p><code class="option">baseurl: [BASE_URL]</code></p>
-        <p><code class="flag">--baseurl [url]</code></p>
+        <p><code class="option">baseurl: URL</code></p>
+        <p><code class="flag">--baseurl URL</code></p>
       </td>
     </tr>
   </tbody>
@@ -223,14 +203,38 @@ before your site is served.
 
 <div class="note warning">
   <h5>Do not use tabs in configuration files</h5>
-  <p>This will either lead to parsing errors, or Jekyll will revert to the default settings. Use spaces instead.</p>
+  <p>
+    This will either lead to parsing errors, or Jekyll will revert to the
+    default settings. Use spaces instead.
+  </p>
 </div>
 
 ## Default Configuration
 
-Jekyll runs with the following configuration options by default. Unless alternative settings for these options are explicitly specified in the configuration file or on the command-line, Jekyll will run using these options.
+Jekyll runs with the following configuration options by default. Unless
+alternative settings for these options are explicitly specified in the
+configuration file or on the command-line, Jekyll will run using these options.
 
 {% highlight yaml %}
+source:      .
+destination: ./_site
+plugins:     ./_plugins
+layouts:     ./_layouts
+keep_files:  ['.git','.svn']
+
+future:      true
+pygments:    false
+
+markdown:      maruku
+permalink:     date
+include:       ['.htaccess']
+paginate_path: 'page:num'
+
+markdown_ext: markdown,mkd,mkdn,md
+textile_ext: textile
+
+excerpt_separator: "\n\n"
+
 safe:        false
 watch:       false
 server:      false
@@ -238,16 +242,7 @@ host:        0.0.0.0
 port:        4000
 baseurl:     /
 url:         http://localhost:4000
-
-source:      .
-destination: ./_site
-plugins:     ./_plugins
-
-future:      true
 lsi:         false
-pygments:    false
-markdown:    maruku
-permalink:   date
 
 maruku:
   use_tex:    false
@@ -259,11 +254,15 @@ maruku:
 rdiscount:
   extensions: []
 
+redcarpet:
+  extensions: []
+
 kramdown:
-  auto_ids: true,
+  auto_ids: true
   footnote_nr: 1
   entity_output: as_char
   toc_levels: 1..6
+  smart_quotes: lsquo,rsquo,ldquo,rdquo
   use_coderay: false
 
   coderay:
@@ -274,4 +273,6 @@ kramdown:
     coderay_bold_every: 10
     coderay_css: style
 
+redcloth:
+  hard_breaks: true
 {% endhighlight %}