symfony · nicolas-grekas · Dec 16, 2014 · Sep 30, 2014 · Sep 30, 2014 · Sep 30, 2014
diff --git a/CHANGELOG-2.6.md b/CHANGELOG-2.6.md
@@ -0,0 +1,48 @@
+CHANGELOG for 2.6.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 2.6 minor versions.
+
+To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.6.0...v2.6.1
+
+* 2.6.1 (2014-12-03)
+
+ * bug #12823 [DependencyInjection] fix PhpDumper (nicolas-grekas)
+ * bug #12811 Configure firewall's kernel exception listener with configured entry point or a default entry point (rjkip)
+ * bug #12770 [Filesystem] fix lock file permissions (nicolas-grekas)
+ * bug #12784 [DependencyInjection] make paths relative to __DIR__ in the generated container (nicolas-grekas)
+ * bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
+
+* 2.6.0 (2014-11-28)
+
+ * bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
+ * bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
+ * bug #12437  [Validator] make DateTime objects represented as strings in the violation message (hhamon)
+ * bug #12575 [WebProfilerBundle] Remove usage of app.request in search bar template (jeromemacias)
+ * bug #12570 Fix initialized() with aliased services (Daniel Wehner)
+
+* 2.6.0-BETA2 (2014-11-23)
+
+ * bug #12555 [Debug] fix ENT_SUBSTITUTE usage (nicolas-grekas)
+ * feature #12538 [FrameworkBundle] be smarter when guessing the document root (xabbuh)
+ * bug #12539 [TwigBundle] properly set request attributes in controller test (xabbuh)
+ * bug #12267 [Form][WebProfiler] Empty form names fix (kix)
+ * bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
+ * bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
+ * bug #12296 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners (rjkip)
+ * bug #12446 [Twig/DebugBundle] move dump extension registration (nicolas-grekas)
+ * bug #12489 [FrameworkBundle] Fix server run in case the router script does not exist (romainneutron)
+ * feature #12404 [Form] Remove timezone options from DateType and TimeType (jakzal)
+ * bug #12487 [DomCrawler] Added support for 'link' tags in the Link class (StephaneSeng)
+ * bug #12490 [FrameworkBundle] Fix server start in case the PHP binary is not found (romainneutron)
+ * bug #12443 [HttpKernel] Adding support for invokable controllers in the RequestDataCollector (jameshalsall)
+ * bug #12393 [DependencyInjection] inlined factory not referenced (boekkooi)
+ * bug #12411 [VarDumper] Use Unicode Control Pictures (nicolas-grekas)
+ * bug #12436 [Filesystem] Fixed case for empty folder (yosmanyga)
+
+* 2.6.0-BETA1 (2014-11-03)
+
+ * first beta release
+
diff --git a/UPGRADE-2.5.md b/UPGRADE-2.5.md
@@ -109,7 +109,7 @@ Validator
 
    After:
 
-   Default email validation is now done via a simple regex which may cause invalid emails (not RFC compilant) to be
+   Default email validation is now done via a simple regex which may cause invalid emails (not RFC compliant) to be
    valid. This is the default behaviour.
 
    Strict email validation has to be explicitly activated in the configuration file by adding