Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-73
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-74
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-75
   Make ERC comply with the new copyright year guidelines.

 * emacs@sv.gnu.org/emacs--devo--0--patch-76
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-77
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-78
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-79
   (rcirc-format-response-string): Fix small bugs

 * emacs@sv.gnu.org/emacs--devo--0--patch-80
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-81
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-82
   Fix compiler error in erc-dcc.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-83
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-84
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-85
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-86
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-87
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-88
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-89
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-90
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-513

13 files changed, 199 insertions, 100 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index fa6e236959f..0d22e6d17bc 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,63 @@
+2006-02-15  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * maintaining.texi (Create Tags Table): Explain why the
+        exception when etags writes to files under the /dev tree.
+
+2006-02-14  Richard M. Stallman  <rms@gnu.org>
+
+        * custom.texi (Safe File Variables): Lots of clarification.
+        Renamed from Unsafe File Variables.
+
+2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.texi (Unsafe File Variables): File variable confirmation
+        assumed denied in batch mode.
+
+2006-02-14  Richard M. Stallman  <rms@gnu.org>
+
+        * building.texi (GDB User Interface Layout): Don't say `inferior'
+        for program being debugged.
+
+2006-02-15  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GDB Graphical Interface): Replace
+        gdb-use-inferior-io-buffer with gdb-use-separate-io-buffer.
+
+2006-02-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.texi (Specifying File Variables, Unsafe File Variables):
+        New nodes, split from File Variables.  Document new file local
+        variable behavior.
+
+2006-02-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * display.texi (Standard Faces):
+        * faq.texi (Colors on a TTY):
+        * files.texi (Visiting):
+        * frames.texi (Clipboard):
+        * glossary.texi (Glossary) <Clipboard>:
+        * xresources.texi (X Resources): Mention Mac OS port.
+
+2006-02-12  Karl Berry  <karl@gnu.org>
+
+        * faq.texi (Emacs for Atari ST): use Sch@"auble instead of the
+        8-bit accented a.
+
+2006-02-12  Richard M. Stallman  <rms@gnu.org>
+
+        * building.texi (Building): Clarify topic in intro.
+
+        * maintaining.texi (Maintaining): Change title; clarify topic.
+        Delete duplicate index entries.
+
+        * building.texi (Other GDB User Interface Buffers): Clarifications.
+
+        * text.texi (Cell Commands): Clarifications.
+
+        * programs.texi (Defuns): Delete duplicate explanation of
+        left-margin paren convention.
+        (Hungry Delete): Minor cleanup.
+
 2006-02-11  Mathias Dahl  <mathias.dahl@gmail.com>
 
         * dired.texi (Tumme): More tumme documentation.
diff --git a/man/building.texi b/man/building.texi
index e3e3b5ac5a2..497c2777a5a 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -10,7 +10,7 @@
 
   The previous chapter discusses the Emacs commands that are useful for
 making changes in programs.  This chapter deals with commands that assist
-in the larger process of developing and maintaining programs.
+in the larger process of compiling and testing programs.
 
 @menu
 * Compilation::         Compiling programs in languages other
@@ -828,20 +828,20 @@ displays the following frame layout:
 @example
 +--------------------------------+--------------------------------+
 |                                |                                |
-|  GUD buffer (I/O of GDB)       |     Locals buffer              |
+|   GUD buffer (I/O of GDB)      |   Locals buffer                |
 |                                |                                |
 |--------------------------------+--------------------------------+
 |                                |                                |
-|  Source buffer                 |     I/O buffer (of inferior)   |
+|   Source buffer                |   I/O buffer for debugged pgm  |
 |                                |                                |
 |--------------------------------+--------------------------------+
 |                                |                                |
-|  Stack buffer                  |     Breakpoints buffer         |
+|   Stack buffer                 |   Breakpoints buffer           |
 |                                |                                |
 +--------------------------------+--------------------------------+
 @end example
 
