diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-26 19:33:32 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-10-26 19:33:32 +0200 |
commit | fd2468864b719af4cfb0266b1bb8c6b0dbd53aa0 (patch) | |
tree | c1473eff168c9f99ce0bd4dbe5f506c4381b2649 /doc | |
parent | 31a646d592e09918a801e86274eb1b97bf4541d2 (diff) | |
download | pies-fd2468864b719af4cfb0266b1bb8c6b0dbd53aa0.tar.gz pies-fd2468864b719af4cfb0266b1bb8c6b0dbd53aa0.tar.bz2 |
Minor changes
* doc/Config (EXTRA_HEAD, AFTER_BODY_OPEN): Use qq{} to quote contents.
* doc/fdl.texi: Upgrade to v.1.3.
* doc/pies.texi: Likewise.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Config | 28 | ||||
-rw-r--r-- | doc/fdl.texi | 91 | ||||
-rw-r--r-- | doc/pies.texi | 2 |
3 files changed, 89 insertions, 32 deletions
@@ -30,20 +30,20 @@ $SEPARATED_FOOTNOTES = 0; | |||
30 | 30 | ||
31 | $BODYTEXT = ""; | 31 | $BODYTEXT = ""; |
32 | 32 | ||
33 | $EXTRA_HEAD="\ | 33 | $EXTRA_HEAD=qq{ |
34 | <link rev=\"made\" href=\"mailto:gray@gnu.org.ua\">\ | 34 | <link rev="made" href="mailto:gray@gnu.org.ua"> |
35 | <link rel=\"stylesheet\" type=\"text/css\" href=\"${top_html_dir}/gray.css\">\ | 35 | <link rel="stylesheet" type="text/css" href="${top_html_dir}/gray.css"> |
36 | <link rel=\"stylesheet\" type=\"text/css\" href=\"${top_html_dir}/texi.css\">\ | 36 | <link rel="stylesheet" type="text/css" href="${top_html_dir}/texi.css"> |
37 | <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-icon.png\">"; | 37 | <link rel="icon" type="image/png" href="/graphics/gnu-head-icon.png">}; |
38 | 38 | ||
39 | $AFTER_BODY_OPEN="\ | 39 | $AFTER_BODY_OPEN=qq{ |
40 | <!--#include virtual=\"${top_html_dir}/inc/header.html\" -->\ | 40 | <!--#include virtual="${top_html_dir}/inc/header.html" --> |
41 | <ul class=\"tabs\">\ | 41 | <ul class="tabs"> |
42 | <li><a href=\"/software/pies/pies.html\">Main</a></li>\ | 42 | <li><a href="${top_html_dir}/pies.html">Main</a></li> |
43 | <li><a href=\"/software/pies/example.html\">Examples</a></li>\ | 43 | <li><a href="${top_html_dir}/example.html">Examples</a></li> |
44 | <li><a href=\"/software/pies/download.html\">Downloads</a></li>\ | 44 | <li><a href="${top_html_dir}/download.html">Downloads</a></li> |
45 | <li><a class=\"active\" href=\"/software/pies/manual.html\">Documentation</a></li>\ | 45 | <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li> |
46 | </ul>"; | 46 | </ul>}; |
47 | 47 | ||
48 | $PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved."; | 48 | $PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved."; |
49 | 49 | ||
diff --git a/doc/fdl.texi b/doc/fdl.texi index 7da8738..8805f1a 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi | |||
@@ -1,10 +1,12 @@ | |||
1 | @setfilename fdl.info | 1 | @c The GNU Free Documentation License. |
2 | @cindex FDL, GNU Free Documentation License | 2 | @center Version 1.3, 3 November 2008 |
3 | @center Version 1.2, November 2002 | 3 | |
4 | @c This file is intended to be included within another document, | ||
5 | @c hence no sectioning command or @node. | ||
4 | 6 | ||
5 | @display | 7 | @display |
6 | Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. | 8 | Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. |
7 | 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA | 9 | @uref{http://fsf.org/} |
8 | 10 | ||
9 | Everyone is permitted to copy and distribute verbatim copies | 11 | Everyone is permitted to copy and distribute verbatim copies |
10 | of this license document, but changing it is not allowed. | 12 | of this license document, but changing it is not allowed. |
@@ -109,6 +111,9 @@ formats which do not have any title page as such, ``Title Page'' means | |||
109 | the text near the most prominent appearance of the work's title, | 111 | the text near the most prominent appearance of the work's title, |
110 | preceding the beginning of the body of the text. | 112 | preceding the beginning of the body of the text. |
111 | 113 | ||
114 | The ``publisher'' means any person or entity that distributes copies | ||
115 | of the Document to the public. | ||
116 | |||
112 | A section ``Entitled XYZ'' means a named subunit of the Document whose | 117 | A section ``Entitled XYZ'' means a named subunit of the Document whose |
113 | title either is precisely XYZ or contains XYZ in parentheses following | 118 | title either is precisely XYZ or contains XYZ in parentheses following |
114 | text that translates XYZ in another language. (Here XYZ stands for a | 119 | text that translates XYZ in another language. (Here XYZ stands for a |
@@ -341,7 +346,7 @@ and independent documents or works, in or on a volume of a storage or | |||
341 | distribution medium, is called an ``aggregate'' if the copyright | 346 | distribution medium, is called an ``aggregate'' if the copyright |
342 | resulting from the compilation is not used to limit the legal rights | 347 | resulting from the compilation is not used to limit the legal rights |
343 | of the compilation's users beyond what the individual works permit. | 348 | of the compilation's users beyond what the individual works permit. |
344 | When the Document is included an aggregate, this License does not | 349 | When the Document is included in an aggregate, this License does not |
345 | apply to the other works in the aggregate which are not themselves | 350 | apply to the other works in the aggregate which are not themselves |
346 | derivative works of the Document. | 351 | derivative works of the Document. |
347 | 352 | ||
@@ -377,13 +382,30 @@ title. | |||
377 | @item | 382 | @item |
378 | TERMINATION | 383 | TERMINATION |
379 | 384 | ||
380 | You may not copy, modify, sublicense, or distribute the Document except | 385 | You may not copy, modify, sublicense, or distribute the Document |
381 | as expressly provided for under this License. Any other attempt to | 386 | except as expressly provided under this License. Any attempt |
382 | copy, modify, sublicense or distribute the Document is void, and will | 387 | otherwise to copy, modify, sublicense, or distribute it is void, and |
383 | automatically terminate your rights under this License. However, | 388 | will automatically terminate your rights under this License. |
384 | parties who have received copies, or rights, from you under this | 389 | |
385 | License will not have their licenses terminated so long as such | 390 | However, if you cease all violation of this License, then your license |
386 | parties remain in full compliance. | 391 | from a particular copyright holder is reinstated (a) provisionally, |
392 | unless and until the copyright holder explicitly and finally | ||
393 | terminates your license, and (b) permanently, if the copyright holder | ||
394 | fails to notify you of the violation by some reasonable means prior to | ||
395 | 60 days after the cessation. | ||
396 | |||
397 | Moreover, your license from a particular copyright holder is | ||
398 | reinstated permanently if the copyright holder notifies you of the | ||
399 | violation by some reasonable means, this is the first time you have | ||
400 | received notice of violation of this License (for any work) from that | ||
401 | copyright holder, and you cure the violation prior to 30 days after | ||
402 | your receipt of the notice. | ||
403 | |||
404 | Termination of your rights under this section does not terminate the | ||
405 | licenses of parties who have received copies or rights from you under | ||
406 | this License. If your rights have been terminated and not permanently | ||
407 | reinstated, receipt of a copy of some or all of the same material does | ||
408 | not give you any rights to use it. | ||
387 | 409 | ||
388 | @item | 410 | @item |
389 | FUTURE REVISIONS OF THIS LICENSE | 411 | FUTURE REVISIONS OF THIS LICENSE |
@@ -401,11 +423,46 @@ following the terms and conditions either of that specified version or | |||
401 | of any later version that has been published (not as a draft) by the | 423 | of any later version that has been published (not as a draft) by the |
402 | Free Software Foundation. If the Document does not specify a version | 424 | Free Software Foundation. If the Document does not specify a version |
403 | number of this License, you may choose any version ever published (not | 425 | number of this License, you may choose any version ever published (not |
404 | as a draft) by the Free Software Foundation. | 426 | as a draft) by the Free Software Foundation. If the Document |
427 | specifies that a proxy can decide which future versions of this | ||
428 | License can be used, that proxy's public statement of acceptance of a | ||
429 | version permanently authorizes you to choose that version for the | ||
430 | Document. | ||
431 | |||
432 | @item | ||
433 | RELICENSING | ||
434 | |||
435 | ``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any | ||
436 | World Wide Web server that publishes copyrightable works and also | ||
437 | provides prominent facilities for anybody to edit those works. A | ||
438 | public wiki that anybody can edit is an example of such a server. A | ||
439 | ``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the | ||
440 | site means any set of copyrightable works thus published on the MMC | ||
441 | site. | ||
442 | |||
443 | ``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 | ||
444 | license published by Creative Commons Corporation, a not-for-profit | ||
445 | corporation with a principal place of business in San Francisco, | ||
446 | California, as well as future copyleft versions of that license | ||
447 | published by that same organization. | ||
448 | |||
449 | ``Incorporate'' means to publish or republish a Document, in whole or | ||
450 | in part, as part of another Document. | ||
451 | |||
452 | An MMC is ``eligible for relicensing'' if it is licensed under this | ||
453 | License, and if all works that were first published under this License | ||
454 | somewhere other than this MMC, and subsequently incorporated in whole | ||
455 | or in part into the MMC, (1) had no cover texts or invariant sections, | ||
456 | and (2) were thus incorporated prior to November 1, 2008. | ||
457 | |||
458 | The operator of an MMC Site may republish an MMC contained in the site | ||
459 | under CC-BY-SA on the same site at any time before August 1, 2009, | ||
460 | provided the MMC is eligible for relicensing. | ||
461 | |||
405 | @end enumerate | 462 | @end enumerate |
406 | 463 | ||
407 | @page | 464 | @page |
408 | @appendixsec ADDENDUM: How to use this License for your documents | 465 | @heading ADDENDUM: How to use this License for your documents |
409 | 466 | ||
410 | To use this License in a document you have written, include a copy of | 467 | To use this License in a document you have written, include a copy of |
411 | the License in the document and put the following copyright and | 468 | the License in the document and put the following copyright and |
@@ -415,7 +472,7 @@ license notices just after the title page: | |||
415 | @group | 472 | @group |
416 | Copyright (C) @var{year} @var{your name}. | 473 | Copyright (C) @var{year} @var{your name}. |
417 | Permission is granted to copy, distribute and/or modify this document | 474 | Permission is granted to copy, distribute and/or modify this document |
418 | under the terms of the GNU Free Documentation License, Version 1.2 | 475 | under the terms of the GNU Free Documentation License, Version 1.3 |
419 | or any later version published by the Free Software Foundation; | 476 | or any later version published by the Free Software Foundation; |
420 | with no Invariant Sections, no Front-Cover Texts, and no Back-Cover | 477 | with no Invariant Sections, no Front-Cover Texts, and no Back-Cover |
421 | Texts. A copy of the license is included in the section entitled ``GNU | 478 | Texts. A copy of the license is included in the section entitled ``GNU |
@@ -424,7 +481,7 @@ license notices just after the title page: | |||
424 | @end smallexample | 481 | @end smallexample |
425 | 482 | ||
426 | If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, | 483 | If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, |
427 | replace the ``with...Texts.'' line with this: | 484 | replace the ``with@dots{}Texts.'' line with this: |
428 | 485 | ||
429 | @smallexample | 486 | @smallexample |
430 | @group | 487 | @group |
diff --git a/doc/pies.texi b/doc/pies.texi index d780e6d..9db612b 100644 --- a/doc/pies.texi +++ b/doc/pies.texi | |||
@@ -44,7 +44,7 @@ Boston, MA 02110-1301 USA | |||
44 | Copyright @copyright{} 2005, 2006, 2007, 2008, 2009 Sergey Poznyakoff | 44 | Copyright @copyright{} 2005, 2006, 2007, 2008, 2009 Sergey Poznyakoff |
45 | 45 | ||
46 | Permission is granted to copy, distribute and/or modify this document | 46 | Permission is granted to copy, distribute and/or modify this document |
47 | under the terms of the GNU Free Documentation License, Version 1.2 or | 47 | under the terms of the GNU Free Documentation License, Version 1.3 or |
48 | any later version published by the Free Software Foundation; with no | 48 | any later version published by the Free Software Foundation; with no |
49 | Invariant Sections, with the Front-Cover texts being ``GNU Pies Manual'', | 49 | Invariant Sections, with the Front-Cover texts being ``GNU Pies Manual'', |
50 | and with the Back-Cover Texts as in (a) below. A copy of the license | 50 | and with the Back-Cover Texts as in (a) below. A copy of the license |