autoupdate

diff --git a/doc/gendocs_template b/doc/gendocs_template
index 1bb1a5c11ac2ecc0a856dfc764d42820fba4fbe7..ee6a5c566e6242f36ea6ab9f3599c793cc1b7994 100644 (file)
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -78,12 +78,11 @@ script</a>.)</p>
 
 <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 @@ Please send broken links and other corrections or suggestions to
 <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
index 47084562fd2253713514b1c059d832f0d0ba01b7..58b8944add0e0fb9d4ae58fcd1410093a08c7598 100644 (file)
--- a/doc/gendocs_template_min
+++ b/doc/gendocs_template_min
@@ -81,18 +81,13 @@
 script</a>.)</p>
 
 <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>