merged branch ricardclau/add_charset_doc_doctrineprovider (PR #569)

This PR was merged into the master branch.

Commits
-------

d32857ac add charset documentation in doctrine provider

Discussion
----------

[docs] Add charset documentation in doctrine provider

This PR refers to https://github.com/fabpot/Silex/issues/549 and adds documentation on how to setup charset when connecting to mysql

I've also edited the mysql example so that it is even more clear

And last but not least, I've upgraded links to doctrine documentation so that it points to their latest version

---------------------------------------------------------------------------

by ricardclau at 2012-12-30T14:31:32Z

Tests have failed in travis due to a TransportException when downloading Pimple... weird!

doc/providers/doctrine.rst

@@ -29,11 +29,14 @@ Parameters
 
   * **password**: The password of the database to connect to.
 
+  * **charset**: Only relevant for ``pdo_mysql``, ``pdo_oci`` and ``oci8``,
+    specifies the charset used when connecting to the database.
+
   * **path**: Only relevant for ``pdo_sqlite``, specifies the path to
     the SQLite database.
 
   These and additional options are described in detail in the `Doctrine DBAL
-  configuration documentation <http://www.doctrine-project.org/docs/dbal/2.0/en/reference/configuration.html>`_.
+  configuration documentation <http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html>`_.
 
 Services
 --------
@@ -100,6 +103,7 @@ and values are options::
                 'dbname'    => 'my_database',
                 'user'      => 'my_username',
                 'password'  => 'my_password',
+                'charset'   => 'utf8',
             ),
             'mysql_write' => array(
                 'driver'    => 'pdo_mysql',
@@ -107,6 +111,7 @@ and values are options::
                 'dbname'    => 'my_database',
                 'user'      => 'my_username',
                 'password'  => 'my_password',
+                'charset'   => 'utf8',
             ),
         ),
     ));
@@ -133,4 +138,4 @@ Using multiple connections::
     });
 
 For more information, consult the `Doctrine DBAL documentation
-<http://www.doctrine-project.org/docs/dbal/2.0/en/>`_.
+<http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/>`_.