Merge branch 'maint'

etc/ORG-NEWS

@@ -1,7 +1,7 @@
-#+LINK: doc http://orgmode.org/worg/doc.html#%s
-
 ORG NEWS -- history of user-visible changes.           -*- org -*-
 
+#+LINK: doc http://orgmode.org/worg/doc.html#%s
+
 Copyright (C) 2012-2013  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
@@ -9,8 +9,6 @@ Please send Org bug reports to emacs-orgmode@gnu.org.
 
 * Version 7.9.3
 
-** Agenda speed up
-
 ** New option [[doc::org-agenda-use-tag-inheritance][org-agenda-use-tag-inheritance]]
 
 [[doc::org-use-tag-inheritance][org-use-tag-inheritance]] controls whether tags are inherited when
@@ -23,8 +21,13 @@ to display.  Still, you might want to have all tag information correct
 in the agenda buffer, e.g. for tag filtering.  In that case, add the
 agenda type to this variable.
 
-Note that setting this variable to nil considerably speeds up the
-agenda generation.
+Setting this variable to nil should considerably speeds up the agenda
+generation.
+
+Note that the default was to display inherited tags in the agenda
+lines even if `org-use-tag-inheritance' was nil.  The default is now
+to *never* display inherited tags in agenda lines, but to /know/ about
+them when the agenda type is listed in [[doc::org-agenda-use-tag-inheritance][org-agenda-use-tag-inheritance]].
 
 ** New default value nil for [[doc::org-agenda-dim-blocked-tasks][org-agenda-dim-blocked-tasks]]
 
@@ -40,7 +43,6 @@ consistent with using the `:' key in agenda view.
 You can now use `=' for [[doc::org-columns][org-columns]].
 
 ** =org-float= is now obsolete, use =diary-float= instead
-
 ** No GPL manual anymore
 
 There used to be a GPL version of the Org manual, but this is not the