Fixes for license. Add Introduction section.

1 files changed, 40 insertions, 14 deletions

diff --git a/doc/libtasn1.texi b/doc/libtasn1.texi
index e97474c..a48d1d9 100644
--- a/doc/libtasn1.texi
+++ b/doc/libtasn1.texi
@@ -16,22 +16,17 @@ This manual is for Libtasn1
 which is a library for Abstract Syntax Notation One (ASN.1) and
 Distinguish Encoding Rules (DER) manipulation.
 
-Copyright @copyright{} 2004, 2006  Free Software Foundation
+Copyright @copyright{} 2004, 2006, 2007  Free Software Foundation
 
 Copyright @copyright{} 2001, 2002, 2003  Fabio Fiorina
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+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 the Front-Cover Texts being ``A GNU Manual,''
-and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License.''
-
-(a) 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.''
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled ``GNU Free
+Documentation License''.
 @end quotation
 @end copying
 
@@ -62,10 +57,11 @@ Software Foundation raise funds for GNU development.''
 @end ifnottex
 
 @menu
+* Introduction
 * ASN.1 structure handling::
 * Utilities::
 * Function reference::
-* Copying This Manual::
+* Copying Information::
 
 Indices
 
@@ -73,6 +69,16 @@ Indices
 * Function and Data Index::     Index of functions, variables and data types.
 @end menu
 
+@node Introduction
+@chapter Introduction
+
+Libtasn1 is library for dealing with ASN.1 and DER data.
+
+The library is licensed under the GNU Lesser General Public License
+version 2.1 (@pxref{GNU LGPL}).  The command line tools and self-tests
+are licensed under the GNU General Public License version 3.0
+(@pxref{GNU GPL}).
+
 
 @node ASN.1 structure handling
 @chapter ASN.1 structure handling
@@ -380,15 +386,35 @@ Options:
 
 @include texi/parser_aux.c.texi
 
-@node Copying This Manual
-@appendix Copying This Manual
+@node Copying Information
+@appendix Copying Information
 
 @menu
-* GNU Free Documentation License::  License for copying this manual.
+* GNU Free Documentation License::   License for copying this manual.
+* GNU LGPL::                     License for copying the core GnuTLS library.
+* GNU GPL::                      License for copying GNUTLS extra and tools.
 @end menu
 
+@node GNU Free Documentation License
+@appendixsec GNU Free Documentation License
+
+@cindex FDL, GNU Free Documentation License
+
 @include fdl.texi
 
+@node GNU LGPL
+@appendixsec GNU Lesser General Public License
+@cindex LGPL, GNU Lesser General Public License
+@cindex License, GNU LGPL
+
+@include lgpl-2.1.texi
+
+@node GNU GPL
+@appendixsec GNU General Public License
+@cindex GPL, GNU General Public License
+@cindex License, GNU GPL
+
+@include gpl-3.0.texi
 
 @node Concept Index
 @unnumbered Concept Index