aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorArtem Yunusov <nedrlab@gmail.com>2008-08-21 23:56:34 +0500
committerArtem Yunusov <nedrlab@gmail.com>2008-08-21 23:56:34 +0500
commit15fe229e19f218eb99dfb09cc745705a9c2d1e97 (patch)
tree827a01fa82a097774088a4196342bf5bd4ecd72d /docs
parentb4362b3bf562bfb1b79bff9aee07feba32983e58 (diff)
parentc846dbced12091cfa1b783f268db96d8c87be030 (diff)
downloadmarkdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.tar.gz
markdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.tar.bz2
markdown-15fe229e19f218eb99dfb09cc745705a9c2d1e97.zip
Merge git@gitorious.org:python-markdown/mainline
Conflicts: markdown.py
Diffstat (limited to 'docs')
-rw-r--r--docs/AUTHORS1
-rw-r--r--docs/CHANGE_LOG6
-rw-r--r--docs/LICENSE30
3 files changed, 36 insertions, 1 deletions
diff --git a/docs/AUTHORS b/docs/AUTHORS
index b4cd939..00abb15 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -32,5 +32,6 @@ Tiago Cogumbreiro
G. Clark Haynes
Daniel Krech
Steward Midwinter
+Neale Pickett
Malcolm Tredinnick
and many others to helped by reporting bugs
diff --git a/docs/CHANGE_LOG b/docs/CHANGE_LOG
index 200d5b7..d040789 100644
--- a/docs/CHANGE_LOG
+++ b/docs/CHANGE_LOG
@@ -1,7 +1,11 @@
PYTHON MARKDOWN CHANGELOG
=========================
-August 2008: Updated included extensions to ElementTree. Added a
+August 18 2008: Reorganized directory structure. Added a 'docs' dir
+and moved all extensions into a 'markdown-extensions' package.
+Added additional documentation and a few bug fixes. (v2.0-beta)
+
+August 4 2008: Updated included extensions to ElementTree. Added a
seperate commanline script. (v2.0-alpha)
July 2008: Switched from home-grown NanoDOM to ElementTree and
diff --git a/docs/LICENSE b/docs/LICENSE
new file mode 100644
index 0000000..4cd8b14
--- /dev/null
+++ b/docs/LICENSE
@@ -0,0 +1,30 @@
+Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
+Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+Copyright 2004 Manfred Stienstra (the original version)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* 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.
+* Neither the name of the <organization> nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
+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.
+