Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14462:61818c1e26b8
autoupdate
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Tue, 22 Mar 2011 16:55:41 -0700 |
parents | f3ad11231a87 |
children | 12b0cce643ed |
files | doc/gendocs_template doc/gendocs_template_min |
diffstat | 2 files changed, 22 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -66,29 +66,28 @@ <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 © 2011 Free Software Foundation, Inc.</p> -<p>Copyright © 2010 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>
--- 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>