Skip to content

Commit

Permalink
Merge pull request #3969 from rexkerr/fix-versioning-docs
Browse files Browse the repository at this point in the history
Fixes incorrect references to URLPathVersioning
  • Loading branch information
jpadilla committed Feb 27, 2016
2 parents a15e46a + 88320b8 commit eec7c17
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/api-guide/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Your URL conf must include a pattern that matches the version with a `'version'`

## NamespaceVersioning

To the client, this scheme is the same as `URLParameterVersioning`. The only difference is how it is configured in your Django application, as it uses URL namespacing, instead of URL keyword arguments.
To the client, this scheme is the same as `URLPathVersioning`. The only difference is how it is configured in your Django application, as it uses URL namespacing, instead of URL keyword arguments.

GET /v1/something/ HTTP/1.1
Host: example.com
Expand All @@ -165,7 +165,7 @@ In the following example we're giving a set of views two different possible URL
url(r'^v2/bookings/', include('bookings.urls', namespace='v2'))
]

Both `URLParameterVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLParameterVersioning` approach might be better suitable for small ad-hoc projects, and the `NamespaceVersioning` is probably easier to manage for larger projects.
Both `URLPathVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLPathVersioning` approach might be better suitable for small ad-hoc projects, and the `NamespaceVersioning` is probably easier to manage for larger projects.

## HostNameVersioning

Expand Down

0 comments on commit eec7c17

Please sign in to comment.