From 7d56426d50c1e2f3c3061cec92ee83532e9dfc22 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 2 Oct 2013 23:06:31 -0500
Subject: [PATCH] Update history to reflect merge of #1592

Combine it with the entry for #1590 since they're related. Move it
down to the site enhancements section since both pulls are changes to
the site.
---
 History.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index 3759156f..6feedf5a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,7 +23,6 @@
 ### Development Fixes
   * Add coverage reporting with Coveralls (#1539)
   * Refactor the Liquid `include` tag (#1490)
-  * Update the documentation for generators (#1590)
 
 ### Site Enhancements
   * Fix params for `JekyllImport::WordPress.process` arguments (#1554)
@@ -32,6 +31,7 @@
   * Add note about installing Xcode on the Mac in the Installation docs (#1561)
   * Simplify/generalize pagination docs (#1577)
   * Add documentation for the new data sources feature (#1503)
+  * Add more information on how to create generators (#1590, #1592)
 
 ## 1.2.1 / 2013-09-14