summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-06-01 08:01:05 -0400
committerTim Graham <timograham@gmail.com>2016-06-01 08:29:28 -0400
commitbad894d5b82d91eb1d0c45bbd6efc9e34413dcd0 (patch)
tree60583eac206e0818244739a7fcec69c6a3dcc449
parent58f0d40b6d98bf9ad2861cf742f7b2a327cc8068 (diff)
[1.10.x] Fixed #26695 -- Clarified return value of View.options().
Thanks mmoreaux and DheerendraRathor. Backport of db2a6b6bfa9881725e70ca579a17e942a97a4df8 from master
-rw-r--r--docs/ref/class-based-views/base.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index d22d63cd6f..abc3767e7f 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -99,8 +99,10 @@ MRO is an acronym for Method Resolution Order.
.. method:: options(request, *args, **kwargs)
- Handles responding to requests for the OPTIONS HTTP verb. Returns a
- list of the allowed HTTP method names for the view.
+ Handles responding to requests for the OPTIONS HTTP verb. Returns a
+ response with the ``Allow`` header containing a list of the view's
+ allowed HTTP method names.
+
``TemplateView``
================