diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt index 619fc6a985..c9e9f1fc28 100644 --- a/docs/ref/contrib/gis/db-api.txt +++ b/docs/ref/contrib/gis/db-api.txt @@ -29,7 +29,8 @@ MySQL Spatial Limitations MySQL's spatial extensions only support bounding box operations (what MySQL calls minimum bounding rectangles, or MBR). Specifically, -`MySQL does not conform to the OGC standard `_: +`MySQL does not conform to the OGC standard +`_: Currently, MySQL does not implement these functions [``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``, @@ -52,6 +53,7 @@ on a different spatial backend. Creating and Saving Geographic Models ===================================== + Here is an example of how to create a geometry object (assuming the ``Zipcode`` model):: @@ -303,8 +305,8 @@ Method PostGIS Oracle SpatiaLite .. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms `_, PostGIS documentation at Ch. 4.1.2. .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification `_, Revision 1.0 (June 16, 2008). .. [#fndistsphere15] *See* `PostGIS 1.5 documentation `_ on ``ST_distance_sphere``. -.. [#fnmysqlidx] *See* `Creating Spatial Indexes `_ - in the MySQL 5.1 Reference Manual: +.. [#fnmysqlidx] *See* `Creating Spatial Indexes `_ + in the MySQL Reference Manual: For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage engines that support nonspatial indexing of spatial columns, the engine diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index a4d5eb2deb..cea54c361f 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -171,17 +171,14 @@ Version support Django supports MySQL 5.0.3 and higher. -`MySQL 5.0`_ adds the ``information_schema`` database, which contains detailed -data on all database schema. Django's ``inspectdb`` feature uses it. +Django's ``inspectdb`` feature uses the ``information_schema`` database, which +contains detailed data on all database schemas. Django expects the database to support Unicode (UTF-8 encoding) and delegates to it the task of enforcing transactions and referential integrity. It is important to be aware of the fact that the two latter ones aren't actually enforced by MySQL when using the MyISAM storage engine, see the next section. -.. _MySQL: http://www.mysql.com/ -.. _MySQL 5.0: http://dev.mysql.com/doc/refman/5.0/en/index.html - .. _mysql-storage-engines: Storage engines @@ -212,9 +209,9 @@ running ``migrate``:: 1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)" ) -.. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html -.. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html -.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-storage-engine.html +.. _storage engines: http://dev.mysql.com/doc/refman/5.6/en/storage-engines.html +.. _MyISAM: http://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html +.. _InnoDB: http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html .. [#] Unless this was changed by the packager of your MySQL package. We've had reports that the Windows Community Server installer sets up InnoDB as @@ -297,7 +294,7 @@ If you plan on using Django's :doc:`timezone support `, use `mysql_tzinfo_to_sql`_ to load time zone tables into the MySQL database. This needs to be done just once for your MySQL server, not per database. -.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html +.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html Creating your database ---------------------- @@ -308,7 +305,7 @@ You can `create your database`_ using the command-line tools and this SQL:: This ensures all tables and columns will use UTF-8 by default. -.. _create your database: http://dev.mysql.com/doc/refman/5.0/en/create-database.html +.. _create your database: http://dev.mysql.com/doc/refman/5.6/en/create-database.html .. _mysql-collation: @@ -322,7 +319,7 @@ the MySQL documentation. In all cases, you set the collation by directly manipulating the database tables; Django doesn't provide a way to set this on the model definition. -.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.0/en/charset.html +.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.6/en/charset.html By default, with a UTF-8 database, MySQL will use the ``utf8_general_ci`` collation. This results in all string equality @@ -420,7 +417,7 @@ Several other MySQLdb connection options may be useful, such as ``ssl``, ``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for more details. -.. _MySQL option file: http://dev.mysql.com/doc/refman/5.0/en/option-files.html +.. _MySQL option file: http://dev.mysql.com/doc/refman/5.6/en/option-files.html .. _MySQLdb documentation: http://mysql-python.sourceforge.net/ Creating your tables diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 613b1d3094..294eeb6ef5 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -688,7 +688,7 @@ object. If it's ``None``, Django uses the :ref:`current time zone .. _pytz: http://pytz.sourceforge.net/ .. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES .. _Choosing a Time Zone File: http://docs.oracle.com/cd/B19306_01/server.102/b14225/ch4datetime.htm#i1006667 - .. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html + .. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html none ~~~~ @@ -2581,8 +2581,7 @@ Note this is only available in MySQL and requires direct manipulation of the database to add the full-text index. By default Django uses BOOLEAN MODE for full text searches. See the `MySQL documentation`_ for additional details. -.. _MySQL documentation: http://dev.mysql.com/doc/refman/5.1/en/fulltext-boolean.html - +.. _MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/fulltext-boolean.html .. fieldlookup:: regex diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 6637de16b9..913f49f47c 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -613,7 +613,7 @@ Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``) backends. .. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html -.. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html +.. _MySQL: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html .. setting:: TEST_COLLATION diff --git a/docs/ref/unicode.txt b/docs/ref/unicode.txt index 9f10d5a43a..90201d2d33 100644 --- a/docs/ref/unicode.txt +++ b/docs/ref/unicode.txt @@ -17,8 +17,8 @@ data. Normally, this means giving it an encoding of UTF-8 or UTF-16. If you use a more restrictive encoding -- for example, latin1 (iso8859-1) -- you won't be able to store certain characters in the database, and information will be lost. -* MySQL users, refer to the `MySQL manual`_ (section 10.1.3.2 for MySQL 5.1) - for details on how to set or alter the database character set encoding. +* MySQL users, refer to the `MySQL manual`_ for details on how to set or alter + the database character set encoding. * PostgreSQL users, refer to the `PostgreSQL manual`_ (section 22.3.2 in PostgreSQL 9) for details on creating databases with the correct encoding. @@ -26,7 +26,7 @@ able to store certain characters in the database, and information will be lost. * SQLite users, there is nothing you need to do. SQLite always uses UTF-8 for internal encoding. -.. _MySQL manual: http://dev.mysql.com/doc/refman/5.1/en/charset-database.html +.. _MySQL manual: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html .. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html All of Django's database backends automatically convert Unicode strings into diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt index aca396be0a..1d94153707 100644 --- a/docs/releases/1.6.txt +++ b/docs/releases/1.6.txt @@ -491,7 +491,7 @@ pytz_. If you're using MySQL, you must install pytz_ and load the time zone tables with `mysql_tzinfo_to_sql`_. .. _pytz: http://pytz.sourceforge.net/ -.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.5/en/mysql-tzinfo-to-sql.html +.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html Addition of ``QuerySet.datetimes()`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt index 6871e3e4a6..06b8285652 100644 --- a/docs/topics/db/transactions.txt +++ b/docs/topics/db/transactions.txt @@ -447,7 +447,7 @@ function in autocommit mode: statements will be executed and committed as soon as they're called. If your MySQL setup *does* support transactions, Django will handle transactions as explained in this document. -.. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.0/en/sql-syntax-transactions.html +.. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.6/en/sql-syntax-transactions.html Handling exceptions within PostgreSQL transactions --------------------------------------------------