Commit 4d13cc56 authored by Eric Boersma's avatar Eric Boersma Committed by Tim Graham
Browse files

Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 

The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
parent 93dd31ca

django/contrib/gis/db/models/sql/conversion.py

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ class DistanceField(BaseField): 
class GeomField(BaseField):

    """

    Wrapper for Geometry values.  It is a lightweight alternative to 

    using GeometryField (which requires a SQL query upon instantiation).

    using GeometryField (which requires an SQL query upon instantiation).

    """

    pass

django/db/backends/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ class BaseDatabaseOperations(object): 


    def cache_key_culling_sql(self):

        """

        Returns a SQL query that retrieves the first cache key greater than the

        Returns an SQL query that retrieves the first cache key greater than the

        n smallest.



        This is used by the 'db' cache backend to determine where to start
@@ -960,7 +960,7 @@ class BaseDatabaseOperations(object): 


    def random_function_sql(self):

        """

        Returns a SQL expression that returns a random value.

        Returns an SQL expression that returns a random value.

        """

        return 'RANDOM()'

docs/internals/contributing/writing-documentation.txt

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ documentation: 


* **MySQL**, **PostgreSQL**, **SQLite**



* **SQL** -- when referring to SQL, the expected pronunciation should be

  "Ess Queue Ell" and not "sequel". Thus in a phrase like "Returns an

  SQL expression", "SQL" should be preceded by "an" and not "a".



* **Python** -- when referring to the language, capitalize Python.



* **realize**, **customize**, **initialize**, etc. -- use the American

docs/ref/contrib/gis/testing.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ database to use. It automatically defaults to ``'template_postgis'`` 
^^^^^^^^^^^^^^^^^^^



When GeoDjango's spatial backend initializes on PostGIS, it has to perform

a SQL query to determine the version in order to figure out what

an SQL query to determine the version in order to figure out what

features are available. Advanced users wishing to prevent this additional

query may set the version manually using a 3-tuple of integers specifying

the major, minor, and subminor version numbers for PostGIS. For example,

docs/ref/databases.txt

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ Parameters not quoted in ``connection.queries`` 
``sqlite3`` does not provide a way to retrieve the SQL after quoting and

substituting the parameters. Instead, the SQL in ``connection.queries`` is

rebuilt with a simple string interpolation. It may be incorrect. Make sure

you add quotes where necessary before copying a query into a SQLite shell.

you add quotes where necessary before copying a query into an SQLite shell.



.. _oracle-notes: