updated changelog thing

diff --git a/doc/build/builder/changelog.py b/doc/build/builder/changelog.py
index 38ec235db6b697b1b46e0c31ca6e27f6d0aea8af..24ceaeaa3a9448bf5400e65ac212e2ae08705b3f 100644 (file)
--- a/doc/build/builder/changelog.py
+++ b/doc/build/builder/changelog.py
@@ -153,12 +153,19 @@ class ChangeLogDirective(EnvDirective, Directive):
                 insert_ticket.append(nodes.Text(", ", ", "))
             else:
                 insert_ticket.append(nodes.Text(" ", " "))
-            insert_ticket.append(
-                nodes.reference('', '',
-                    nodes.Text("#%s" % ticket, "#%s" % ticket),
-                    refuri=self.env.config.changelog_render_ticket(ticket)
+            refuri = self.env.config.changelog_render_ticket
+            if refuri is not None:
+                refuri = refuri % ticket
+                insert_ticket.append(
+                    nodes.reference('', '',
+                        nodes.Text("#%s" % ticket, "#%s" % ticket),
+                        refuri=refuri
+                    )
+                )
+            else:
+                insert_ticket.append(
+                    nodes.Text("#%s" % ticket, "#%s" % ticket)
                 )
-            )
 
         if rec['tags']:
             tag_node = nodes.strong('',
@@ -217,5 +224,6 @@ def setup(app):
     app.add_config_value("changelog_sections", [], 'env')
     app.add_config_value("changelog_inner_tag_sort", [], 'env')
     app.add_config_value("changelog_render_ticket",
-            lambda ticket: ticket, 'env'
+            None,
+            'env'
         )

diff --git a/doc/build/builder/mako.py b/doc/build/builder/mako.py
index 2d3dc03e36b9049cd0b994acf2e731ef8bdf3871..845686afccd9bd5afc1fb45029d575fa3b804b39 100644 (file)
--- a/doc/build/builder/mako.py
+++ b/doc/build/builder/mako.py
@@ -76,7 +76,7 @@ class MakoBridge(TemplateBridge):
 
 def setup(app):
     app.config['template_bridge'] = "builder.mako.MakoBridge"
-    app.add_config_value('release_date', "", True)
-    app.add_config_value('site_base', "", True)
-    app.add_config_value('build_number', "", 1)
+    app.add_config_value('release_date', "", 'env')
+    app.add_config_value('site_base', "", 'env')
+    app.add_config_value('build_number', "", 'env')
 

diff --git a/doc/build/conf.py b/doc/build/conf.py
index a6c333c026a8c06a0fb17589e4191e4e964f87ba..9e2749888a341c0b525d64d387ec220355a71def 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -61,8 +61,7 @@ changelog_sections = ["general", "orm", "orm declarative", "orm querying", \
 changelog_inner_tag_sort = ["feature", "bug", "moved", "changed", "removed"]
 
 # how to render a ticket link
-def changelog_render_ticket(ticket):
-    return "http://www.sqlalchemy.org/trac/ticket/%s" % ticket
+changelog_render_ticket = "http://www.sqlalchemy.org/trac/ticket/%s"
 
 
 # The encoding of source files.