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