Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit 4a7f9737b092 · 2014-09-01T15:10:39.000-04:00
* 2.4:
  Update home of DoctrineExtensions.
  Update datetime.rst
  Update datetime.rst
diff --git a/cookbook/doctrine/common_extensions.rst b/cookbook/doctrine/common_extensions.rst
@@ -22,12 +22,12 @@ To do this, you have two options:
 #. Implement this services directly by following the documentation for integration
    with Symfony2: `Install Gedmo Doctrine2 extensions in Symfony2`_
 
-.. _`DoctrineExtensions`: https://.com/l3pp4rd/DoctrineExtensions
+.. _`DoctrineExtensions`: https://.com/Atlantic18/DoctrineExtensions
 .. _`StofDoctrineExtensionsBundle`: https://.com/stof/StofDoctrineExtensionsBundle
-.. _`Sluggable`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/sluggable.md
-.. _`Translatable`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/translatable.md
-.. _`Timestampable`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/timestampable.md
-.. _`Loggable`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/loggable.md
-.. _`Tree`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/tree.md
-.. _`Sortable`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/sortable.md
-.. _`Install Gedmo Doctrine2 extensions in Symfony2`: https://.com/l3pp4rd/DoctrineExtensions/blob/master/doc/symfony2.md
+.. _`Sluggable`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/sluggable.md
+.. _`Translatable`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/translatable.md
+.. _`Timestampable`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/timestampable.md
+.. _`Loggable`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/loggable.md
+.. _`Tree`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/tree.md
+.. _`Sortable`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/sortable.md
+.. _`Install Gedmo Doctrine2 extensions in Symfony2`: https://.com/Atlantic18/DoctrineExtensions/blob/master/doc/symfony2.md
diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst
@@ -74,7 +74,7 @@ format
 
 **type**: ``string`` **default**: ``Symfony\Component\Form\Extension\Core\Type\DateTimeType::HTML5_FORMAT``
 
-If the ``widget`` option is set to ``single_text``, this option specifies the
+If the ``widget`` option is set to ``single_text``, this option specifies
 the format of the input, i.e. how Symfony will interpret the given input
 as a datetime string. It defaults to the `RFC 3339`_ format which is used
 by the HTML5 ``datetime`` field. Keeping the default value will cause the
