Skip to content

Commit 2257852

Browse files
xordoquytomchristie
xordoquy
authored and
tomchristie
committed
Documentation update (encode#4717)
1 parent 4f6c326 commit 2257852

21 files changed

+36
-36
lines changed

‎docs/api-guide/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a
363363
[oauth]: http://oauth.net/2/
364364
[permission]: permissions.md
365365
[throttling]: throttling.md
366-
[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
366+
[csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax
367367
[mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization
368368
[django-oauth-toolkit-getting-started]: https://django-oauth-toolkit.readthedocs.io/en/latest/rest-framework/getting_started.html
369369
[django-rest-framework-oauth]: http://jpadilla.github.io/django-rest-framework-oauth/

‎docs/api-guide/fields.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -665,12 +665,12 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides geog
665665

666666
The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreField` to support [django-hstore][django-hstore] `DictionaryField` model field.
667667

668-
[cite]: https://docs.djangoproject.com/en/dev/ref/forms/api/#django.forms.Form.cleaned_data
668+
[cite]: https://docs.djangoproject.com/en/stable/ref/forms/api/#django.forms.Form.cleaned_data
669669
[html-and-forms]: ../topics/html-and-forms.md
670-
[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS
670+
[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS
671671
[ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15
672672
[strftime]: https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior
673-
[django-widgets]: https://docs.djangoproject.com/en/dev/ref/forms/widgets/
673+
[django-widgets]: https://docs.djangoproject.com/en/stable/ref/forms/widgets/
674674
[iso8601]: http://www.w3.org/TR/NOTE-datetime
675675
[drf-compound-fields]: https://drf-compound-fields.readthedocs.io
676676
[drf-extra-fields]: https://github.com/Hipo/drf-extra-fields

‎docs/api-guide/filtering.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,14 +455,14 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter]
455455

456456
[drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements.
457457

458-
[cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters
458+
[cite]: https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-specific-objects-with-filters
459459
[django-filter]: https://github.com/alex/django-filter
460460
[django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html
461461
[guardian]: https://django-guardian.readthedocs.io/
462462
[view-permissions]: https://django-guardian.readthedocs.io/en/latest/userguide/assign.html
463463
[view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models
464464
[nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py
465-
[search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields
465+
[search-django-admin]: https://docs.djangoproject.com/en/stable/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields
466466
[django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters
467467
[django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter
468468
[django-url-filter]: https://github.com/miki725/django-url-filter

‎docs/api-guide/generic-views.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ The [django-rest-framework-bulk package][django-rest-framework-bulk] implements
382382
[Django Rest Multiple Models][django-rest-multiple-models] provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request.
383383

384384

385-
[cite]: https://docs.djangoproject.com/en/dev/ref/class-based-views/#base-vs-generic-views
385+
[cite]: https://docs.djangoproject.com/en/stable/ref/class-based-views/#base-vs-generic-views
386386
[GenericAPIView]: #genericapiview
387387
[ListModelMixin]: #listmodelmixin
388388
[CreateModelMixin]: #createmodelmixin

‎docs/api-guide/pagination.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin`
325325

326326
The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter.
327327

328-
[cite]: https://docs.djangoproject.com/en/dev/topics/pagination/
328+
[cite]: https://docs.djangoproject.com/en/stable/topics/pagination/
329329
[github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/
330330
[link-header]: ../img/link-header-pagination.png
331331
[drf-extensions]: http://chibisov.github.io/drf-extensions/docs/

‎docs/api-guide/parsers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Modify your REST framework settings.
224224

225225
[jquery-ajax]: http://api.jquery.com/jQuery.ajax/
226226
[cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion
227-
[upload-handlers]: https://docs.djangoproject.com/en/dev/topics/http/file-uploads/#upload-handlers
227+
[upload-handlers]: https://docs.djangoproject.com/en/stable/topics/http/file-uploads/#upload-handlers
228228
[rest-framework-yaml]: http://jpadilla.github.io/django-rest-framework-yaml/
229229
[rest-framework-xml]: http://jpadilla.github.io/django-rest-framework-xml/
230230
[yaml]: http://www.yaml.org/

‎docs/api-guide/permissions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ The [Django Rest Framework Roles][django-rest-framework-roles] package makes it
269269
[authentication]: authentication.md
270270
[throttling]: throttling.md
271271
[filtering]: filtering.md
272-
[contribauth]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#custom-permissions
273-
[objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions
272+
[contribauth]: https://docs.djangoproject.com/en/stable/topics/auth/customizing/#custom-permissions
273+
[objectpermissions]: https://docs.djangoproject.com/en/stable/topics/auth/customizing/#handling-object-permissions
274274
[guardian]: https://github.com/lukaszb/django-guardian
275275
[get_objects_for_user]: http://pythonhosted.org/django-guardian/api/guardian.shortcuts.html#get-objects-for-user
276276
[2.2-announcement]: ../topics/2.2-announcement.md

‎docs/api-guide/relations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ For example, given the following model for a tag, which has a generic relationsh
505505
"""
506506
Tags arbitrary model instances using a generic relation.
507507

508-
See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/
508+
See: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/
509509
"""
510510
tag_name = models.SlugField()
511511
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
@@ -593,9 +593,9 @@ The [drf-nested-routers package][drf-nested-routers] provides routers and relati
593593
The [rest-framework-generic-relations][drf-nested-relations] library provides read/write serialization for generic foreign keys.
594594

595595
[cite]: http://lwn.net/Articles/193245/
596-
[reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward
596+
[reverse-relationships]: https://docs.djangoproject.com/en/stable/topics/db/queries/#following-relationships-backward
597597
[routers]: http://www.django-rest-framework.org/api-guide/routers#defaultrouter
598-
[generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1
598+
[generic-relations]: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/#id1
599599
[2.2-announcement]: ../topics/2.2-announcement.md
600600
[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers
601601
[drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations

‎docs/api-guide/renderers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily
476476
[Rest Framework Latex] provides a renderer that outputs PDFs using Laulatex. It is maintained by [Pebble (S/F Software)][mypebble].
477477

478478

479-
[cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process
479+
[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/#the-rendering-process
480480
[conneg]: content-negotiation.md
481481
[html-and-forms]: ../topics/html-and-forms.md
482482
[browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers
@@ -485,7 +485,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily
485485
[quote]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven
486486
[application/vnd.github+json]: http://developer.github.com/v3/media/
487487
[application/vnd.collection+json]: http://www.amundsen.com/media-types/collection/
488-
[django-error-views]: https://docs.djangoproject.com/en/dev/topics/http/views/#customizing-error-views
488+
[django-error-views]: https://docs.djangoproject.com/en/stable/topics/http/views/#customizing-error-views
489489
[rest-framework-jsonp]: http://jpadilla.github.io/django-rest-framework-jsonp/
490490
[cors]: http://www.w3.org/TR/cors/
491491
[cors-docs]: http://www.django-rest-framework.org/topics/ajax-csrf-cors/

‎docs/api-guide/responses.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ As with any other `TemplateResponse`, this method is called to render the serial
9191

9292
You won't typically need to call `.render()` yourself, as it's handled by Django's standard response cycle.
9393

94-
[cite]: https://docs.djangoproject.com/en/dev/ref/template-response/
94+
[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/
9595
[statuscodes]: status-codes.md

‎docs/api-guide/reverse.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ As with the `reverse` function, you should **include the request as a keyword ar
5151
api_root = reverse_lazy('api-root', request=request)
5252

5353
[cite]: http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm#sec_5_1_5
54-
[reverse]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse
55-
[reverse-lazy]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse-lazy
54+
[reverse]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse
55+
[reverse-lazy]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse-lazy

‎docs/api-guide/schemas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,5 +541,5 @@ A short description of the meaning and intended usage of the input field.
541541
[open-api]: https://openapis.org/
542542
[json-hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html
543543
[api-blueprint]: https://apiblueprint.org/
544-
[static-files]: https://docs.djangoproject.com/en/dev/howto/static-files/
545-
[named-arguments]: https://docs.djangoproject.com/en/dev/topics/http/urls/#named-groups
544+
[static-files]: https://docs.djangoproject.com/en/stable/howto/static-files/
545+
[named-arguments]: https://docs.djangoproject.com/en/stable/topics/http/urls/#named-groups

‎docs/api-guide/serializers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali
11181118

11191119
[cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion
11201120
[relations]: relations.md
1121-
[model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/
1121+
[model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/
11221122
[encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/
11231123
[django-rest-marshmallow]: http://tomchristie.github.io/django-rest-marshmallow/
11241124
[marshmallow]: https://marshmallow.readthedocs.io/en/latest/

‎docs/api-guide/testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,6 @@ For example, to add support for using `format='html'` in test requests, you migh
373373
}
374374

375375
[cite]: http://jacobian.org/writing/django-apps-with-buildout/#s-create-a-test-wrapper
376-
[client]: https://docs.djangoproject.com/en/dev/topics/testing/tools/#the-test-client
377-
[requestfactory]: https://docs.djangoproject.com/en/dev/topics/testing/advanced/#django.test.client.RequestFactory
376+
[client]: https://docs.djangoproject.com/en/stable/topics/testing/tools/#the-test-client
377+
[requestfactory]: https://docs.djangoproject.com/en/stable/topics/testing/advanced/#django.test.client.RequestFactory
378378
[configuration]: #configuration

‎docs/api-guide/throttling.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,5 @@ The following is an example of a rate throttle, that will randomly throttle 1 in
193193
[cite]: https://dev.twitter.com/docs/error-codes-responses
194194
[permissions]: permissions.md
195195
[identifing-clients]: http://oxpedia.org/wiki/index.php?title=AppSuite:Grizzly#Multiple_Proxies_in_front_of_the_cluster
196-
[cache-setting]: https://docs.djangoproject.com/en/dev/ref/settings/#caches
197-
[cache-docs]: https://docs.djangoproject.com/en/dev/topics/cache/#setting-up-the-cache
196+
[cache-setting]: https://docs.djangoproject.com/en/stable/stable/settings/#caches
197+
[cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache

‎docs/api-guide/validators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,4 @@ In some advanced cases you might want a validator to be passed the serializer fi
300300
# In `__call__` we can then use that information to modify the validation behavior.
301301
self.is_update = serializer_field.parent.instance is not None
302302

303-
[cite]: https://docs.djangoproject.com/en/dev/ref/validators/
303+
[cite]: https://docs.djangoproject.com/en/stable/ref/validators/

‎docs/topics/2.2-announcement.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ When using a serializer with a `HyperlinkedRelatedField` or `HyperlinkedIdentity
147147
From version 2.2 onwards, serializers with hyperlinked relationships *always* require a `'request'` key to be supplied in the context dictionary. The implicit behavior will continue to function, but its use will raise a `PendingDeprecationWarning`.
148148

149149
[xordoquy]: https://github.com/xordoquy
150-
[django-python-3]: https://docs.djangoproject.com/en/dev/faq/install/#can-i-use-django-with-python-3
151-
[porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/
152-
[python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility
153-
[django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy
150+
[django-python-3]: https://docs.djangoproject.com/en/stable/faq/install/#can-i-use-django-with-python-3
151+
[porting-python-3]: https://docs.djangoproject.com/en/stable/topics/python3/
152+
[python-compat]: https://docs.djangoproject.com/en/stable/releases/1.5/#python-compatibility
153+
[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy
154154
[credits]: http://www.django-rest-framework.org/topics/credits
155155
[mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework
156156
[django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs

‎docs/topics/2.4-announcement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ The next planned release will be 3.0, featuring an improved and simplified seria
162162

163163
Once again, many thanks to all the generous [backers and sponsors][kickstarter-sponsors] who've helped make this possible!
164164

165-
[lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases
165+
[lts-releases]: https://docs.djangoproject.com/en/stable/internals/release-process/#long-term-support-lts-releases
166166
[2-4-release-notes]: release-notes#240
167167
[view-name-and-description-settings]: ../api-guide/settings#view-names-and-descriptions
168168
[client-ip-identification]: ../api-guide/throttling#how-clients-are-identified

‎docs/topics/3.0-announcement.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ The `COMPACT_JSON` setting has been added, and can be used to revert this behavi
870870

871871
#### File fields as URLs
872872

873-
The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's [standard `MEDIA_URL` setting](https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/dev/howto/static-files/#serving-uploaded-files-in-development).
873+
The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's [standard `MEDIA_URL` setting](https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/stable/howto/static-files/#serving-uploaded-files-in-development).
874874

875875
You can revert this behavior, and display filenames in the representation by using the `UPLOADED_FILES_USE_URL` settings key:
876876

@@ -962,4 +962,4 @@ You can follow development on the GitHub site, where we use [milestones to indic
962962
[kickstarter]: http://kickstarter.com/projects/tomchristie/django-rest-framework-3
963963
[sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors
964964
[mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py
965-
[django-localization]: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#localization-how-to-create-language-files
965+
[django-localization]: https://docs.djangoproject.com/en/stable/topics/i18n/translation/#localization-how-to-create-language-files

‎docs/topics/ajax-csrf-cors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The best way to deal with CORS in REST framework is to add the required response
3535

3636
[cite]: http://www.codinghorror.com/blog/2008/10/preventing-csrf-and-xsrf-attacks.html
3737
[csrf]: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)
38-
[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
38+
[csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax
3939
[cors]: http://www.w3.org/TR/cors/
4040
[ottoyiu]: https://github.com/ottoyiu/
4141
[django-cors-headers]: https://github.com/ottoyiu/django-cors-headers/

‎docs/topics/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ For older release notes, [please see the version 2.x documentation][old-release-
598598

599599
[cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html
600600
[deprecation-policy]: #deprecation-policy
601-
[django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy
601+
[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy
602602
[defusedxml-announce]: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
603603
[743]: https://github.com/tomchristie/django-rest-framework/pull/743
604604
[staticfiles14]: https://docs.djangoproject.com/en/1.4/howto/static-files/#with-a-template-tag

0 commit comments

Comments
 (0)