# HG changeset patch
# User Karl Berry <karl@freefriends.org>
# Date 1240410886 25200
# Node ID 3bc886cdc68cf4cedaa9e5946afe69b15d280589
# Parent  c1ccb2a194bac5d360fe6f29bfe2553361d19096
autoupdate

diff --git a/doc/gendocs_template b/doc/gendocs_template
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -78,12 +78,11 @@
 
 <p>
 Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
+<a href="mailto:gnu@gnu.org">&lt;gnu@gnu.org&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
+the FSF.<br />
 Please send broken links and other corrections or suggestions to
-<a href="mailto:%%EMAIL%%"><em>%%EMAIL%%</em></a>.
+<a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.
 </p>
 
 <p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>
@@ -91,7 +90,6 @@
 <p>Verbatim copying and distribution of this entire article is
 permitted in any medium, provided this notice is preserved.</p>
 
-
 </div>
 </div>
 </body>
diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min
--- a/doc/gendocs_template_min
+++ b/doc/gendocs_template_min
@@ -82,17 +82,12 @@
 
 <div class="copyright">
 <p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
-
-<p>
 Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a>
-the FSF.
-<br />
+<a href="mailto:gnu@gnu.org">&lt;gnu@gnu.org&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.<br />
 Please send broken links and other corrections (or suggestions) to
-<a href="mailto:%%EMAIL%%"><em>%%EMAIL%%</em></a>.
+<a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.
 </p>
 
 <p>Copyright &copy; 2009 Free Software Foundation, Inc.</p>