--- a/doc/4.0.rst	Thu Jun 27 19:02:06 2013 +0200
+++ b/doc/4.0.rst	Thu Jun 27 19:09:23 2013 +0200
@@ -129,6 +129,9 @@
   standard instance attributes. ``set_cnx`` and ``_init_repo`` class methods
   become instance methods.
 
+* ``set_cnxset`` and ``free_cnxset`` are deprecated. cnxset are now
+  automatically managed.
+
 
 Deprecated Code Drops
 ----------------------

--- a/server/session.py	Thu Jun 27 19:02:06 2013 +0200
+++ b/server/session.py	Thu Jun 27 19:09:23 2013 +0200
@@ -629,10 +629,14 @@
                 cnxset.cnxset_freed()
                 self.repo._free_cnxset(cnxset)
 
+    @deprecated('[4.0] cnxset are automatically managed now.'
+                ' stop using explicit set and free.')
     def set_cnxset(self):
         self._auto_free_cnx_set = False
         return self._set_cnxset()
 
+    @deprecated('[4.0] cnxset are automatically managed now.'
+                ' stop using explicit set and free.')
     def free_cnxset(self, ignoremode=False):
         self._auto_free_cnx_set = True
         return self._free_cnxset(ignoremode=ignoremode)