-  However, if @code{gdb-use-inferior-io-buffer} is @code{nil}, the I/O
+  However, if @code{gdb-use-separate-io-buffer} is @code{nil}, the I/O
 buffer does not appear and the source buffer occupies the full width
 of the frame.
 
@@ -972,15 +972,17 @@ for variables defined in compound statements, the default value is
 
 @table @asis
 @item Input/Output Buffer
-@vindex gdb-use-inferior-io-buffer
-If the variable @code{gdb-use-inferior-io-buffer} is non-@code{nil},
+@vindex gdb-use-separate-io-buffer
+If the variable @code{gdb-use-separate-io-buffer} is non-@code{nil},
 the executable program that is being debugged takes its input and
 displays its output here.  Otherwise it uses the GUD buffer for that.
-To toggle the use of this buffer, do @kbd{M-x
-gdb-use-inferior-io-buffer}.
+To toggle whether GUD mode uses this buffer, do @kbd{M-x
+gdb-use-separate-io-buffer}.  That takes effect when you next
+restart the program you are debugging.
 
-Some of the commands from shell mode are available here.  @xref{Shell
-Mode}.
+The history and replay commands from Shell mode are available here,
+as are the commands to send signals to the program you are debugging.
+@xref{Shell Mode}.
 
 @item Locals Buffer
 The locals buffer displays the values of local variables of the
@@ -990,8 +992,8 @@ Information on a frame, gdb, The GNU debugger}).
 Arrays and structures display their type only.  With GDB 6.4 or later,
 move point to their name and press @key{RET}, or alternatively click
 @kbd{Mouse-2} there, to examine their values.  With earlier versions
-of GDB, move point to their type description ([struct/union] or
-[array]).  @xref{Watch Expressions}.
+of GDB, use @kbd{Mouse-2} or @key{RET} on the type description
+(@samp{[struct/union]} or @samp{[array]}).  @xref{Watch Expressions}.
 
 @item Registers Buffer
 @findex toggle-gdb-all-registers
diff --git a/man/custom.texi b/man/custom.texi
index 2efbdd81398..db88f64f839 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1043,7 +1043,15 @@ file with Emacs.  Visiting the file checks for local variable
 specifications; it automatically makes these variables local to the
 buffer, and sets them to the values specified in the file.
 
-  There are two ways to specify local variable values: in the first
+@menu
+* Specifying File Variables:: Specifying file local variables.
+* Safe File Variables::       Making sure file local variables are safe.
+@end menu
+
+@node Specifying File Variables
+@subsubsection Specifying File Variables
+
+  There are two ways to specify file local variable values: in the first
 line, or with a local variables list.  Here's how to specify them in the
 first line:
 
@@ -1089,7 +1097,7 @@ variables list and a @samp{-*-} line, Emacs processes @emph{everything}
 in the @samp{-*-} line first, and @emph{everything} in the local
 variables list afterward.
 
-Here is an example of a local variables list:
+  Here is an example of a local variables list:
 
 @example
 ;;; Local Variables: ***
@@ -1170,33 +1178,63 @@ list need not take the time to search the whole file.
 major mode of a buffer according to the file name and contents,
 including the local variables list if any.  @xref{Choosing Modes}.
 
