diff --git a/benchmark/flat-map b/benchmark/flat-map index b10c5c9a..547bcee1 100644 --- a/benchmark/flat-map +++ b/benchmark/flat-map @@ -14,4 +14,3 @@ Benchmark.ips do |x| x.report('.map.flatten with no nested arrays') { enum.map { |i| do_thing(i) }.flatten(1) } x.report('.flat_map with no nested arrays') { enum.flat_map { |i| do_thing(i) } } end - diff --git a/lib/jekyll/commands/new.rb b/lib/jekyll/commands/new.rb index 724a1d8d..433d33b7 100644 --- a/lib/jekyll/commands/new.rb +++ b/lib/jekyll/commands/new.rb @@ -3,7 +3,7 @@ require 'erb' module Jekyll module Commands class New < Command - class << self + class << self def init_with_program(prog) prog.command(:new) do |c| c.syntax 'new PATH' @@ -11,7 +11,7 @@ module Jekyll c.option 'force', '--force', 'Force creation even if PATH already exists' c.option 'blank', '--blank', 'Creates scaffolding but with empty files' - + c.action do |args, options| Jekyll::Commands::New.process(args, options) end @@ -76,7 +76,7 @@ module Jekyll def scaffold_path "_posts/0000-00-00-welcome-to-jekyll.markdown.erb" end - end + end end end end diff --git a/site/_docs/usage.md b/site/_docs/usage.md index 38dabf7f..7a424bd4 100644 --- a/site/_docs/usage.md +++ b/site/_docs/usage.md @@ -27,12 +27,12 @@ $ jekyll build --watch

The contents of <destination> are automatically cleaned, by default, when the site is built. Files or folders that are not - created by your site will be removed. Files and folders you wish to retain - in <destination> may be specified within the <keep_files> + created by your site will be removed. Files and folders you wish to retain + in <destination> may be specified within the <keep_files> configuration directive.

- Do not use an important location for <destination>; + Do not use an important location for <destination>; instead, use it as a staging area and copy files from there to your web server.

diff --git a/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown b/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown index 5a64cfc9..1e3e44ce 100644 --- a/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown +++ b/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown @@ -15,5 +15,3 @@ greatest code a spin without having to clone a repository from git. Please take this prerelease for a spin and [let us know](https://github.com/jekyll/jekyll/issues/new) if you run into any issues! - - diff --git a/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown b/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown index 509571b3..63407158 100644 --- a/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown +++ b/site/_posts/2013-12-09-jekyll-1-4-1-released.markdown @@ -16,5 +16,3 @@ keep on writing without any problems. As always, you can find the full list of fixes in this release in the [change log](/docs/history/)! - - diff --git a/test/fixtures/broken_front_matter3.erb b/test/fixtures/broken_front_matter3.erb index 5fff53b7..0672ae43 100644 --- a/test/fixtures/broken_front_matter3.erb +++ b/test/fixtures/broken_front_matter3.erb @@ -4,4 +4,3 @@ test: good Real content starts here Русский текст - diff --git a/test/source/+/%# +.md b/test/source/+/%# +.md index a850f4dc..18e9cccc 100644 --- a/test/source/+/%# +.md +++ b/test/source/+/%# +.md @@ -1,6 +1,6 @@ --- layout: default -title : Page name with non-alphabetic character +title : Page name with non-alphabetic character --- Line 1 {{ page.title }} diff --git a/test/source/_posts/2008-02-02-published.textile b/test/source/_posts/2008-02-02-published.textile index 78651408..5b2428e4 100644 --- a/test/source/_posts/2008-02-02-published.textile +++ b/test/source/_posts/2008-02-02-published.textile @@ -5,4 +5,3 @@ category: publish_test --- This should be published. - diff --git a/test/source/deal.with.dots.html b/test/source/deal.with.dots.html index a69dac8c..afe2aa11 100644 --- a/test/source/deal.with.dots.html +++ b/test/source/deal.with.dots.html @@ -4,4 +4,3 @@ permalink: /deal.with.dots/ --- Let's test if jekyll deals properly with dots. -