Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.83 -r1.84
--- openacs-4/packages/acs-tcl/acs-tcl.info	26 Jun 2018 10:11:33 -0000	1.83
+++ openacs-4/packages/acs-tcl/acs-tcl.info	27 Jun 2018 10:14:58 -0000	1.84
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.10.0d11" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d11.apm">
+    <version name="5.10.0d12" url="http://openacs.org/repository/download/apm/acs-tcl-5.10.0d12.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2017-08-06</release-date>
@@ -18,7 +18,7 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.10.0d11"/>
+        <provides url="acs-tcl" version="5.10.0d12"/>
         <requires url="acs-bootstrap-installer" version="5.10.0d3"/>
         <requires url="acs-kernel" version="5.9.1"/>
 
Index: openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl	26 Jun 2018 09:56:54 -0000	1.2
+++ openacs-4/packages/acs-tcl/tcl/acs-cache-procs.tcl	27 Jun 2018 10:14:58 -0000	1.3
@@ -175,9 +175,8 @@
     #
     # Simple Partitioned Cache class
     #
-    # Partitioning is based on a modulo function using the provided
-    # key, which has to be numeric. So far, no partitioning-spanning
-    # methods are provided.
+    # Partitioning is based on a modulo function using the cache
+    # key, which has to be numeric.
     #
     ##########################################################################
 
@@ -219,15 +218,14 @@
 
     ##########################################################################
     #
-    # Tree Partitioned Cache class
+    # Class for key-partitioned caches
     #
-    # Tree Partitioning is based on a modulo function using a special
-    # partition_key, which has to be numeric. So far, no
-    # partitioning-spanning methods are provided.
+    # Key-partitioning is based on a modulo function using a special
+    # partition_key, which has to be numeric - at least for the time being. 
     #
     ##########################################################################
 
-    nx::Class create ::acs::TreePartitionedCache -superclasses ::acs::PartitionedCache {
+    nx::Class create ::acs::KeyPartitionedCache -superclasses ::acs::PartitionedCache {
 	:property {partitions:integer 1}
 
 	:public method flush_pattern {{-partition_key:integer,required} pattern} {
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.111 -r1.112
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	26 Jun 2018 09:10:44 -0000	1.111
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	27 Jun 2018 10:14:58 -0000	1.112
@@ -1288,7 +1288,7 @@
             #   ns_param SiteNodesChildenCacheSize  100000
             #
 
-            ::acs::TreePartitionedCache create ::acs::site_nodes_cache \
+            ::acs::KeyPartitionedCache create ::acs::site_nodes_cache \
                 -package_key acs-tcl \
                 -parameter SiteNodesCache \
                 -default_size 2000000
@@ -1298,7 +1298,7 @@
                 -parameter SiteNodesIdCache \
                 -default_size 100000
 
-            ::acs::TreePartitionedCache create ::acs::site_nodes_children_cache \
+            ::acs::KeyPartitionedCache create ::acs::site_nodes_children_cache \
                 -package_key acs-tcl \
                 -parameter SiteNodesChildenCache \
                 -default_size 100000
Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -r1.102 -r1.103
--- openacs-4/packages/xotcl-core/xotcl-core.info	26 Jun 2018 10:24:24 -0000	1.102
+++ openacs-4/packages/xotcl-core/xotcl-core.info	27 Jun 2018 10:14:58 -0000	1.103
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="5.10.0d10" url="http://media.wu-wien.ac.at/download/xotcl-core-5.10.0d10.apm">
+    <version name="5.10.0d11" url="http://media.wu-wien.ac.at/download/xotcl-core-5.10.0d11.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
         <release-date>2017-08-06</release-date>
@@ -43,12 +43,12 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-core" version="5.10.0d10"/>
+        <provides url="xotcl-core" version="5.10.0d11"/>
 	<requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-templating" version="5.9.1"/>
 	<requires url="acs-api-browser" version="5.9.1"/>
 	<requires url="acs-content-repository" version="5.9.1"/>
-        <requires url="acs-tcl" version="5.10.0d11"/>
+        <requires url="acs-tcl" version="5.10.0d12"/>
 
         <callbacks>
             <callback type="before-install"  proc="::xotcl-core::before-install"/>
Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -r1.133 -r1.134
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	26 Jun 2018 10:24:24 -0000	1.133
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	27 Jun 2018 10:14:58 -0000	1.134
@@ -748,7 +748,7 @@
         -partitions 2
     ns_log notice "... created ::xo::xotcl_object_cache"
 
-    ::acs::TreePartitionedCache create ::xo::xotcl_object_type_cache \
+    ::acs::KeyPartitionedCache create ::xo::xotcl_object_type_cache \
         -package_key xotcl-core \
         -parameter XOTclObjectTypeCache \
         -default_size 50000