X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=CHANGES;h=8838a21542b0e1b2bc3adf04276b4c967fd82673;hb=1d4c6389c946128da73c6b3355f5200868e64112;hp=9fdfba2a963b54007b8f13c5962833a772586f5a;hpb=18286b6efb3b772d2db04a7ff7fd4c3be764fee0;p=jinja2.git

diff --git a/CHANGES b/CHANGES
index 9fdfba2..8838a21 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,23 @@
 Jinja2 Changelog
 ================
 
-Version 2.6
+Version 2.7
 -----------
 (codename to be selected, release date to be announced)
 
+- Choice and prefix loaders now dispatch source and template lookup
+  separately in order to work in combination with module loaders as
+  advertised.
+- Fixed filesizeformat.
+- Added a non-silent option for babel extraction.
+- Added `urlescape` filter that automatically quotes values for
+  URL safe usage with utf-8 as only supported encoding.  If applications
+  want to change this encoding they can override the filter.
+
+Version 2.6
+-----------
+(codename Convolution, released on July 24th 2011)
+
 - internal attributes now raise an internal attribute error now instead
   of returning an undefined.  This fixes problems when passing undefined
   objects to Python semantics expecting APIs.
@@ -15,7 +28,7 @@ Version 2.6
   integers instead of longs)
 - groupby filter now supports dotted notation for grouping by attributes
   of attributes.
-- scoped blocks not properly treat toplevel assignments and imports.
+- scoped blocks now properly treat toplevel assignments and imports.
   Previously an import suddenly "disappeared" in a scoped block.
 - automatically detect newer Python interpreter versions before loading code
   from bytecode caches to prevent segfaults on invalid opcodes.  The segfault