Merge branch '2.3' into 2.4

weaverryan · weaverryan · commit 281d490f1212 · 2014-08-21T09:12:43.000-04:00
* 2.3:
  add missing Monolog handler type in XML config
diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst
@@ -56,6 +56,7 @@ it is broken down.
                 />
                 <monolog:handler
                     name="swift"
+                    type="swift_mailer"
                     from-email="error@example.com"
                     to-email="error@example.com"
                     subject="An Error Occurred!"
