diff options
author | wl <wl> | 2009-01-05 20:33:52 +0000 |
---|---|---|
committer | wl <wl> | 2009-01-05 20:33:52 +0000 |
commit | 2eae1b9c568def516c7170cdb274ab076bf6a02e (patch) | |
tree | ef902414cecc2c8712d879be2dc83baee57f4aad | |
parent | 02800f48133239ee2445cb7c89512cbf001e4a28 (diff) | |
download | groff-2eae1b9c568def516c7170cdb274ab076bf6a02e.tar.gz |
Update FDL 1.1 to FDL 1.3.
38 files changed, 221 insertions, 108 deletions
@@ -1,5 +1,9 @@ 2009-01-05 Werner LEMBERG <wl@gnu.org> + * */*: Update FDL 1.1 to FDL 1.3. + +2009-01-05 Werner LEMBERG <wl@gnu.org> + * */*: Update copyright year. 2009-01-05 Werner LEMBERG <wl@gnu.org> @@ -1,13 +1,13 @@ - GNU Free Documentation License - Version 1.2, November 2002 + GNU Free Documentation License + Version 1.3, 3 November 2008 - Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - 0. PREAMBLE The purpose of this License is to make a manual, textbook, or other @@ -50,11 +50,11 @@ modifications and/or translated into another language. A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the -publishers or authors of the Document to the Document's overall subject -(or to related matters) and contains nothing that could fall directly -within that overall subject. (Thus, if the Document is in part a -textbook of mathematics, a Secondary Section may not explain any -mathematics.) The relationship could be a matter of historical +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them. @@ -103,6 +103,9 @@ formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. +The "publisher" means any person or entity that distributes copies of +the Document to the public. + A section "Entitled XYZ" means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a @@ -118,14 +121,13 @@ License, but only as regards disclaiming warranties: any other implication that these Warranty Disclaimers may have is void and has no effect on the meaning of this License. - 2. VERBATIM COPYING You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies -to the Document are reproduced in all copies, and that you add no other -conditions whatsoever to those of this License. You may not use +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use technical measures to obstruct or control the reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough @@ -169,8 +171,9 @@ Opaque copy (directly or through your agents or retailers) of that edition to the public. It is requested, but not required, that you contact the authors of the -Document well before redistributing any large number of copies, to give -them a chance to provide you with an updated version of the Document. +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. 4. MODIFICATIONS @@ -285,16 +288,18 @@ Entitled "Endorsements". 6. COLLECTIONS OF DOCUMENTS -You may make a collection consisting of the Document and other documents -released under this License, and replace the individual copies of this -License in the various documents with a single copy that is included in -the collection, provided that you follow the rules of this License for -verbatim copying of each of the documents in all other respects. +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. -You may extract a single document from such a collection, and distribute -it individually under this License, provided you insert a copy of this -License into the extracted document, and follow this License in all -other respects regarding verbatim copying of that document. +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. 7. AGGREGATION WITH INDEPENDENT WORKS @@ -340,21 +345,38 @@ title. 9. TERMINATION -You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document is void, and will -automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. 10. FUTURE REVISIONS OF THIS LICENSE -The Free Software Foundation may publish new, revised versions -of the GNU Free Documentation License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. See +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See http://www.gnu.org/copyleft/. Each version of the License is given a distinguishing version number. @@ -364,7 +386,39 @@ following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. ADDENDUM: How to use this License for your documents @@ -375,7 +429,7 @@ license notices just after the title page: Copyright (c) YEAR YOUR NAME. Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 + under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU diff --git a/contrib/hdtbl/groff_hdtbl.man b/contrib/hdtbl/groff_hdtbl.man index 83189954..6cc67d2f 100644 --- a/contrib/hdtbl/groff_hdtbl.man +++ b/contrib/hdtbl/groff_hdtbl.man @@ -7,7 +7,7 @@ Written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de> This file is part of groff, the groff. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man index 178e369c..43d457b4 100644 --- a/contrib/mom/groff_mom.man +++ b/contrib/mom/groff_mom.man @@ -6,7 +6,7 @@ Copyright (C) 2002, 2003, 2005, 2008, 2009 written by Werner Lemberg <wl@gnu.org> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appendices.html index 60e5299b..b53af14e 100644 --- a/contrib/mom/momdoc/appendices.html +++ b/contrib/mom/momdoc/appendices.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.html index 3b944e91..c8b0ea9f 100644 --- a/contrib/mom/momdoc/color.html +++ b/contrib/mom/momdoc/color.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.html index 6b24ab5c..8abeee37 100644 --- a/contrib/mom/momdoc/cover.html +++ b/contrib/mom/momdoc/cover.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html index 7873f2e4..042af917 100644 --- a/contrib/mom/momdoc/definitions.html +++ b/contrib/mom/momdoc/definitions.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/docelement.html index c62dc82b..8d308a66 100644 --- a/contrib/mom/momdoc/docelement.html +++ b/contrib/mom/momdoc/docelement.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html index 77523622..4e2447ed 100644 --- a/contrib/mom/momdoc/docprocessing.html +++ b/contrib/mom/momdoc/docprocessing.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies.html index b60a0656..fddce21c 100644 --- a/contrib/mom/momdoc/goodies.html +++ b/contrib/mom/momdoc/goodies.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graphical.html index 98159a9c..e12aa9ab 100644 --- a/contrib/mom/momdoc/graphical.html +++ b/contrib/mom/momdoc/graphical.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/headfootpage.html index faebeb64..b49d5dc5 100644 --- a/contrib/mom/momdoc/headfootpage.html +++ b/contrib/mom/momdoc/headfootpage.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html index 69f42016..75b645fc 100644 --- a/contrib/mom/momdoc/inlines.html +++ b/contrib/mom/momdoc/inlines.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.html index 5fc83d9d..38ea12f6 100644 --- a/contrib/mom/momdoc/intro.html +++ b/contrib/mom/momdoc/intro.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters.html index e55051f8..0d815bfb 100644 --- a/contrib/mom/momdoc/letters.html +++ b/contrib/mom/momdoc/letters.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macrolist.html index e48df851..3b0669c0 100644 --- a/contrib/mom/momdoc/macrolist.html +++ b/contrib/mom/momdoc/macrolist.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rectoverso.html index d9c83008..c9d635b1 100644 --- a/contrib/mom/momdoc/rectoverso.html +++ b/contrib/mom/momdoc/rectoverso.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.html index a2985ebe..252098cd 100644 --- a/contrib/mom/momdoc/refer.html +++ b/contrib/mom/momdoc/refer.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserved.html index 4a594a5c..34cfaacd 100644 --- a/contrib/mom/momdoc/reserved.html +++ b/contrib/mom/momdoc/reserved.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html index b77d27db..41ddb23f 100644 --- a/contrib/mom/momdoc/toc.html +++ b/contrib/mom/momdoc/toc.html @@ -7,7 +7,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/typemacdoc.html b/contrib/mom/momdoc/typemacdoc.html index 48b857c4..01bb3db4 100644 --- a/contrib/mom/momdoc/typemacdoc.html +++ b/contrib/mom/momdoc/typemacdoc.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typesetting.html index 357c47d6..ed1d56fd 100644 --- a/contrib/mom/momdoc/typesetting.html +++ b/contrib/mom/momdoc/typesetting.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.html index 7a2da862..287b0ee9 100644 --- a/contrib/mom/momdoc/using.html +++ b/contrib/mom/momdoc/using.html @@ -6,7 +6,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. Written by Peter Schaffter. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this comment section, with no Front-Cover Texts, and with no Back-Cover Texts. diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms index d5cfd36f..9e5e4e75 100644 --- a/contrib/pdfmark/pdfmark.ms +++ b/contrib/pdfmark/pdfmark.ms @@ -10,7 +10,7 @@ Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc. written by Keith Marshall <keith.d.marshall@ntlworld.com> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Front-Cover Texts, no Back-Cover Texts, and the following Invariant Sections:-- diff --git a/contrib/pdfmark/pdfroff.man b/contrib/pdfmark/pdfroff.man index 165414ef..5b6904f4 100644 --- a/contrib/pdfmark/pdfroff.man +++ b/contrib/pdfmark/pdfroff.man @@ -15,7 +15,7 @@ Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. written by Keith Marshall <keith.d.marshall@ntlworld.com> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Front-Cover Texts, no Back-Cover Texts, and the following Invariant Sections:-- @@ -792,7 +792,7 @@ Copyright \(co 2005, 2006, 2007, 2009 Free Software Foundation, Inc. . .P This man page is distributed under the terms of the -GNU Free Documentation License (FDL), version 1.1 or later, +GNU Free Documentation License (FDL), version 1.3 or later, and is part of the .I GNU troff software package. diff --git a/doc/fdl.texi b/doc/fdl.texi index 994044df..8805f1a4 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -1,13 +1,12 @@ +@c The GNU Free Documentation License. +@center Version 1.3, 3 November 2008 -@node GNU Free Documentation License -@appendixsec GNU Free Documentation License - -@cindex FDL, GNU Free Documentation License -@center Version 1.2, November 2002 +@c This file is intended to be included within another document, +@c hence no sectioning command or @node. @display -Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +@uref{http://fsf.org/} Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -112,6 +111,9 @@ formats which do not have any title page as such, ``Title Page'' means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. +The ``publisher'' means any person or entity that distributes copies +of the Document to the public. + A section ``Entitled XYZ'' means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a @@ -380,13 +382,30 @@ title. @item TERMINATION -You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document is void, and will -automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. @item FUTURE REVISIONS OF THIS LICENSE @@ -404,11 +423,46 @@ following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +@item +RELICENSING + +``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the +site means any set of copyrightable works thus published on the MMC +site. + +``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +``Incorporate'' means to publish or republish a Document, in whole or +in part, as part of another Document. + +An MMC is ``eligible for relicensing'' if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole +or in part into the MMC, (1) had no cover texts or invariant sections, +and (2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + @end enumerate @page -@appendixsubsec ADDENDUM: How to use this License for your documents +@heading ADDENDUM: How to use this License for your documents To use this License in a document you have written, include a copy of the License in the document and put the following copyright and @@ -418,7 +472,7 @@ license notices just after the title page: @group Copyright (C) @var{year} @var{your name}. Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 + under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU @@ -427,7 +481,7 @@ license notices just after the title page: @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with...Texts.'' line with this: +replace the ``with@dots{}Texts.'' line with this: @smallexample @group diff --git a/doc/groff.texinfo b/doc/groff.texinfo index e7793df1..f93f07b4 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -32,7 +32,7 @@ Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover texts being `A GNU Manual,'' and with the Back-Cover Texts as in (a) below. A copy of the license is diff --git a/man/ditroff.man b/man/ditroff.man index 73237301..91efa396 100644 --- a/man/ditroff.man +++ b/man/ditroff.man @@ -9,7 +9,7 @@ written by Bernd Warken <bwarken@mayn.de> maintained by Werner Lemberg <wl@gnu.org> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -156,11 +156,12 @@ multi-devicing. .SH "AUTHORS" .\" -------------------------------------------------------------------- . -Copyright (C) 2001, 2002, 2004, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2001, 2002, 2004, 2007, 2008, 2009 +Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/man/groff.man b/man/groff.man index 426500f1..b5790b1e 100644 --- a/man/groff.man +++ b/man/groff.man @@ -11,7 +11,7 @@ written by Bernd Warken <bwarken@mayn.de> maintained by Werner Lemberg <wl@gnu.org> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -3985,12 +3985,12 @@ be reproduced, and say which version of groff you are using. .SH AUTHORS .\" -------------------------------------------------------------------- . -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/man/groff_char.man b/man/groff_char.man index cdce927b..d8e10c2d 100644 --- a/man/groff_char.man +++ b/man/groff_char.man @@ -24,7 +24,7 @@ written by Werner Lemberg <wl@gnu.org> with additions by Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHOR, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -1356,11 +1356,11 @@ phi, and `\f(CW\e[+f]\fP' the curly variant. .\" -------------------------------------------------------------------- . Copyright \(co 1989-2000, 2001, 2002, 2003, -2004, 2006, 2008 Free Software Foundation, Inc. +2004, 2006, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/man/groff_diff.man b/man/groff_diff.man index 00a4fce0..7f39a50a 100644 --- a/man/groff_diff.man +++ b/man/groff_diff.man @@ -14,7 +14,7 @@ modified by Werner Lemberg <wl@gnu.org> Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -3783,12 +3783,12 @@ classical `device-independent' troff did. .SH AUTHORS .\" -------------------------------------------------------------------- . -Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008 +Copyright (C) 1989, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/man/groff_out.man b/man/groff_out.man index 2d96daca..7c2db26c 100644 --- a/man/groff_out.man +++ b/man/groff_out.man @@ -11,7 +11,7 @@ Free Software Foundation, Inc. rewritten from scrach 2001 by Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -1983,13 +1983,13 @@ CSTR\~#54 .SH "AUTHORS" .\" -------------------------------------------------------------------- . -Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. . . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL with this package; it is also available on-line at the diff --git a/man/groff_tmac.man b/man/groff_tmac.man index 9b22ca1d..45de5b67 100644 --- a/man/groff_tmac.man +++ b/man/groff_tmac.man @@ -11,7 +11,7 @@ written by Bernd Warken <bwarken@mayn.de> and Werner Lemberg <wl@gnu.org> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHOR, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -1202,7 +1202,7 @@ Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/man/roff.man b/man/roff.man index 055154f2..0368c3f9 100644 --- a/man/roff.man +++ b/man/roff.man @@ -10,7 +10,7 @@ written by Bernd Warken <bwarken@mayn.de> maintained by Werner Lemberg <wl@gnu.org> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHORS, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -1239,12 +1239,12 @@ might be a good starting point. .SH AUTHORS .\" -------------------------------------------------------------------- . -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the \f[CR]FDL\f[] -(\f[CR]GNU Free Documentation License\f[]) version 1.1 or later. +(\f[CR]GNU Free Documentation License\f[]) version 1.3 or later. . You should have received a copy of the \f[CR]FDL\f[] on your system, it is also available on-line at the diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man index a77897de..ca2948f6 100644 --- a/src/roff/groff/groff.man +++ b/src/roff/groff/groff.man @@ -6,7 +6,7 @@ Free Software Foundation, Inc. Rewritten in 2002 by Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHOR, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -1707,12 +1707,12 @@ This is the only grap version supported by .SH AUTHORS .\" -------------------------------------------------------------------- . -Copyright \(co 1989, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright \(co 1989, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the \f[CR]FDL\f[] -(\f[CR]GNU Free Documentation License\f[]) version 1.1 or later. +(\f[CR]GNU Free Documentation License\f[]) version 1.3 or later. . You should have received a copy of the \f[CR]FDL\f[] on your system, it is also available on-line at the diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man index f7fbc7de..6c53f4d5 100644 --- a/src/roff/troff/troff.man +++ b/src/roff/troff/troff.man @@ -13,7 +13,7 @@ modified by Werner Lemberg <wl@gnu.org> Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHOR, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -581,12 +581,12 @@ necessary. .SH AUTHOR .\" -------------------------------------------------------------------- . -Copyright (C) 1989, 2001, 2002, 2003, 2007, 2008 +Copyright (C) 1989, 2001, 2002, 2003, 2007, 2008, 2009 Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free -Documentation License) version 1.1 or later. +Documentation License) version 1.3 or later. . You should have received a copy of the FDL on your system, it is also available on-line at the diff --git a/tmac/groff_trace.man b/tmac/groff_trace.man index 60c36e59..c3631b3d 100644 --- a/tmac/groff_trace.man +++ b/tmac/groff_trace.man @@ -13,7 +13,7 @@ Copyright (C) 2002, 2006, 2007, 2008, 2009 written by Bernd Warken. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or +under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with the Invariant Sections being this .ig-section and AUTHOR, with no Front-Cover Texts, and with no Back-Cover Texts. |