7 files changed, 65 insertions, 11 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e7d7c4ea2e7..ccb9451bd7a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * macos.texi (GNUstep Support):
+        * trouble.texi (Checklist, Contributing, Service):
+        Avoid mailto: in html output.
+
 2013-07-02  Glenn Morris  <rgm@gnu.org>
 
         * maintaining.texi (EDE): Fix cross-reference.
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 4483c91802d..6247df23216 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -207,4 +207,10 @@ restart Emacs to access newly-available services.
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact
+@ifnothtml
 @email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index ad321e74e68..a1774458bc7 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -650,7 +650,13 @@ absolutely sure it is best to leave it, so that the developers can
 decide for themselves.
 
 When you have finished writing your report, type @kbd{C-c C-c} and it
-will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
+will be sent to the Emacs maintainers at
+@ifnothtml
+@email{bug-gnu-emacs@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}.
+@end ifhtml
 (If you want to suggest an improvement or new feature, use the same
 address.)  If you cannot send mail from inside Emacs, you can copy the
 text of your report to your normal mail client (if your system
@@ -1130,15 +1136,26 @@ form that is clearly safe to install.
 @section Contributing to Emacs Development
 @cindex contributing to Emacs
 
-If you would like to work on improving Emacs, please contact
-the maintainers at @email{emacs-devel@@gnu.org}.  You can ask for
-suggested projects or suggest your own ideas.
+If you would like to work on improving Emacs, please contact the maintainers at
+@ifnothtml
+@email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
+You can ask for suggested projects or suggest your own ideas.
 
 If you have already written an improvement, please tell us about it.  If
 you have not yet started work, it is useful to contact
-@email{emacs-devel@@gnu.org} before you start; it might be
-possible to suggest ways to make your extension fit in better with the
-rest of Emacs.
+@ifnothtml
+@email{emacs-devel@@gnu.org}
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel}
+@end ifhtml
+before you start; it might be possible to suggest ways to make your
+extension fit in better with the rest of Emacs.
 
 The development version of Emacs can be downloaded from the
 repository where it is actively maintained by a group of developers.
@@ -1156,10 +1173,17 @@ ways to find it:
 
 @itemize @bullet
 @item
-Send a message to the mailing list
-@email{help-gnu-emacs@@gnu.org}, or post your request on
-newsgroup @code{gnu.emacs.help}.  (This mailing list and newsgroup
-interconnect, so it does not matter which one you use.)
+Send a message to
+@ifnothtml
+the mailing list @email{help-gnu-emacs@@gnu.org},
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the
+help-gnu-emacs mailing list},
+@end ifhtml
+or post your request on newsgroup @code{gnu.emacs.help}.  (This
+mailing list and newsgroup interconnect, so it does not matter which
+one you use.)
 
 @item
 Look in the service directory for someone who might help you for a fee.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index de326f362c7..ead243558f2 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (Thank You): Avoid mailto: in html output.
+
 2013-07-05  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Top):
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index ebb82dab3f1..33bf301c35c 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1070,7 +1070,12 @@ encouragement.  My mistakes are my own.
 
 @flushright
 Robert J. Chassell
+@ifnothtml
 @email{bob@@gnu.org}
+@end ifnothtml
+@ifhtml
+bob@@gnu.org
+@end ifhtml
 @end flushright
 
 @c ================ Beginning of main text ================
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 959e426ea01..1ef5730674e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * woman.texi (Top): Avoid mailto: in html output.
+
 2013-07-25  Glenn Morris  <rgm@gnu.org>
 
         * erc.texi (Special Features): Update contact information.
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 2dbcc6dcd47..35afdefb83a 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -75,7 +75,12 @@ modify this GNU manual.''
 Software Version @value{VERSION}
 Manual Last Updated @value{UPDATED}
 
+@ifnothtml
 @email{F.J.Wright@@qmw.ac.uk, Francis J. Wright}
+@end ifnothtml
+@ifhtml
+Francis J. Wright
+@end ifhtml
 @uref{http://centaur.maths.qmw.ac.uk/, School of Mathematical Sciences}
 Queen Mary and Westfield College (University of London)
 Mile End Road, London E1 4NS, UK