-@findex enable-local-variables
-  The variable @code{enable-local-variables} controls whether to process
-local variables in files, and thus gives you a chance to override them.
-Its default value is @code{t}, which means do process local variables in
-files.  If you set the value to @code{nil}, Emacs simply ignores local
-variables in files.  Any other value says to query you about each file
-that has local variables, showing you the local variable specifications
-so you can judge.
-
-@findex enable-local-eval
-  The @code{eval} ``variable,'' and certain actual variables, create a
-special risk; when you visit someone else's file, local variable
-specifications for these could affect your Emacs in arbitrary ways.
-Therefore, the variable @code{enable-local-eval} controls whether Emacs
-processes @code{eval} variables, as well variables with names that end
-in @samp{-hook}, @samp{-hooks}, @samp{-function} or @samp{-functions},
-and certain other variables.  The three possibilities for the variable's
-value are @code{t}, @code{nil}, and anything else, just as for
-@code{enable-local-variables}.  The default is @code{maybe}, which is
-neither @code{t} nor @code{nil}, so normally Emacs does ask for
-confirmation about file settings for these variables.
-
-@findex safe-local-eval-forms
+@node Safe File Variables
+@subsubsection Safety of File Variables
+
+  File-local variables can be dangerous; when you visit someone else's
+file, there's no telling what its local variables list could do to
+your Emacs.  Improper values of the @code{eval} ``variable,'' and
+other variables such as @code{load-path}, could execute Lisp code you
+didn't intend to run.
+
+  Therefore, whenever Emacs encounters file local variable values that
+are not known to be safe, it displays the file's entire local
+variables list, and asks you for confirmation before setting them.
+You can type @kbd{y} or @key{SPC} to put the local variables list into
+effect, or @kbd{n} to ignore it.  When Emacs is run in batch mode
+(@pxref{Initial Options}), it can't really ask you, so it assumes the
+answer @samp{n}.
+
+  Emacs normally recognizes certain variables/value pairs as safe.
+For instance, it is safe to give @code{comment-column} or
+@code{fill-column} any integer value.  If a file specifies only safe
+variable/value pairs, Emacs does not ask for confirmation before
+setting them.  Otherwise, you can tell Emacs to record that all the
+variable/value pairs in the file are safe, by typing @kbd{!} at the
+confirmation prompt.  When Emacs encounters these variable/value pairs
+subsequently, in the same file or others, it will assume they are
+safe.
+
+@vindex safe-local-variable-values
+@cindex risky variable
+  Some variables, such as @code{load-path}, are considered
+particularly @dfn{risky}: there is seldom any reason to specify them
+as local variables, and changing them can be dangerous.  Even if you
+enter @kbd{!} at the confirmation prompt, Emacs will not record any
+values as safe for these variables.  If you really want to record safe
+values for these variables, do it directly by customizing
+@samp{safe-local-variable-values} (@pxref{Easy Customization}).
+
+@vindex enable-local-variables
+  The variable @code{enable-local-variables} allows you to change the
+way Emacs processes local variables.  Its default value is @code{t},
+which specifies the behavior described above.  If it is @code{nil},
+Emacs simply ignores all file local variables.  Any other value says
+to query you about each file that has local variables, without trying
+to determine whether the values are known to be safe.
+
+@vindex enable-local-eval
+  The variable @code{enable-local-eval} controls whether Emacs
+processes @code{eval} variables.  The three possibilities for the
+variable's value are @code{t}, @code{nil}, and anything else, just as
+for @code{enable-local-variables}.  The default is @code{maybe}, which
+is neither @code{t} nor @code{nil}, so normally Emacs does ask for
+confirmation about processes @code{eval} variables.
+
+@vindex safe-local-eval-forms
   The @code{safe-local-eval-forms} is a customizable list of eval
 forms which are safe to eval, so Emacs should not ask for
-confirmation to evaluate these forms, even if
-@code{enable-local-variables} says to ask for confirmation in general.
+confirmation to evaluate these forms.
 
 @node Key Bindings
 @section Customizing Key Bindings
diff --git a/man/dired.texi b/man/dired.texi
index d391e4566f1..195a77e0fd3 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -1146,6 +1146,7 @@ C-c}.
 @section Thumbnail and image file viewing and manipulation
 
 @cindex tumme mode
+
   Tumme provides for simple viewing of thumbnails of image files.  It
 provides viewing of the original file, sized or in full size, inside
 Emacs or in an external viewer.
@@ -1159,14 +1160,14 @@ files.  All images in that directory will get thumbnail files created
 for them, and the thumbnails will be displayed in the ``thumbnail
 buffer''.
 
