2 files changed, 16 insertions, 6 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8d5dcc09a0b..dde87568796 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-26  Glenn Morris  <rgm@gnu.org>
+
+        * faq.texi (Latest version of Emacs): Mention stability of development
+        version.
+        (Problems with very large files): Max buffer size increase in 23.2.
+        (VM): VM has moved house again.
+
 2009-11-22  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Radix modes): Discuss alternate bases for two's complement
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 1c10c91c763..44bb54066da 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -12,8 +12,8 @@
 @c appreciate a notice if you do).
 
 @copying
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-Free Software Foundation, Inc.@*
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009 Free Software Foundation, Inc.@*
 Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000
 Reuven M. Lerner@*
 Copyright @copyright{} 1992, 1993 Steven Byrnes@*
@@ -1027,7 +1027,9 @@ available.
 Because Emacs undergoes many changes before a release, the version
 number of a development version is not especially meaningful.  It is
 better to refer to the date on which the sources were retrieved from the
-development repository.
+development repository.  The development version is usually quite robust
+for every-day use, but if stability is more important to you than the
+latest features, you may want to stick to the releases.
 
 The following sections list some of the major new features in the last
 few Emacs releases.  For full details of the changes in any version of
@@ -2698,8 +2700,8 @@ type @kbd{C-h C-p} to read it.
 Old versions (i.e., anything before 19.29) of Emacs had problems editing
 files larger than 8 megabytes.  In versions 19.29 and later, the maximum
 buffer size is at least 2^27-1, or 134,217,727 bytes, or 132 MBytes.
-And in Emacs 22, the maximum buffer size has been increased to
-268,435,455 bytes (or 256 MBytes) on 32-bit machines.
+The maximum buffer size on 32-bit machines increased to 256 MBytes in
+Emacs 22, and again to 512 MBytes in Emacs 23.2.
 
 Emacs compiled on a 64-bit machine can handle much larger buffers.
 
@@ -3416,7 +3418,8 @@ See the file @file{nextstep/INSTALL} in the distribution.
 @table @b
 
 @item Web site
-@uref{http://www.nongnu.org/viewmail/}
+@uref{http://launchpad.net/vm}
+(was @uref{http://www.nongnu.org/viewmail/})
 
 @item Informational newsgroup
 @uref{news:gnu.emacs.vm.info}@*