diff options
| author | Karl Berry <karl@freefriends.org> | 2011-03-22 16:55:41 -0700 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-03-22 16:55:41 -0700 |
| commit | 70676abc18115ca824ca0be6affc803759040d5e (patch) | |
| tree | b8f7ce1c1a7d128e15810cdadceb442f78916030 /doc | |
| parent | d59013190eb71a562203341f13c108365bfd8e74 (diff) | |
| download | gnulib-70676abc18115ca824ca0be6affc803759040d5e.tar.gz | |
autoupdate
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gendocs_template | 25 | ||||
| -rw-r--r-- | doc/gendocs_template_min | 25 |
2 files changed, 21 insertions, 29 deletions
diff --git a/doc/gendocs_template b/doc/gendocs_template index ccce0be2aa..33c6c2d9cb 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -66,29 +66,28 @@ this helps support FSF activities.</p> <p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%% script</a>.)</p> -<!-- If needed, change the copyright block at the bottom. In general, --> -<!-- all pages on the GNU web server should have the section about --> -<!-- verbatim copying. Please do NOT remove this without talking --> -<!-- with the webmasters first. --> -<!-- Please make sure the copyright date is consistent with the document --> -<!-- and that it is like this "2001, 2002" not this "2001-2002." --> +<!-- If needed, change the copyright block at the bottom. In general, + all pages on the GNU web server should have the section about + verbatim copying. Please do NOT remove this without talking + with the webmasters first. + Please make sure the copyright date is consistent with the document + and that it is like this: "2001, 2002", not this: "2001-2002". --> </div><!-- for id="content", starts in the include above --> <!--#include virtual="/server/footer.html" --> <div id="footer"> -<p> -Please send FSF & GNU inquiries to +<p>Please send general FSF & GNU inquiries to <a href="mailto:gnu@gnu.org"><gnu@gnu.org></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%%"><%%EMAIL%%></a>. -</p> +<a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> -<p>Copyright © 2010 Free Software Foundation, Inc.</p> +<p>Copyright © 2011 Free Software Foundation, Inc.</p> -<p>Verbatim copying and distribution of this entire article is -permitted in any medium, provided this notice is preserved.</p> +<p>Verbatim copying and distribution of this entire article are +permitted worldwide, without royalty, in any medium, provided this +notice, and the copyright notice, are preserved.</p> </div> </div> diff --git a/doc/gendocs_template_min b/doc/gendocs_template_min index a5412841e4..109487a2c7 100644 --- a/doc/gendocs_template_min +++ b/doc/gendocs_template_min @@ -10,12 +10,6 @@ <link rev="made" href="webmasters@gnu.org" /> </head> -<!-- This document is in XML, and xhtml 1.0 --> -<!-- Please make sure to properly nest your tags --> -<!-- and ensure that your final document validates --> -<!-- consistent with W3C xhtml 1.0 and CSS standards --> -<!-- See validator.w3.org --> - <body> <h3>%%TITLE%%</h3> @@ -80,22 +74,21 @@ <p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%% script</a>.)</p> -<div class="copyright"> -<p> -Please send FSF & GNU inquiries to +<div id="footer" class="copyright"> + +<p>Please send general FSF & GNU inquiries to <a href="mailto:gnu@gnu.org"><gnu@gnu.org></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%%"><%%EMAIL%%></a>. -</p> +Please send broken links and other corrections or suggestions to +<a href="mailto:%%EMAIL%%"><%%EMAIL%%></a>.</p> -<p>Copyright © 2010 Free Software Foundation, Inc.</p> +<p>Copyright © 2011 Free Software Foundation, Inc.</p> -<p>Verbatim copying and distribution of this entire article is -permitted in any medium, provided this notice is preserved.</p> +<p>Verbatim copying and distribution of this entire article are +permitted worldwide, without royalty, in any medium, provided this +notice, and the copyright notice, are preserved.</p> </div> - </body> </html> |