From 0acc6f9808726e36cb813d65c9e869452142b35d Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Thu, 24 Sep 2009 18:17:52 +0200 Subject: [PATCH] Docs: include license directly. --- LICENSE.txt | 5 +++-- doc/source/license.txt | 30 +----------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 963dd975..087749a8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,8 +1,9 @@ +Unless otherwise specified by LICENSE.txt files in individual +directories, all code is + Copyright (C) 2008 Stéfan van der Walt All rights reserved. -Note: LICENSE.txt files in subdirectories take preference over this license. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/doc/source/license.txt b/doc/source/license.txt index 610b6932..2d6670ed 100644 --- a/doc/source/license.txt +++ b/doc/source/license.txt @@ -1,32 +1,4 @@ License ======= -Unless otherwise specified by LICENSE.txt files in individual -directories, all code is - -Copyright (C) 2008 Stéfan van der Walt -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - +.. literalinclude:: ../../LICENSE.txt