2004-09-30 Marcus Brinkmann <[email protected]>

	* Makefile.am (gpgme_TEXINFOS): Remove fdl.texi.
	* gpgme.texi: Do not include fdl.texi.  Change license to GPL.
	* fdl.texi: File removed.

1 files changed, 26 insertions, 21 deletions

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index 5617a330..2d889051 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -23,14 +23,19 @@ This is Edition @value{EDITION}, last updated @value{UPDATED}, of
 @c NOTE: Don't forget to update the year for the TeX version, too.
 Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``Free Software Needs Free Documentation'' and
-``GNU Lesser General Public License'', the Front-Cover texts being (a)
-(see below), and with the Back-Cover Texts being (b) (see below).  A
-copy of the license is included in the section entitled ``GNU Free
-Documentation License''.
+The GPGME reference manual is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GPGME reference manual is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this manual; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 @end ifinfo
 
@@ -51,14 +56,19 @@ Documentation License''.
 @vskip 0pt plus 1filll
 Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``Free Software Needs Free Documentation'' and
-``GNU Lesser General Public License'', the Front-Cover texts being (a)
-(see below), and with the Back-Cover Texts being (b) (see below).  A
-copy of the license is included in the section entitled ``GNU Free
-Documentation License''.
+The GPGME reference manual is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GPGME reference manual is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this manual; if not, write to the Free Software Foundation,
+Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 @end titlepage
 @page
 
@@ -83,8 +93,6 @@ Appendices
 
 * Copying::                       The GNU General Public License says how you
                                   can copy and share `GnuPG Made Easy'.
-* Free Documentation License::    This manual is under the GNU Free
-                                  Documentation License.
 
 Indices
 
@@ -5045,9 +5053,6 @@ case the state of @var{ctx} is not modified).
 @include gpl.texi
 
 
-@include fdl.texi
-
-
 @node Concept Index
 @unnumbered Concept Index