[yelp-tools] Updated COPYING file

[Shaun McCance <shaunm src gnome org>]

commit 069230f35a33cc657a919b916f1769255e1e441f
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Jun 14 15:34:54 2011 -0400

    Updated COPYING file

 COPYING      |  124 ++------------
 COPYING.LGPL |  504 ----------------------------------------------------------
 Makefile.am  |    4 +-
 3 files changed, 19 insertions(+), 613 deletions(-)
---
diff --git a/COPYING b/COPYING
index 0119f77..1e29103 100644
--- a/COPYING
+++ b/COPYING
@@ -1,106 +1,18 @@
-The Gnome Documentation Utilities is a collection of programs and data files
-to help you build, maintain, and distribute documentation.  This package is
-entirely free software; however, not all components of the package are under
-the same free software license.
-
-The GNU General Public License and the GNU Lesser General Public License are
-used for particular components of this package, depending on need.  You should
-have received a copy of both licenses with this package; see COPYING.GPL and
-COPYING.LGPL.  If you did not receive these files, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-This document attempts to provide a brief overview of the programs in this
-package and their licensing terms.
-
-
-xml2po
-------
-The xml2po program is used to convert between PO files and XML documents.
-Within gnome-doc-utils, it is used primarily to translate documentation
-written in the DocBook format.  It was written by Danilo Segan.
-
-xml2po is released under the terms of the GNU GPL.  PO and XML files
-output by xml2po are unaffected by the GPL; you are free to license
-them however you see fit.
-
-
-gnome-doc-prepare
------------------
-The gnome-doc-prepare script is used to initialize your source tree for
-using the gnome-doc-utils build utilities.  It can also be used to create
-a template document and the necessary supporting files and folders.  It
-was written by Danilo Segan.
-
-gnome-doc-prepare is released under the terms of the GNU GPL.  The build
-files output by gnome-doc-prepare are unaffected by the GPL; you are free
-to distribute them however you see fit.  The template files are separate
-entities from gnome-doc-prepare.  They should specify their own terms of
-distribution.  In many cases, they will be simply stubs, and will have no
-restrictions on modification or redistribution.
-
-As a special exception to the GNU General Public License, if you distribute
-gnome-doc-prepare as part of a program that contains a configuration script
-generated by Autoconf, you may include gnome-doc-prepare under the same
-distribution terms that you use for the rest of that program.
-
-
-gnome-doc-utils.make
---------------------
-The gnome-doc-utils.make make script can be included into your Makefiles
-to build, verify, and install your documentation.  It was written by
-Shaun McCance.
-
-gnome-doc-utils.make is released under the terms of the GNU GPL.  Most
-files output by gnome-doc-utils.make are actually output using one of
-the other tools in this package, or using a commonly-available tool
-from another package.  Thus, the files output by this script are not
-affected by the GPL.  They may, however, be affected by the terms of
-the individual programs that are being invoked.
-
-We make every effort to avoid calling programs that will introduce
-restrictions on redistribution of your package; however, we can not
-guarantee that no such restrictions exist for files generated by tools
-outside this package.
-
-As a special exception to the GNU General Public License, if you distribute
-gnome-doc-utils.make as part of a program that contains a configuration script
-generated by Autoconf, you may include gnome-doc-utils.make under the same
-distribution terms that you use for the rest of that program.
-
-
-XSLT
-----
-This package contains various XSLT files for transforming DocBook and other
-formats.  They were written primarily by Shaun McCance.
-
-The XSLT files are released under the terms of the GNU LGPL.  You may build
-customizations from these stylesheets using their public documented interfaces,
-using either xsl:import or xsl:include, with no restrictions on your customized
-stylesheets.  You may also invoke the stylesheets freely, either with a simple
-XSLT processor such as xsltproc, or using an XSLT processing library within
-your program.  The use of these stylesheets has no bearing on the licensing
-terms of the XSLT processing program you use.
-
-The files output by the stylesheets are not affected by the terms of the LGPL.
-In particular, some of the stylesheets output program files rather than simple
-data files.  The generated program files are also not affected by the LGPL.
-You can redistribute all generated files as you see fit.
-
-Sometimes it is necessary to include small portions of the stylesheets within
-your source distribution to make building simpler for end users and packagers.
-As a special exception to the GNU General Public License, if you distribute
-the stylesheets as part of a program that contains a configuration script
-generated by Autoconf, you may include those stylesheets under the same
-distribution terms that you use for the rest of that program.
-
-
-Images
-------
-This package contains a number of images that are used in the formatted
-output.  They were created primarily by Josef VybÃral.  These images are
-licensed under the terms of the GNU GPL.
-
-As a special exception to the GNU General Public License, if you distribute
-copies of your document formatted by the tools in this package, you may
-redistribute unmodified copies of any images used or referenced in that
-formatted copy without restriction.
+yelp-tools is a collection of scripts and build utilities to help create,
+manage, and publish documentation for Yelp and the web.
+
+This package 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. See the file COPYING.GPL.
+
+As an exception to the GPL, if you use the included yelp.m4 file as
+part of your build process, you may redistribute it along with your
+package without any restriction.
+
+Note that this package builds heavily on the yelp-xsl package. For
+example, it provides command-line utilities to build HTML using the
+XSLT, Javascript, CSS, and images from yelp-xsl. The yelp-xsl license
+grants exceptions to the GPL for redistribution of some of these files
+when distributed as part of a built document using its tools. These
+exceptions are also granted when using the tools in this package.
diff --git a/Makefile.am b/Makefile.am
index 872b422..94736d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = templates tools xslt
 
-EXTRA_DIST = 						\
-	COPYING.GPL					\
-	COPYING.LGPL
+EXTRA_DIST = COPYING.GPL
 
 ChangeLog:
 	@if test -f $(top_srcdir)/.git/HEAD; then \