summaryrefslogtreecommitdiff
path: root/docs/topics/http
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-01-01 08:12:42 -0500
committerTim Graham <timograham@gmail.com>2013-01-02 18:50:00 -0500
commitbe1e006c581cc45ed48ae0b423e7a0a996d2199b (patch)
tree5e33669588d7c8d2a49d99f82ae87524d22a9455 /docs/topics/http
parent61c861546bdbae694f22e2c54e9ca0f42331cae1 (diff)
[1.5.x] Fixed #19516 - Fixed remaining broken links.
Added -n to sphinx builds to catch issues going forward. Backport of 9b5f64cc6e from master.
Diffstat (limited to 'docs/topics/http')
-rw-r--r--docs/topics/http/file-uploads.txt4
-rw-r--r--docs/topics/http/views.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/topics/http/file-uploads.txt b/docs/topics/http/file-uploads.txt
index b3a830c25e..53499359e3 100644
--- a/docs/topics/http/file-uploads.txt
+++ b/docs/topics/http/file-uploads.txt
@@ -227,8 +227,8 @@ field in the model::
``UploadedFile`` objects
========================
-In addition to those inherited from :class:`File`, all ``UploadedFile`` objects
-define the following methods/attributes:
+In addition to those inherited from :class:`~django.core.files.File`, all
+``UploadedFile`` objects define the following methods/attributes:
.. attribute:: UploadedFile.content_type
diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
index caa2882f37..79d702e045 100644
--- a/docs/topics/http/views.txt
+++ b/docs/topics/http/views.txt
@@ -132,6 +132,8 @@ Customizing error views
The 404 (page not found) view
-----------------------------
+.. function:: django.views.defaults.page_not_found(request, template_name='404.html')
+
When you raise an ``Http404`` exception, Django loads a special view devoted
to handling 404 errors. By default, it's the view
``django.views.defaults.page_not_found``, which either produces a very simple