--- a/debian/copyright	Thu Jan 09 15:08:54 2014 +0100
+++ b/debian/copyright	Thu Jan 09 16:16:34 2014 +0100
@@ -41,6 +41,6 @@
     Entypo pictograms are licensed under CC BY-SA 3.0 and the font
     under SIL Open Font License.
 
-    The rights to each pictogram in the social extention are either
+    The rights to each pictogram in the social extension are either
     trademarked or copyrighted by the respective company.
 

--- a/doc/3.15.rst	Thu Jan 09 15:08:54 2014 +0100
+++ b/doc/3.15.rst	Thu Jan 09 16:16:34 2014 +0100
@@ -13,7 +13,7 @@
   used for entity cache invalidation.
 
 * Improved WSGI support. While there is still some caveats, most of the code
-  which as twisted only is now generic and allows related functionalities to work
+  which was twisted only is now generic and allows related functionalities to work
   with a WSGI front-end.
 
 * Full undo/transaction support : undo of modification has eventually been

--- a/doc/3.18.rst	Thu Jan 09 15:08:54 2014 +0100
+++ b/doc/3.18.rst	Thu Jan 09 16:16:34 2014 +0100
@@ -22,6 +22,15 @@
 * the embedded jQuery copy has been updated to version 1.10.2, and jQuery UI to
   version 1.10.3.
 
+* initial support for wsgi for the debug mode, available through the new
+  ``wsgi`` cubicweb-ctl command, which can use either python's builtin
+  wsgi server or the werkzeug module if present.
+
+* a ``rql-table`` directive is now available in ReST fields
+
+* cubicweb-ctl upgrade can now generate the static data resource directory
+  directly, without a manual call to gen-static-datadir.
+
 API changes
 -----------
 
@@ -46,6 +55,13 @@
 * BreadCrumbEntityVComponent's open_breadcrumbs method now includes
   the first breadcrumbs separator
 
+* entities can be compared for equality and hashed
+
+* the ``on_fire_transition`` predicate accepts a sequence of possible
+  transition names
+
+* the GROUP_CONCAT rql aggregate function no longer repeats duplicate
+  values, on the sqlite and postgresql backends
 
 Deprecation
 ---------------------
@@ -59,6 +75,8 @@
 * `find_one_entity` and `find_entities` in favor of `find`
   (see `#3361290 https://www.cubicweb.org/ticket/3361290`_)
 
+* the `TmpFileViewMixin` and `TmpPngView` classes (see `#3400448
+  https://www.cubicweb.org/ticket/3400448`_)
 
 Deprecated Code Drops
 ----------------------
@@ -73,3 +91,5 @@
 * all 3.8 backward compat is gone
 
 * all 3.9 backward compat (including the javascript side) is gone
+
+* the ``twisted`` (web-only) instance type has been removed

--- a/doc/4.0.rst	Thu Jan 09 15:08:54 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-What's new in CubicWeb 4.0?
-============================
-
-Deprecated Code Drops
-----------------------
-
-* The ldapuser source has been dropped. ldapfeed is the only official source
-  remaining for ldap.