[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/ddd1bb6ac071
changeset:   86060:ddd1bb6ac071
parent:      86058:0a51e097ad6d
parent:      86059:3bc02a63596c
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 12:38:57 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/sqlite3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -174,7 +174,7 @@
    For the *isolation_level* parameter, please see the
    :attr:`Connection.isolation_level` property of :class:`Connection` objects.
 
-   SQLite natively supports only the types TEXT, INTEGER, FLOAT, BLOB and NULL. If
+   SQLite natively supports only the types TEXT, INTEGER, REAL, BLOB and NULL. If
    you want to use other types you must add support for them yourself. The
    *detect_types* parameter and the using custom **converters** registered with the
    module-level :func:`register_converter` function allow you to easily do that.

-- 
Repository URL: http://hg.python.org/cpython