Improve wording in config and remove unnecessary preamble in COPYING

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/COPYING b/COPYING
index 07535ad7ea1cd5a8292ce3af8333571377f1d4ff..5b6e7c66c276e7610d4a73c70ec1a1f7c1003259 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,42 +1,3 @@
-
-GNU General Public License
---------------------------
-
-Most files in this repository are licensed under the terms of the GNU
-General Public License (GPL), a copy of which is attached at the end
-of this notice. Note that the only valid version of the GPL as far as
-the files in this repository are concerned is _this_ particular
-version of the license (i.e., *only* v2, not v2.2 or v3.x or
-whatever), unless explicitly otherwise stated.
-
-Some code fragments in the hypervisor and associated subsystems
-include the 2- or 3-clause BSD license stanzas (also known as Modified
-BSD licenses). When these code sections are compiled as part of a
-GPLv2-licensed program, such as Xen, the result is licensed under
-GPLv2. See the FSF's definition of GPL compatibility:
- http://www.gnu.org/licenses/gpl-faq.html#WhatDoesCompatMean
-And how this applies to a range of open source licenses:
- http://www.gnu.org/licenses/license-list.html
-
-Licensing Exceptions (the relaxed BSD-style license)
-----------------------------------------------------
-
-For the convenience of users and those who are porting OSes to run as
-Xen guests, certain files in this repository are not subject to the
-GPL when distributed separately or included in software packages
-outside this repository. Instead we specify a much more relaxed
-BSD-style license. Affected files include the Xen interface headers
-(xen/include/public/COPYING), MiniOS (extras/mini-os) and various
-drivers, support functions and header files within Xen-aware Linux
-source trees.  In all such cases, license terms are stated at the top
-of the file or in a COPYING file in the same directory. Note that
-_any_ file that is modified and then distributed within a Linux kernel
-is still subject to the GNU GPL.
-
- -- Keir Fraser (on behalf of the Xen team)
-
-=====================================================================
-
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 

diff --git a/config b/config
index 401577ba35b8040ce479bd26a1086a49878c08ef..5b474c7d11e83492d040d5a46e76ee67908ce1f3 100644 (file)
--- a/config
+++ b/config
@@ -15,7 +15,7 @@ LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git"
 
 # Software versions. Leave blank if you want to avoid the build, like
 # this: GRUB_UPSTREAM_REVISION=
-# Keep in mind that both Grub and Libvirt needs Xen to build and run.
+# Grub and Libvirt needs Xen to build and run.
 XEN_UPSTREAM_REVISION="RELEASE-4.5.0"
 GRUB_UPSTREAM_REVISION="master"
 LIBVIRT_UPSTREAM_REVISION="master"