Put changelog for #2634 under “New in master”

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 14, 2017 · 2423c64 · 2423c64
1 parent a9656c9
commit 2423c64
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,14 @@
+New in master
+=============
+
+Features
+--------
+* Add META_GENERATOR_TAG option in conf.py allowing the meta generator
+  to be disabled if needed. (Issue #2628)
+
+Bugfixes
+--------
+
 New in v7.8.3
 =============
 
@@ -11,8 +22,6 @@ Features
 * Sort posts in the following order (most important last): source path
   (A-Z), title (A-Z), date (reverse chronological order), priority
   meta number (descending). (Issue #2627)
-* Add META_GENERATOR_TAG option in conf.py allowing the meta generator 
-  to be disabled if needed. (Issue #2628)
 
 Bugfixes
 --------

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -718,10 +718,10 @@ IMAGE_FOLDERS = {'images': 'images'}
 # Please note that this will undo the effect of INDEXES_STATIC, as all index pages
 # must be recreated whenever the number of pages changes.
 # SHOW_INDEX_PAGE_NAVIGATION = False
-#
-# If the following is true, a meta tag with content = "generator" is added to
-# pages. The generator tag is used to specify the software used to generate the 
-# page. 
+
+# If the following is True, a meta name="generator" tag is added to pages. The
+# generator tag is used to specify the software used to generate the page
+# (it promotes Nikola).
 # META_GENERATOR_TAG = True
 
 # Color scheme to be used for code blocks. If your theme provides