Merge branch 'master' into schema-alteration

4 files changed, 35 insertions, 18 deletions

diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index a0649f38a2..f891bc4eb7 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -15,7 +15,7 @@ Journal-World`_ of Lawrence, Kansas, USA.
 
     He was lead developer at World Online for 2.5 years, during which time
     Django was developed and implemented on World Online's sites. He was the
-    leader and founder of EveryBlock_, a "news feed for your block." He now 
+    leader and founder of EveryBlock_, a "news feed for your block." He now
     develops for Soundslice_.
 
     Adrian lives in Chicago, USA.
@@ -41,7 +41,7 @@ Journal-World`_ of Lawrence, Kansas, USA.
 `Wilson Miner`_
     Wilson's design-fu is what makes Django look so nice. He designed the
     Web site you're looking at right now, as well as Django's acclaimed admin
-    interface. Wilson was the designer for EveryBlock and Rdio_. He now 
+    interface. Wilson was the designer for EveryBlock and Rdio_. He now
     designs for Facebook.
 
     Wilson lives in San Francisco, USA.
@@ -105,8 +105,8 @@ Malcolm Tredinnick
 .. _russell keith-magee: http://cecinestpasun.com/
 
 Joseph Kocherhans
-    Joseph was the director of lead development at EveryBlock and previously 
-    developed at the Lawrence Journal-World. He is treasurer of the `Django 
+    Joseph was the director of lead development at EveryBlock and previously
+    developed at the Lawrence Journal-World. He is treasurer of the `Django
     Software Foundation`_. He often disappears for several days into the woods,
     attempts to teach himself computational linguistics, and annoys his
     neighbors with his Charango_ playing.
@@ -386,17 +386,17 @@ Florian Apolloner
 .. _Ubuntuusers webteam: http://wiki.ubuntuusers.de/ubuntuusers/Webteam
 
 Jeremy Dunck
-    Jeremy was rescued from corporate IT drudgery by Free Software and, in part, 
+    Jeremy was rescued from corporate IT drudgery by Free Software and, in part,
     Django.  Many of Jeremy's interests center around access to information.
 
-    Jeremy was the lead developer of Pegasus News, one of the first uses of 
-    Django outside World Online, and has since joined Votizen, a startup intent 
+    Jeremy was the lead developer of Pegasus News, one of the first uses of
+    Django outside World Online, and has since joined Votizen, a startup intent
     on reducing the influence of money in politics.
 
-    He serves as DSF Secretary, organizes and helps organize sprints, cares 
-    about the health and equity of the Django community.  He has gone an 
+    He serves as DSF Secretary, organizes and helps organize sprints, cares
+    about the health and equity of the Django community.  He has gone an
     embarrassingly long time without a working blog.
-    
+
     Jeremy lives in Mountain View, CA, USA.
 
 `Bryan Veloso`_
@@ -441,6 +441,20 @@ Jeremy Dunck
 .. _Ultimate Frisbee: http://www.montrealultimate.ca
 .. _Reptiletech: http://www.reptiletech.com
 
+`Daniel Lindsley`_
+    Pythonista since 2003, Djangonaut since 2006. Daniel started with Django
+    just after the v0.90 release (back when ``Manipulators`` looked good) & fell
+    in love. Since then, he wrote third-party apps like Haystack & Tastypie
+    & has run the annual Django Dash since 2007. One of the testing faithful,
+    Daniel's contributions include rewriting the ``Forms`` test suite & the
+    addition of ``request.is_ajax``. Daniel currently works as a Python
+    developer at `Amazon Web Services`_ on the ``boto`` library.
+
+    Daniel lives in Seattle, WA, USA.
+
+.. _`Daniel Lindsley`: http://toastdriven.com/
+.. _`Amazon Web Services`: https://aws.amazon.com/
+
 Specialists
 -----------
 
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt
index 0cde77882c..01b88d8d9a 100644
--- a/docs/internals/contributing/localizing.txt
+++ b/docs/internals/contributing/localizing.txt
@@ -62,5 +62,5 @@ Django source tree, as for any code change:
 
 .. _Transifex: https://www.transifex.com/
 .. _Django i18n mailing list: http://groups.google.com/group/django-i18n/
-.. _Django project page: https://www.transifex.com/projects/p/django/
+.. _Django project page: https://www.transifex.com/projects/p/django-core/
 .. _Transifex User Guide: http://help.transifex.com/
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt
index 469f8614b9..2944dea504 100644
--- a/docs/internals/contributing/writing-documentation.txt
+++ b/docs/internals/contributing/writing-documentation.txt
@@ -188,8 +188,8 @@ Our policy for new features is:
     release, not the development version.
 
 Our preferred way for marking new features is by prefacing the features'
-documentation with: "``.. versionadded:: X.Y``", followed by an optional one
-line comment and a mandatory blank line.
+documentation with: "``.. versionadded:: X.Y``", followed by a a mandatory
+blank line and an optional content (indented).
 
 General improvements, or other changes to the APIs that should be emphasized
 should use the "``.. versionchanged:: X.Y``" directive (with the same format
diff --git a/docs/internals/howto-release-django.txt b/docs/internals/howto-release-django.txt
index a49251da76..fd985ddafc 100644
--- a/docs/internals/howto-release-django.txt
+++ b/docs/internals/howto-release-django.txt
@@ -175,13 +175,13 @@ OK, this is the fun part, where we actually push out a release!
 
 #. Make sure you have an absolutely clean tree by running ``git clean -dfx``.
 
-#. Run ``python setup.py sdist`` to generate the release package. This will
-   create the release package in a ``dist/`` directory.
+#. Run ``make -f extras/Makefile`` to generate the release packages. This will
+   create the release packages in a ``dist/`` directory.
 
-#. Generate the hashes of the release package::
+#. Generate the hashes of the release packages::
 
-        $ md5sum dist/Django-<version>.tar.gz
-        $ sha1sum dist/Django-<version>.tar.gz
+        $ md5sum dist/Django-*
+        $ sha1sum dist/Django-*
 
    *FIXME: perhaps we should switch to sha256?*
 
@@ -221,6 +221,9 @@ Now you're ready to actually put the release out there. To do this:
         $ mktmpenv
         $ pip install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1.tar.gz
         $ deactivate
+        $ mktmpenv
+        $ pip install https://www.djangoproject.com/m/releases/1.5/Django-1.5.1-py2.py3-none-any.whl
+        $ deactivate
 
    This just tests that the tarballs are available (i.e. redirects are up) and
    that they install correctly, but it'll catch silly mistakes.