diff --git a/ChangeLog b/ChangeLog index 6128f082..00847d31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-12-08 James Youngman + Distribute findutils documentation under FDL 1.2. + * doc/find.texi: This file is now distributed under version 1.2 of + the GNU Free Documentation license. Include a copy of the + license document in the info and dvi files. + * doc/.cvsignore: Ignore fdl.texi. + * import-gnulib.config (modules): Import the fdl module. + * NEWS: Mention this fact. + Updated to version 3 of the GNU General Public License. * COPYING: Update to GPL version 3. * find/defs.h, find/find.c, @@ -28,6 +36,7 @@ under version 3 or later of the GNU GPL. * depcomp, missing: Update from gnulib to get the current version (which is distributed under GPL v3). + * NEWS: Mention this change. * import-gnulib.sh: Use git rather than cvs to check the gnulib code out (typically, when building findutils from CVS). diff --git a/NEWS b/NEWS index 9d192e92..dd6628d5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout)* * Major changes in release 4.2.32-CVS +** License changes + +This version of findutils is now distributed under version 3 (or +later) of the GNU GPL. The documentation is distributed under +version 1.2 (or later) of the GNU Free Documentation License. + ** Documentation Fixes #19596: -printf %b should be compared with %s/512, not %s/1024. diff --git a/doc/.cvsignore b/doc/.cvsignore index 9eae33d2..f6b695b2 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -21,3 +21,4 @@ regexprops.texi stamp-vti texinfo.tex version.texi +fdl.texi diff --git a/doc/find.texi b/doc/find.texi index 9858a905..8f94b555 100644 --- a/doc/find.texi +++ b/doc/find.texi @@ -33,26 +33,12 @@ certain criteria and performing various operations on them. Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -@ignore -Permission is granted to process this file through TeX and print the -results, provided the printed document carries copying permission -notice identical to this one except for the removal of this paragraph -(this paragraph not being relevant to the printed manual). - -@end ignore -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the -entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - -Permission is granted to copy and distribute translations of this -manual into another language, under the above conditions for modified -versions, except that this permission notice may be stated in a -translation approved by the Foundation. +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license is included in the section entitled +``GNU Free Documentation License.'' @end copying @titlepage @@ -70,7 +56,9 @@ translation approved by the Foundation. @ifnottex @node Top, Introduction, , (dir) +@top GNU Findutils @comment node-name, next, previous, up +@insertcopying This file documents the GNU utilities for finding files that match certain criteria and performing various actions on them. @@ -91,6 +79,7 @@ This is edition @value{EDITION}, for @code{find} version @value{VERSION}. * Worked Examples:: Examples demonstrating more complex points. * Security Considerations:: Security issues relating to findutils. * Error Messages:: Explanations of some messages you might see. +* GNU Free Documentation License:: Copying and sharing this manual. * Primary Index:: The components of @code{find} expressions. @end menu @@ -4462,7 +4451,7 @@ only trusted programs. @end table @comment node-name, next, previous, up -@node Error Messages, Primary Index, Security Considerations, Top +@node Error Messages, GNU Free Documentation License, Security Considerations, Top @chapter Error Messages This section describes some of the error messages sometimes made by @@ -4642,7 +4631,12 @@ you are having a problem understanding one of these, ask for help on @email{bug-findutils@@gnu.org}. -@node Primary Index, , Error Messages, Top +@node GNU Free Documentation License, Primary Index, Error Messages, Top +@comment node-name, next, previous, up +@appendix GNU Free Documentation License +@include fdl.texi + +@node Primary Index, , GNU Free Documentation License, Top @unnumbered @code{find} Primary Index This is a list of all of the primaries (tests, actions, and options) diff --git a/import-gnulib.config b/import-gnulib.config index e27a0c15..f45756df 100644 --- a/import-gnulib.config +++ b/import-gnulib.config @@ -34,6 +34,7 @@ closein closeout dirname error +fdl fileblocks filemode fnmatch-gnu