Merge lp:~andrea.corbellini/beeseek/gnu-fdl into lp:beeseek

Proposed by Andrea Corbellini
Status: Merged
Merged at revision: 103
Proposed branch: lp:~andrea.corbellini/beeseek/gnu-fdl
Merge into: lp:beeseek
Diff against target: 465 lines (+454/-0)
2 files modified
LICENSE.doc (+450/-0)
doc/index.txt (+4/-0)
To merge this branch: bzr merge lp:~andrea.corbellini/beeseek/gnu-fdl
Reviewer Review Type Date Requested Status
Andrea Colangelo Approve
Review via email: mp+34683@code.launchpad.net

Description of the change

The documentation was currently unlicensed. I've decided to use the GNU Free Documentation License (without any optional feature) for it, because it's GNU and because we can switch to the Creative Commons BY-SA if/when we need:

  http://www.gnu.org/licenses/fdl-1.3-faq.html

I've placed the note about the license just in the doc/index.txt file and not in all the other documents because it is sufficient:

  http://www.gnu.org/licenses/fdl-howto.html

To post a comment you must log in.
Revision history for this message
Andrea Colangelo (warp10) wrote :

Apart from the .doc extension that provokes hives, rash and panic attacks in me, I like it. :)

review: Approve
Revision history for this message
Andrea Corbellini (andrea.corbellini) wrote :

Hehe, it took a while for me to understand what was wrong with the .doc extension. Fortunately, not all the operating systems and tools use the file name to know the file type. :-)

Revision history for this message
Andrea Colangelo (warp10) wrote :

