# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1252650279 -10800
# Node ID e2240be7176c1d16b2d30339e00d083930794c82
# Parent  449463d34133eb63eb0b0194af29c219b36f060a# Parent  9f4af21befaf60f074b2e5dcbd96b6e32f96c676
Automated merge with file:///d:\srv\hg-home\admin-doc

diff -r 9f4af21befaf -r e2240be7176c emacs.rst
--- a/emacs.rst	Thu Sep 10 14:22:47 2009 +0300
+++ b/emacs.rst	Fri Sep 11 09:24:39 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/