Index: openacs-4/packages/xowiki/tcl/xowiki-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-init.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/xowiki/tcl/xowiki-init.tcl	26 Aug 2020 18:46:08 -0000	1.3.2.2
+++ openacs-4/packages/xowiki/tcl/xowiki-init.tcl	9 Sep 2020 10:27:17 -0000	1.3.2.3
@@ -13,6 +13,15 @@
     nsv_unset xowiki must_update_hkeys
 }
 
+# Make sure, the site-wide pages are loaded and/or refetched when the
+# source code in the prototype pages changed.
+#
+try {
+  ::xowiki::Package require_site_wide_pages -refetch_if_modified true
+} on error {errorMsg} {
+  ns_log error "xowiki-init:  require_site_wide_pages lead to: $errorMsg"
+}
+
 set ::xowiki::search_mounted_p 1
 set search_driver [parameter::get -package_id [apm_package_id_from_key search] \
                        -parameter FtsEngineDriver]
Index: openacs-4/packages/xowiki/www/prototypes/folder.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/folder.form.page,v
diff -u -r1.11.6.1 -r1.11.6.2
--- openacs-4/packages/xowiki/www/prototypes/folder.form.page	29 Jul 2020 11:02:10 -0000	1.11.6.1
+++ openacs-4/packages/xowiki/www/prototypes/folder.form.page	9 Sep 2020 10:27:17 -0000	1.11.6.2
@@ -4,8 +4,8 @@
     -title "Folder Form" \
     -set anon_instances t \
     -set text {@_description@} \
-    -set form {<form>@_description@ @index@ @extra_menu_entries@ @langstring@</form>} \
-    -set form_constraints {extra_menu_entries:menuentries _nls_language:omit _name:required _page_order:omit langstring:textarea _description:richtext,default={{child-resources}},label=Content}
+    -set form {<form>@_description@ @index@ @extra_menu_entries@</form>} \
+    -set form_constraints {extra_menu_entries:menuentries _nls_language:omit _name:required _page_order:omit _title:localized_text _description:richtext,default={{child-resources}},label=Content}
 
 
 
Index: openacs-4/packages/xowiki/www/prototypes/link.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/link.page,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/xowiki/www/prototypes/link.page	13 Sep 2012 16:05:38 -0000	1.3
+++ openacs-4/packages/xowiki/www/prototypes/link.page	9 Sep 2020 10:27:17 -0000	1.3.6.1
@@ -6,7 +6,7 @@
     -set text {@link@} \
     -set form {} \
     -set form_constraints {
-       link:include
+       _title:localized_text link:include 
      }