diff --git a/history.md b/history.md index 1c47a964..9e4a62bb 100644 --- a/history.md +++ b/history.md @@ -3,8 +3,15 @@ ## HEAD ### Major Enhancements ### Minor Enhancements + * Commander error message now preferred over process abort with incorrect args (#1040) + ### Bug Fixes + * Fix the index build with LSI (#1045) + * Don't print deprecation warning when no arguments are specified. (#1041) + * Add missing
to site template used by `new` subcommand, fixed typos in code (#1032) + ### Site Enhancements + * Remove CSS cruft, fix typos, fix HTML errors (#1028) * Removing manual install of Pip and Distribute (#1025) * Updated URL for Markdown references plugin (#1022) diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb index 4bc41682..d6856bb1 100644 --- a/lib/jekyll/configuration.rb +++ b/lib/jekyll/configuration.rb @@ -3,8 +3,8 @@ module Jekyll class Configuration < Hash - # Default options. Overriden by values in _config.yml. - # Strings rather than symbols are used for compatability with YAML. + # Default options. Overridden by values in _config.yml. + # Strings rather than symbols are used for compatibility with YAML. DEFAULTS = { 'source' => Dir.pwd, 'destination' => File.join(Dir.pwd, '_site'), diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index ae074f33..5b88fbf0 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -17,17 +17,15 @@ module Jekyll end def self.no_subcommand(args) - if args.size == 0 || args.first =~ /^--/ + if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first) Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \ switches. Run `jekyll help' to find out more." - exit(1) end end def self.deprecation_message(args, deprecated_argument, message) if args.include?(deprecated_argument) Jekyll::Logger.error "Deprecation:", message - exit(1) end end end diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb index 388c86c3..571d854d 100644 --- a/lib/jekyll/post.rb +++ b/lib/jekyll/post.rb @@ -261,7 +261,7 @@ module Jekyll puts "Starting the classifier..." lsi = Classifier::LSI.new(:auto_rebuild => false) $stdout.print(" Populating LSI... "); $stdout.flush - posts.each { |x| $stdout.print("."); $stdout.flush; lsi.add_item(x) } + self.site.posts.each { |x| $stdout.print("."); $stdout.flush; lsi.add_item(x) } $stdout.print("\n Rebuilding LSI index... ") lsi.build_index puts "" diff --git a/lib/site_template/_layouts/default.html b/lib/site_template/_layouts/default.html index ad1d3b85..46ebc109 100644 --- a/lib/site_template/_layouts/default.html +++ b/lib/site_template/_layouts/default.html @@ -39,7 +39,7 @@

- + diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html index ff09c5be..30446d4d 100644 --- a/site/_includes/docs_contents_mobile.html +++ b/site/_includes/docs_contents_mobile.html @@ -32,5 +32,5 @@ - diff --git a/site/_posts/2012-07-01-configuration.md b/site/_posts/2012-07-01-configuration.md index 800a9638..4c268835 100644 --- a/site/_posts/2012-07-01-configuration.md +++ b/site/_posts/2012-07-01-configuration.md @@ -16,7 +16,7 @@ in the terminal. ### Global Configuration The table below lists the available settings for Jekyll, and the various options (specifed in the configuration file) and options (specified in the configuration file) and flags (specified on the command-line) that control them.
diff --git a/site/_posts/2012-07-01-resources.md b/site/_posts/2012-07-01-resources.md index 12c7494d..775c4d03 100644 --- a/site/_posts/2012-07-01-resources.md +++ b/site/_posts/2012-07-01-resources.md @@ -41,6 +41,6 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext - [Jekyll Extensions -= Pain](http://rfelix.com/2010/01/19/jekyll-extensions-minus-equal-pain/) - A way to [extend Jekyll](http://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](http://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reutilized and shared. + A way to [extend Jekyll](http://github.com/rfelix/jekyll_ext) without forking and modifying the Jekyll gem codebase and some [portable Jekyll extensions](http://wiki.github.com/rfelix/jekyll_ext/extensions) that can be reused and shared. - [Using your Rails layouts in Jekyll](http://numbers.brighterplanet.com/2010/08/09/sharing-rails-views-with-jekyll) diff --git a/site/_posts/2012-07-01-troubleshooting.md b/site/_posts/2012-07-01-troubleshooting.md index 9b3fc593..1002ca7e 100644 --- a/site/_posts/2012-07-01-troubleshooting.md +++ b/site/_posts/2012-07-01-troubleshooting.md @@ -11,7 +11,7 @@ If you ever run into problems installing or using Jekyll, here’s a few tips th If you encounter errors during gem installation, you may need to install the header files for compiling extension modules for ruby 1.9.1. This -can be done on Ubunutu or Debian by running: +can be done on Ubuntu or Debian by running: {% highlight bash %} sudo apt-get install ruby1.9.1-dev diff --git a/site/_posts/2012-07-01-upgrading.md b/site/_posts/2012-07-01-upgrading.md index 0c9004b5..b8288d84 100644 --- a/site/_posts/2012-07-01-upgrading.md +++ b/site/_posts/2012-07-01-upgrading.md @@ -38,7 +38,7 @@ Rather than passing individual flags via the command line, you can now pass an entire custom Jekyll config file. This helps to distinguish between environments, or lets you programmatically override user-specified defaults. Simply add the `--config` flag to the `jekyll` command, followed by the path -to one or more config files (comma-deliminated, no spaces). +to one or more config files (comma-delimited, no spaces). #### As a result, the following command line flags are now deprecated: diff --git a/site/css/style.css b/site/css/style.css index 7dad2f89..3f5c3c64 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -250,7 +250,7 @@ body > footer a:hover img { margin: 0 20px; padding: 5px 0; border-radius: 5px 5px 0 0; - box-shadow: box-shadow: 0 3px 10px rgba(0,0,0,.5); + box-shadow: 0 3px 10px rgba(0,0,0,.5); font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; @@ -447,7 +447,6 @@ body > footer a:hover img { padding: 8px 12px 10px; border-radius: 5px; /*border: 1px solid #333;*/ - background: #999; box-shadow: 0 1px 3px rgba(0,0,0,.3), inset 0 1px 1px rgba(255,255,255,.5); background: #777; } @@ -702,7 +701,7 @@ code.option, code.flag, code.filter, code.output { margin-left: -30px; padding: 20px 20px 24px; padding-left: 50px; - border-radius: 0px 5px 5px 0px; + border-radius: 0 5px 5px 0; position: relative; box-shadow: 0 1px 5px rgba(0, 0, 0, .3), inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.3); background: #7e6d42; diff --git a/test/test_post.rb b/test/test_post.rb index 1d7b8539..b28af071 100644 --- a/test/test_post.rb +++ b/test/test_post.rb @@ -535,7 +535,7 @@ class TestPost < Test::Unit::TestCase assert conv.kind_of? Jekyll::Converters::Markdown end - should "process .text as indentity under default configuration" do + should "process .text as identity under default configuration" do post = setup_post '2011-04-12-text-extension.text' conv = post.converter assert conv.kind_of? Jekyll::Converters::Identity