From 57a51f790bdff6c1cf34f3c6d64b0bef3033d89e Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 24 Sep 2013 09:21:55 +0100
Subject: Added @mkai, for work on #1126.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 4483f170..b5dce504 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -169,6 +169,7 @@ The following people have helped make REST framework great.
 * Edmond Wong - [edmondwong]
 * Ben Reilly - [bwreilly]
 * Tai Lee - [mrmachine]
+* Markus Kaiserswerth - [mkai]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -374,3 +375,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [edmondwong]: https://github.com/edmondwong
 [bwreilly]: https://github.com/bwreilly
 [mrmachine]: https://github.com/mrmachine
+[mkai]: https://github.com/mkai
-- 
cgit v1.2.3


From 49847584a8524883181e4118a9df9bb62f597271 Mon Sep 17 00:00:00 2001
From: Krzysztof Jurewicz
Date: Sun, 29 Sep 2013 12:49:38 +0200
Subject: Minor documentation fix.

---
 docs/topics/ajax-csrf-cors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md
index 0555b84d..97dd4710 100644
--- a/docs/topics/ajax-csrf-cors.md
+++ b/docs/topics/ajax-csrf-cors.md
@@ -6,7 +6,7 @@
 
 ## Javascript clients
 
-If your building a javascript client to interface with your Web API, you'll need to consider if the client can use the same authentication policy that is used by the rest of the website, and also determine if you need to use CSRF tokens or CORS headers.
+If you’re building a JavaScript client to interface with your Web API, you'll need to consider if the client can use the same authentication policy that is used by the rest of the website, and also determine if you need to use CSRF tokens or CORS headers.
 
 AJAX requests that are made within the same context as the API they are interacting with will typically use `SessionAuthentication`.  This ensures that once a user has logged in, any AJAX requests made can be authenticated using the same session-based authentication that is used for the rest of the website.
 
-- 
cgit v1.2.3


From 61dd9ce914382ad7b26e2654a590215885308828 Mon Sep 17 00:00:00 2001
From: Jeff
Date: Tue, 1 Oct 2013 15:47:47 -0600
Subject: Update release-notes.md

Simple typo fix.---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e4294ae3..3df8869a 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -58,7 +58,7 @@ You can determine your currently installed version using `pip freeze`:
 * 'Raw data' and 'HTML form' tab preference in browseable API now saved between page views.
 * Bugfix: `required=True` argument fixed for boolean serializer fields.
 * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists.
-* Bugfix: Client sending emptry string instead of file now clears `FileField`.
+* Bugfix: Client sending empty string instead of file now clears `FileField`.
 * Bugfix: Empty values on ChoiceFields with `required=False` now consistently return `None`.
 
 ### 2.3.7
-- 
cgit v1.2.3


From 3833f1d55f97db33596242d89dbed997221f3b82 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 4 Oct 2013 15:55:57 +0100
Subject: Added @hcliff for #1153. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index b5dce504..586bb0f0 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -170,6 +170,7 @@ The following people have helped make REST framework great.
 * Ben Reilly - [bwreilly]
 * Tai Lee - [mrmachine]
 * Markus Kaiserswerth - [mkai]
+* Henry Clifford - [hcliff]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -376,3 +377,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [bwreilly]: https://github.com/bwreilly
 [mrmachine]: https://github.com/mrmachine
 [mkai]: https://github.com/mkai
+[hcliff]: https://github.com/hcliff
-- 
cgit v1.2.3


From 545ee013e332db0a81e5bd82b76f30b7d2d08b12 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 17 Oct 2013 09:40:06 +0100
Subject: Added @badale, for work on #1179.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 586bb0f0..9a20028c 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -171,6 +171,7 @@ The following people have helped make REST framework great.
 * Tai Lee - [mrmachine]
 * Markus Kaiserswerth - [mkai]
 * Henry Clifford - [hcliff]
+* Thomas Badaud - [badale]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -378,3 +379,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [mrmachine]: https://github.com/mrmachine
 [mkai]: https://github.com/mkai
 [hcliff]: https://github.com/hcliff
+[badale]: https://github.com/badale
-- 
cgit v1.2.3


