summaryrefslogtreecommitdiffstats
path: root/application/config/migration.php
diff options
context:
space:
mode:
authorftwbzhao <b.zhao1@gmail.com>2015-07-06 10:47:54 +0200
committerftwbzhao <b.zhao1@gmail.com>2015-07-06 10:47:54 +0200
commit5cd726abed384ce594d07cc59dcd61f613f10d49 (patch)
treea59af74d4084620ab360a26a403eb2a7495364d2 /application/config/migration.php
parent820f06f63de3da890a87a88161daea0fd1be8caa (diff)
parentc79a62c5c43c75a3dbc0af77433694340b235047 (diff)
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Conflicts: user_guide_src/source/changelog.rst
Diffstat (limited to 'application/config/migration.php')
-rw-r--r--application/config/migration.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/migration.php b/application/config/migration.php
index 083bf287c..4b585a65c 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -21,12 +21,12 @@ $config['migration_enabled'] = FALSE;
| Migration file names may be based on a sequential identifier or on
| a timestamp. Options are:
|
-| 'sequential' = Default migration naming (001_add_blog.php)
+| 'sequential' = Sequential migration naming (001_add_blog.php)
| 'timestamp' = Timestamp migration naming (20121031104401_add_blog.php)
| Use timestamp format YYYYMMDDHHIISS.
|
-| If this configuration value is missing the Migration library defaults
-| to 'sequential' for backward compatibility.
+| Note: If this configuration value is missing the Migration library
+| defaults to 'sequential' for backward compatibility with CI2.
|
*/
$config['migration_type'] = 'timestamp';