aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-05-17 21:17:45 +0300
committerEli Zaretskii2011-05-17 21:17:45 +0300
commit8a70d4b1e2543aa6d920cb3e77ab23c8f49a0a69 (patch)
tree1a1fec6d66fe3ce768d91ffac22a0b2d71d7ad6c
parent1d99a745e284a3b378f11195ec6cfb63359c3de8 (diff)
downloademacs-8a70d4b1e2543aa6d920cb3e77ab23c8f49a0a69.tar.gz
emacs-8a70d4b1e2543aa6d920cb3e77ab23c8f49a0a69.zip
nt/README.W32: Add information about GnuTLS libraries.
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/README.W329
2 files changed, 13 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6de2b15fced..7198ba767cb 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12011-05-17 Eli Zaretskii <eliz@gnu.org>
2
3 * README.W32: Add information about GnuTLS libraries.
4
12011-05-09 Eli Zaretskii <eliz@gnu.org> 52011-05-09 Eli Zaretskii <eliz@gnu.org>
2 6
3 * config.nt [_MSC_VER] (va_copy): Replacement for the MS compiler. 7 * config.nt [_MSC_VER] (va_copy): Replacement for the MS compiler.
diff --git a/nt/README.W32 b/nt/README.W32
index 4e26ef1c8d7..4a3f7c41e9e 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -147,6 +147,15 @@ See the end of the file for license conditions.
147 unreliable under Windows. See nt/INSTALL in the src distribution if 147 unreliable under Windows. See nt/INSTALL in the src distribution if
148 you wish to compile Emacs with SVG support. 148 you wish to compile Emacs with SVG support.
149 149
150* GnuTLS support
151
152 In order to support GnuTLS at runtime, Emacs must be able to find
153 the relevant DLLs during startup; failure to do so is not an error,
154 but GnuTLS won't be available to the running session.
155
156 You can get pre-built binaries (including any required DLL and the
157 gnutls.h file) and an installer at http://josefsson.org/gnutls4win/.
158
150* Uninstalling Emacs 159* Uninstalling Emacs
151 160
152 If you should need to uninstall Emacs, simply delete all the files 161 If you should need to uninstall Emacs, simply delete all the files