- ZReST: the charset used in the rendered HTML was not set to the

       corresponding output_encoding property of the ZReST instance. In addition
       changing the encodings through the Properties tab did not re-render 
       the HTML.

doc/CHANGES.txt

@@ -142,6 +142,11 @@ Zope Changes
 
     Bugs fixed
 
+     - ZReST: the charset used in the rendered HTML was not set to the 
+       corresponding output_encoding property of the ZReST instance. In addition
+       changing the encodings through the Properties tab did not re-render 
+       the HTML.
+
      - Collector #1234: an exception triple passed to LOG() was not 
        propagated properly to the logging module of Python
 

lib/python/Products/ZReST/ZReST.py

@@ -196,11 +196,11 @@ class ZReST(Item, PropertyManager, Historical, Implicit, Persistent):
         # remember warnings
         pub.settings.warning_stream = Warnings()
 
-        # input
         pub.source = docutils.io.StringInput(
             source=self.source, encoding=self.input_encoding)
 
         # output - not that it's needed
+        pub.settings.output_encoding = self.output_encoding
         pub.destination = docutils.io.StringOutput(
             encoding=self.output_encoding)
 
@@ -282,6 +282,13 @@ class ZReST(Item, PropertyManager, Historical, Implicit, Persistent):
             self, rev1, rev2, REQUEST,
             historyComparisonResults=html_diff(rev1.source, rev2.source))
 
+    def manage_editProperties(self, REQUEST):
+        """ re-render the page after changing the properties (encodings!!!) """
+        result = PropertyManager.manage_editProperties(self, REQUEST)        
+        self.render()
+        return result
+
+
 InitializeClass(ZReST)
 modulesecurity.apply(globals())