Updated release process for new release schedule. (aed437d5) · Commits · Dom Sekotill / django

docs/internals/contributing/localizing.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -46,11 +46,11 @@ translating or add a language that isn't yet translated, here's what to do:
		`Transifex User Guide`_.

		Translations from Transifex are only integrated into the Django repository at
		the time of a new major release. We try to update them a second time during one
		of the following minor releases, but that depends on the translation manager's
		availability. So don't miss the string freeze period (between the release
		candidate and the major release) to take the opportunity to complete and fix
		the translations for your language!
		the time of a new :term:`feature release`. We try to update them a second time
		during one of the following :term:`patch release`\s, but that depends on the
		translation manager's availability. So don't miss the string freeze period
		(between the release candidate and the feature release) to take the opportunity
		to complete and fix the translations for your language!

		Formats
		-------

docs/internals/contributing/writing-code/submitting-patches.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -236,11 +236,11 @@ Finally, there are a couple of updates to Django's documentation to make:
		the "Features deprecated in A.B" heading.

		#) Add an entry in the deprecation timeline (``docs/internals/deprecation.txt``)
		under the ``A.B+2`` version describing what code will be removed.
		under the appropriate version describing what code will be removed.

		Once you have completed these steps, you are finished with the deprecation.
		In each major release, all ``RemovedInDjangoXXWarning``\s matching the new
		version are removed.
		In each :term:`feature release`, all ``RemovedInDjangoXXWarning``\s matching
		the new version are removed.

		JavaScript patches
		------------------

docs/internals/contributing/writing-documentation.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ __ http://sphinx-doc.org/markup/

		To link, use ``:djadminopt:`--traceback```.

		* Links to Trac tickets (typically reserved for minor release notes)::
		* Links to Trac tickets (typically reserved for patch release notes)::

		:ticket:`12345`

docs/internals/git.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ The Git repository includes several `branches`_:
		activity is focused.

		* ``stable/A.B.x`` are the branches where release preparation work happens.
		They are also used for support and bugfix releases which occur as necessary
		after the initial release of a major or minor version.
		They are also used for bugfix and security releases which occur as necessary
		after the initial release of a feature version.

		* ``soc20XX/<project>`` branches were used by students who worked on Django
		during the 2009 and 2010 Google Summer of Code programs.
		@@ -84,8 +84,7 @@ coding style and how to generate and submit a patch.
		Other branches
		==============

		Django uses branches to prepare for releases of Django (whether they be
		:term:`major <Major release>` or :term:`minor <Minor release>`).
		Django uses branches to prepare for releases of Django.

		In the past when Django was hosted on Subversion, branches were also used for
		feature development. Now Django is hosted on Git and feature development is

docs/internals/howto-release-django.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ any time leading up to the actual release:
		#. Double-check that the release notes index has a link to the notes
		for the new release; this will be in ``docs/releases/index.txt``.

		#. If this is a major release, ensure translations from Transifex have been
		#. If this is a feature release, ensure translations from Transifex have been
		integrated. This is typically done by a separate translation's manager
		rather than the releaser, but here are the steps. Provided you have an
		account on Transifex::
		@@ -181,9 +181,9 @@ OK, this is the fun part, where we actually push out a release!

		__ https://github.com/django/django/commit/3ef4bbf495cc6c061789132e3d50a8231a89406b

		#. For a major version release, remove the ``UNDER DEVELOPMENT`` header at the
		#. For a feature release, remove the ``UNDER DEVELOPMENT`` header at the
		top of the release notes and add the release date on the next line. For a
		minor release, replace ``Under Development`` with the release date. Make
		patch release, replace ``Under Development`` with the release date. Make
		this change on all branches where the release notes for a particular version
		are located.

		@@ -377,9 +377,9 @@ need to be done by the releaser.
		``docs/fixtures/doc_releases.json`` JSON fixture, so people without access
		to the production DB can still run an up-to-date copy of the docs site.

		#. Create a stub release note for the new major version. Use the stub from the
		previous major version or use the previous major version and delete most of
		the contents leaving only section headings.
		#. Create a stub release note for the new feature version. Use the stub from
		the previous feature release version or copy the contents from the previous
		feature version and delete most of the contents leaving only the headings.

		#. Increase the default PBKDF2 iterations in
		``django.contrib.auth.hashers.PBKDF2PasswordHasher`` by about 20%