* lisp/files.el (auto-mode-alist): Add .f03, .f08 for f90-mode.

[bpt/emacs.git] / nt / README.W32

diff --git a/nt/README.W32 b/nt/README.W32
index 9f1df8a..4a3f7c4 100644 (file)
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,5 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                           Emacs for Windows
@@ -106,9 +105,6 @@ See the end of the file for license conditions.
     a mail spool or POP server to a local user mailbox.  See the
     `Movemail' node of the Emacs manual.
 
-  + digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
-    built-in documentation.
-
 * Image support
 
   Emacs has built in support for XBM and PPM/PGM/PBM images, and the
@@ -119,14 +115,19 @@ See the end of the file for license conditions.
   libXpm library from X11R7.3.
 
   Emacs can also support some other image formats with appropriate
-  libraries.  These libraries are all available as part of GTK, or from
-  gnuwin32.sourceforge.net.  Emacs will find them if the directory they
-  are installed in is on the PATH.
-
-      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.
+  libraries.  These libraries are all available as part of GTK
+  download for Windows (http://www.gtk.org/download-windows.html), or
+  from the GnuWin32 project.  Emacs will find them if the directory
+  they are installed in is on the PATH.
+
+      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 Independant JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
@@ -137,12 +138,24 @@ See the end of the file for license conditions.
       GIF: requires libungif or giflib 4.1 or later, which will be
       called giflib4.dll, libungif4.dll or libungif.dll.
 
+   If you have image support DLLs under different names, customize the
+   value of `dynamic-library-alist'.
+
    In addition, Emacs can be compiled to support SVG.  This precompiled
    distribution has not been compiled that way, since the SVG library
    or one or more of its extensive dependencies appear to be
    unreliable under Windows.  See nt/INSTALL in the src distribution if
    you wish to compile Emacs with SVG support.
 
+* GnuTLS support
+
+  In order to support GnuTLS at runtime, Emacs must be able to find
+  the relevant DLLs during startup; failure to do so is not an error,
+  but GnuTLS won't be available to the running session.
+
+  You can get pre-built binaries (including any required DLL and the
+  gnutls.h file) and an installer at http://josefsson.org/gnutls4win/.
+
 * Uninstalling Emacs
 
   If you should need to uninstall Emacs, simply delete all the files