From daf927ef68ce992055e8b7bc1a07cf03ee67b742 Mon Sep 17 00:00:00 2001
From: Colin
Date: Thu, 17 Oct 2013 12:28:58 -0700
Subject: add @tamakisquare for work on #1111

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 9a20028c..e9c45965 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -172,6 +172,7 @@ The following people have helped make REST framework great.
 * Markus Kaiserswerth - [mkai]
 * Henry Clifford - [hcliff]
 * Thomas Badaud - [badale]
+* Colin Huang - [tamakisquare]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -380,3 +381,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [mkai]: https://github.com/mkai
 [hcliff]: https://github.com/hcliff
 [badale]: https://github.com/badale
+[tamakisquare]: https://github.com/tamakisquare
-- 
cgit v1.2.3


From fa87fac61b87858e80788fc233591fa11dbc18e7 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 22 Oct 2013 10:21:06 +0100
Subject: Added @ross for work on #1187. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index e9c45965..cd3b3710 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -173,6 +173,7 @@ The following people have helped make REST framework great.
 * Henry Clifford - [hcliff]
 * Thomas Badaud - [badale]
 * Colin Huang - [tamakisquare]
+* Ross McFarland - [ross]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -382,3 +383,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [hcliff]: https://github.com/hcliff
 [badale]: https://github.com/badale
 [tamakisquare]: https://github.com/tamakisquare
+[ross]: https://github.com/ross
-- 
cgit v1.2.3


From f92d8bd9721d788e3017c16fb285189c88112a46 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 22 Oct 2013 12:21:26 +0100
Subject: Added @jbzdak, for the nice docs improvements in #1191. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index cd3b3710..bcf77b03 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -174,6 +174,7 @@ The following people have helped make REST framework great.
 * Thomas Badaud - [badale]
 * Colin Huang - [tamakisquare]
 * Ross McFarland - [ross]
+* Jacek Bzdak - [jbzdak]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -384,3 +385,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [badale]: https://github.com/badale
 [tamakisquare]: https://github.com/tamakisquare
 [ross]: https://github.com/ross
+[jbzdak]: https://github.com/jbzdak
-- 
cgit v1.2.3


From 4d894fd39ec5670e72756c26908468fd743354c6 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 24 Oct 2013 13:50:05 +0100
Subject: Added @alexanderlukanin13 for fix #1198.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index bcf77b03..028dfffc 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -175,6 +175,7 @@ The following people have helped make REST framework great.
 * Colin Huang - [tamakisquare]
 * Ross McFarland - [ross]
 * Jacek Bzdak - [jbzdak]
+* Alexander Lukanin - [alexanderlukanin13]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -386,3 +387,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [tamakisquare]: https://github.com/tamakisquare
 [ross]: https://github.com/ross
 [jbzdak]: https://github.com/jbzdak
+[alexanderlukanin13]: https://github.com/alexanderlukanin13
-- 
cgit v1.2.3


From 2ddf7869e3ce57d056c5b0546154c7bbe524cc09 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 24 Oct 2013 15:29:40 +0100
Subject: Added @yamila-moreno for work on #1199. Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 028dfffc..e6de1dbe 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -176,6 +176,7 @@ The following people have helped make REST framework great.
 * Ross McFarland - [ross]
 * Jacek Bzdak - [jbzdak]
 * Alexander Lukanin - [alexanderlukanin13]
+* Yamila Moreno - [yamila-moreno]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -388,3 +389,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [ross]: https://github.com/ross
 [jbzdak]: https://github.com/jbzdak
 [alexanderlukanin13]: https://github.com/alexanderlukanin13
+[yamila-moreno]: https://github.com/yamila-moreno
-- 
cgit v1.2.3


From 5e0538fcda75eed82ed183c7c4dcfcda5ad35d5f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 2 Nov 2013 09:15:35 +0000
Subject: Added @robhudson for work on #1211.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index e6de1dbe..9751850b 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -177,6 +177,7 @@ The following people have helped make REST framework great.
 * Jacek Bzdak - [jbzdak]
 * Alexander Lukanin - [alexanderlukanin13]
 * Yamila Moreno - [yamila-moreno]
+* Rob Hudson - [robhudson]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -390,3 +391,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [jbzdak]: https://github.com/jbzdak
 [alexanderlukanin13]: https://github.com/alexanderlukanin13
 [yamila-moreno]: https://github.com/yamila-moreno
+[robhudson]: https://github.com/robhudson
-- 
cgit v1.2.3


