Merge branch '1.2' into 1.3

* 1.2: Changed Doctrine page to use utf8mb4 as sample

Merge branch '1.2' into 1.3
* 1.2: Changed Doctrine page to use utf8mb4 as sample
b682c867 · Fabien Potencier · 1b5f29d3 · e46e475d · b682c867
Commit b682c867 authored May 28, 2015 by Fabien Potencier
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

doc/providers/doctrine.rst doc/providers/doctrine.rst +2 -2

No files found.
--- a/doc/providers/doctrine.rst
+++ b/doc/providers/doctrine.rst
@@ -100,7 +100,7 @@ and values are options::
                'dbname'    => 'my_database',
                'user'      => 'my_username',
                'password'  => 'my_password',
-                'charset'   => 'utf8',
+                'charset'   => 'utf8mb4',
            ),
            'mysql_write' => array(
                'driver'    => 'pdo_mysql',
@@ -108,7 +108,7 @@ and values are options::
                'dbname'    => 'my_database',
                'user'      => 'my_username',
                'password'  => 'my_password',
-                'charset'   => 'utf8',
+                'charset'   => 'utf8mb4',
            ),
        ),
    ));