Merged conflict.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Tue, 25 Aug 2009 19:27:16 +0300
changeset 182 5e9ea846a8c3
parent 180 f6dc9574b69d (current diff)
parent 181 4202927c15ac (diff)
child 186 449463d34133
child 187 a4767fc91847
child 195 514a359034f2
Merged conflict.
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/