From 0b21af938825830a85a9cbb6515b985e72f19453 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 2 Jan 2012 18:31:46 +0000
Subject: [PATCH 1/5] Drop mercurial reference.

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 3311bfa99..4141ccf5b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -49,7 +49,7 @@ You can install Django REST framework using ``pip`` or ``easy_install``::
 
     pip install djangorestframework
 
-Or get the latest development version using mercurial or git::
+Or get the latest development version using git::
 
     git clone git@github.com:tomchristie/django-rest-framework.git
 

From 1a72836edce52d50f2775af85a1de4280913c7fb Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 2 Jan 2012 18:36:53 +0000
Subject: [PATCH 2/5] Rename examples in tox.

---
 tox.ini | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index 015b5d2e4..5e07e0f21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -120,7 +120,7 @@ deps=
 
 ####################################### EXAMPLES ################################################
     
-[testenv:py25-django12e]
+[testenv:py25-django12-examples]
 basepython=python2.5
 commands=
 	python examples/runtests.py
@@ -134,7 +134,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py26-django12e]
+[testenv:py26-django12-examples]
 basepython=python2.6
 commands=
 	python examples/runtests.py
@@ -148,7 +148,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py27-django12e]
+[testenv:py27-django12-examples]
 basepython=python2.7
 commands=
 	python examples/runtests.py
@@ -162,7 +162,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py25-django13e]
+[testenv:py25-django13-examples]
 basepython=python2.5
 commands=
 	python examples/runtests.py
@@ -176,7 +176,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py26-django13e]
+[testenv:py26-django13-examples]
 basepython=python2.6
 commands=
 	python examples/runtests.py
@@ -190,7 +190,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py27-django13e]
+[testenv:py27-django13-examples]
 basepython=python2.7
 commands=
 	python examples/runtests.py
@@ -204,7 +204,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 
-[testenv:py25-django14a1e]
+[testenv:py25-django14a1-examples]
 basepython=python2.5
 commands=
 	python examples/runtests.py
@@ -218,7 +218,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py26-django14a1e]
+[testenv:py26-django14a1-examples]
 basepython=python2.6
 commands=
 	python examples/runtests.py
@@ -232,7 +232,7 @@ deps=
     unittest-xml-reporting==1.2
     Pyyaml==3.10
 	
-[testenv:py27-django14a1e]
+[testenv:py27-django14a1-examples]
 basepython=python2.7
 commands=
 	python examples/runtests.py

From 9f349ca6fee18c0b1973173f6ce5fd1f163485dc Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 2 Jan 2012 18:37:41 +0000
Subject: [PATCH 3/5] Rename examples in tox.

---
 tox.ini | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5e07e0f21..6c51cc071 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,15 +12,15 @@ envlist=
     py25-django14a1,
     py26-django14a1,
     py27-django14a1,
-    py25-django12e,
-    py26-django12e,
-    py27-django12e,
-    py25-django13e,
-    py26-django13e,
-    py27-django13e
-    py25-django14a1e,
-    py26-django14a1e,
-    py27-django14a1e
+    py25-django12-examples,
+    py26-django12-examples,
+    py27-django12-examples,
+    py25-django13-examples,
+    py26-django13-examples,
+    py27-django13-examples,
+    py25-django14a1-examples,
+    py26-django14a1-examples,
+    py27-django14a1-examples
 
 ########################################### CORE TESTS ############################################
 

From 48a79a99e35057d4ddfeddeeaf1288ff1e44377a Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 2 Jan 2012 18:39:29 +0000
Subject: [PATCH 4/5] Add 1.4.

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 97aae8230..454674403 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ We also have a `Jenkins service <http://jenkins.tibold.nl/job/djangorestframewor
 Requirements:
 
 * Python (2.5, 2.6, 2.7 supported)
-* Django (1.2, 1.3 supported)
+* Django (1.2, 1.3, 1.4-alpha supported)
 
 
 Installation Notes

From 17290b0beb6bf85c1558cf95cc71124bae97c947 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 2 Jan 2012 18:39:55 +0000
Subject: [PATCH 5/5] Add 1.4

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index 4141ccf5b..b105e1ab7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -39,7 +39,7 @@ Requirements
 ------------
 
 * Python (2.5, 2.6, 2.7 supported)
-* Django (1.2, 1.3 supported)
+* Django (1.2, 1.3, 1.4-alpha supported)
 
 
 Installation