Skip to content

Commit 4aa006e

Browse files
committed
Merge pull request #1377 from Matt-Stevens/doc-fixes-ref-databases
Updated the `databases` documentation
2 parents 997e305 + fa217d1 commit 4aa006e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docs/ref/databases.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ MySQL when using the MyISAM storage engine, see the next section.
208208
Storage engines
209209
---------------
210210

211-
MySQL has several `storage engines`_ (previously called table types). You can
212-
change the default storage engine in the server configuration.
211+
MySQL has several `storage engines`_. You can change the default storage engine
212+
in the server configuration.
213213

214214
Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
215215
MyISAM are that it doesn't support transactions or enforce foreign-key
@@ -232,7 +232,7 @@ running ``syncdb``::
232232

233233
.. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
234234
.. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html
235-
.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb.html
235+
.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-storage-engine.html
236236

237237
.. [#] Unless this was changed by the packager of your MySQL package. We've
238238
had reports that the Windows Community Server installer sets up InnoDB as
@@ -718,9 +718,9 @@ as empty strings.
718718
Threaded option
719719
----------------
720720

721-
If you plan to run Django in a multithreaded environment (e.g. Apache in Windows
722-
using the default MPM module), then you **must** set the ``threaded`` option of
723-
your Oracle database configuration to True::
721+
If you plan to run Django in a multithreaded environment (e.g. Apache using the
722+
the default MPM module on any modern operating system), then you **must** set
723+
the ``threaded`` option of your Oracle database configuration to True::
724724

725725
'OPTIONS': {
726726
'threaded': True,

0 commit comments

Comments
 (0)