Merge from trunk.

13 files changed, 51 insertions, 38 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index fc3370bb380..6030dd8f6d3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * admin.el (manual-dvi): Fix typo.
+
+2011-11-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * nt/README-ftp-server: Update the information about PNG libraries.
+
+2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * make-emacs: Fix typo.
+
 2011-11-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * unidata/makefile.w32-in (clean): Remove bidimirror.h and biditype.h.
diff --git a/admin/README b/admin/README
index 4dd1705fe74..10a8f2244fc 100644
--- a/admin/README
+++ b/admin/README
@@ -18,7 +18,7 @@ Living list of activities that must be completed before the next release.
 
 ** make-tarball.txt
 
-Instructions to create pretest or release tarballs, annoucements, etc.
+Instructions to create pretest or release tarballs, announcements, etc.
 
 ** admin.el
 
@@ -88,4 +88,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/admin/admin.el b/admin/admin.el
index 673d86c8825..9235144f6c6 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -330,7 +330,7 @@ the @import directive."
 
 (defun manual-dvi (texi-file dest ps-dest)
   "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
-Also generate postscript output in PS-DEST."
+Also generate PostScript output in PS-DEST."
   (call-process "texi2dvi" nil nil nil texi-file "-o" dest)
   (call-process "dvips" nil nil nil dest "-o" ps-dest)
   (call-process "gzip" nil nil nil dest)
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index e09ddd62b97..b3ea8af9d70 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -40,7 +40,7 @@ void
 usage (const char *progname)
 {
   fprintf (stderr, "Usage %s options\n", progname);
-  fprintf (stderr, "-n NCOLORS  allcoate NCOLORS colors\n");
+  fprintf (stderr, "-n NCOLORS  allocate NCOLORS colors\n");
   exit (1);
 }
 
@@ -111,4 +111,3 @@ main (int argc, char **argv)
   XCloseDisplay (dpy);
   return 0;
 }
-
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index c1804af98cd..e87d548cf31 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -6,7 +6,7 @@ See the end of the file for license conditions.
 
                    The charset map files directory
 
-This directory contains two kinds of charse map files; verbatim copies
+This directory contains two kinds of charset map files; verbatim copies
 (or their compressed versions) of files freely available in the
 Internet, and newly created files based on freely available
 information.
diff --git a/admin/charsets/mapfiles/Uni2JIS b/admin/charsets/mapfiles/Uni2JIS
index b81d10c6ae2..e3c8a25db17 100644
--- a/admin/charsets/mapfiles/Uni2JIS
+++ b/admin/charsets/mapfiles/Uni2JIS
@@ -26,7 +26,7 @@
 #                       where XXXX is the code point.  Including all these
 #                       names in this file increases its size substantially
 #                       and needlessly.  The token "<CJK>" is used for the
-#                       name of these chracters.  If necessary, it can be
+#                       name of these characters.  If necessary, it can be
 #                       expanded algorithmically by a parser or editor.
 #
 #       The entries are in Unicode order.
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index 1797827679b..004f0b5f30f 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -566,7 +566,7 @@ template-type
     (TYPE-TAG $2 "class" nil nil )
   | STRUCT symbol
     (TYPE-TAG $2 "struct" nil nil )
- ;; TODO: Klaus Berndl: For the moment is is ok, that we parse the C++
+ ;; TODO: Klaus Berndl: For the moment it is ok, that we parse the C++
  ;; keyword typename as a class....
   | TYPENAME symbol
     (TYPE-TAG $2 "class" nil nil)
@@ -734,7 +734,7 @@ builtintype
 
 ;; Klaus Berndl: This parses also nonsense like "const volatile int
 ;; const volatile const const volatile a ..." but IMHO nobody writes
-;; such code. Normaly we shoud define a rule like typeformbase-mode
+;; such code. Normally we should define a rule like typeformbase-mode
 ;; which exactly defines the different allowed cases and combinations
 ;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so
 ;; we could recognize more invalid code but IMHO this is not worth the
@@ -1105,7 +1105,7 @@ fun-or-proto-end
     ( t )
   | semantic-list
     ( nil )
- ;; Here is an anoying feature of C++ pure virtual methods
+ ;; Here is an annoying feature of C++ pure virtual methods
   | EQUAL ZERO SEMICOLON
     ( :pure-virtual-flag )
   | fun-try-end
diff --git a/admin/make-emacs b/admin/make-emacs
index b21dcad5f37..d231f66b03b 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -72,7 +72,7 @@ Build Emacs.
  --gprof                make Emacs for profiling
  --union-type           define USE_LISP_UNION_TYPE (bad for GDB)
  --malloc-check         define GC_MALLOC_CHECK
