Improved changelog rendering

--HG--
branch : trunk

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6e514be8eee941e31c0f188792b2fedcbc1160e6..9f114842654b692717ba1a23af50a013dd1c37cb 100644 (file)
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,4 +1,3 @@
-Changelog
-=========
+.. module:: jinja2
 
-.. jinjachangelog::
+.. include:: ../CHANGES

diff --git a/docs/jinjaext.py b/docs/jinjaext.py
index 65f9694e97138a396cc0ee7c4215218efda06176..212c8bfb353e2efe19031ed52274464ee951fb1b 100644 (file)
--- a/docs/jinjaext.py
+++ b/docs/jinjaext.py
@@ -139,19 +139,6 @@ def dump_functions(mapping):
     return directive
 
 
-def jinja_changelog(dirname, arguments, options, content, lineno,
-                    content_offset, block_text, state, state_machine):
-    doc = ViewList()
-    changelog = file(os.path.join(os.path.dirname(jinja2.__file__), '..',
-                                  'CHANGES'))
-    try:
-        for line in islice(changelog, 3, None):
-            doc.append(line.rstrip().decode('utf-8'), '<jinjaext>')
-    finally:
-        changelog.close()
-    return parse_rst(state, content_offset, doc)
-
-
 from jinja2.defaults import DEFAULT_FILTERS, DEFAULT_TESTS
 jinja_filters = dump_functions(DEFAULT_FILTERS)
 jinja_tests = dump_functions(DEFAULT_TESTS)
@@ -210,7 +197,6 @@ def inject_toc(app, doctree, docname):
 def setup(app):
     app.add_directive('jinjafilters', jinja_filters, 0, (0, 0, 0))
     app.add_directive('jinjatests', jinja_tests, 0, (0, 0, 0))
-    app.add_directive('jinjachangelog', jinja_changelog, 0, (0, 0, 0))
     app.add_directive('jinjanodes', jinja_nodes, 0, (0, 0, 0))
     # uncomment for inline toc.  links are broken unfortunately
     ##app.connect('doctree-resolved', inject_toc)