Added corrections as suggested by @parkr.

- Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>

lib/jekyll.rb

@@ -49,13 +49,13 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :CollectionReader,        'jekyll/readers/dynamic/collection_reader'
-  autoload :DataReader,        'jekyll/readers/dynamic/data_reader'
+  autoload :CollectionReader,    'jekyll/readers/dynamic/collection_reader'
+  autoload :DataReader,          'jekyll/readers/dynamic/data_reader'
   autoload :LayoutReader,        'jekyll/readers/dynamic/layout_reader'
-  autoload :DraftReader,        'jekyll/readers/dynamic/draft_reader'
-  autoload :PostReader,        'jekyll/readers/dynamic/post_reader'
-  autoload :PageReader, 'jekyll/readers/dynamic/page_reader'
-  autoload :StaticFileReader,        'jekyll/readers/static/static_file_reader'
+  autoload :DraftReader,         'jekyll/readers/dynamic/draft_reader'
+  autoload :PostReader,          'jekyll/readers/dynamic/post_reader'
+  autoload :PageReader,          'jekyll/readers/dynamic/page_reader'
+  autoload :StaticFileReader,    'jekyll/readers/static/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'

lib/jekyll/reader.rb

@@ -51,8 +51,8 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_posts(dir)
-      site.posts += PostReader.new(site).read(dir)
-      site.posts += DraftReader.new(site).read(dir) if site.show_drafts
+      site.posts.concat(PostReader.new(site).read(dir))
+      site.posts.concat(DraftReader.new(site).read(dir)) if site.show_drafts
       site.posts.sort!
     end
 
@@ -72,7 +72,7 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_pages(dir, dot_pages)
-      site.pages += PageReader.new(site, dir).read(dot_pages)
+      site.pages.concat(PageReader.new(site, dir).read(dot_pages))
       site.pages.sort_by!(&:name)
     end
 
@@ -81,7 +81,7 @@ module Jekyll
     #
     # Returns nothing.
     def retrieve_static_files(dir, dot_static_files)
-      site.static_files += StaticFileReader.new(site, dir).read(dot_static_files)
+      site.static_files.concat(StaticFileReader.new(site, dir).read(dot_static_files))
       site.static_files.sort_by!(&:relative_path)
     end
 
@@ -110,4 +110,4 @@ module Jekyll
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
   end
-end
+end

site/_docs/history.md

@@ -191,7 +191,6 @@ permalink: "/docs/history/"
 - Allow Travis to 'parallelize' our tests ([#2859]({{ site.repository }}/issues/2859))
 - Fix test for Liquid rendering in Sass ([#2856]({{ site.repository }}/issues/2856))
 - Fixing "vertycal" typo in site template's `_base.scss` ([#2889]({{ site.repository }}/issues/2889))
-- Convert remaining textile test documents to markdown ([#3528]({{ site.repository }}/issues/3528))
 
 ### Site Enhancements
 {: #site-enhancements-v2-4-0}

test/test_site.rb

@@ -189,7 +189,7 @@ class TestSite < JekyllUnitTest
     end
 
     should "read posts" do
-      @site.posts += PostReader.new(@site).read('')
+      @site.posts.concat(PostReader.new(@site).read(''))
       posts = Dir[source_dir('_posts', '**', '*')]
       posts.delete_if { |post| File.directory?(post) && !Post.valid?(post) }
       assert_equal posts.size - @num_invalid_posts, @site.posts.size

test/test_tags.rb

@@ -13,7 +13,7 @@ class TestTags < JekyllUnitTest
     site = Site.new(Jekyll.configuration)
 
     if override['read_posts']
-      site.posts += PostReader.new(site).read('')
+      site.posts.concat(PostReader.new(site).read(''))
     end
 
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }