diff options
| author | Tom Christie | 2015-03-16 11:57:42 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-03-16 11:57:42 +0000 |
| commit | 4cd49d5de38b860e4b2260d7fa82dbdf9256c6e8 (patch) | |
| tree | 139e2ae4df198e3d672e7b47ef875e48cf1311da /docs/topics | |
| parent | c573e7b4a8b4fedfe70b934571284d84e9a81103 (diff) | |
| parent | 1c0db6dda8235bc0bfab2370ea6c6d0fd08a1da5 (diff) | |
| download | django-rest-framework-4cd49d5de38b860e4b2260d7fa82dbdf9256c6e8.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/3.1-announcement.md | 2 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 6eb3681f..80d4007e 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -206,4 +206,4 @@ This will either be made as a single 3.2 release, or split across two separate r [pagination]: ../api-guide/pagination.md [versioning]: ../api-guide/versioning.md [internationalization]: internationalization.md -[customizing-field-mappings]: ../api-guide/serializers.md/#customizing-field-mappings +[customizing-field-mappings]: ../api-guide/serializers.md#customizing-field-mappings diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 35592feb..84d310c2 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -154,7 +154,7 @@ For older release notes, [please see the version 2.x documentation](old-release- [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion [ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 -[old-release-notes]: http://tomchristie.github.io/rest-framework-2-docs/topics/release-notes#24x-series +[old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/version-2.4.x/docs/topics/release-notes.md [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 |