Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 25)
+++ trunk/docs/Changelog	(revision 27)
@@ -1,3 +1,8 @@
 2.2.0:
+	* add copyright/license info to test scripts
+	* add copyright/license info to deployment system scripts
+	* support server-to-server relay
+	* new CL option --server-port
+	* minor improvements in manual
 	* patch by Yoann Vandoorselaere for sh_prelude.c
 	* allow --longopt arg as well as --longopt=arg
Index: trunk/docs/README.UPGRADE
===================================================================
--- trunk/docs/README.UPGRADE	(revision 25)
+++ trunk/docs/README.UPGRADE	(revision 27)
@@ -1,2 +1,12 @@
+
+since 2.2.0: server-to-server relay is possible
+
+  -- this implies that problems will arise if your server is misconfigured
+     to connect to itself (SetExportSeverity is explicitely set
+     to a threshold different from 'none', and the logserver is set to 
+     localhost). The server may deadlock in this case.
+
+
+
 since 2.1.0: update and daemon mode can be combined