diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-03 17:46:41 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-03 17:48:30 +0200 |
| commit | 63fcc4002aded7fed47fe19008c3ae96a18fbbd6 (patch) | |
| tree | 0cffa7e88877c1302917628e8dd06f29ea9dd94f /doc | |
| parent | 1ff921d2f8e3b4a9a4ac6317e6dcdcf3f472e5f2 (diff) | |
| download | gnutls-63fcc4002aded7fed47fe19008c3ae96a18fbbd6.tar.gz | |
Added new gnulib.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gendocs_template | 31 | ||||
| -rw-r--r-- | doc/lgpl-2.1.texi | 16 |
2 files changed, 14 insertions, 33 deletions
diff --git a/doc/gendocs_template b/doc/gendocs_template index 5c860fd63d..4120d03fb8 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -3,12 +3,6 @@ <!--#include virtual="/server/banner.html" --> <h2>%%TITLE%%</h2> -<!-- 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 --> - <address>Free Software Foundation</address> <address>last updated %%DATE%%</address> @@ -73,29 +67,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/lgpl-2.1.texi b/doc/lgpl-2.1.texi index a2ba64bfea..ab03d6cc37 100644 --- a/doc/lgpl-2.1.texi +++ b/doc/lgpl-2.1.texi @@ -470,13 +470,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. -@iftex -@heading NO WARRANTY -@end iftex -@ifinfo -@center NO WARRANTY - -@end ifinfo +@center @b{NO WARRANTY} @item BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO @@ -502,13 +496,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. @end enumerate -@iftex -@heading END OF TERMS AND CONDITIONS -@end iftex -@ifinfo -@center END OF TERMS AND CONDITIONS - -@end ifinfo +@subheading END OF TERMS AND CONDITIONS @page @subheading How to Apply These Terms to Your New Libraries |