summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-19 03:31:15 -0700
committerTim Graham <timograham@gmail.com>2013-07-19 03:31:15 -0700
commit4aa006efd0f7402f795bb0cf893d0747802d93f8 (patch)
treeba29174a94a9cf5b5f19b3c807fa8d3a503bf98d
parent997e305d24b0245085a8364fe7ed15b8def82e0b (diff)
parentfa217d14a040cb09f8359d8ac613cc1dac220619 (diff)
Merge pull request #1377 from Matt-Stevens/doc-fixes-ref-databases
Updated the `databases` documentation
-rw-r--r--docs/ref/databases.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 4e5f136e2e..29f2f3972d 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -208,8 +208,8 @@ MySQL when using the MyISAM storage engine, see the next section.
Storage engines
---------------
-MySQL has several `storage engines`_ (previously called table types). You can
-change the default storage engine in the server configuration.
+MySQL has several `storage engines`_. You can change the default storage engine
+in the server configuration.
Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
MyISAM are that it doesn't support transactions or enforce foreign-key
@@ -232,7 +232,7 @@ running ``syncdb``::
.. _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.html
+.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/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
@@ -718,9 +718,9 @@ as empty strings.
Threaded option
----------------
-If you plan to run Django in a multithreaded environment (e.g. Apache in Windows
-using the default MPM module), then you **must** set the ``threaded`` option of
-your Oracle database configuration to True::
+If you plan to run Django in a multithreaded environment (e.g. Apache using the
+the default MPM module on any modern operating system), then you **must** set
+the ``threaded`` option of your Oracle database configuration to True::
'OPTIONS': {
'threaded': True,