summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2015-12-02 23:55:50 +0000
committerTim Graham <timograham@gmail.com>2015-12-03 12:49:03 -0500
commit8897f4b0df30f385d0a95156f8a18b4b25cea37e (patch)
tree06b90550ea4c2481adbe89a918817d5b1726e65e /docs
parent519cfbb4e8f388664347fcc708e44148148ed6f8 (diff)
[1.9.x] Fixed many spelling mistakes in code, comments, and docs.
Backport of 93452a70e8a62c7408eeded444f5088d4a26212d from master
Diffstat (limited to 'docs')
-rw-r--r--docs/_theme/djangodocs/static/djangodocs.css2
-rw-r--r--docs/conf.py2
-rw-r--r--docs/ref/contrib/syndication.txt2
-rw-r--r--docs/spelling_wordlist2
-rw-r--r--docs/topics/auth/default.txt2
-rw-r--r--docs/topics/http/sessions.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/_theme/djangodocs/static/djangodocs.css b/docs/_theme/djangodocs/static/djangodocs.css
index 569e53e434..22fce2a158 100644
--- a/docs/_theme/djangodocs/static/djangodocs.css
+++ b/docs/_theme/djangodocs/static/djangodocs.css
@@ -118,7 +118,7 @@ div.admonition-philosophy { padding-left:65px; background:url(docicons-philosoph
div.admonition-behind-the-scenes { padding-left:65px; background:url(docicons-behindscenes.png) .8em .8em no-repeat;}
.admonition.warning { background:url(docicons-warning.png) .8em .8em no-repeat; border:1px solid #ffc83c;}
-/*** versoinadded/changes ***/
+/*** versionadded/changes ***/
div.versionadded, div.versionchanged { }
div.versionadded span.title, div.versionchanged span.title, span.versionmodified { font-weight: bold; }
div.versionadded, div.versionchanged, div.deprecated { color:#555; }
diff --git a/docs/conf.py b/docs/conf.py
index bd80585e49..90d4a29f22 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -6,7 +6,7 @@
# This file is execfile()d with the current directory set to its containing dir.
#
# The contents of this file are pickled, so don't put values in the namespace
-# that aren't pickleable (module imports are okay, they're removed automatically).
+# that aren't picklable (module imports are okay, they're removed automatically).
#
# All configuration values have a default; values that are commented out
# serve to show the default.
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 278e293276..4a77f39435 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -851,7 +851,7 @@ This example illustrates all possible attributes and methods for a
def item_updateddate(self):
"""
- Returns the updateddated for every item in the feed.
+ Returns the updateddate for every item in the feed.
"""
item_updateddate = datetime.datetime(2005, 5, 3) # Hard-coded updateddate.
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index e9e119f1d3..69f7ff24e4 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -556,7 +556,7 @@ Peucker
pgAdmin
phishing
php
-pickleable
+picklable
picosecond
PIL
pingback
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 67d843a017..e11917f52e 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -716,7 +716,7 @@ To apply permission checks to :doc:`class-based views
.. versionadded:: 1.9
- This mixin, just like the ``permisison_required``
+ This mixin, just like the ``permission_required``
decorator, checks whether the user accessing a view has all given
permissions. You should specify the permission (or an iterable of
permissions) using the ``permission_required`` parameter::
diff --git a/docs/topics/http/sessions.txt b/docs/topics/http/sessions.txt
index 89e37bb4b7..f6a5bb4859 100644
--- a/docs/topics/http/sessions.txt
+++ b/docs/topics/http/sessions.txt
@@ -663,7 +663,7 @@ Technical details
* The session dictionary accepts any :mod:`json` serializable value when using
:class:`~django.contrib.sessions.serializers.JSONSerializer` or any
- pickleable Python object when using
+ picklable Python object when using
:class:`~django.contrib.sessions.serializers.PickleSerializer`. See the
:mod:`pickle` module for more information.