[FYI] {branch-1.11} news: fix other blunders

[Stefano Lattarini]

* NEWS: Remove some duplicated entries, and reorder some others,
and rename a subsection.  This blunders are probably due to a
botched merge.
---
 ChangeLog |    7 +++++++
 NEWS      |   29 +++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf01432..5b33a7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-10  Stefano Lattarini  <address@hidden>
+
+       news: fix other blunders
+       * NEWS: Remove some duplicated entries, and reorder some others,
+       and rename a subsection.  This blunders are probably due to a
+       botched merge.
+
 2011-12-09  Jim Meyering  <address@hidden>
            Stefano Lattarini  <address@hidden>
 
diff --git a/NEWS b/NEWS
index ad0af5f..0fc4b42 100644
--- a/NEWS
+++ b/NEWS
@@ -67,14 +67,13 @@ New in 1.11.1a:
 
 Bugs fixed in 1.11.1a:
 
-* Bugs introduced by 1.11.1:
+* Bugs introduced by 1.11:
 
-* Long-standing bugs:
+  - The parallel-tests driver no longer produces erroneous results with
+    Tru64/OSF 5.1 sh upon unreadable log files.
 
-  - The `parallel-tests' test driver works around a GNU make 3.80 bug with
-    trailing white space in the test list (`TESTS = foo $(EMPTY)'), and
-    does not report spurious successes when used with concurrent FreeBSD
-    make (e.g., "make check -j3").
+  - The `parallel-tests' test driver does not report spurious successes
+    when used with concurrent FreeBSD make (e.g., "make check -j3").
 
   - When the parallel-tests driver is in use, automake now explicitly
     rejects invalid entries and conditional contents in TEST_EXTENSIONS,
@@ -88,8 +87,10 @@ Bugs fixed in 1.11.1a:
     not used, `make' output no longer contains spurious backslash-only
     lines, thus once again matching what Automake did before 1.11.
 
-  - A per-Makefile.am setting of -Werror does not carry over to the
-    handling of other Makefile.am files any more.
+  - The AM_COND_IF macro also works if the shell expression for the
+    conditional is no longer valid for the condition.
+
+* Long-standing bugs:
 
   - The order of Yacc and Lex flags is fixed to be consistent with other
     languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
@@ -105,15 +106,6 @@ Bugs fixed in 1.11.1a:
   - Automake now warns about more primary/directory invalid combinations,
     such as "doc_LIBRARIES" or "pkglib_PROGRAMS".
 
-  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
-    even if the `--prefix' argument pointed outside of a system directory.
-    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
-    `get_python_lib' function if it points outside the configured prefix,
-    unless the `--prefix' argument was either `/usr' or below `/System'.
-
-  - The AM_COND_IF macro also works if the shell expression for the conditional
-    is no longer valid for the condition.
-
   - Rules generated by Automake now try harder to not change any files when
     `make -n' is invoked.  Fixes include compilation of Emacs Lisp, Vala, or
     Yacc source files and the rule to update config.h.
@@ -128,9 +120,6 @@ Bugs fixed in 1.11.1a:
     make bug triggered by sources containing repeated slashes when the
     `subdir-objects' option was used.
 
-  - The parallel-tests driver no longer produces erroneous results with
-    Tru64/OSF 5.1 sh upon unreadable log files.
-
   - The makedepend and hp depmodes now work better with VPATH builds.
 
   - Java sources specified with check_JAVA are no longer compiled for
-- 
1.7.2.3