# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1251217636 -10800
# Node ID 5e9ea846a8c3b6232d6ac62071c20ddc575872ca
# Parent  f6dc9574b69df6e26db14dc8123bf24b9e04c758# Parent  4202927c15ace9d275570ba1bd1219b816bc8122
Merged conflict.

diff -r f6dc9574b69d -r 5e9ea846a8c3 emacs.rst
--- a/emacs.rst	Fri Aug 21 14:45:28 2009 +0300
+++ b/emacs.rst	Tue Aug 25 19:27:16 2009 +0300
@@ -49,3 +49,11 @@
 Add (error 'No error until here') in the middle of your file. If you get the
 error 'No error until here' when reloading the file, move the expression
 towards the back of the file, otherwise towards the front of the file.
+
+* WWW.
+
+** Text based WWW browser.
+
+  http://en.wikipedia.org/wiki/W3m
+  http://emacs-w3m.namazu.org/
+  http://www.gnu.org/software/w3/