From ae45d49c1614132e85ab92bfd1320597e1b5c75c Mon Sep 17 00:00:00 2001 From: milde Date: Wed, 20 Jul 2011 20:39:57 +0000 Subject: [PATCH] Fix [ 3364658 ] (Change last file with Apache license to BSD-2-Clause) git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7096 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- COPYING.txt | 2 ++ docs/user/docutils-05-compat.sty.txt | 18 ++++++++++++------ docutils/writers/latex2e/docutils-05-compat.sty | 18 ++++++++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/COPYING.txt b/COPYING.txt index 7cb8bee12..4c722a932 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -79,6 +79,8 @@ The exceptions to the `Public Domain Dedication`_ above are: * docutils/math/__init__.py, docutils/math/latex2mathml.py, docutils/writers/xetex/__init__.py, + docutils/writers/latex2e/docutils-05-compat.sty, + docs/user/docutils-05-compat.sty.txt, docutils/error_reporting.py: Copyright © Günter Milde. diff --git a/docs/user/docutils-05-compat.sty.txt b/docs/user/docutils-05-compat.sty.txt index ee2a06bb4..027bdc365 100644 --- a/docs/user/docutils-05-compat.sty.txt +++ b/docs/user/docutils-05-compat.sty.txt @@ -8,15 +8,21 @@ A backwards compatibility style sheet :Author: Guenter Milde :Contact: milde@users.berlios.de :Revision: $Revision$ -:Date: $Date: 2009-02-24$ -:Copyright: © 2009 G. Milde, - Released without warranties or conditions of any kind - under the terms of the Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 +:Date: $Date$ +:Copyright: © 2009 Günter Milde, +:License: Released under the terms of the `2-Clause BSD license`_, in short: + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. + This file is offered as-is, without any warranty. + :Abstract: This file documents changes and provides a style for best possible compatibility to the behaviour of the `latex2e` writer of Doctutils release 0.5. +.. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause + :: \NeedsTeXFormat{LaTeX2e} @@ -659,7 +665,7 @@ New Feature: :topic: ``\DUtopic`` and ``\DUtitle`` commands, :transition: ``\DUtransition`` command. :footnotes: ``\DUfootnotemark`` and ``\DUfootnotetext`` commands with - hyperlink support using the Docutils-provided footnote label. + hyperlink support using the Docutils-provided footnote label. Backwards compatibility: In most cases, the default definition corresponds to the previously used diff --git a/docutils/writers/latex2e/docutils-05-compat.sty b/docutils/writers/latex2e/docutils-05-compat.sty index 7d0323e2a..b80a3aea4 100644 --- a/docutils/writers/latex2e/docutils-05-compat.sty +++ b/docutils/writers/latex2e/docutils-05-compat.sty @@ -7,16 +7,22 @@ % % :Author: Guenter Milde % :Contact: milde@users.berlios.de -% :Revision: $Revision: 6152 $ -% :Date: $Date: 2009-02-24$ -% :Copyright: © 2009 G. Milde, -% Released without warranties or conditions of any kind -% under the terms of the Apache License, Version 2.0 -% http://www.apache.org/licenses/LICENSE-2.0 +% :Revision: $Revision: 6156 $ +% :Date: $Date: 2009-02-24 $ +% :Copyright: © 2009 Günter Milde, +% :License: Released under the terms of the `2-Clause BSD license`_, in short: +% +% Copying and distribution of this file, with or without modification, +% are permitted in any medium without royalty provided the copyright +% notice and this notice are preserved. +% This file is offered as-is, without any warranty. +% % :Abstract: This file documents changes and provides a style for best % possible compatibility to the behaviour of the `latex2e` % writer of Doctutils release 0.5. % +% .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause +% % :: \NeedsTeXFormat{LaTeX2e} -- 2.11.4.GIT