summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorFloris den Hengst <florisdenhengst@gmail.com>2015-03-07 17:34:33 +0100
committerBaptiste Mispelon <bmispelon@gmail.com>2015-03-07 17:59:03 +0100
commite42a720ba22a51c68d2316d425234a197eaff467 (patch)
treeed4b713f5d58841134df6d8a4337474d6692cae8 /docs
parent87d78241a2fc85e5715fb51c554fe06e91deee58 (diff)
Fixed typos and updated spelling wordlist.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/applications.txt2
-rw-r--r--docs/ref/contrib/admin/actions.txt2
-rw-r--r--docs/ref/contrib/gis/gdal.txt2
-rw-r--r--docs/ref/files/uploads.txt4
-rw-r--r--docs/spelling_wordlist194
-rw-r--r--docs/topics/db/sql.txt2
6 files changed, 197 insertions, 9 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt
index 9029e55635..5ca931ad89 100644
--- a/docs/ref/applications.txt
+++ b/docs/ref/applications.txt
@@ -241,7 +241,7 @@ Methods
In the usual initialization process, the ``ready`` method is only called
once by Django. But in some corner cases, particularly in tests which
are fiddling with installed applications, ``ready`` might be called more
- than once. In that case, either write idempotents methods, or put a flag
+ than once. In that case, either write idempotent methods, or put a flag
on your ``AppConfig`` classes to prevent re-running code which should
be executed exactly one time.
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index 5757e2e39b..b3d9f0eb0d 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -70,7 +70,7 @@ Writing action functions
------------------------
First, we'll need to write a function that gets called when the action is
-trigged from the admin. Action functions are just regular functions that take
+triggered from the admin. Action functions are just regular functions that take
three arguments:
* The current :class:`ModelAdmin`
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index b3f168ed4a..1f52921d22 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -6,7 +6,7 @@ GDAL API
:synopsis: GeoDjango's high-level interface to the GDAL library.
`GDAL`__ stands for **Geospatial Data Abstraction Library**,
-and is a veritable "swiss army knife" of GIS data functionality. A subset
+and is a veritable "Swiss army knife" of GIS data functionality. A subset
of GDAL is the `OGR`__ Simple Features Library, which specializes
in reading and writing vector geographic data in a variety of standard
formats.
diff --git a/docs/ref/files/uploads.txt b/docs/ref/files/uploads.txt
index bb2bbad321..8bbdb161c3 100644
--- a/docs/ref/files/uploads.txt
+++ b/docs/ref/files/uploads.txt
@@ -109,8 +109,8 @@ Subclasses of ``UploadedFile`` include:
A file uploaded into memory (i.e. stream-to-memory). This class is used
by the :class:`~django.core.files.uploadhandler.MemoryFileUploadHandler`.
-Built-in upload handers
-=======================
+Built-in upload handlers
+========================
.. module:: django.core.files.uploadhandler
:synopsis: Django's handlers for file uploads.
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index d32046da77..e9fe8cdfec 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -1,15 +1,22 @@
à
Aalto
accessor
+accessors
Aceh
+Activations
addslashes
admin
admindocs
admins
+affine
aggregator
Ai
Alchin
+alphanumerics
amet
+amongst
+analytics
+Angeles
Anssi
apnumber
Apolloner
@@ -20,7 +27,10 @@ architected
arg
args
assistive
+atomicity
+Atomicity
attr
+Augustin
auth
autoclobber
autocommit
@@ -36,6 +46,7 @@ autoescaping
autogenerated
autoincrement
autoreload
+Aviv
Aymeric
Azerbaijani
backend
@@ -44,6 +55,7 @@ backport
backported
backports
backtraces
+balancer
basename
bbcontains
bboverlaps
@@ -53,9 +65,13 @@ bcrypt
Bcrypt
beatles
Beaven
+benchmarking
+Benoit
Berners
Biggs
+bitwise
Bjørn
+blazingly
blocktrans
blog
blogs
@@ -65,6 +81,8 @@ Bokmål
bolded
bookmarklets
Bookmarklets
+boolean
+booleans
bpython
Bronn
bugfix
@@ -73,6 +91,7 @@ bugfixing
buildbot
builtin
builtins
+bulleted
Byteorder
bytestring
bytestrings
@@ -82,6 +101,9 @@ callables
camelcase
camelCase
capfirst
+cardinality
+centric
+centroid
changelist
Changelist
changepassword
@@ -91,6 +113,8 @@ checkbox
checkboxes
checkin
Checkin
+checksum
+checksums
clearable
clearsessions
clickable
@@ -98,6 +122,7 @@ clickjacking
cms
codebase
codec
+coercible
collectstatic
commenter
commenters
@@ -111,8 +136,8 @@ contactdata
ContentType
contenttypes
contrib
-coveredby
Córdoba
+coveredby
createcachetable
createdb
createsuperuser
@@ -120,25 +145,42 @@ criticals
cron
crontab
crossref
+cryptographic
+Cryptographic
+cryptographically
+Cryptographically
csrf
csrfmiddlewaretoken
css
csv
Ctrl
customizability
+customizable
+Customizable
+customizations
daemonizing
+Dahl
+Daly
Danga
+Daniele
Darussalam
dat
databrowse
Databrowse
+datafile
+dataset
+datasets
datatype
datetimes
dbshell
de
+deactivations
Debian
+declaratively
deconstruct
deconstructing
+decrement
+decrementing
deduplicates
deepcopy
deserialization
@@ -147,6 +189,7 @@ deserialized
deserializer
deserializing
Deserializing
+Deutsch
dev
dict
dictConfig
@@ -155,15 +198,18 @@ dictsort
dictsortreversed
diff
diffsettings
+Dimensionally
+dimensioned
dirmod
+discoverable
Disqus
distro
divisibleby
django
-Django's
djangojs
djangonaut
djangoproject
+Django's
dm
docstring
docstrings
@@ -183,9 +229,11 @@ dumpdata
Dunck
dwithin
editability
+encodings
Endian
endswith
Enero
+environ
escapejs
esque
Ess
@@ -194,15 +242,22 @@ ETag
ETags
exe
extendible
+extensibility
+Extensibility
fabfile
fabfiles
Facebook
+facto
fallback
fallbacks
faq
FastCGI
fieldset
fieldsets
+filename
+Filename
+filenames
+Filenames
filesizeformat
filesystem
filesystems
@@ -215,9 +270,12 @@ Flatpage
flatpages
Flatpages
floatformat
+Florian
flup
followup
fooapp
+formatters
+Formatters
formfield
formset
formsets
@@ -226,8 +284,10 @@ freenode
Friedl
Frysian
fu
+functionalities
gdal
geo
+Geoff
geoip
geolibs
geolocalized
@@ -237,6 +297,7 @@ geoquerysets
georeference
georeferenced
georeferencing
+Georg
geospatial
Geospatial
Gettext
@@ -245,6 +306,7 @@ gid
gis
github
globalization
+Godwin
google
Googol
Graz
@@ -262,8 +324,10 @@ hardcode
hardcoded
hardcoding
hashable
+hasher
hashers
headerlist
+hoc
Hoerner
Holovaty
Homebrew
@@ -289,16 +353,21 @@ ifnotequal
iframe
inbox
Incompliance
+incrementing
indices
ing
ini
init
+initializer
inline
inlines
inspectdb
Instagram
+instantiation
intcomma
+interdependencies
internet
+interoperability
intranet
intword
ip
@@ -327,6 +396,8 @@ JServ
Julien
jython
Kääriäinen
+Kaplan
+Kessler
keyservers
KiB
kilometre
@@ -345,6 +416,7 @@ lhs
lifecycle
lifecycles
lighttpd
+linearize
linebreaks
linebreaksbr
linenumbers
@@ -357,10 +429,22 @@ localflavor
localflavors
localhost
localizable
+localizers
localtime
+login
+Login
+logout
+Logout
Loïc
+lookup
+Lookup
+lookups
+Lookups
loopback
lorem
+Los
+lowercased
+lowercasing
lt
lte
Luhn
@@ -369,6 +453,8 @@ makemessages
makemigrations
Mako
Mapnik
+Marino
+Markus
MBR
memcache
memcached
@@ -385,15 +471,23 @@ middlewares
migrationname
millimetre
Minification
+minified
+minify
+mis
+misconfiguration
Mispelon
mixin
mixins
modelforms
modelformset
+modularly
modwsgi
monkeypatched
Montréal
mssql
+multi
+Multi
+multicolumn
multijoins
multiline
multipart
@@ -413,10 +507,12 @@ Namespaced
namespaces
namespacing
Nanggroe
+natively
naturalday
naturaltime
nd
needsinfo
+nestable
neuroscientist
newforms
nginx
@@ -429,6 +525,9 @@ OGR
ogrinspect
oldforms
online
+ons
+onwards
+optimizations
orderable
O'Reilly
org
@@ -439,6 +538,7 @@ Outdim
outfile
paginator
Palau
+parameterized
params
parens
pdf
@@ -446,6 +546,7 @@ PEM
perl
permalink
pessimization
+Petri
Peucker
pgAdmin
phishing
@@ -458,17 +559,22 @@ pingbacks
Pinney
Pinterest
plaintext
+pluggable
+Pluggable
plugin
plugins
+pluralizations
po
podcast
popup
+postfix
postgis
postgres
Postgres
postgresql
pq
pre
+precisions
preconfigured
prefetch
prefetched
@@ -478,11 +584,14 @@ preforked
prepend
prepended
prepending
+prepends
prepopulate
prepopulated
prepopulates
preprocess
preprocesses
+preprocessing
+Preprocessing
Procida
programmatically
projectname
@@ -506,6 +615,7 @@ Querysets
querystring
queueing
Quickstart
+quo
quoteless
Radziej
rc
@@ -513,20 +623,35 @@ rebase
rebased
rebasing
recomputation
+recursed
+redeclare
+redirections
+redisplay
+redisplayed
+redisplaying
+redisplays
refactor
refactored
+refactoring
refactorings
refactors
referer
reflow
regex
regexes
+registrable
reimplement
reindent
reindex
+reinstall
+reinstalls
+releaser
releasers
+reloader
removetags
+renderer
repo
+reportable
reprojection
reraise
reST
@@ -534,17 +659,20 @@ reStructuredText
reupload
reusability
revalidate
+reverter
rhs
rjust
roadmap
Roald
rss
runserver
+runtime
SaaS
safeseq
Sandvik
savepoint
savepoints
+scalable
Schaub
schemas
screencast
@@ -576,6 +704,7 @@ slashdot
sliceable
slippy
slugify
+SMTP
solaris
Solr
spaceless
@@ -594,12 +723,15 @@ stacktrace
startapp
startproject
startswith
+startup
stateful
staticfile
staticfiles
stderr
stdlib
stdout
+storages
+Storages
stringformat
striptags
Stufft
@@ -607,25 +739,44 @@ stylesheet
stylesheets
subclass
subclassed
+subclasses
+Subclasses
subclassing
+subcommand
+subcommands
+Subcommands
subdir
+subdirectories
+subdirectory
subdomain
subdomains
+subfields
sublanguage
+sublist
subminor
+submodule
+submodules
subpackage
subpackages
subqueries
subquery
subselect
substr
+substring
+Substring
subtemplate
subtemplates
+subtree
+subtype
subviews
subwidgets
+superclass
+superset
+swappable
symlink
symlinking
symlinks
+syntaxes
sysadmin
systemwide
tablespace
@@ -642,7 +793,11 @@ templating
testcase
testserver
textarea
+th
+that'll
+That'll
Thejaswi
+This'll
timedelta
timeframe
timeline
@@ -650,36 +805,53 @@ timelines
timesaving
timesince
timestamp
+timestamped
+timestamps
timeuntil
+timezones
titlecase
tmp
+tokenized
toolbar
+toolkits
toolset
trac
+tracebacks
+transactional
Transifex
Tredinnick
triager
triagers
+triaging
+Triaging
truncatechars
truncatewords
+tuple
+tuples
tv
txt
tz
ubuntu
Ubuntuusers
ul
+Ulrich
umask
Unaccent
-unassigning
unapplied
unapply
unapplying
+unassigning
+uncategorized
uncheck
unclaim
+uncommented
uncopyable
unencoded
+unencrypted
unescape
unescaped
+unevaluated
+unglamorous
ungrouped
unhandled
unharmful
@@ -691,18 +863,29 @@ uniterated
unittest
unittests
unlocalize
+unlocalized
+unmanaged
+Unmanaged
+unordered
unparseable
+unparsed
unpickle
unpickled
unpickling
+unpopulated
unpythonic
unregistration
unrendered
+unreproducible
Unreviewed
unsanitized
+unselected
unsets
unsquashed
untar
+untrusted
+unvalidated
+uptime
url
urlencode
urlize
@@ -727,9 +910,11 @@ VARCHAR
variadic
vendored
vendorname
+versa
versioned
versioning
vertices
+viewable
virtualenv
virtualized
Votizen
@@ -744,6 +929,8 @@ webservers
whatsnext
whitelist
whitelisted
+whitespace
+Whitespace
whitespaces
whizbang
widthratio
@@ -766,4 +953,5 @@ xref
XSS
xxxxx
yesno
+Zealand
Zope
diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
index 0c382e811d..0b39bcda4d 100644
--- a/docs/topics/db/sql.txt
+++ b/docs/topics/db/sql.txt
@@ -56,7 +56,7 @@ options that make it very powerful.
.. admonition:: Model table names
- Where'd the name of the ``Person`` table come from in that example?
+ Where did the name of the ``Person`` table come from in that example?
By default, Django figures out a database table name by joining the
model's "app label" -- the name you used in ``manage.py startapp`` -- to