Merge branch 'master' into localizedfloatfield

docs/topics/funding.md

@@ -147,7 +147,7 @@ Sign up for a paid plan today, and help ensure that REST framework becomes a sus
 >  It's really awesome that this project continues to endure. The code base is top notch and the maintainers are committed to the highest level of quality.
 DRF is one of the core reasons why Django is top choice among web frameworks today. In my opinion, it sets the standard for rest frameworks for the development community at large.
 >
-> — agconti, Django REST framework user
+> — Andrew Conti, Django REST framework user
 
 ---
 

docs/tutorial/4-authentication-and-permissions.md

@@ -209,7 +209,7 @@ We can make a successful request by including the username and password of one o
     http -a tom:password123 POST http://127.0.0.1:8000/snippets/ code="print 789"
 
     {
-        "id": 5,
+        "id": 1,
         "owner": "tom",
         "title": "foo",
         "code": "print 789",

docs/tutorial/7-schemas-and-client-libraries.md

@@ -41,7 +41,7 @@ view in our URL configuration.
     schema_view = get_schema_view(title='Pastebin API')
 
     urlpatterns = [
-        url('^schema/$', schema_view),
+        url(r'^schema/$', schema_view),
         ...
     ]