Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org

[bpt/emacs.git] / doc / lispref / anti.texi

diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi
index f70d023..577411b 100644 (file)
--- a/doc/lispref/anti.texi
+++ b/doc/lispref/anti.texi
@@ -1,11 +1,11 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2002-2013 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This node must have no pointers.
 
-@node Antinews, GNU Free Documentation License, Packaging, Top
+@node Antinews
 @appendix Emacs 23 Antinews
 @c Update the elisp.texi Antinews menu entry with the above version number.
 
@@ -71,9 +71,8 @@ been removed, including @code{display-buffer-overriding-action} and
 related variables, as well as the @var{action} argument to
 @code{display-buffer} and other functions.  The way to
 programmatically control how Emacs chooses a window to display a
-buffer is to bind the right combination of
-@code{special-display-regexps}, @code{pop-up-frames}, and other
-variables.
+buffer is to bind the right combination of @code{pop-up-frames} and
+other variables.
 
 @item
 The standard completion interface has been simplified, eliminating the