diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.markdown index 94533415..8bd2febe 100644 --- a/CONTRIBUTING.markdown +++ b/CONTRIBUTING.markdown @@ -67,7 +67,7 @@ You can find the documentation for jekyllrb.com in the [site](https://github.com/jekyll/jekyll/tree/master/site) directory of Jekyll's repo on GitHub.com. -All documentation pull requests should be directed at `master`. Pull +All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub diff --git a/History.markdown b/History.markdown index 67fdb963..a1eb3aa1 100644 --- a/History.markdown +++ b/History.markdown @@ -538,7 +538,7 @@ * Add `Jekyll::LiquidExtensions` with `.lookup_variable` method for easy looking up of variable values in a Liquid context. (#2253) * Remove literal lang name from class (#2292) - * Return `utf-8` encoding in header for webrick error page response (#2289) + * Return `utf-8` encoding in header for webrick error page response (#2289) * Make template site easier to customize (#2268) * Add two-digit year to permalink template option (#2301) * Add `site.documents` to Liquid payload (list of all docs) (#2295) diff --git a/benchmark/string-replacement b/benchmark/string-replacement index 13715376..36de613c 100644 --- a/benchmark/string-replacement +++ b/benchmark/string-replacement @@ -8,6 +8,6 @@ Benchmark.ips do |x| x.report('#tr') { str.tr('some', 'a') } x.report('#gsub') { str.gsub('some', 'a') } x.report('#gsub!') { str.gsub!('some', 'a') } - x.report('#sub') { str.sub('some', 'a') } - x.report('#sub!') { str.sub!('some', 'a') } + x.report('#sub') { str.sub('some', 'a') } + x.report('#sub!') { str.sub!('some', 'a') } end diff --git a/lib/site_template/_includes/footer.html b/lib/site_template/_includes/footer.html index be3976f7..ee8246a5 100644 --- a/lib/site_template/_includes/footer.html +++ b/lib/site_template/_includes/footer.html @@ -5,19 +5,19 @@