Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.153.2.8 -r1.153.2.9
--- openacs-4/packages/xowiki/xowiki.info	31 Dec 2015 17:01:44 -0000	1.153.2.8
+++ openacs-4/packages/xowiki/xowiki.info	4 Jan 2016 13:09:07 -0000	1.153.2.9
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d2" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d2.apm">
+    <version name="5.9.1d3" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d3.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2015-10-04</release-date>
@@ -55,11 +55,12 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d2"/>
+        <provides url="xowiki" version="5.9.1d3"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d1"/>
         <requires url="acs-subsite" version="5.9.0"/>
+	<requires url="richtext-xinha" version="0.2"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.9.0"/>
         <requires url="general-comments" version="5.9.0"/>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.248.2.8 -r1.248.2.9
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Oct 2015 11:39:10 -0000	1.248.2.8
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	4 Jan 2016 13:09:07 -0000	1.248.2.9
@@ -2196,7 +2196,7 @@
       my render_richtext_as_div
     } else {
       # we use for the time being the initialization of xinha based on
-      # the site master
+      # the blank master
       set ::acs_blank_master(xinha) 1
       set quoted [list]
       foreach e [my plugins] {lappend quoted '$e'}
Index: openacs-4/packages/xowiki/www/xinha/attach-file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/attach-file.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/xowiki/www/xinha/attach-file.adp	13 Sep 2012 16:07:07 -0000	1.3
+++ openacs-4/packages/xowiki/www/xinha/attach-file.adp	4 Jan 2016 13:09:07 -0000	1.3.4.1
@@ -3,7 +3,7 @@
   <title>#acs-templating.HTMLArea_InsertImageTitle#</title>
 
   <script type="text/javascript" 
-	  src="/resources/acs-templating/xinha-nightly/popups/popup.js">
+	  src="/resources/richtext-xinha/xinha-nightly/popups/popup.js">
   </script>
 
 
Index: openacs-4/packages/xowiki/www/xinha/insert-file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-file.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/xowiki/www/xinha/insert-file.adp	13 Sep 2012 16:07:08 -0000	1.3
+++ openacs-4/packages/xowiki/www/xinha/insert-file.adp	4 Jan 2016 13:09:07 -0000	1.3.4.1
@@ -3,7 +3,7 @@
   <title>#acs-templating.HTMLArea_InsertImageTitle#</title>
 
   <script type="text/javascript" 
-	  src="/resources/acs-templating/xinha-nightly/popups/popup.js">
+	  src="/resources/richtext-xinha/xinha-nightly/popups/popup.js">
   </script>
 
 
Index: openacs-4/packages/xowiki/www/xinha/insert-ilink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-ilink.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/xowiki/www/xinha/insert-ilink.adp	13 Sep 2012 16:07:08 -0000	1.3
+++ openacs-4/packages/xowiki/www/xinha/insert-ilink.adp	4 Jan 2016 13:09:07 -0000	1.3.4.1
@@ -3,7 +3,7 @@
   <title>#acs-templating.HTMLArea_InsertModifyLink#</title>
 
   <script type="text/javascript" 
-          src="/resources/acs-templating/xinha-nightly/popups/popup.js">
+          src="/resources/richtext-xinha/xinha-nightly/popups/popup.js">
   </script>
 
 
Index: openacs-4/packages/xowiki/www/xinha/insert-image.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-image.adp,v
diff -u -r1.4 -r1.4.4.1
--- openacs-4/packages/xowiki/www/xinha/insert-image.adp	13 Sep 2012 16:07:08 -0000	1.4
+++ openacs-4/packages/xowiki/www/xinha/insert-image.adp	4 Jan 2016 13:09:07 -0000	1.4.4.1
@@ -3,7 +3,7 @@
   <title>#acs-templating.HTMLArea_InsertImageTitle#</title>
 
   <script type="text/javascript" 
-	  src="/resources/acs-templating/xinha-nightly/popups/popup.js">
+	  src="/resources/richtext-xinha/xinha-nightly/popups/popup.js">
   </script>
 
 <script type="text/javascript">
Index: openacs-4/packages/xowiki/www/xinha/insert-wlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-wlink.adp,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/xowiki/www/xinha/insert-wlink.adp	13 Sep 2012 16:07:09 -0000	1.3
+++ openacs-4/packages/xowiki/www/xinha/insert-wlink.adp	4 Jan 2016 13:09:07 -0000	1.3.4.1
@@ -3,7 +3,7 @@
   <title>#acs-templating.HTMLArea_InsertWikiLink#</title>
   <link rel="stylesheet" href="/resources/acs-templating/lists.css" type="text/css" media="all">
   <script type="text/javascript" 
-          src="/resources/acs-templating/xinha-nightly/popups/popup.js">
+          src="/resources/richtext-xinha/xinha-nightly/popups/popup.js">
   </script>
 
 <style type="text/css">