From e2ea98e8ab3192fa8d252d33cc03929fcf6ed02f Mon Sep 17 00:00:00 2001
From: Tymur Maryokhin
Date: Sat, 29 Nov 2014 20:23:55 +0100
Subject: Fixed typos

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

(limited to 'docs/tutorial/quickstart.md')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 1c398c1f..3e1ce0a9 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -100,7 +100,7 @@ Okay, now let's wire up the API URLs.  On to `tutorial/urls.py`...
     router.register(r'groups', views.GroupViewSet)
 
     # Wire up our API using automatic URL routing.
-    # Additionally, we include login URLs for the browseable API.
+    # Additionally, we include login URLs for the browsable API.
     urlpatterns = [
         url(r'^', include(router.urls)),
         url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
-- 
cgit v1.2.3


From 34b5db62e560e73516fb569eaf9b71ea5562958f Mon Sep 17 00:00:00 2001
From: phalt
Date: Mon, 1 Dec 2014 13:39:53 +0000
Subject: Use httpie for tutorials

---
 docs/tutorial/quickstart.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'docs/tutorial/quickstart.md')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 1c398c1f..41e864cc 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -24,6 +24,10 @@ Create a new Django project named `tutorial`, then start a new app called `quick
     django-admin.py startapp quickstart
 	cd ..
 
+Optionally, install [httpie][httpie] for tastier HTTP requests:
+
+    pip install httpie
+
 Now sync your database for the first time:
 
     python manage.py migrate
@@ -159,6 +163,30 @@ We can now access our API, both from the command-line, using tools like `curl`..
         ]
     }
 
+Or with [httpie][httpie], a tastier version of `curl`...
+
+    bash: http -a username:password http://127.0.0.1:8000/users/ --body
+    {
+        "count": 2,
+        "next": null,
+        "previous": null,
+        "results": [
+            {
+                "email": "admin@example.com",
+                "groups": [],
+                "url": "http://localhost:8000/users/1/",
+                "username": "paul"
+            },
+            {
+                "email": "tom@example.com",
+                "groups": [                ],
+                "url": "http://127.0.0.1:8000/users/2/",
+                "username": "tom"
+            }
+        ]
+    }
+
+
 Or directly through the browser...
 
 ![Quick start image][image]
@@ -173,3 +201,4 @@ If you want to get a more in depth understanding of how REST framework fits toge
 [image]: ../img/quickstart.png
 [tutorial]: 1-serialization.md
 [guide]: ../#api-guide
+[httpie]: https://github.com/jakubroztocil/httpie#installation
-- 
cgit v1.2.3


From fcbae5d99f93a28c9aac340bf2d4d2a3930e1a6a Mon Sep 17 00:00:00 2001
From: phalt
Date: Thu, 4 Dec 2014 11:20:33 +0000
Subject: updates based on suggestions

---
 docs/tutorial/quickstart.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'docs/tutorial/quickstart.md')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 41e864cc..43220ce8 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -24,10 +24,6 @@ Create a new Django project named `tutorial`, then start a new app called `quick
     django-admin.py startapp quickstart
 	cd ..
 
-Optionally, install [httpie][httpie] for tastier HTTP requests:
-
-    pip install httpie
-
 Now sync your database for the first time:
 
     python manage.py migrate
@@ -163,9 +159,12 @@ We can now access our API, both from the command-line, using tools like `curl`..
         ]
     }
 
-Or with [httpie][httpie], a tastier version of `curl`...
+Or using the [httpie][httpie], command line tool...
+
+    bash: http -a username:password http://127.0.0.1:8000/users/
 
-    bash: http -a username:password http://127.0.0.1:8000/users/ --body
+    HTTP/1.1 200 OK
+    ...
     {
         "count": 2,
         "next": null,
-- 
cgit v1.2.3


From e2b39088345e564a06ce332b740215600c29e481 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 5 Dec 2014 09:44:01 +0000
Subject: Fix quickstart tutorial

---
 docs/tutorial/quickstart.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'docs/tutorial/quickstart.md')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 3e1ce0a9..d0703381 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -19,10 +19,9 @@ Create a new Django project named `tutorial`, then start a new app called `quick
     pip install djangorestframework
 
     # Set up a new project with a single application
-    django-admin.py startproject tutorial
+    django-admin.py startproject tutorial .
     cd tutorial
     django-admin.py startapp quickstart
-	cd ..
 
 Now sync your database for the first time:
 
-- 
cgit v1.2.3


From 4e9ebb5fe9eee2ef6f21718d9becfb8e94bbbe98 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 8 Dec 2014 16:38:17 +0000
Subject: cd back to parent directory

---
 docs/tutorial/quickstart.md | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/tutorial/quickstart.md')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index d0703381..f72fc7dd 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -22,6 +22,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick
     django-admin.py startproject tutorial .
     cd tutorial
     django-admin.py startapp quickstart
+    cd ..
 
 Now sync your database for the first time:
 
-- 
cgit v1.2.3