diff options
| author | James Bennett <james@b-list.org> | 2013-11-06 07:54:49 -0600 |
|---|---|---|
| committer | James Bennett <james@b-list.org> | 2013-11-06 07:54:49 -0600 |
| commit | a71ff762356a46f37d189f503f0ec2aaaca6ad0e (patch) | |
| tree | a49f3f93a20180fc84dbfd17761e87fd2d17ba24 | |
| parent | 84b9ab7c1d0dd2567a060e148ad630c7aa0103ee (diff) | |
| download | django-a71ff762356a46f37d189f503f0ec2aaaca6ad0e.tar.gz | |
[1.6.x] Bump version numbers for 1.6 release.
| -rw-r--r-- | django/__init__.py | 2 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.6.txt | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/django/__init__.py b/django/__init__.py index 24be902a1b..64ef084e4a 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 6, 0, 'rc', 1) +VERSION = (1, 6, 0, 'final', 0) def get_version(*args, **kwargs): # Don't litter django/__init__.py with all the get_version stuff. diff --git a/docs/conf.py b/docs/conf.py index feff99b6f4..363e53993e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -71,7 +71,7 @@ else: release = django_release() # The "development version" of Django -django_next_version = '1.6' +django_next_version = '1.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index 950ec6337e..42ebfdbc73 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -1,6 +1,6 @@ -============================================ -Django 1.6 release notes - UNDER DEVELOPMENT -============================================ +========================= + Django 1.6 release notes +========================= .. note:: @@ -20,6 +20,8 @@ Django 1.6 release notes - UNDER DEVELOPMENT -- The Django Developers +*November 6, 2013* + Welcome to Django 1.6! These release notes cover the `new features`_, as well as some `backwards |