diff --git a/docs/source/conf.py b/docs/source/conf.py index 7060c25..b76301c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -83,9 +83,10 @@ github_project_url = "https://github.com/ipython/ipython" # other places throughout the built documents. # # The full version, including alpha/beta/rc tags. -release = iprelease['version'] -# The short X.Y version. -version = '.'.join(release.split('.',2)[:2]) +codename = iprelease['codename'] +release = "%s: %s" % (iprelease['version'], codename) +# Just the X.Y.Z part, no '-dev' +version = iprelease['version'].split('-', 1)[0] # There are two options for replacing |today|: either, you set today to some diff --git a/docs/source/whatsnew/version1.0.rst b/docs/source/whatsnew/version1.0.rst index e9145b6..47c0386 100644 --- a/docs/source/whatsnew/version1.0.rst +++ b/docs/source/whatsnew/version1.0.rst @@ -2,8 +2,9 @@ 1.0 Series ============ -Release 1.0 -=========== +Release 1.0.0: An Afternoon Hack +================================ + IPython 1.0 requires Python ≥ 2.6.5 or ≥ 3.2.1. It does not support Python 3.0, 3.1, or 2.5.