From 72d72e4d3e497000bab8019151972b0e71f6957a Mon Sep 17 00:00:00 2001
From: Alex
Date: Wed, 13 Nov 2013 14:32:37 +0000
Subject: Add Alex Good to credits (Whoop!)

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 9751850b..e6c9c034 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -178,6 +178,7 @@ The following people have helped make REST framework great.
 * Alexander Lukanin - [alexanderlukanin13]
 * Yamila Moreno - [yamila-moreno]
 * Rob Hudson - [robhudson]
+* Alex Good - [alexjg]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -392,3 +393,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [alexanderlukanin13]: https://github.com/alexanderlukanin13
 [yamila-moreno]: https://github.com/yamila-moreno
 [robhudson]: https://github.com/robhudson
+[alexjg]: https://github.com/alexjg
-- 
cgit v1.2.3


From 1d1b2f765cbf3a56c677c44eee99260c8979a0a0 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 15 Nov 2013 13:55:02 +0000
Subject: Version 2.3.9

---
 docs/topics/release-notes.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 3df8869a..6c1447d5 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,10 +40,21 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.9
 
+**Date**: 15th November 2013
+
+* Fix Django 1.6 exception API compatibility issue caused by `ValidationError`.
+* Include errors in HTML forms in browsable API.
 * Added JSON renderer support for numpy scalars.
+* Added `transform_<fieldname>` hooks on serializers for easily modifying field output.
 * Added `get_context` hook in `BrowsableAPIRenderer`.
+* Allow serializers to be passed `files` but no `data`.
+* `HTMLFormRenderer` now renders serializers directly to HTML without needing to create an intermediate form object.
+* Added `get_filter_backends` hook.
+* Added queryset aggregates to allowed fields in `OrderingFilter`.
+* Bugfix: Fix decimal suppoprt with `YAMLRenderer`.
+* Bugfix: Fix submission of unicode in browsable API through raw data form.
 
 ### 2.3.8
 
-- 
cgit v1.2.3


From ca2bd616d989f78d00641231e645198a6c95caa0 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Nov 2013 11:01:27 +0000
Subject: Remove a couple of .html suffixes in docs

---
 docs/topics/2.2-announcement.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md
