# HG changeset patch
# User cmlenz
# Date 1155652868 0
# Node ID dcc9dc25bc5994227594559d4bcde4899e4a85b9
# Parent  a4a0ca41b6ad01359798ca7e72987066db58a0a7
Added changelog file, plus some README and setup tweaks.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,23 @@
+Version 0.2
+http://svn.edgewall.org/repos/markup/tags/0.2.0/
+(?, from branches/stable/0.2.x)
+
+ * XPath syntax errors now contain position info (ticket #20)
+ * Errors in expression evaluation now contain the correct line number in the
+   template (ticket #22)
+ * <script> and <style> element contents are no longer escaped when using HTML
+   serialization (ticket #24)
+ * In some cases expressions in templates did not get interpolated (ticket #26)
+ * CDATA sections are now passed through the pipeline and serialized correctly.
+   That allows using <script> or <style> elements in XHTML output that is still
+   compatible with HTML user agents.
+ * Output can be encoded using legacy codecs such as ISO-8859-1, any character
+   not representable in the chosen encoding gets replaced by the corresponding
+   XML character reference.
+
+
+Version 0.1
+http://svn.edgewall.org/repos/markup/tags/0.1.0/
+(Aug 3 2006, from branches/stable/0.1.x)
+
+ * First public release
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,31 @@
 About Markup
 ============
 
-Markup is a Python library that provides a integrated set of components
+Markup is a Python library that provides an integrated set of components
 for parsing, generating, and processing HTML or XML content in a uniform
-manner. The major feature is a template language, which is heavily
-inspired by Kid.
+manner. The major feature is a template language that is heavily inspired
+by Kid.
+
+
+Prerequisites
+-------------
+
+ * Python, version 2.3 or later (version 2.4 or later is recommended)
+ * Optional: setuptools 0.6a2 or later
+
+
+Installation
+------------
+
+Once you've downloaded and unpacked a Markup source release, enter the
+directory where the archive was unpacked, and run:
+
+  $ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+it will by default attempt to install Markup to the Python site-packages
+directory on your system.
+
 
 For more information visit the Markup web site:
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,20 @@
     from distutils.core import setup
 
 setup(
-    name='Markup', version='0.2',
-    description='Toolkit for stream-based generation of markup for the web',
-    author='Edgewall Software', author_email='info@edgewall.org',
-    license='BSD', url='http://markup.edgewall.org/',
-    download_url='http://markup.edgewall.org/wiki/MarkupDownload',
+    name = 'Markup',
+    version = '0.2',
+    description = 'Toolkit for stream-based generation of markup for the web',
+    long_description = \
+'''Markup is a Python library that provides an integrated set of components for
+parsing, generating, and processing HTML or XML content in a uniform manner.
+The major feature is a template language that is heavily inspired by Kid.''',
+    author = 'Edgewall Software',
+    author_email = 'info@edgewall.org',
+    license = 'BSD',
+    url = 'http://markup.edgewall.org/',
+    download_url = 'http://markup.edgewall.org/wiki/MarkupDownload',
+    zip_safe = True,
+
     classifiers = [
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
@@ -35,13 +44,12 @@
         'Topic :: Text Processing :: Markup :: HTML',
         'Topic :: Text Processing :: Markup :: XML'
     ],
-
     packages=['markup'],
+    test_suite = 'markup.tests.suite',
 
-    test_suite = 'markup.tests.suite',
-    zip_safe = True,
+    extras_require = {'plugin': ['setuptools>=0.6a2']},
     entry_points = """
     [python.templating.engines]
-    markup = markup.plugin:TemplateEnginePlugin
+    markup = markup.plugin:TemplateEnginePlugin[plugin]
     """,
 )