3 files changed, 19 insertions, 12 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3626367da52..75561a0ba21 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * calc.texi (General Mode Commands): Calc file should be in .emacs.d.
+
+        * faq.texi (New in Emacs 22): Max buffer size is now 512 MB.
+
 2009-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Direct Functions): Add missing port number to tls method.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 590ec8059e7..c88bb3e9ab8 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -12134,17 +12134,18 @@ the @emph{appearance} or @emph{interpretation} of the stack's contents.
 @cindex Saving mode settings
 @cindex Permanent mode settings
 @cindex Calc init file, mode settings
-You can save all of the current mode settings in your Calc init file 
+You can save all of the current mode settings in your Calc init file
 (the file given by the variable @code{calc-settings-file}, typically
-@file{~/.calc.el}) with the @kbd{m m} (@code{calc-save-modes}) command.
-This will cause Emacs to reestablish these modes each time it starts up.
-The modes saved in the file include everything controlled by the @kbd{m}
-and @kbd{d} prefix keys, the current precision and binary word size,
-whether or not the trail is displayed, the current height of the Calc
-window, and more.  The current interface (used when you type @kbd{C-x * *}) 
-is also saved.  If there were already saved mode settings in the
-file, they are replaced.  Otherwise, the new mode information is
-appended to the end of the file.
+@file{~/.emacs.d/calc.el}) with the @kbd{m m} (@code{calc-save-modes})
+command.  This will cause Emacs to reestablish these modes each time
+it starts up.  The modes saved in the file include everything
+controlled by the @kbd{m} and @kbd{d} prefix keys, the current
+precision and binary word size, whether or not the trail is displayed,
+the current height of the Calc window, and more.  The current
+interface (used when you type @kbd{C-x * *}) is also saved.  If there
+were already saved mode settings in the file, they are replaced.
+Otherwise, the new mode information is appended to the end of the
+file.
 
 @kindex m R
 @pindex calc-mode-record-mode
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index a9db21e6cd7..f969940b496 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1124,8 +1124,8 @@ Font Lock mode, Auto Compression mode, and File Name Shadow Mode are
 enabled by default.
 
 @item
-The maximum size of buffers has been doubled and is 256M on 32-bit
-machines.
+The maximum size of buffers is increased: on 32-bit machines, it is
+256 MBytes for Emacs 23.1, and 512 MBytes for Emacs 23.2 and above.
 
 @item
 Links can be followed with @kbd{mouse-1}, in addition to @kbd{mouse-2}.