index 7d276049..0f980e1c 100644
--- a/docs/topics/2.2-announcement.md
+++ b/docs/topics/2.2-announcement.md
@@ -151,7 +151,7 @@ From version 2.2 onwards, serializers with hyperlinked relationships *always* re
 [porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/
 [python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility
 [django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy
-[credits]: http://django-rest-framework.org/topics/credits.html
+[credits]: http://django-rest-framework.org/topics/credits
 [mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
 [django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs
 [marcgibbons]: https://github.com/marcgibbons/
-- 
cgit v1.2.3


From 304b193efe076868ceca624543183791f5931726 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Nov 2013 15:58:34 +0000
Subject: Update release-notes.md

---
 docs/topics/release-notes.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 6c1447d5..0759bd9d 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
+### Master
+
+* Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
+
 ### 2.3.9
 
 **Date**: 15th November 2013
-- 
cgit v1.2.3


From fe4c7d4000675a1720e7d3e02c3014a693d835aa Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Dec 2013 08:26:58 +0000
Subject: Update release-notes.md

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 0759bd9d..c7e24a5e 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`:
 
 ### Master
 
+* Added `pre_delete()` and `post_delete()` method hooks.
 * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
 
 ### 2.3.9
-- 
cgit v1.2.3


From b92c911cf66805f7826713c68f4e6704b2ad4589 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Dec 2013 16:05:19 +0000
Subject: Update release-notes.md

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index c7e24a5e..f9ad55f7 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`:
 
 ### Master
 
+* Add in choices information for ChoiceFields in response to `OPTIONS` requests.
 * Added `pre_delete()` and `post_delete()` method hooks.
 * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
 
-- 
cgit v1.2.3


From 9f1918e41e1b8dcfa621b00788bab865f2fc31aa Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Dec 2013 16:06:57 +0000
Subject: Added @ian-foote, for work on #1250.  Thanks!

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index e6c9c034..3395cd9e 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -179,6 +179,7 @@ The following people have helped make REST framework great.
 * Yamila Moreno - [yamila-moreno]
 * Rob Hudson - [robhudson]
 * Alex Good - [alexjg]
+* Ian Foote - [ian-foote]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -394,3 +395,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [yamila-moreno]: https://github.com/yamila-moreno
 [robhudson]: https://github.com/robhudson
 [alexjg]: https://github.com/alexjg
+[ian-foote]: https://github.com/ian-foote
-- 
cgit v1.2.3


From 38d78b21c0a7c68c205ebe6e79433ca51fe609ce Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 3 Dec 2013 16:55:11 +0000
Subject: Remove Content-Type header from empty responses. Fixes #1196

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index f9ad55f7..e6085f59 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`:
 
 * Add in choices information for ChoiceFields in response to `OPTIONS` requests.
 * Added `pre_delete()` and `post_delete()` method hooks.
+* Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header.
 * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
 
 ### 2.3.9
-- 
cgit v1.2.3


From de5b9e39dd4c21f4dcceb7cf13c7366b0fb74ec9 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 4 Dec 2013 14:59:09 +0000
Subject: First pass on contribution guide

---
 docs/topics/contributing.md | 91 ++++++++++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 29 deletions(-)

(limited to 'docs/topics')

diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index 123e4a8a..2b18c4f6 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -6,19 +6,27 @@
 
 There are many ways you can contribute to Django REST framework.  We'd like it to be a community-led project, so please get involved and help shape the future of the project.
 
-# Community
+## Community
 
-If you use and enjoy REST framework please consider [staring the project on GitHub][github], and [upvoting it on Django packages][django-packages].  Doing so helps potential new users see that the project is well used, and help us continue to attract new users.
+The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible.  Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case.
 
-You might also consider writing a blog post on your experience with using REST framework, writing a tutorial about using the project with a particular javascript framework, or simply sharing the love on Twitter.
+If you use REST framework, we'd love you to be vocal about your experiances with it - you might consider writing a blog post on your experience with using REST framework, or publishing a tutorial about using the project with a particular javascript framework.  Experiances from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are and aren't easy to understand and work with.
 
 Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag.
 
 When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. 
 
+## Code of conduct
+
+Please keep the tone polite & professional.  For some users a discussion on the REST framework mailing list or ticket tracker may be their first engagement with the open source community.  First impressions count, so let's try to make everyone feel welcome.
+
+Be mindful in the language you choose.  As an example, in an environment that is heavily male-dominated, posts that start 'Hey guys,' can come across as unintentionally exclusive.  It's just as easy, and more inclusive to use gender neutral language in those situations.
+
+The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines for participating in community forums.
+
 # Issues
 
-It's really helpful if you make sure you address issues to the correct channel.  Usage questions should be directed to the [discussion group][google-group].  Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues].
+It's really helpful if you can make sure to address issues on the correct channel.  Usage questions should be directed to the [discussion group][google-group].  Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues].
 
 Some tips on good issue reporting:
 
@@ -26,30 +34,61 @@ Some tips on good issue reporting:
 * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue.
 * If reporting a bug, then try to include a pull request with a failing test case.  This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
 
+## Triaging issues
 
+Getting involved in triaging incoming issues is a good way to start contributing.  Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be.  Anyone can help out with this, you just need to be willing to 
 
-* TODO: Triage
+* Read through the ticket - does it make sense, is it missing any context that would help explain it better?
+* Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group?
+* If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request?
+* If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package?
 
 # Development
 
+To start developing on Django REST framework, clone the repo:
+
+    git clone git@github.com:tomchristie/django-rest-framework.git
+
+Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you setup your editor to automatically indicated non-conforming styles.
+
+## Testing
+
+To run the tests, clone the repository, and then:
+
+    # Setup the virtual environment
+    virtualenv env
+    env/bin/activate
+    pip install -r requirements.txt
+    pip install -r optionals.txt
+
+    # Run the tests
+    rest_framework/runtests/runtests.py
 
-* git clone & PYTHONPATH
-* Pep8
-* Recommend editor that runs pep8
+You can also use the excellent `[tox][tox]` testing tool to run the tests against all supported versions of Python and Django.  Install `tox` globally, and then simply run:
 
-### Pull requests
+    tox
 
-* Make pull requests early
-* Describe branching
+## Pull requests
 
-### Managing compatibility issues
+It's a good idea to make pull requests early on.  A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission.
 
-* Describe compat module
+It's also always best to make a new branch before starting work on a pull request.  This means that you'll be able to later switch back to working on another seperate issue without interfering with an ongoing pull requests.
 
-# Testing
+It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests.
 
-* Running the tests
-* tox
+GitHub's documentation for working on pull requests is [available here][pull-requests].
+
+Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django.
+
+Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are runnning as you'd expect.
+
+![Travis status][travis-status]
+
+*Above: Travis build notifications*
+
+## Managing compatibility issues
+
+Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment.  Any code that branches in this way should be isolated into the `compat.py` module, and should provide a single common interface that the rest of the codebase can use.
 
 # Documentation
 
@@ -77,7 +116,7 @@ Some other tips:
 
 * Keep paragraphs reasonably short.
 * Use double spacing after the end of sentences.
-* Don't use the abbreviations such as 'e.g..' but instead use long form, such as 'For example'.
+* Don't use the abbreviations such as 'e.g.' but instead use long form, such as 'For example'.
 
 ## Markdown style
 
@@ -118,25 +157,19 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
 
     ---
     
-    **Note:** Make sure you do this thing.
+    **Note:** A useful documentation note.
     
     ---
 
-# Third party packages
-
-* Django reusable app
-
-# Core committers
-
-* Still use pull reqs
-* Credits
-
 [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html
-[github]: https://github.com/tomchristie/django-rest-framework
-[django-packages]: https://www.djangopackages.com/grids/g/api/
+[code-of-conduct]: https://www.djangoproject.com/conduct/
 [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
 [so-filter]: http://stackexchange.com/filters/66475/rest-framework
 [issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open
+[pep-8]: http://www.python.org/dev/peps/pep-0008/
+[travis-status]: ../img/travis-status.png
+[pull-requests]: https://help.github.com/articles/using-pull-requests
+[tox]: http://tox.readthedocs.org/en/latest/
 [markdown]: http://daringfireball.net/projects/markdown/basics
 [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs
 [mou]: http://mouapp.com/
-- 
cgit v1.2.3


From 51359e461299905c6cd359000941f9da3d561f7d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 6 Dec 2013 21:42:52 +0000
Subject: Added @chuckharmston for kickass bug squashing in #1272

---
 docs/topics/credits.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 3395cd9e..1a838421 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -180,6 +180,7 @@ The following people have helped make REST framework great.
 * Rob Hudson - [robhudson]
 * Alex Good - [alexjg]
 * Ian Foote - [ian-foote]
+* Chuck Harmston - [chuckharmston]
 
 Many thanks to everyone who's contributed to the project.
 
@@ -396,3 +397,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
 [robhudson]: https://github.com/robhudson
 [alexjg]: https://github.com/alexjg
 [ian-foote]: https://github.com/ian-foote
+[chuckharmston]: https://github.com/chuckharmston
-- 
cgit v1.2.3


From 85d9eb0f7ed3ef66a25a443b34ead914a506462c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 6 Dec 2013 21:47:26 +0000
Subject: Update release-notes.md

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e6085f59..2df2cf93 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`:
 
 * Add in choices information for ChoiceFields in response to `OPTIONS` requests.
 * Added `pre_delete()` and `post_delete()` method hooks.
+* Bugfix: Partial updates which erronously set a related field to `None` now correctly fail validation instead of raising an exception.
 * Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header.
 * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
 
-- 
cgit v1.2.3


From 910de38a9c8cd03243e738c8f4adcbade8a4d7d6 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 6 Dec 2013 22:13:50 +0000
Subject: Version 2.3.10

---
 docs/topics/release-notes.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 2df2cf93..b080ad43 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,10 +40,13 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
-### Master
+### 2.3.10
+
+**Date**: 6th December 2013
 
 * Add in choices information for ChoiceFields in response to `OPTIONS` requests.
 * Added `pre_delete()` and `post_delete()` method hooks.
+* Added status code category helper functions.
 * Bugfix: Partial updates which erronously set a related field to `None` now correctly fail validation instead of raising an exception.
 * Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header.
 * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400.
-- 
cgit v1.2.3


From e80b353085c460c5ab7e9b4d22249f01176c5eb1 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 08:10:51 +0000
Subject: Add notes to contributing docs

---
 docs/topics/contributing.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index 2b18c4f6..4dd2718f 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -33,6 +33,8 @@ Some tips on good issue reporting:
 * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing.
 * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue.
 * If reporting a bug, then try to include a pull request with a failing test case.  This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one.
+* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library.  Keeping new feature requests implemented as third party libraries allows us to keep down the maintainence overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation.
+* Closing an issue doesn't necessarily mean the end of a discussion.  If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened.
 
 ## Triaging issues
 
@@ -42,6 +44,7 @@ Getting involved in triaging incoming issues is a good way to start contributing
 * Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group?
 * If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request?
 * If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package?
+* If a ticket hasn't had much activity and it addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again.
 
 # Development
 
-- 
cgit v1.2.3


From 23369650e3502305ebf5d682e141c7d47db89111 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 08:14:21 +0000
Subject: Add notes to contributing docs

---
 docs/topics/contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index 4dd2718f..b3ab52bb 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -10,7 +10,7 @@ There are many ways you can contribute to Django REST framework.  We'd like it t
 
 The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible.  Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case.
 
-If you use REST framework, we'd love you to be vocal about your experiances with it - you might consider writing a blog post on your experience with using REST framework, or publishing a tutorial about using the project with a particular javascript framework.  Experiances from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are and aren't easy to understand and work with.
+If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particularJjavascript framework.  Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with.
 
 Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag.
 
-- 
cgit v1.2.3


From e6f6bb5c7e3e882b0215c981e2f2b6a576820100 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 08:42:09 +0000
Subject: Add notes to contributing docs

---
 docs/topics/contributing.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index b3ab52bb..77c60fb4 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -164,6 +164,16 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
     
     ---
 
+## Third party packages
+
+New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework.  Ideally third party libraries should be properly documented and packaged, and made available on PyPI.
+
+If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved.  We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging.
+
+Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main documentation.
+
+We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package.
+
 [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html
 [code-of-conduct]: https://www.djangoproject.com/conduct/
 [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
@@ -176,3 +186,4 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
 [markdown]: http://daringfireball.net/projects/markdown/basics
 [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs
 [mou]: http://mouapp.com/
+[django-reusable-app]: https://github.com/dabapps/django-reusable-app
-- 
cgit v1.2.3


From c1be503308e755d72aae2c9695739bd33631e18b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 08:46:18 +0000
Subject: Add notes to contributing docs

---
 docs/topics/contributing.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'docs/topics')

diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md
index 77c60fb4..906950bb 100644
--- a/docs/topics/contributing.md
+++ b/docs/topics/contributing.md
@@ -164,16 +164,20 @@ If you want to draw attention to a note or warning, use a pair of enclosing line
     
     ---
 
-## Third party packages
+# Third party packages
 
 New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework.  Ideally third party libraries should be properly documented and packaged, and made available on PyPI.
 
-If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved.  We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging.
+## Getting started
 
-Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main documentation.
+If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved.  We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging.
 
 We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package.
 
+## Linking to your package
+
+Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation.
+
 [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html
 [code-of-conduct]: https://www.djangoproject.com/conduct/
 [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
-- 
cgit v1.2.3


From 2c898bd9018e40a8d0e4718fb2a0e3672e64782c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Dec 2013 09:27:10 +0000
Subject: Update release notes

---
 docs/topics/release-notes.md | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index b080ad43..d3f85e6e 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`:
 
 ## 2.3.x series
 
+### Master
+
+* JSON renderer now deals with objects that implement a dict-like interface.
+
 ### 2.3.10
 
 **Date**: 6th December 2013
-- 
cgit v1.2.3


From 40164fcc6241489033d7015d429cbe0afc674d37 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 10 Dec 2013 08:49:54 +0000
Subject: Update release notes

---
 docs/topics/release-notes.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index d3f85e6e..e186893e 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`:
 ### Master
 
 * JSON renderer now deals with objects that implement a dict-like interface.
+* Bugfix: Refine behavior that call's model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations.
 
 ### 2.3.10
 
-- 
cgit v1.2.3


From c09ad1bedc8559b2e6eadf0e5b8f3732af2d9d29 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 10 Dec 2013 08:53:38 +0000
Subject: Remove incorrect apostrophe

---
 docs/topics/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/topics')

diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index e186893e..1ddd8351 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -43,7 +43,7 @@ You can determine your currently installed version using `pip freeze`:
 ### Master
 
 * JSON renderer now deals with objects that implement a dict-like interface.
-* Bugfix: Refine behavior that call's model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations.
+* Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations.
 
 ### 2.3.10
 
-- 
cgit v1.2.3