From 36642a126955308a4fd68315ef49e035523549c8 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Tue, 23 Aug 2011 21:12:14 +0000 Subject: [PATCH] Allow for the GNU FDL as an alternate option to the existing documentation license. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@977 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 7 +++++++ doc/avrdude.texi | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 617d5054..2c0fe24e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-08-23 Joerg Wunsch + + bug #29585: Fix license + * doc/avrdude.texi: Add FDL as an option to the licensing + statement, as the savannah administration would like it + that way. + 2011-08-23 Joerg Wunsch Submitted by Darell Tan: diff --git a/doc/avrdude.texi b/doc/avrdude.texi index 2933edbd..399e8ac4 100644 --- a/doc/avrdude.texi +++ b/doc/avrdude.texi @@ -52,6 +52,9 @@ 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 Free Software Foundation. + +Alternatively, this documentation may be copied and distributed under +the terms of the GNU Free Documentation License (FDL), version 1.3. @end ifinfo @titlepage