diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-22 08:07:07 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-22 08:07:07 -0400 |
| commit | 3c05fb076c617fa0c8820344135cfe9e028400a8 (patch) | |
| tree | fe7669a845674848a3c65e32d988ad2527331a67 /docs | |
| parent | 72561a213ccc456738582551e85fab0f0c8d09ab (diff) | |
| parent | 4388d317712be00a1d49cc73ac78407fe6906263 (diff) | |
| download | pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.tar.gz pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.tar.bz2 pyramid-3c05fb076c617fa0c8820344135cfe9e028400a8.zip | |
Merge branch '1.4-branch'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index 80ee0d2e5..7abae7a85 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.4dev' +version = '1.4a1' # The full version, including alpha/beta/rc tags. release = version @@ -160,7 +160,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( github_url='https://github.com/Pylons/pyramid', - in_progress='true', +# in_progress='true', ) # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths |