Skip to content
Permalink
Browse files

Move from Apache 2 license to 2-Clause BSD. Solves [ 3304675 ]

  • Loading branch information...
gmilde committed Jun 27, 2011
1 parent bdf960c commit ea75ded71d97b8ff82abbdc2399d404abec5155e
@@ -15,11 +15,6 @@ below. There are a few exceptions_, listed below.
Files in the Sandbox_ are not distributed with Docutils releases and
may have different license terms.

One goal of the Docutils project is to be included in the Python
standard library distribution, at which time it is expected that
copyright will be asserted by the `Python Software Foundation
<http://www.python.org/psf/>`_.


Public Domain Dedication
========================
@@ -59,16 +54,15 @@ that have not yet been invented or conceived.

(This dedication is derived from the text of the `Creative Commons
Public Domain Dedication
<http://creativecommons.org/licenses/publicdomain>`_.)
<http://creativecommons.org/licenses/publicdomain>`_. [#]_)

.. Creative Commons has `retired this legal tool`__ and does not
.. [#] Creative Commons has `retired this legal tool`__ and does not
recommend that it be applied to works: This tool is based on United
States law and may not be applicable outside the US. For dedicating
new works to the public domain, Creative Commons recommend CC0_. So
does the Free Software Foundation in its license-list_.

__ http://creativecommons.org/retiredlicenses

.. _CC0: http://creativecommons.org/publicdomain/zero/1.0/legalcode

Exceptions
@@ -83,21 +77,22 @@ The exceptions to the `Public Domain Dedication`_ above are:
this notice remains intact.

* docutils/math/__init__.py,
docutils/math/mathtools.py,
docutils/math/latex2mathml.py,
docutils/writers/xetex/__init__.py,
docutils/error_reporting.py:

Copyright © Günter Milde.
Released under the terms of the `Apache License, Version 2.0`_
(`local copy <licenses/apache-license-2-0.txt>`__).
Released under the terms of the `2-Clause BSD license`_
(`local copy <licenses/BSD-2-Clause.txt>`__).

* docutils/math/math2html.py, Copyright (C) Alex Fernández
* docutils/math/math2html.py,
docutils/writers/html4css1/math.css

This conversion script is part of eLyXer_, released under the `GNU
Copyright © Alex Fernández
These files are part of eLyXer_, released under the `GNU
General Public License`_ version 3 or later. The author relicensed
it for Docutils under the `Apache License, Version 2.0`_
(`local copy <licenses/apache-license-2-0.txt>`__).
them for Docutils under the terms of the `2-Clause BSD license`_
(`local copy <licenses/BSD-2-Clause.txt>`__).

.. _eLyXer: http://www.nongnu.org/elyxer/

@@ -112,14 +107,8 @@ The exceptions to the `Public Domain Dedication`_ above are:

__ licenses/gpl-3.0.txt

(Disclaimer: I am not a lawyer.) The Apache License, version 2.0 and
the Python licenses are OSI-approved_ and GPL-compatible_ (the Apache
License is compatible to GPL version 3 but *not* version 2).
The BSD license
basically lets you copy, use, modify, and redistribute files as long
as you keep the copyright attribution intact, note any changes you
make, and don't use the owner's name in vain. Although complicated by
multiple owners and lots of legalese, the Python license is similar.
The `2-Clause BSD license`_ and the Python licenses are OSI-approved_
and GPL-compatible_.

Plaintext versions of all the linked-to licenses are provided in the
licenses_ directory.
@@ -128,7 +117,7 @@ licenses_ directory.
.. _licenses: licenses/
.. _Python 2.1.1 license: http://www.python.org/2.1.1/license.html
.. _GNU General Public License: http://www.gnu.org/copyleft/gpl.html
.. _Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
.. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause
.. _OSI-approved: http://opensource.org/licenses/
.. _license-list:
.. _GPL-compatible: http://www.gnu.org/licenses/license-list.html
@@ -29,14 +29,22 @@ Changes Since 0.7
- Orphaned "python" reader and "newlatex2e" writer moved to the sandbox.
- New sub-module `error_reporting`: handle encoding/decoding errors
when reporting exceptions.
- Some additions to the Docutils core are released under the 2-Clause BSD
license, see COPYING_ for details.

.. _BCP 47: http://www.rfc-editor.org/rfc/bcp/bcp47.txt
.. _COPYING: COPYING.html

* docs/dev/policies.txt:

- Recommend the 2-Clause BSD license
(http://www.spdx.org/licenses/BSD-2-Clause)
for code that is kept under the author's copyright.

* tools/buildhtml.py:

- Fix ``--local`` switch.


* Fix [ 3018371 ] Added Lithuanian mappings by Dalius Dobravolskas.

* docutils/writers/html4css1/__init__.py
@@ -73,7 +81,7 @@ Changes Since 0.7

- Fix: BUG#3219183 - vertical space in definition lists containing markup.
- Fix: vertical space cleaning for option group ``.``.

* tools/editors/emacs/rst.el:

- Fix [ 3001100 ] does not handle spaces in filenames
@@ -163,18 +163,59 @@ intentions regarding copyright, in one of the following ways:
with either an embedded license statement, a reference to an
accompanying license file, or a license URL.

One of the goals of the Docutils project, once complete, is to be
incorporated into the Python standard library. At that time, the
Docutils code will be released under Python's license. If the
copyright/license option is chosen for new files, the license should
be compatible with Python's current license, and the author(s) of the
files should be willing to sign a `Contributor Agreement` (see
`Contributing to the PSF`_). As initial license for contributions,
the PSF accepts the `Academic Free License v. 2.1
<http://opensource.org/licenses/afl-2.1.php>`_ and the `Apache
License, Version 2.0 <http://opensource.org/licenses/apache2.0.php>`_.

.. _Contributing to the PSF: http://www.python.org/psf/contrib/
The license should be well known, simple and compatible with other
open source software licenses. To keep the number of different
licenses at a minimum, using the `2-Clause BSD license`_
(also known as "Simplified" or `FreeBSD license`_) is recommended.

.. _2-Clause BSD license: http://www.opensource.org/licenses/BSD-2-Clause
.. _FreeBSD license: http://www.freebsd.org/copyright/freebsd-license.html

..

The following licenses are described as simple
and permissible on `Various Licenses and Comments about Them`_ by
the GNU Project and listed as popular in `OSI Approved Licenses`_:

Expat License / MIT License

http://www.jclark.com/xml/copying.txt
http://www.opensource.org/licenses/MIT
http://www.spdx.org/licenses/MIT

The term MIT License is ambiguous and may accurately refer to the
Expat license or the X11 license
[http://en.wikipedia.org/wiki/MIT_License]

-1 called `MIT license` by OSI and in the
`SPDX Open Source License Registry`_
but `Expat license` by GNU

2-Clause BSD license / FreeBSD license

http://www.freebsd.org/copyright/freebsd-license.html
http://www.opensource.org/licenses/BSD-2-Clause
http://www.spdx.org/licenses/BSD-2-Clause

If you want a simple, permissive non-copyleft free software
license, the FreeBSD license is a reasonable choice. However,
please don't call it a “BSD” or “BSD-style” license, because
that is likely to cause confusion which could lead to use of the
flawed original BSD license.

-- `Various Licenses and Comments about Them`_

+1 license used by the closely related Sphinx project
+1 "2-Clause BSD license" is a non-ambiguous name,
used by both, OSI and GNU.
+1 clear wording, structured text

.. _Various Licenses and Comments about Them:
http://www.gnu.org/licenses/license-list.html
.. _OSI Approved Licenses: http://www.opensource.org/licenses/category
.. _SPDX Open Source License Registry: http://www.spdx.org/licenses/
.. _pypi: http://pypi.python.org/pypi?:action=browse&c=54


Subversion Repository
=====================
@@ -1,10 +1,16 @@
#!/usr/bin/env python
# -*- coding: utf8 -*-
# :Copyright: © 2011 Günter 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

# :Id: $Id$
# :Copyright: © 2011 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.
#
# .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause

"""
Error reporting should be safe from encoding/decoding errors.
@@ -1,10 +1,13 @@
#!/usr/bin/env python
# -*- coding: utf8 -*-
# :Copyright: © 2011 Günter 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)
# :Id: $Id$
# :Author: Guenter 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.
#
# .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause

"""
This is the Docutils (Python Documentation Utilities) "math" sub-package.
@@ -14,18 +17,30 @@
:math2html: LaTeX math -> HTML conversion from eLyXer
:latex2mathml: LaTeX math -> presentational MathML
:mathtools: helpers for Docutils math support
:unimathsymbols2tex: Unicode symbol to LaTeX math translation table
"""

# helpers for Docutils math support
# =================================

# While Docutils components can be used as parts in programs released
# under GPL v3, it is not possible to include GPLed-code in a public
# domain or Apache-2 licensed program.
#
# math2html.py is part of eLyXer_, released under the `GNU General
# Public License`_ version 3 or later. The author kindly relicensed it
# for Docutils under the Apache License, Version 2.0.
#
# .. _Docutils policies: docs/dev/policies.txt
# .. _eLyXer: http://www.nongnu.org/elyxer/
def pick_math_environment(code, numbered=False):
"""Return the right math environment to display `code`.
The test simply looks for line-breaks (``\\``) outside environments.
Multi-line formulae are set with ``align``, one-liners with
``equation``.
If `numbered` evaluates to ``False``, the "starred" versions are used
to suppress numbering.
"""
# cut out environment content:
chunks = code.split(r'\begin{')
toplevel_code = ''.join([chunk.split(r'\end{')[-1]
for chunk in chunks])
if toplevel_code.find(r'\\') >= 0:
env = 'align'
else:
env = 'equation'
if not numbered:
env += '*'
return env
@@ -1,16 +1,23 @@
#!/usr/bin/env python
# -*- coding: utf8 -*-

# :Id: $Id$
# :Copyright: © 2010 Günter Milde.
# Based on rst2mathml.py from the latex_math sandbox project
# © 2005 Jens Jørgen Mortensen
# :License: 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
# :Id: $Id$
# :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.
#
# .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause


"""Convert LaTex math code into presentational MathML"""

# latex2mathml.py: Convert LaTex math code into presentational MathML
# Based on `latex_math` sandbox project by Jens Jørgen Mortensen
# =========================================================================
# Based on the `latex_math` sandbox project by Jens Jørgen Mortensen


# LaTeX to MathML translation stuff:

0 comments on commit ea75ded

Please sign in to comment.
You can’t perform that action at this time.