2 files changed, 17 insertions, 7 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index fe015cd1ce9..8fe3bcd9484 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-09  Romain Francoise  <romain@orebokech.com>
+
+        * faq.texi (New in Emacs 22): Mention improvements to the Windows and
+        Mac OS ports.  Make it clear that mouse-1 complements and doesn't
+        replace mouse-2.
+
 2007-04-09  Alan Mackenzie  <acm@muc.de>
 
         * cmdargs.texi (Initial Options): Call "inhibit-splash-screen" by its
diff --git a/man/faq.texi b/man/faq.texi
index f35d2870a1f..781d7b5ce56 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1154,6 +1154,16 @@ and on @code{xterm} with @kbd{emacs -nw}.
 Emacs can be built with GTK+ widgets, and supports drag-and-drop
 operation on X.
 
+@cindex Supported systems
+@item
+Emacs 22 features support for GNU/Linux systems on S390 and x86-64
+machines, as well as support for the Mac OS X and Cygwin operating
+systems.
+
+@item
+The native MS-Windows, Mac OS 9 and Mac OS X builds include full support
+for images, toolbar, and tooltips.
+
 @item
 Font Lock mode, Auto Compression mode, and File Name Shadow Mode are
 enabled by default.
@@ -1163,7 +1173,7 @@ The maximum size of buffers has been doubled and is 256M on 32-bit
 machines.
 
 @item
-Links can be followed with @kbd{mouse-1}.
+Links can be followed with @kbd{mouse-1}, in addition to @kbd{mouse-2}.
 
 @cindex Mouse wheel
 @item
@@ -1220,12 +1230,6 @@ Bulgarian, Chinese-EUC-TW, Croatian, French, Georgian, Italian, Latin-6,
 Latin-7, Latvian, Lithuanian, Malayalam, Russian, Slovenian, Swedish,
 Tajik, Tamil, UTF-8, Ukrainian, Welsh, and Windows-1255.
 
-@cindex Supported systems
-@item
-Emacs 22 features support for GNU/Linux systems on S390 and x86-64
-machines, as well as support for the Mac OS X and Cygwin operating
-systems.
-
 @cindex Documentation
 @cindex Emacs Lisp Manual
 @item