Merge branch 'master' of bitbucket.org:zzzeek/mako

3 files changed, 4 insertions, 15 deletions

diff --git a/.gitreview b/.gitreview
index 95d1a31..8af0a07 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=gerrit.sqlalchemy.org
-project=zzzeek/mako
+project=sqlalchemy/mako
 defaultbranch=master
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 46e9e98..1e9e698 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -79,7 +79,6 @@ Changelog
 
     .. change::
         :tags: feature
-        :pullreq: bitbucket:16
 
       Added new method :meth:`.Template.list_defs`.   Pull request courtesy
       Jonathan Vanasco.
@@ -90,7 +89,6 @@ Changelog
 
     .. change::
         :tags: bug, babel
-        :pullreq: bitbucket:21
 
       Fixed an issue where the Babel plugin would not handle a translation
       symbol that contained non-ascii characters.  Pull request courtesy
@@ -122,7 +120,6 @@ Changelog
 
     .. change::
         :tags: bug
-        :pullreq: bitbucket:18
 
       Update the Lingua translation extraction plugin to correctly
       handle templates mixing Python control statements (such as if,
@@ -149,14 +146,12 @@ Changelog
 
     .. change::
         :tags: feature
-        :pullreq: bitbucket:9
 
       Added support for Lingua, a translation extraction system as an
       alternative to Babel.  Pull request courtesy Wichert Akkerman.
 
     .. change::
         :tags: bug, py3k
-        :pullreq: bitbucket:11
 
       Modernized the examples/wsgi/run_wsgi.py file for Py3k.
       Pull requset courtesy Cody Taylor.
@@ -167,7 +162,6 @@ Changelog
 
     .. change::
         :tags: bug, py2k
-        :pullreq: bitbucket:8
 
       Improved the error re-raise operation when a custom
       :paramref:`.Template.error_handler` is used that does not handle
@@ -176,7 +170,6 @@ Changelog
 
     .. change::
         :tags: bug, py2k, filters
-        :pullreq: bitbucket:7
 
       Added an html_escape filter that works in "non unicode" mode.
       Previously, when using ``disable_unicode=True``, the ``u`` filter
@@ -217,7 +210,6 @@ Changelog
 
     .. change::
         :tags: feature
-        :pullreq: bitbucket:5
 
       mako-render is now implemented as a setuptools entrypoint script;
       a standalone mako.cmd.cmdline() callable is now available, and the
@@ -226,7 +218,6 @@ Changelog
 
     .. change::
         :tags: feature
-        :pullreq: bitbucket:4
 
       The mako-render script will now catch exceptions and run them
       into the text error handler, and exit with a non-zero exit code.
@@ -234,7 +225,6 @@ Changelog
 
     .. change::
         :tags: bug
-        :pullreq: bitbucket:2
 
       A rework of the mako-render script allows the script to run
       correctly when given a file pathname that is outside of the current
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 5197ea0..787d059 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -33,12 +33,11 @@ import mako
 extensions = ['sphinx.ext.autodoc',
                 'changelog', 'sphinx_paramlinks', 'zzzeeksphinx']
 
-changelog_render_ticket = "https://bitbucket.org/zzzeek/mako/issue/%s/"
+changelog_render_ticket = "https://github.com/sqlalchemy/mako/issues/%s"
 
 changelog_render_pullreq = {
-    "bitbucket": "https://bitbucket.org/zzzeek/mako/pull-request/%s",
-    "default": "https://bitbucket.org/zzzeek/mako/pull-request/%s",
-    "github": "https://github.com/zzzeek/mako/pull/%s",
+    "default": "https://github.com/sqlalchemy/mako/pull/%s",
+    "github": "https://github.com/sqlalchemy/mako/pull/%s",
 }
 
 # Add any paths that contain templates here, relative to this directory.