- --no-mcheck            dont define GC_MCHECK
+ --no-mcheck            don't define GC_MCHECK
  --wall                 compile with -Wall
  --gcc3                 use GCC 3.0 (30% slower compilation, slower code)
  --trace-selection      print traces in xselect.c
diff --git a/admin/notes/commits b/admin/notes/commits
index f37c3e020be..2c6f80c56f0 100644
--- a/admin/notes/commits
+++ b/admin/notes/commits
@@ -17,7 +17,7 @@ Date: 	 Tue, 31 Mar 2009 12:21:20 +0900
     files), not one-by-one.  This is pretty easy using vc-dir now.
 
 (2) Make the log message describe the entire changeset, perhaps
-    including relevant changelog entiries (I often don't bother with
+    including relevant changelog entries (I often don't bother with
     the latter if it's a trivial sort of change).
 
     Many modern source-control systems vaguely distinguish the first
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index 85babb903b9..67516fa78b6 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions:
 
 name="$1"
 shift
-    
+
 if [ -z "$name" ]; then
     echo "Usage: connect_emacs <name> <args>..." >&2
     exit 1
@@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER"
 serverdir="/tmp/emacs$UID"
 emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs
 
-if [ -z "$name" ]; then 
+if [ -z "$name" ]; then
     echo "Usage: preload_emacs <name> [<waitp>]" >&2
     exit 1
 fi
@@ -314,7 +314,7 @@ THINGS TO DO
    Emacs with GTK support.  If you want to play around with GTK
    multidisplay (and don't mind core dumps), you can edit src/config.h
    and define HAVE_GTK_MULTIDISPLAY there by hand.
-   
+
         http://bugzilla.gnome.org/show_bug.cgi?id=85715
 
    Update: Han reports that GTK+ version 2.8.9 almost gets display
@@ -414,7 +414,7 @@ THINGS TO DO
    sometimes; Emacs does not respond to stimuli from other keyboards.
    At least a beep or a message would be important, if the single-mode
    is still required to prevent interference.  (Reported by Dan
-   Nicolaescu.)  
+   Nicolaescu.)
 
    Update: selecting a region with the mouse enables single_kboard
    under X.  This is very confusing.
@@ -542,7 +542,7 @@ THINGS TO DO
    are not useful; before starting work on DOS support, revert to
    pristine, pre-multi-tty versions.
 
-** Fix Windows support. Currently bootstraping works on w32, but Emacs
+** Fix Windows support. Currently bootstrapping works on w32, but Emacs
    crashes on startup and none of the multi-tty features are
    implemented. Many XXX comments mark things that probably need
    updating, ChangeLogs will help in spotting changes to X specific
@@ -585,7 +585,7 @@ DIARY OF CHANGES
 -- other-frame should cycle through the frames on the `current'
    terminal only.
 
-   (Done, by trivially modifiying next_frame and prev_frame.)
+   (Done, by trivially modifying next_frame and prev_frame.)
 
 -- Support different terminal sizes.
 
@@ -984,7 +984,7 @@ DIARY OF CHANGES
    wrt foreground/background process groups.)
 
 -- There is a flicker during the startup of `emacs -nw'; it's as if
-   the terminal is initialized, reset and then initialialized again.
+   the terminal is initialized, reset and then initialized again.
    Debug this.  (Hint: narrow_foreground_group is called twice during
    startup.)
 
@@ -1026,7 +1026,7 @@ DIARY OF CHANGES
    settings as Emacs itself.  This may lead to bogus results in a
    multi-locale setup. (E.g., while logging in from a remote client
    with a different locale.)
-   (Update after new bugreport by Friedrich Delgado Friedrichs: 
+   (Update after new bugreport by Friedrich Delgado Friedrichs:
    (at least) the structs terminal_coding and keyboard_coding in
    coding.c must be moved to struct display, and the Lisp interface
    [set-]keyboard-coding-system must be adapted for the change.)
@@ -1088,7 +1088,7 @@ DIARY OF CHANGES
 -- Miles Bader suggests that C-x C-c on an emacsclient frame should
    only close the frame, not exit the entire Emacs session.  Update:
    see above for a function that does this.  Maybe this should be the
-   new default?  
+   new default?
 
    (Done.  This is the new default.  No complaints so far.)
 
@@ -1131,7 +1131,7 @@ DIARY OF CHANGES
    from exiting Emacs. (Reported by Mnemonikk on freenode.)
 
    (Done, I hope.)
-   
+
 
 -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow
    keys on non-selected terminals under screen, and sometimes on other
@@ -1157,7 +1157,7 @@ DIARY OF CHANGES
         > Cursor mode. Applications have to send the smkx and rmkx terminfo
         > strings to switch between the 2 modes. So Emacs (and emacsclient) have
         > to send smkx when initializing and rmkx when quitting (or on
-        > suspend). 
+        > suspend).
 
    (I think patch-370 fixed this.)
 
@@ -1166,7 +1166,7 @@ DIARY OF CHANGES
 
         emacs
                 M-x server-start
-        
+
         # From another xterm:
         emacsclient -e '(y-or-n-p "Do you want me to crash? ")'
                 # Notice how the answer ends up in the *scratch* buffer
@@ -1205,7 +1205,7 @@ DIARY OF CHANGES
    it is not recognized correctly.  May be related to the bug below.
 
    (Seems to have been fixed as a side effect of patch-434.  "The bug
-   below" was the set-input-mode madness.)  
+   below" was the set-input-mode madness.)
 
    (Update: this bug was fixed for good in patch-449.  It was tracked
    down to a bug in `read_key_sequence': it failed to reinitialize its
@@ -1359,4 +1359,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/admin/notes/nextstep b/admin/notes/nextstep
index 462101f9abf..cf0ebbc11aa 100644
--- a/admin/notes/nextstep
+++ b/admin/notes/nextstep
@@ -78,7 +78,7 @@ Text Rendering and Font Handling
 nsfont.m implements the font driver, responsible for managing fonts and
 rendering text.  Fonts are obtained through NSFontManager.  Rendering must be
 done at a low level due to emacs' fine control over this process, therefore
-there are different approachs under Cocoa and GNUstep.  Under GNUstep, the
+there are different approaches under Cocoa and GNUstep.  Under GNUstep, the
 original NeXT Display PostScript (DPS) APIs are available and used.  Under
 Cocoa, these were removed and Quartz drawing functions replaced them.
 
@@ -156,4 +156,3 @@ EmacsPrefsController : NSObject
 EmacsSavePanel : NSSavePanel
 EmacsOpenPanel : NSOpenPanel
   - utility override for panel notifications
-
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 3c70ed8dbe0..c320bbe915d 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -73,10 +73,11 @@ See the end of the file for license conditions.
 
 * Image support
 
-  Emacs 24.1 contains support for images, however for most image formats
-  supporting libraries are required.  This distribution has been tested
-  with the libraries that are distributed with GTK for Windows, and the
-  libraries found at http://gnuwin32.sourceforge.net/. The following image
+  Emacs 24.1 contains support for images, however for most image
+  formats supporting libraries are required.  This distribution has
+  been tested with the libraries that are distributed with GTK for
+  Windows (http://www.gtk.org/download/win32.php), and the libraries
+  found at http://gnuwin32.sourceforge.net/. The following image
   formats are supported:
 
       PBM/PGM/PPM: Supported natively by Emacs. This format is used for
@@ -87,10 +88,14 @@ See the end of the file for license conditions.
       can be replaced by other versions with the name xpm4.dll,
       libxpm-nox4.dll or libxpm.dll.
 
-      PNG: requires the PNG reference library 1.2 or later, which will
-      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
-      or libpng.dll. LibPNG requires zlib, which should come from the same
-      source as you got libpng.
+      PNG: requires the PNG reference library 1.4 or later, which will
+      be named libpng14.dll or libpng14-14.dll.  LibPNG requires zlib,
+      which should come from the same source as you got libpng.
+      Starting with Emacs 23.3, the precompiled Emacs binaries are
+      built with libpng 1.4.x and later, and are incompatible with
+      earlier versions of libpng DLLs.  So if you have libpng 1.2.x,
+      the PNG support will not work, and you will have to download
+      newer versions.
 
       JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
@@ -249,7 +254,7 @@ See the end of the file for license conditions.
 
   Another valuable source of information and help which should not be
   overlooked is the various Usenet news groups dedicated to Emacs.
-  These are particuarly good for help with general issues which aren't
+  These are particularly good for help with general issues which aren't
   specific to the Windows port of Emacs.  The main news groups to use
   for seeking help are:
 
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 1002bb003af..713b0512e09 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -158,7 +158,7 @@
 ;; DEFAULT: the default value of the property.  It may have the form
 ;;   (VAL0 (FROM1 TO1 VAL1) ...) which indicates that the default
 ;;   value is VAL0 except for characters in the ranges specified by
-;;   FROMn and TOn (incusive).  The default value of characters
+;;   FROMn and TOn (inclusive).  The default value of characters
 ;;   between FROMn and TOn is VALn.
 ;; VAL-LIST: list of specially ordered property values