From e4e73bddb3bd377d2398e7e9f9354661644f063f Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 15:57:43 +0100 Subject: [PATCH 01/16] Fixed select closing tag --- site/_includes/docs_contents_mobile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - From eacf7e948bfb5e8d9a2c16274c757c7cce94fc41 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 16:07:45 +0100 Subject: [PATCH 02/16] Fixed typos --- site/_posts/2012-07-01-configuration.md | 2 +- site/_posts/2012-07-01-resources.md | 2 +- site/_posts/2012-07-01-troubleshooting.md | 2 +- site/_posts/2012-07-01-upgrading.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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: From b61f81c64d2a066b8656a8c58d1ee083690e4182 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 16:08:36 +0100 Subject: [PATCH 03/16] Removed duplicate css entry --- site/css/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/site/css/style.css b/site/css/style.css index 7dad2f89..fad86199 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -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; } From 221c5250579fa6e3cb39f36d926cdc19e11607b5 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 16:09:26 +0100 Subject: [PATCH 04/16] Fixed duplicate attribute in css --- site/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/css/style.css b/site/css/style.css index fad86199..de86c706 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; From d34991ce3d001eabc638a914260ee899c221cd73 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 16:10:29 +0100 Subject: [PATCH 05/16] Removed useless measure in css --- site/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/css/style.css b/site/css/style.css index de86c706..3f5c3c64 100644 --- a/site/css/style.css +++ b/site/css/style.css @@ -701,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; From 60bbcaa86334e5e29f7a474a05169d71a21f08f7 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 6 May 2013 20:06:53 +0200 Subject: [PATCH 06/16] Update history to reflect merge of #1028 --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index e7f60ada..d2e15b19 100644 --- a/History.txt +++ b/History.txt @@ -3,6 +3,7 @@ * Minor Enhancements * Bug Fixes * 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) * Development Fixes From c7b707cdfdb2fe6fd99ea639ec7d7bb4544a2761 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 6 May 2013 20:17:28 +0200 Subject: [PATCH 07/16] Ignore --help and --version in Deprecator. Fixes #1030 --- lib/jekyll/deprecator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index ae074f33..13871300 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -17,7 +17,7 @@ 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) From 410e5912a2a0cba03268f0753d1722a30904be7e Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 20:26:39 +0100 Subject: [PATCH 08/16] Fixed html --- lib/site_template/_layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@

- + From 29b3dc97f0b38cfbc3744fd216d6bcbf5bcd4a3d Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Mon, 6 May 2013 20:27:00 +0100 Subject: [PATCH 09/16] Fixed typos --- lib/jekyll/configuration.rb | 4 ++-- test/test_post.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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 From dde2d7c3f6c6abf6d2cc1f23dc5ce0591ab78ba4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 6 May 2013 22:10:18 +0200 Subject: [PATCH 10/16] Update history to reflect merge of #1032 --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index d2e15b19..d6225114 100644 --- a/History.txt +++ b/History.txt @@ -2,6 +2,7 @@ * Major Enhancements * Minor Enhancements * Bug Fixes + * 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) From a0ad8a4031bbdd49f0fa77f12623181e29d0b4f9 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 7 May 2013 13:10:29 +0200 Subject: [PATCH 11/16] Don't print deprecation warning if no arg is specified. Fixes #1041. --- lib/jekyll/deprecator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index 13871300..4be93480 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -17,7 +17,7 @@ module Jekyll end def self.no_subcommand(args) - if args.size == 0 || (args.first =~ /^--/ && !%w[--help --version].include?(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) From 7dccb6c9967e1f96c731177c666f98cc9f05b748 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 7 May 2013 13:11:17 +0200 Subject: [PATCH 12/16] Update history to reflect fix of #1041. --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index d6225114..1861374a 100644 --- a/History.txt +++ b/History.txt @@ -2,6 +2,7 @@ * Major Enhancements * Minor Enhancements * Bug Fixes + * 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) From d0a9948eed2560702b5b0182f5e6b46529e0be31 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 7 May 2013 13:15:03 +0200 Subject: [PATCH 13/16] Let Commander handle bad args after printing of deprecation warning. Fixes #1040. --- lib/jekyll/deprecator.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/jekyll/deprecator.rb b/lib/jekyll/deprecator.rb index 4be93480..5b88fbf0 100644 --- a/lib/jekyll/deprecator.rb +++ b/lib/jekyll/deprecator.rb @@ -20,14 +20,12 @@ module Jekyll 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 From e12482fc6b749642e39cc12163ee2ec8511ecc65 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 7 May 2013 13:16:15 +0200 Subject: [PATCH 14/16] Update history to reflect fix of #1040 --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index 1861374a..449a1fc3 100644 --- a/History.txt +++ b/History.txt @@ -1,6 +1,7 @@ == HEAD * Major Enhancements * Minor Enhancements + * Commander error message now preferred over process abort with incorrect args (#1040) * Bug Fixes * 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) From 39d33b48b0c7dc6a5eab5289b3cf0e9252db2387 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Tue, 7 May 2013 06:58:54 -0500 Subject: [PATCH 15/16] Fix the index build with LSI --- lib/jekyll/post.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 "" From 877e328650a2d741f66b3f73211e38deb601057a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 7 May 2013 14:32:37 +0200 Subject: [PATCH 16/16] Update history to reflect merge of #1045 --- History.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/History.txt b/History.txt index 449a1fc3..9c3a9820 100644 --- a/History.txt +++ b/History.txt @@ -3,6 +3,7 @@ * 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