Commit 08f38d19 authored by Floris den Hengst's avatar Floris den Hengst Committed by Tim Graham
Browse files

[1.7.x] Fixed doc typos.

Backport of e42a720b from master
parent f8ed6474
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,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.

+1 −1
Original line number Diff line number Diff line
@@ -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`
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,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.
+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,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.
+1 −1
Original line number Diff line number Diff line
@@ -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