Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.5.x] Updated the `databases` documentation

 + Removed a reference about MySQL storage engines also being
   called 'table types', as this term has been deprecated for
   8 years and is no longer used.

 + Fixed the link to the official InnoDB storage engine docs.

 + Apache (versions >= 2.4) will always choose a multi-threaded
   MPM module on modern operating systems (later than 2002).

Backport of fa217d1 from master
  • Loading branch information...
commit 9386bbc75f23a8b9bd747eb3b37bc220fe04563b 1 parent c89cc4f
Matt Deacalion Stevens authored July 19, 2013 timgraham committed July 19, 2013

Showing 1 changed file with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. 12  docs/ref/databases.txt
12  docs/ref/databases.txt
@@ -151,8 +151,8 @@ MySQL when using the MyISAM storage engine, see the next section.
151 151
 Storage engines
152 152
 ---------------
153 153
 
154  
-MySQL has several `storage engines`_ (previously called table types). You can
155  
-change the default storage engine in the server configuration.
  154
+MySQL has several `storage engines`_. You can change the default storage engine
  155
+in the server configuration.
156 156
 
157 157
 Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
158 158
 MyISAM are that it doesn't support transactions or enforce foreign-key
@@ -187,7 +187,7 @@ key references and an `IntegrityError` is raised if any are found.
187 187
 
188 188
 .. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
189 189
 .. _MyISAM: http://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html
190  
-.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb.html
  190
+.. _InnoDB: http://dev.mysql.com/doc/refman/5.5/en/innodb-storage-engine.html
191 191
 
192 192
 .. [#] Unless this was changed by the packager of your MySQL package. We've
193 193
    had reports that the Windows Community Server installer sets up InnoDB as
@@ -655,9 +655,9 @@ as empty strings.
655 655
 Threaded option
656 656
 ----------------
657 657
 
658  
-If you plan to run Django in a multithreaded environment (e.g. Apache in Windows
659  
-using the default MPM module), then you **must** set the ``threaded`` option of
660  
-your Oracle database configuration to True::
  658
+If you plan to run Django in a multithreaded environment (e.g. Apache using the
  659
+the default MPM module on any modern operating system), then you **must** set
  660
+the ``threaded`` option of your Oracle database configuration to True::
661 661
 
662 662
             'OPTIONS': {
663 663
                 'threaded': True,

0 notes on commit 9386bbc

Please sign in to comment.
Something went wrong with that request. Please try again.