aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 22:36:11 -0800
committerLars Ingebrigtsen2014-02-07 22:36:11 -0800
commitfdb510756f7958570387b32d307683dfed7bd3e7 (patch)
tree73b42587b1c205a9a907bb6c36d23fb7437e5c76
parent6ef4f3cef2627334fa2f7fda02099b4b19452998 (diff)
downloademacs-fdb510756f7958570387b32d307683dfed7bd3e7.tar.gz
emacs-fdb510756f7958570387b32d307683dfed7bd3e7.zip
* README.W32: Say what GnuTLS and libxml2 does.
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/README.W326
2 files changed, 10 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index bf7dc902017..d3447b504b0 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * README.W32: Say what GnuTLS and libxml2 does (bug#14762).
4
12014-01-18 Eli Zaretskii <eliz@gnu.org> 52014-01-18 Eli Zaretskii <eliz@gnu.org>
2 6
3 * runemacs.c (ensure_unicows_dll): Don't tell in the message box 7 * runemacs.c (ensure_unicows_dll): Don't tell in the message box
diff --git a/nt/README.W32 b/nt/README.W32
index bc1203a1241..4f94b6027a5 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -185,6 +185,9 @@ See the end of the file for license conditions.
185 185
186* GnuTLS support 186* GnuTLS support
187 187
188 GnuTLS provides SSL/TLS network support for Emacs (https, imaps and
189 so on.)
190
188 In order to support GnuTLS at runtime, Emacs must be able to find 191 In order to support GnuTLS at runtime, Emacs must be able to find
189 the relevant DLLs during startup; failure to do so is not an error, 192 the relevant DLLs during startup; failure to do so is not an error,
190 but GnuTLS won't be available to the running session. 193 but GnuTLS won't be available to the running session.
@@ -194,6 +197,9 @@ See the end of the file for license conditions.
194 197
195* libxml2 support 198* libxml2 support
196 199
200 libxml2 provides HTML parsing support for Emacs, which is necessary
201 to use the built-in eww browser.
202
197 In order to support libxml2 at runtime, a libxml2-enabled Emacs must 203 In order to support libxml2 at runtime, a libxml2-enabled Emacs must
198 be able to find the relevant DLLs during startup; failure to do so 204 be able to find the relevant DLLs during startup; failure to do so
199 is not an error, but libxml2 features won't be available to the 205 is not an error, but libxml2 features won't be available to the