diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 5af429d16..6fdb77c86 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -273,6 +273,8 @@ Default: `'accept'` The name of a URL parameter that may be used to override the default `Accept` header based content negotiation. +If the value of this setting is `None` then URL format overloading will be disabled. + Default: `'format'` --- diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index f644e6ec7..449cd3802 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -72,20 +72,24 @@ {% if 'GET' in allowed_methods %}
{% endif %}