fix typo and comma splice error (#1555)

* fix typo and comma splice error * update for small typo change in HTML control panel
plone · May 5, 2016 · 934b86a · 934b86a
1 parent 2e83bff
commit 934b86a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -63,6 +63,8 @@ Fixes:
 
 - Do not hard-code baseUrl in bundle to avoid bad URL when switching domains.
   [ebrehault]
+
+- fix typo and comma splice error in HTML filtering control panel [tkimnguyen]
 
 
 5.1a1 (2016-03-31)

diff --git a/Products/CMFPlone/interfaces/controlpanel.py b/Products/CMFPlone/interfaces/controlpanel.py
@@ -337,14 +337,14 @@ class IFilterSchema(Interface):
 
     disable_filtering = schema.Bool(
         title=_(u'Disable html filtering'),
-        description=_(u'Warning, disabling can be potentially dangereous. '
+        description=_(u'Warning: disabling this can be dangerous. '
                       u'Only disable if you know what you are doing.'),
         default=False,
         required=False)
 
     nasty_tags = schema.List(
         title=_(u'Nasty tags'),
-        description=_(u"These tags, and their content are completely blocked "
+        description=_(u"These tags and their content are completely blocked "
                       "when a page is saved or rendered."),
         default=[u'style', u'object', u'embed', u'applet', u'script', u'meta'],
         value_type=schema.TextLine(),