django/django

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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

Updated the `databases` documentation

Loading branch information...

commit 4aa006efd0f7402f795bb0cf893d0747802d93f8 2 parents 997e305 + fa217d1

timgraham authored July 19, 2013

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

12  docs/ref/databases.txt

12  docs/ref/databases.txt

show inline notes

View

              
    @@ -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,

0 notes on commit `4aa006e`

Please sign in to comment.

public django/django

HTTPS clone URL

Subversion checkout URL

0 notes on commit 4aa006e

0 notes on commit `4aa006e`