remerge from 1.0.x after changelog addition change

--HG-- branch : trunk
2009-08-19 21:07:37 +02:00
parent 9c6d5080e3 ab83c4e05c
commit e051c9a4b8
3 changed files with 4 additions and 0 deletions
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -0,0 +1 @@
+../CHANGELOG
--- a/doc/confrest.py
+++ b/doc/confrest.py
@@ -59,6 +59,7 @@ pageTracker._trackPageview();
        items = [
            self.a_docref("install", "download.html"),
            self.a_docref("contact", "contact.html"),
+            self.a_docref("changelog", "changelog.html"),
            self.a_docref("faq", "faq.html"),
            html.div(
                html.h3("py.test:"),
--- a/doc/test/index.txt
+++ b/doc/test/index.txt
@@ -17,7 +17,9 @@ funcargs_: powerful parametrized test function setup

 customize_: configuration, customization, extensions 

+changelog_: history of changes covering last releases

+.. _changelog: ../changelog.html
 .. _`plugins`: plugin/index.html
 .. _`talks, tutorials, examples`: talks.html
 .. _quickstart: quickstart.html