merge changes in emacs-23 branch

3 files changed, 20 insertions, 2 deletions

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 2b2cbb90a9e..47f059e7d3c 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-26  Sven Joachim  <svenjoac@gmx.de>
+
+        * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.2 released.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 15b7a73259b..2ad9e2c543a 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -403,11 +403,12 @@ sets the window's text color.
 The desired fullscreen size.
 The value can be one of
 .IR fullboth ,
+.IR maximized ,
 .IR fullwidth ,
 or
 .IR fullheight ,
-which correspond to the command-line options `\-fs', `\-fw', and
-`\-fh', respectively.
+which correspond to the command-line options `\-fs', `-mm', `\-fw',
+and `\-fh', respectively.
 Note that this applies to the initial frame only.
 .TP
 .BR geometry " (class " Geometry )
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e142af49ad1..482499d4df5 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -30,6 +30,19 @@
 
         Sync with Tramp 2.1.19.
 
+        * tramp.texi (Inline methods, Default Method): Mention
+        `tramp-inline-compress-start-size'.  Remove "kludgy" phrase.  Remove
+        remark about doubled "-t" argument.
+        (Auto-save and Backup): Remove reference to Emacs 21.
+        (Filename Syntax): Describe port numbers.
+        (Frequently Asked Questions): Adapt supported (X)Emacs versions.  Adapt
+        supported MS Windows versions.  Remove obsolete URL.  Recommend "sshx"
+        and "scpx" for echoing shells.  Use the $() syntax, texi2dvi reports
+        errors with the backquotes.
+        (External packages): File attributes cache flushing for asynchronous
+        processes.
+        (Traces and Profiles): Describe verbose level 9.
+
         * trampver.texi: Update release number.
 
 2010-08-23  Michael Albinus  <michael.albinus@gmx.de>