From: Graham Percival <graham@percival-music.ca>
Date: Sat, 26 Sep 2009 13:48:36 +0000 (+0100)
Subject: Doc: clarify FDL vs. public domain.
X-Git-Tag: release/2.13.5-0~37
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=23417e5ae21dbd5756dbf3c36983e97d25088a65;p=lilypond.git

Doc: clarify FDL vs. public domain.
---

diff --git a/Documentation/application.tely b/Documentation/application.tely
index d8f245fe1a..2399bca341 100644
--- a/Documentation/application.tely
+++ b/Documentation/application.tely
@@ -24,6 +24,7 @@ Copyright @copyright{}
 by the authors.
 @end macro
 
+@set FDL
 @include macros.itexi
 
 
diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index a6d01f2247..8e12964ec6 100644
--- a/Documentation/contributor.texi
+++ b/Documentation/contributor.texi
@@ -24,6 +24,7 @@ Copyright @copyright{}
 by the authors.
 @end macro
 
+@set FDL
 @include macros.itexi
 
 
diff --git a/Documentation/essay.tely b/Documentation/essay.tely
index 0e310165f9..e5debcf585 100644
--- a/Documentation/essay.tely
+++ b/Documentation/essay.tely
@@ -23,6 +23,7 @@ Copyright @copyright{}
 by the authors.
 @end macro
 
+@set FDL
 @c TODO: we shouldn't need this!
 @set web
 @include macros.itexi
diff --git a/Documentation/general.texi b/Documentation/general.texi
index e727fcbed1..2ffdb9ce0a 100644
--- a/Documentation/general.texi
+++ b/Documentation/general.texi
@@ -12,6 +12,7 @@
 @documentlanguage en
 @afourpaper
 
+@set FDL
 @set web
 @include macros.itexi
 
diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 571f18c9ab..9a618e686d 100644
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -23,6 +23,7 @@ Copyright @copyright{}
 by the authors.
 @end macro
 
+@set FDL
 @include macros.itexi
 
 
diff --git a/Documentation/macros.itexi b/Documentation/macros.itexi
index 2843fda7a4..5886d77b46 100644
--- a/Documentation/macros.itexi
+++ b/Documentation/macros.itexi
@@ -70,6 +70,9 @@ found at @w{@uref{http://@/www@/.lilypond@/.org/}}.
 @syncodeindex fn cp
 @syncodeindex vr cp
 
+
+@c   ***** Copyright stuff *****
+@ifset FDL
 @copying
 @copyrightDeclare
 
@@ -82,9 +85,17 @@ A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
 @end quotation
 @end copying
+@end ifset
+
+@ifclear FDL
+@copying
+This document has been placed in the public domain.
+@end copying
+@end ifclear
+
 
 
-@c TITLE PAGE
+@c   ***** Title page *****
 @ifnottex
 @node Top
 @top LilyPond --- \TITLE\
diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index 70800e3d1c..4a2cca803e 100644
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -26,6 +26,7 @@ by the authors.
 @end macro
 
 
+@set FDL
 @include macros.itexi
 
 @c  TODO: all the direntry stuff should be moved to general.texi