[Python-modules-commits] [python-django] 02/03: Merge tag 'upstream/1.7.5' into debian/sid

[Raphaël Hertzog]

This is an automated email from the git hooks/post-receive script.

hertzog pushed a commit to branch debian/sid
in repository python-django.

commit 4749841b3e8e123825df20a1bd41cc50c00df055
Merge: 930fd17 b3fae59
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Fri Mar 6 21:13:01 2015 +0100

    Merge tag 'upstream/1.7.5' into debian/sid
    
    Upstream version 1.7.5

 Django.egg-info/PKG-INFO                       |  2 +-
 Django.egg-info/SOURCES.txt                    |  3 ++
 PKG-INFO                                       |  2 +-
 django/__init__.py                             |  2 +-
 django/conf/locale/az/__init__.py              |  0
 django/conf/locale/az/formats.py               | 35 ++++++++++++++
 django/contrib/auth/management/__init__.py     |  5 --
 django/contrib/auth/tests/test_management.py   | 20 +-------
 django/contrib/contenttypes/management.py      |  5 --
 django/contrib/contenttypes/tests/tests.py     | 23 +--------
 django/contrib/sites/management.py             |  2 +-
 django/contrib/sites/tests.py                  | 14 +++++-
 django/db/backends/postgresql_psycopg2/base.py | 28 +++++++++--
 django/db/backends/schema.py                   |  7 ++-
 django/db/backends/sqlite3/schema.py           | 11 +++--
 django/db/migrations/loader.py                 | 12 -----
 docs/howto/custom-template-tags.txt            | 24 ++++++---
 docs/howto/deployment/wsgi/uwsgi.txt           |  2 +-
 docs/howto/outputting-pdf.txt                  |  2 +-
 docs/howto/upgrade-version.txt                 |  4 +-
 docs/intro/overview.txt                        |  2 +-
 docs/intro/tutorial01.txt                      | 51 ++++++++++----------
 docs/intro/tutorial02.txt                      |  6 +--
 docs/intro/whatsnext.txt                       |  6 +--
 docs/ref/class-based-views/flattened-index.txt |  6 +--
 docs/ref/class-based-views/mixins-editing.txt  | 18 ++-----
 docs/ref/contrib/formtools/form-wizard.txt     |  2 +-
 docs/ref/contrib/gis/geos.txt                  |  3 +-
 docs/ref/contrib/gis/install/geolibs.txt       |  2 +-
 docs/ref/contrib/gis/tutorial.txt              | 34 ++++++-------
 docs/ref/databases.txt                         | 29 +++++------
 docs/ref/django-admin.txt                      |  4 +-
 docs/ref/forms/validation.txt                  |  4 +-
 docs/ref/models/instances.txt                  |  2 +-
 docs/ref/models/querysets.txt                  |  4 +-
 docs/ref/settings.txt                          |  2 +-
 docs/releases/1.0-porting-guide.txt            |  6 +--
 docs/releases/1.4.13.txt                       |  2 +-
 docs/releases/1.4.18.txt                       |  2 +-
 docs/releases/1.4.6.txt                        |  2 +-
 docs/releases/1.5.2.txt                        |  2 +-
 docs/releases/1.5.8.txt                        |  2 +-
 docs/releases/1.6.10.txt                       |  2 +-
 docs/releases/1.6.5.txt                        |  2 +-
 docs/releases/1.6.txt                          |  9 ++--
 docs/releases/1.7.3.txt                        |  2 +-
 docs/releases/1.7.5.txt                        | 27 +++++++++++
 docs/releases/index.txt                        |  1 +
 docs/spelling_wordlist                         | 45 ++++++++++++++++-
 docs/topics/cache.txt                          |  7 +--
 docs/topics/i18n/timezones.txt                 |  2 +-
 docs/topics/install.txt                        | 67 +++++++++++---------------
 docs/topics/migrations.txt                     | 19 +++++++-
 docs/topics/testing/advanced.txt               |  2 +
 docs/topics/testing/tools.txt                  | 42 +++++++---------
 setup.cfg                                      |  3 +-
 tests/backends/tests.py                        | 28 +++++++++++
 tests/schema/fields.py                         |  4 ++
 tests/schema/tests.py                          | 46 +++++++++++++++++-
 59 files changed, 431 insertions(+), 271 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git