fix: cleanup NEWS after botched merges

diff --git a/ChangeLog b/ChangeLog
index 01388cc0b44f4a1127ee79995685b72abb5fc4f4..0fdb2951534c5052b218740199d5988cd255c095 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       * NEWS: Cleanup after botched merges.
+
 2011-09-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        * NEWS: Fix typo.

diff --git a/NEWS b/NEWS
index 1123ec131588991dc53c4202241466f4ba293974..9f07e5fc7f8716da9dd65cd8d7ddcbfe75e8b3ab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,17 +7,6 @@ New in 1.11a:
   - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
     have been removed.
 
-* New targets:
-
-  - New `cscope' target to build a cscope database for the source tree.
-
-  - The `--acdir' option of aclocal is deprecated, and will probably be
-    removed in the next major Automake release (1.12).
-
-  - The exact order in which the directories in the aclocal macro
-    search path are looked up is probably going to be changed in the
-    next Automake release (1.12).
-
 * Changes to aclocal:
 
   - The `--acdir' option is deprecated.  Now you should use the new options
@@ -28,6 +17,14 @@ New in 1.11a:
     automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION)
     and before the system acdir (by default ${prefix}/share/aclocal).
 
+  - The exact order in which the directories in the aclocal macro
+    search path are looked up is probably going to be changed in the
+    next Automake release (1.12).
+
+* New targets:
+
+  - New `cscope' target to build a cscope database for the source tree.
+
 * Miscellaneous changes:
 
   - The `dist' and `dist-all' targets now can run compressors in parallel.