-  Because thumbnails are created on the fly and before they can be
-displayed, the above command might take a long time, especially the
-first time, if the directory contains many image files.  If the number
-of image files is higher than
-@code{tumme-show-all-from-dir-max-files}, the command will be aborted.
-To work around this you can instead mark the files you want to look
-at, using @kbd{m} as usual in Dired, and then type @kbd{C-t d}
-(@code{tumme-display-thumbs}).
+  If the directory contains many image files and becayse thumbnails
+are created on the fly before they can be displayed, the above command
+might take a long time, especially the first time (consecutive
+viewings will use the cached thumbnail files).  Also, if the number of
+image files is higher than @code{tumme-show-all-from-dir-max-files},
+the command will be aborted.  To work around this you can instead mark
+the files you want to look at, using @kbd{m} as usual in Dired, and
+then type @kbd{C-t d} (@code{tumme-display-thumbs}).
 
   Regardless of which command you chose to display the thumbnails, a
 new buffer will open up, displaying thumbnail images of the files that
@@ -1193,26 +1194,37 @@ for deletion in the dired buffer.  If you just want visually to delete
 the thumbnail image from the thumbnail buffer, type @kbd{C-d}
 (@code{tumme-delete-char}).
 
-  More advanced features include commands for using ``tags'' (another
-name for ``keyword'' or ``label'') to tag image files and to search
-for image files with a certain tag.
-
-  The tags put on image files are stored in a database file and can be
-used for marking image files.  For example, you can let Tumme mark all
-files in the current directory tagged with the tag `flowers'.  To tag
-image files, mark them in the dired buffer and type @kbd{C-t t}
-(@code{tumme-tag-files}).  To mark files having a certain tag, type
-@kbd{C-t f} (@code{tumme-mark-tagged-files}).
-
-  After marking image files with a certain tag, they can be viewed as
-explained earlier, by typing @key{C-t d}.
+  More advanced features include commands for using ``tags''.  ``Tag''
+is just another word for ``keyword'', ``label'' or ``category''.  In
+short, it is meta data used to categorize an image file.  Commands
+exist to add tags for one or many image files from dired, to mark
+files having a certain tag in Dired and to remove tags from files.
+The tags put on image files are stored in a database file (currently a
+plain text file).
+
+  To tag image files, mark them in the dired buffer and type @kbd{C-t
+t} (@code{tumme-tag-files}).  You will be prompted for a tag. To mark
+files having a certain tag, type @kbd{C-t f}
+(@code{tumme-mark-tagged-files}). After marking image files with a
+certain tag, they can be viewed as explained earlier, by typing
+@key{C-t d}.
+
+  You can also tag a file from the thumbnail buffer by typing @kbd{t
+t} and remove it by typing @kbd{t r}.  There is also a special ``tag''
+called ``comment'' for each file (it is not a tag in the exact same
+sense as the other tags, it is handled slightly different).  That is
+used to enter a comment or description about the image.  You comment a
+file from the thumbnail buffer by typing @kbd{c}.  You will be
+prompted for a comment.  Comments can also be added from Dired, and
+then also to multiple files at once, by typing @kbd{C-t c}
+(@code{tumme-dired-comment-files}).
 
   Tumme also provide simple image manipulation commands, like rotating
 thumbnails and original image files.  In the thumbnail buffer, type
 @kbd{L} to rotate the original image 90 degrees anti clockwise, and
-@kbd{R} to rotate it 90 degrees clockwise.
-
-
+@kbd{R} to rotate it 90 degrees clockwise.  This rotation will be done
+lossless (the image quality will not be reduced) and needs an external
+utility called JpegTRAN to work.
 
 @node Misc Dired Features
 @section Other Dired Features
diff --git a/man/display.texi b/man/display.texi
index 9c653e2ca56..83b5ae48554 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -472,7 +472,7 @@ This face determines the colors and font of Emacs's menus.  @xref{Menu
 Bars}.  Setting the font of LessTif/Motif menus is currently not
 supported; attempts to set the font are ignored in this case.
 Likewise, attempts to customize this face in Emacs built with GTK and
-in the MS-Windows port are ignored by the respective GUI toolkits;
+in the MS-Windows/Mac ports are ignored by the respective GUI toolkits;
 you need to use system-wide styles and options to change the
 appearance of the menus.
 @end table
diff --git a/man/faq.texi b/man/faq.texi
index 734212758d5..fd69ad663b5 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1272,7 +1272,7 @@ customize, with completion.
 
 In Emacs 21.1 and later, colors and faces are supported in non-windowed mode,
 i.e.@: on Unix and GNU/Linux text-only terminals and consoles, and when
-invoked as @samp{emacs -nw} on X and MS-Windows.  (Colors and faces were
+invoked as @samp{emacs -nw} on X, MS-Windows, and Mac.  (Colors and faces were
 supported in the MS-DOS port since Emacs 19.29.)  Emacs automatically
 detects color support at startup and uses it if available.  If you think
 that your terminal supports colors, but Emacs won't use them, check the
@@ -3670,7 +3670,7 @@ for OS/2 users of Emacs can be found at
 @cindex Atari ST, Emacs for
 @cindex TOS, Emacs for
 
-Roland Schäuble reports that Emacs 18.58 running on plain TOS and MiNT
+Roland Sch@"auble reports that Emacs 18.58 running on plain TOS and MiNT
 is available at
 @uref{ftp://atari.archive.umich.edu/Editors/Emacs-18-58/1858b-d3.zoo}.
 
diff --git a/man/files.texi b/man/files.texi
index 4bafc9b736c..a0822054210 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -239,7 +239,7 @@ toolkit, commands invoked with the mouse (by clicking on the menu bar
 or tool bar) use the toolkit's standard File Selection dialog instead
 of prompting for the file name in the minibuffer.  On Unix and
 GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and
-Motif toolkits; on MS-Windows, the GUI version does that by default.
+Motif toolkits; on MS-Windows and Mac, the GUI version does that by default.
 For information on how to customize this, see @ref{Dialog Boxes}.
 
   Secondly, Emacs supports ``drag and drop''; dropping a file into an
diff --git a/man/frames.texi b/man/frames.texi
index f25399e071b..b5ec21533b7 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -293,7 +293,7 @@ names, all use the clipboard.
 the Emacs yank functions consult the clipboard before the primary
 selection, and to make the kill functions to store in the clipboard as
 well as the primary selection.  Otherwise they do not access the
-clipboard at all.  Using the clipboard is the default on MS-Windows,
+clipboard at all.  Using the clipboard is the default on MS-Windows and Mac,
 but not on other systems.
 
 @node Mouse References
diff --git a/man/glossary.texi b/man/glossary.texi
index 9d86a8d12cc..e2d2ad56832 100644
--- a/man/glossary.texi
+++ b/man/glossary.texi
@@ -175,7 +175,7 @@ mouse button and release it without moving the mouse.  @xref{Mouse Buttons}.
 @item Clipboard
 A clipboard is a buffer provided by the window system for transferring
 text between applications.  On the X Window system, the clipboard is
-provided in addition to the primary selection (q.v.@:); on MS-Windows,
+provided in addition to the primary selection (q.v.@:); on MS-Windows and Mac,
 the clipboard is used @emph{instead} of the primary selection.
 @xref{Clipboard}.
 
diff --git a/man/maintaining.texi b/man/maintaining.texi
index 66a235ae119..9836aae4e83 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -3,14 +3,11 @@
 @c   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Maintaining, Abbrevs, Building, Top
-@chapter Maintaining Programs
-@cindex Lisp editing
-@cindex C editing
-@cindex program editing
+@chapter Maintaining Large Programs
 
-  This chapter describes Emacs features for maintaining programs.  The
-version control features (@pxref{Version Control}) are also particularly
-useful for this purpose.
+  This chapter describes Emacs features for maintaining large
+programs.  The version control features (@pxref{Version Control}) are
+also particularly useful for this purpose.
 
 @menu
 * Change Log::          Maintaining a change history for your program.
@@ -407,7 +404,8 @@ directory where the tags file was initially written.  This way, you can
 move an entire directory tree containing both the tags file and the
 source files, and the tags file will still refer correctly to the source
 files.  If the tags file is in @file{/dev}, however, the file names are
-made relative to the current working directory.
+made relative to the current working directory.  This is useful, for
+example, when writing the tags to @file{/dev/stdout}.
 
   If you specify absolute file names as arguments to @code{etags}, then
 the tags file will contain absolute file names.  This way, the tags file
diff --git a/man/programs.texi b/man/programs.texi
index 6404e3466bc..643e6445fb0 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -132,19 +132,6 @@ place to set up customizations for that major mode.  @xref{Hooks}.
 something like a function, is called a @dfn{defun}.  The name comes
 from Lisp, but in Emacs we use it for all languages.
 
-  In many programming language modes, Emacs assumes that a defun is
-any pair of parentheses (or braces, if the language uses braces this
-way) that starts at the left margin.  For example, in C, the body of a
-function definition is a defun, usually recognized as an open-brace
-that begins at the left margin@footnote{Alternatively, you can set up
-C Mode to recognize a defun at an opening brace at the outermost
-level.  @xref{Movement Commands,,, ccmode, the CC Mode Manual}.}.  A
-variable's initializer can also count as a defun, if the open-brace
-that begins the initializer is at the left margin.
-
-  However, some language modes provide their own code for recognizing
-defuns in a way that suits the language syntax and conventions better.
-
 @menu
 * Left Margin Paren::   An open-paren or similar opening delimiter
                           starts a defun if it is at the left margin.
@@ -1573,9 +1560,9 @@ following point.
 
   As an alternative to the above commands, you can enable @dfn{hungry
 delete mode}.  When this feature is enabled (indicated by @samp{/h} in
-the mode line after the mode name), a single @key{DEL} command deletes
-all preceding whitespace, not just one space, and a single @kbd{C-c
-C-d} (but @emph{not} @key{DELETE}) deletes all following whitespace.
+the mode line after the mode name), a single @key{DEL} deletes all
+preceding whitespace, not just one space, and a single @kbd{C-c C-d}
+(but @emph{not} plain @key{DELETE}) deletes all following whitespace.
 
 @table @kbd
 @item M-x c-toggle-hungry-state
diff --git a/man/text.texi b/man/text.texi
index 4fb5ee9cc1e..2b70c599b89 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -2575,10 +2575,10 @@ Likewise @kbd{M-x table-backward-cell} from the first cell in a table
 moves to the last cell.
 
 @findex table-span-cell
-  The command @code{table-span-cell} spans the current cell into one
-of the four directions---right, left, above or below---and merges the
-current cell with the adjacent cell.  It does not allow directions to
-which spanning does not produce a legitimate cell.
+  The command @code{table-span-cell} merges the current cell with the
+adjacent cell in a specified direction---right, left, above or below.
+You specify the direction with the minibuffer.  It does not allow
+merges which don't result in a legitimate cell layout.
 
 @findex table-split-cell
 @cindex text-based tables, split a cell
@@ -2586,7 +2586,8 @@ which spanning does not produce a legitimate cell.
   The command @code{table-split-cell} splits the current cell
 vertically or horizontally.  This command is a wrapper to the
 direction specific commands @code{table-split-cell-vertically} and
-@code{table-split-cell-horizontally}.
+@code{table-split-cell-horizontally}.  You specify the direction with
+a minibuffer argument.
 
 @findex table-split-cell-vertically
   The command @code{table-split-cell-vertically} splits the current
diff --git a/man/xresources.texi b/man/xresources.texi
index f7947edda17..87781da582c 100644
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -8,7 +8,8 @@
   You can customize some X-related aspects of Emacs behavior using X
 resources, as is usual for programs that use X.  On MS-Windows, you
 can customize some of the same aspects using the system registry.
-@xref{MS-Windows Registry}.
+@xref{MS-Windows Registry}.  Likewise, the Mac Carbon port emulates X
+resources using the Preferences system.  @xref{Mac Environment Variables}.
 
   When Emacs is built using an `X toolkit', such as Lucid or LessTif,
 you need to use X resources to customize the appearance of the