Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #1377 from Matt-Stevens/doc-fixes-ref-databases

Updated the `databases` documentation
  • Loading branch information...
commit 4aa006efd0f7402f795bb0cf893d0747802d93f8 2 parents 997e305 + fa217d1
Tim Graham authored 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
@@ -208,8 +208,8 @@ MySQL when using the MyISAM storage engine, see the next section.
208 208
 Storage engines
209 209
 ---------------
210 210
 
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.
213 213
 
214 214
 Until MySQL 5.5.4, the default engine was MyISAM_ [#]_. The main drawbacks of
215 215
 MyISAM are that it doesn't support transactions or enforce foreign-key
@@ -232,7 +232,7 @@ running ``syncdb``::
232 232
 
233 233
 .. _storage engines: http://dev.mysql.com/doc/refman/5.5/en/storage-engines.html
234 234
 .. _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
236 236
 
237 237
 .. [#] Unless this was changed by the packager of your MySQL package. We've
238 238
    had reports that the Windows Community Server installer sets up InnoDB as
@@ -718,9 +718,9 @@ as empty strings.
718 718
 Threaded option
719 719
 ----------------
720 720
 
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::
724 724
 
725 725
             'OPTIONS': {
726 726
                 'threaded': True,

0 notes on commit 4aa006e

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