summaryrefslogtreecommitdiffstats
path: root/doc/gnupg.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-09-29 13:04:30 +0200
committerWerner Koch <wk@gnupg.org>2004-09-29 13:04:30 +0200
commit4604ae8e99dfdc91d2af76d7336cd4a4d6da2722 (patch)
tree89d58edbf22452f180c7692579bf93b16270866a /doc/gnupg.texi
parent(agent_unprotect): Fixed wiping of CLEARTEXT. Thanks (diff)
downloadgnupg2-4604ae8e99dfdc91d2af76d7336cd4a4d6da2722.tar.xz
gnupg2-4604ae8e99dfdc91d2af76d7336cd4a4d6da2722.zip
Changed license of the manual stuff to GPL.
* gnupg.texi (Top): New menu item Helper Tools. * tools.texi (Helper Tools): New. * Makefile.am (gnupg_TEXINFOS): Add tools.texi.
Diffstat (limited to 'doc/gnupg.texi')
-rw-r--r--doc/gnupg.texi26
1 files changed, 7 insertions, 19 deletions
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 0beb97e69..ec82fe425 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -5,26 +5,14 @@
@include version.texi
@macro copyrightnotice
-Copyright @copyright{} 2002 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2004 Free Software Foundation, Inc.
@end macro
@macro permissionnotice
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 ``GNU 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''.
-
-(a) The FSF's Front-Cover Text is:
-
- A GNU Manual
-
-(b) The FSF's Back-Cover Text is:
-
- You have freedom to copy and modify this GNU Manual, like GNU
- software. Copies published by the Free Software Foundation raise
- funds for GNU development.
+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 text of the license can be found in the
+section entitled ``Copying''.
@end macro
@@ -126,10 +114,10 @@ Developer information
Miscellaneous
+* Helper Tools:: Description of small helper tools
* Debugging:: How to solve problems
* Copying:: GNU General Public License says
how you can copy and share GnuPG
-* GNU Free Documentation License:: How you can copy and share this manual.
* Contributors:: People who have contributed to GnuPG.
Indices
@@ -145,10 +133,10 @@ Indices
@include assuan.texi
+@include tools.texi
@include debugging.texi
@include gpl.texi
-@include fdl.texi
@include contrib.texi