diff options
| author | wiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2006-04-01 01:00:05 +0000 |
|---|---|---|
| committer | wiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2006-04-01 01:00:05 +0000 |
| commit | 0bd5a6d95eaf6e4ddb5086a8b3b94d45dea7be49 (patch) | |
| tree | 0dd2b363abba380f77a7241c3e70b9688616ca92 | |
| parent | 03a8e6c4d77b8dd12b9d3a369c001a2e44e61357 (diff) | |
| download | docutils-0bd5a6d95eaf6e4ddb5086a8b3b94d45dea7be49.tar.gz | |
--- MERGE: merged r4323 to maintenance branch; original log message:
updated to reflect current reality (pep2html.py no longer distributed, tools/editors/emacs/rst-html.el and rst-mode.el combined into rst.el)
git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/docutils-0.4@4469 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
| -rw-r--r-- | COPYING.txt | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/COPYING.txt b/COPYING.txt index 4994ef1fa..b3ce8a4ff 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -95,18 +95,9 @@ The exceptions to the `Public Domain Dedication`_ above are: __ licenses/python-2-2.txt -* tools/pep2html.py, copyright by the Python Software Foundation, - released under the `Python 2.2 license`_ (`local copy`__). - - __ licenses/python-2-2.txt - -* tools/editors/emacs/rst-html.el, copyright by Martin Blais, released - under the `GNU General Public License`_ (`local copy`__). - - __ licenses/gpl.txt - -* tools/editors/emacs/rst-mode.el, copyright by Stefan Merten, - released under the `GNU General Public License`_ (`local copy`__). +* tools/editors/emacs/rst.el, by Martin Blais, Stefan Merten, and + David Goodger, released under the `GNU General Public License`_ + (`local copy`__). __ licenses/gpl.txt |