Doc: clarify FDL vs. public domain.

diff --git a/Documentation/application.tely b/Documentation/application.tely
index d8f245fe1a500fd2aff3f2bd3aa3f75a80a7bce5..2399bca341b2ee03c6973fa34626074449574418 100644 (file)
--- 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 a6d01f2247a49c8a1a8f062cdbb1312bfbf6787f..8e12964ec6d5526f8ab2fc941b91d917a1bf9c0d 100644 (file)
--- 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 0e310165f90018b5ce8a5efb67a8266a012f8a65..e5debcf585c29cf296c8b7db5d6a3ec2803432b5 100644 (file)
--- 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 e727fcbed10fcdd730770ac977c70ecb299e4a52..2ffdb9ce0a76cb06bd4b29836d68bf9148dd3660 100644 (file)
--- 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 571f18c9ab14048d4e2f76fdd09860ab943c965a..9a618e686de2f22f20734b93e99864c9fb0ae2ae 100644 (file)
--- 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 2843fda7a48683db1b3bf7d6cc2877c1d23432e6..5886d77b466deeb7947f0f76e74da8f4b0ef3581 100644 (file)
--- 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 70800e3d1c955eb31111ff1308a60662a66d2f98..4a2cca803ec25546acd49eaab85b2628d264f7b9 100644 (file)
--- 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