Did you heard it, Windows? Shame on you!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'LICENSE.doc'
2--- LICENSE.doc 1970-01-01 00:00:00 +0000
3+++ LICENSE.doc 2010-09-06 16:12:44 +0000
4@@ -0,0 +1,450 @@
5+ GNU Free Documentation License
6+ Version 1.3, 3 November 2008
7+
8+
9+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
10+ <http://fsf.org/>
11+ Everyone is permitted to copy and distribute verbatim copies
12+ of this license document, but changing it is not allowed.
13+
14+0. PREAMBLE
15+
16+The purpose of this License is to make a manual, textbook, or other
17+functional and useful document "free" in the sense of freedom: to
18+assure everyone the effective freedom to copy and redistribute it,
19+with or without modifying it, either commercially or noncommercially.
20+Secondarily, this License preserves for the author and publisher a way
21+to get credit for their work, while not being considered responsible
22+for modifications made by others.
23+
24+This License is a kind of "copyleft", which means that derivative
25+works of the document must themselves be free in the same sense. It
26+complements the GNU General Public License, which is a copyleft
27+license designed for free software.
28+
29+We have designed this License in order to use it for manuals for free
30+software, because free software needs free documentation: a free
31+program should come with manuals providing the same freedoms that the
32+software does. But this License is not limited to software manuals;
33+it can be used for any textual work, regardless of subject matter or
34+whether it is published as a printed book. We recommend this License
35+principally for works whose purpose is instruction or reference.
36+
37+
38+1. APPLICABILITY AND DEFINITIONS
39+
40+This License applies to any manual or other work, in any medium, that
41+contains a notice placed by the copyright holder saying it can be
42+distributed under the terms of this License. Such a notice grants a
43+world-wide, royalty-free license, unlimited in duration, to use that
44+work under the conditions stated herein. The "Document", below,
45+refers to any such manual or work. Any member of the public is a
46+licensee, and is addressed as "you". You accept the license if you
47+copy, modify or distribute the work in a way requiring permission
48+under copyright law.
49+
50+A "Modified Version" of the Document means any work containing the
51+Document or a portion of it, either copied verbatim, or with
52+modifications and/or translated into another language.
53+
54+A "Secondary Section" is a named appendix or a front-matter section of
55+the Document that deals exclusively with the relationship of the
56+publishers or authors of the Document to the Document's overall
57+subject (or to related matters) and contains nothing that could fall
58+directly within that overall subject. (Thus, if the Document is in
59+part a textbook of mathematics, a Secondary Section may not explain
60+any mathematics.) The relationship could be a matter of historical
61+connection with the subject or with related matters, or of legal,
62+commercial, philosophical, ethical or political position regarding
63+them.
64+
65+The "Invariant Sections" are certain Secondary Sections whose titles
66+are designated, as being those of Invariant Sections, in the notice
67+that says that the Document is released under this License. If a
68+section does not fit the above definition of Secondary then it is not
69+allowed to be designated as Invariant. The Document may contain zero
70+Invariant Sections. If the Document does not identify any Invariant
71+Sections then there are none.
72+
73+The "Cover Texts" are certain short passages of text that are listed,
74+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
75+the Document is released under this License. A Front-Cover Text may
76+be at most 5 words, and a Back-Cover Text may be at most 25 words.
77+
78+A "Transparent" copy of the Document means a machine-readable copy,
79+represented in a format whose specification is available to the
80+general public, that is suitable for revising the document
81+straightforwardly with generic text editors or (for images composed of
82+pixels) generic paint programs or (for drawings) some widely available
83+drawing editor, and that is suitable for input to text formatters or
84+for automatic translation to a variety of formats suitable for input
85+to text formatters. A copy made in an otherwise Transparent file
86+format whose markup, or absence of markup, has been arranged to thwart
87+or discourage subsequent modification by readers is not Transparent.
88+An image format is not Transparent if used for any substantial amount
89+of text. A copy that is not "Transparent" is called "Opaque".
90+
91+Examples of suitable formats for Transparent copies include plain
92+ASCII without markup, Texinfo input format, LaTeX input format, SGML
93+or XML using a publicly available DTD, and standard-conforming simple
94+HTML, PostScript or PDF designed for human modification. Examples of
95+transparent image formats include PNG, XCF and JPG. Opaque formats
96+include proprietary formats that can be read and edited only by
97+proprietary word processors, SGML or XML for which the DTD and/or
98+processing tools are not generally available, and the
99+machine-generated HTML, PostScript or PDF produced by some word
100+processors for output purposes only.
101+
102+The "Title Page" means, for a printed book, the title page itself,
103+plus such following pages as are needed to hold, legibly, the material
104+this License requires to appear in the title page. For works in
105+formats which do not have any title page as such, "Title Page" means
106+the text near the most prominent appearance of the work's title,
107+preceding the beginning of the body of the text.
108+
109+The "publisher" means any person or entity that distributes copies of
110+the Document to the public.
111+
112+A section "Entitled XYZ" means a named subunit of the Document whose
113+title either is precisely XYZ or contains XYZ in parentheses following
114+text that translates XYZ in another language. (Here XYZ stands for a
115+specific section name mentioned below, such as "Acknowledgements",
116+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
117+of such a section when you modify the Document means that it remains a
118+section "Entitled XYZ" according to this definition.
119+
120+The Document may include Warranty Disclaimers next to the notice which
121+states that this License applies to the Document. These Warranty
122+Disclaimers are considered to be included by reference in this
123+License, but only as regards disclaiming warranties: any other
124+implication that these Warranty Disclaimers may have is void and has
125+no effect on the meaning of this License.
126+
127+2. VERBATIM COPYING
128+
129+You may copy and distribute the Document in any medium, either
130+commercially or noncommercially, provided that this License, the
131+copyright notices, and the license notice saying this License applies
132+to the Document are reproduced in all copies, and that you add no
133+other conditions whatsoever to those of this License. You may not use
134+technical measures to obstruct or control the reading or further
135+copying of the copies you make or distribute. However, you may accept
136+compensation in exchange for copies. If you distribute a large enough
137+number of copies you must also follow the conditions in section 3.
138+
139+You may also lend copies, under the same conditions stated above, and
140+you may publicly display copies.
141+
142+
143+3. COPYING IN QUANTITY
144+
145+If you publish printed copies (or copies in media that commonly have
146+printed covers) of the Document, numbering more than 100, and the
147+Document's license notice requires Cover Texts, you must enclose the
148+copies in covers that carry, clearly and legibly, all these Cover
149+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
150+the back cover. Both covers must also clearly and legibly identify
151+you as the publisher of these copies. The front cover must present
152+the full title with all words of the title equally prominent and
153+visible. You may add other material on the covers in addition.
154+Copying with changes limited to the covers, as long as they preserve
155+the title of the Document and satisfy these conditions, can be treated
156+as verbatim copying in other respects.
157+
158+If the required texts for either cover are too voluminous to fit
159+legibly, you should put the first ones listed (as many as fit
160+reasonably) on the actual cover, and continue the rest onto adjacent
161+pages.
162+
163+If you publish or distribute Opaque copies of the Document numbering
164+more than 100, you must either include a machine-readable Transparent
165+copy along with each Opaque copy, or state in or with each Opaque copy
166+a computer-network location from which the general network-using
167+public has access to download using public-standard network protocols
168+a complete Transparent copy of the Document, free of added material.
169+If you use the latter option, you must take reasonably prudent steps,
170+when you begin distribution of Opaque copies in quantity, to ensure
171+that this Transparent copy will remain thus accessible at the stated
172+location until at least one year after the last time you distribute an
173+Opaque copy (directly or through your agents or retailers) of that
174+edition to the public.
175+
176+It is requested, but not required, that you contact the authors of the
177+Document well before redistributing any large number of copies, to
178+give them a chance to provide you with an updated version of the
179+Document.
180+
181+
182+4. MODIFICATIONS
183+
184+You may copy and distribute a Modified Version of the Document under
185+the conditions of sections 2 and 3 above, provided that you release
186+the Modified Version under precisely this License, with the Modified
187+Version filling the role of the Document, thus licensing distribution
188+and modification of the Modified Version to whoever possesses a copy
189+of it. In addition, you must do these things in the Modified Version:
190+
191+A. Use in the Title Page (and on the covers, if any) a title distinct
192+ from that of the Document, and from those of previous versions
193+ (which should, if there were any, be listed in the History section
194+ of the Document). You may use the same title as a previous version
195+ if the original publisher of that version gives permission.
196+B. List on the Title Page, as authors, one or more persons or entities
197+ responsible for authorship of the modifications in the Modified
198+ Version, together with at least five of the principal authors of the
199+ Document (all of its principal authors, if it has fewer than five),
200+ unless they release you from this requirement.
201+C. State on the Title page the name of the publisher of the
202+ Modified Version, as the publisher.
203+D. Preserve all the copyright notices of the Document.
204+E. Add an appropriate copyright notice for your modifications
205+ adjacent to the other copyright notices.
206+F. Include, immediately after the copyright notices, a license notice
207+ giving the public permission to use the Modified Version under the
208+ terms of this License, in the form shown in the Addendum below.
209+G. Preserve in that license notice the full lists of Invariant Sections
210+ and required Cover Texts given in the Document's license notice.
211+H. Include an unaltered copy of this License.
212+I. Preserve the section Entitled "History", Preserve its Title, and add
213+ to it an item stating at least the title, year, new authors, and
214+ publisher of the Modified Version as given on the Title Page. If
215+ there is no section Entitled "History" in the Document, create one
216+ stating the title, year, authors, and publisher of the Document as
217+ given on its Title Page, then add an item describing the Modified
218+ Version as stated in the previous sentence.
219+J. Preserve the network location, if any, given in the Document for
220+ public access to a Transparent copy of the Document, and likewise
221+ the network locations given in the Document for previous versions
222+ it was based on. These may be placed in the "History" section.
223+ You may omit a network location for a work that was published at
224+ least four years before the Document itself, or if the original
225+ publisher of the version it refers to gives permission.
226+K. For any section Entitled "Acknowledgements" or "Dedications",
227+ Preserve the Title of the section, and preserve in the section all
228+ the substance and tone of each of the contributor acknowledgements
229+ and/or dedications given therein.
230+L. Preserve all the Invariant Sections of the Document,
231+ unaltered in their text and in their titles. Section numbers
232+ or the equivalent are not considered part of the section titles.
233+M. Delete any section Entitled "Endorsements". Such a section
234+ may not be included in the Modified Version.
235+N. Do not retitle any existing section to be Entitled "Endorsements"
236+ or to conflict in title with any Invariant Section.
237+O. Preserve any Warranty Disclaimers.
238+
239+If the Modified Version includes new front-matter sections or
240+appendices that qualify as Secondary Sections and contain no material
241+copied from the Document, you may at your option designate some or all
242+of these sections as invariant. To do this, add their titles to the
243+list of Invariant Sections in the Modified Version's license notice.
244+These titles must be distinct from any other section titles.
245+
246+You may add a section Entitled "Endorsements", provided it contains
247+nothing but endorsements of your Modified Version by various
248+parties--for example, statements of peer review or that the text has
249+been approved by an organization as the authoritative definition of a
250+standard.
251+
252+You may add a passage of up to five words as a Front-Cover Text, and a
253+passage of up to 25 words as a Back-Cover Text, to the end of the list
254+of Cover Texts in the Modified Version. Only one passage of
255+Front-Cover Text and one of Back-Cover Text may be added by (or
256+through arrangements made by) any one entity. If the Document already
257+includes a cover text for the same cover, previously added by you or
258+by arrangement made by the same entity you are acting on behalf of,
259+you may not add another; but you may replace the old one, on explicit
260+permission from the previous publisher that added the old one.
261+
262+The author(s) and publisher(s) of the Document do not by this License
263+give permission to use their names for publicity for or to assert or
264+imply endorsement of any Modified Version.
265+
266+
267+5. COMBINING DOCUMENTS
268+
269+You may combine the Document with other documents released under this
270+License, under the terms defined in section 4 above for modified
271+versions, provided that you include in the combination all of the
272+Invariant Sections of all of the original documents, unmodified, and
273+list them all as Invariant Sections of your combined work in its
274+license notice, and that you preserve all their Warranty Disclaimers.
275+
276+The combined work need only contain one copy of this License, and
277+multiple identical Invariant Sections may be replaced with a single
278+copy. If there are multiple Invariant Sections with the same name but
279+different contents, make the title of each such section unique by
280+adding at the end of it, in parentheses, the name of the original
281+author or publisher of that section if known, or else a unique number.
282+Make the same adjustment to the section titles in the list of
283+Invariant Sections in the license notice of the combined work.
284+
285+In the combination, you must combine any sections Entitled "History"
286+in the various original documents, forming one section Entitled
287+"History"; likewise combine any sections Entitled "Acknowledgements",
288+and any sections Entitled "Dedications". You must delete all sections
289+Entitled "Endorsements".
290+
291+
292+6. COLLECTIONS OF DOCUMENTS
293+
294+You may make a collection consisting of the Document and other
295+documents released under this License, and replace the individual
296+copies of this License in the various documents with a single copy
297+that is included in the collection, provided that you follow the rules
298+of this License for verbatim copying of each of the documents in all
299+other respects.
300+
301+You may extract a single document from such a collection, and
302+distribute it individually under this License, provided you insert a
303+copy of this License into the extracted document, and follow this
304+License in all other respects regarding verbatim copying of that
305+document.
306+
307+
308+7. AGGREGATION WITH INDEPENDENT WORKS
309+
310+A compilation of the Document or its derivatives with other separate
311+and independent documents or works, in or on a volume of a storage or
312+distribution medium, is called an "aggregate" if the copyright
313+resulting from the compilation is not used to limit the legal rights
314+of the compilation's users beyond what the individual works permit.
315+When the Document is included in an aggregate, this License does not
316+apply to the other works in the aggregate which are not themselves
317+derivative works of the Document.
318+
319+If the Cover Text requirement of section 3 is applicable to these
320+copies of the Document, then if the Document is less than one half of
321+the entire aggregate, the Document's Cover Texts may be placed on
322+covers that bracket the Document within the aggregate, or the
323+electronic equivalent of covers if the Document is in electronic form.
324+Otherwise they must appear on printed covers that bracket the whole
325+aggregate.
326+
327+
328+8. TRANSLATION
329+
330+Translation is considered a kind of modification, so you may
331+distribute translations of the Document under the terms of section 4.
332+Replacing Invariant Sections with translations requires special
333+permission from their copyright holders, but you may include
334+translations of some or all Invariant Sections in addition to the
335+original versions of these Invariant Sections. You may include a
336+translation of this License, and all the license notices in the
337+Document, and any Warranty Disclaimers, provided that you also include
338+the original English version of this License and the original versions
339+of those notices and disclaimers. In case of a disagreement between
340+the translation and the original version of this License or a notice
341+or disclaimer, the original version will prevail.
342+
343+If a section in the Document is Entitled "Acknowledgements",
344+"Dedications", or "History", the requirement (section 4) to Preserve
345+its Title (section 1) will typically require changing the actual
346+title.
347+
348+
349+9. TERMINATION
350+
351+You may not copy, modify, sublicense, or distribute the Document
352+except as expressly provided under this License. Any attempt
353+otherwise to copy, modify, sublicense, or distribute it is void, and
354+will automatically terminate your rights under this License.
355+
356+However, if you cease all violation of this License, then your license
357+from a particular copyright holder is reinstated (a) provisionally,
358+unless and until the copyright holder explicitly and finally
359+terminates your license, and (b) permanently, if the copyright holder
360+fails to notify you of the violation by some reasonable means prior to
361+60 days after the cessation.
362+
363+Moreover, your license from a particular copyright holder is
364+reinstated permanently if the copyright holder notifies you of the
365+violation by some reasonable means, this is the first time you have
366+received notice of violation of this License (for any work) from that
367+copyright holder, and you cure the violation prior to 30 days after
368+your receipt of the notice.
369+
370+Termination of your rights under this section does not terminate the
371+licenses of parties who have received copies or rights from you under
372+this License. If your rights have been terminated and not permanently
373+reinstated, receipt of a copy of some or all of the same material does
374+not give you any rights to use it.
375+
376+
377+10. FUTURE REVISIONS OF THIS LICENSE
378+
379+The Free Software Foundation may publish new, revised versions of the
380+GNU Free Documentation License from time to time. Such new versions
381+will be similar in spirit to the present version, but may differ in
382+detail to address new problems or concerns. See
383+http://www.gnu.org/copyleft/.
384+
385+Each version of the License is given a distinguishing version number.
386+If the Document specifies that a particular numbered version of this
387+License "or any later version" applies to it, you have the option of
388+following the terms and conditions either of that specified version or
389+of any later version that has been published (not as a draft) by the
390+Free Software Foundation. If the Document does not specify a version
391+number of this License, you may choose any version ever published (not
392+as a draft) by the Free Software Foundation. If the Document
393+specifies that a proxy can decide which future versions of this
394+License can be used, that proxy's public statement of acceptance of a
395+version permanently authorizes you to choose that version for the
396+Document.
397+
398+11. RELICENSING
399+
400+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
401+World Wide Web server that publishes copyrightable works and also
402+provides prominent facilities for anybody to edit those works. A
403+public wiki that anybody can edit is an example of such a server. A
404+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
405+means any set of copyrightable works thus published on the MMC site.
406+
407+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
408+license published by Creative Commons Corporation, a not-for-profit
409+corporation with a principal place of business in San Francisco,
410+California, as well as future copyleft versions of that license
411+published by that same organization.
412+
413+"Incorporate" means to publish or republish a Document, in whole or in
414+part, as part of another Document.
415+
416+An MMC is "eligible for relicensing" if it is licensed under this
417+License, and if all works that were first published under this License
418+somewhere other than this MMC, and subsequently incorporated in whole or
419+in part into the MMC, (1) had no cover texts or invariant sections, and
420+(2) were thus incorporated prior to November 1, 2008.
421+
422+The operator of an MMC Site may republish an MMC contained in the site
423+under CC-BY-SA on the same site at any time before August 1, 2009,
424+provided the MMC is eligible for relicensing.
425+
426+
427+ADDENDUM: How to use this License for your documents
428+
429+To use this License in a document you have written, include a copy of
430+the License in the document and put the following copyright and
431+license notices just after the title page:
432+
433+ Copyright (c) YEAR YOUR NAME.
434+ Permission is granted to copy, distribute and/or modify this document
435+ under the terms of the GNU Free Documentation License, Version 1.3
436+ or any later version published by the Free Software Foundation;
437+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
438+ A copy of the license is included in the section entitled "GNU
439+ Free Documentation License".
440+
441+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
442+replace the "with...Texts." line with this:
443+
444+ with the Invariant Sections being LIST THEIR TITLES, with the
445+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
446+
447+If you have Invariant Sections without Cover Texts, or some other
448+combination of the three, merge those two alternatives to suit the
449+situation.
450+
451+If your document contains nontrivial examples of program code, we
452+recommend releasing these examples in parallel under your choice of
453+free software license, such as the GNU General Public License,
454+to permit their use in free software.
455
456=== modified file 'doc/index.txt'
457--- doc/index.txt 2010-07-29 09:34:33 +0000
458+++ doc/index.txt 2010-09-06 16:12:44 +0000
459@@ -1,3 +1,7 @@
460+.. This documentation is Copyright 2010 BeeSeek Developers and is licensed
461+ under the GNU Free Documentation License version 1.3 (see the file
462+ LICENSE.doc).
463+
464 BeeSeek developers documentation
465 ********************************
466

Subscribers

People subscribed via source and target branches