diff --git a/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index c5bb6c1df9..0983cc1d87 100644
--- a/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -41,7 +41,7 @@ class DoctrineExtension extends LoaderExtension
*
* Usage example:
*
- *
+ *
*
* @param array $config A configuration array
*
@@ -54,7 +54,7 @@ class DoctrineExtension extends LoaderExtension
$loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load($this->resources['dbal']));
- foreach (array('dbname', 'host', 'username', 'password', 'path', 'port') as $key)
+ foreach (array('dbname', 'host', 'user', 'password', 'path', 'port') as $key)
{
if (isset($config[$key]))
{
diff --git a/src/Symfony/Framework/DoctrineBundle/Resources/config/schema/dic/doctrine/doctrine-1.0.xsd b/src/Symfony/Framework/DoctrineBundle/Resources/config/schema/dic/doctrine/doctrine-1.0.xsd
index 69445f5faa..739887949b 100644
--- a/src/Symfony/Framework/DoctrineBundle/Resources/config/schema/dic/doctrine/doctrine-1.0.xsd
+++ b/src/Symfony/Framework/DoctrineBundle/Resources/config/schema/dic/doctrine/doctrine-1.0.xsd
@@ -11,7 +11,7 @@
-
+