diff --git a/CHANGES.rst b/CHANGES.rst
index 12fe219..6790b6e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -57,6 +57,10 @@ Changelog
2.3.0 (2014-02-22)
------------------
+- Remove DL's from portal message in templates.
+ https://github.com/plone/Products.CMFPlone/issues/153
+ [khink]
+
- Execute the proper workflow change when using the moderation buttons instead
of hardcoding the workflow action to always publish
[omiron]
diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt
index 0849efc..0018049 100644
--- a/plone/app/discussion/browser/controlpanel.pt
+++ b/plone/app/discussion/browser/controlpanel.pt
@@ -22,12 +22,12 @@
tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
-
- -
+
Warning
-
- -
+
+
You have not configured a mail host or a site 'From'
address, various features including contact forms, email
notification and password reset will not work. Go to the
@@ -38,15 +38,15 @@
>Mail control panel
to fix this.
-
-
+
+
-
- -
+
Warning
-
- -
+
+
You have configured a custom workflow for the 'Discussion Item'
content type. You can enable/disable the comment moderation
in this control panel only if you use one of the default
@@ -58,15 +58,15 @@
>Types control panel
to choose a workflow for the 'Discussion Item' type.
-
-
+
+
-
- -
+
Warning
-
- -
+
+
You have comments that have not been migrated to the new
commenting system that has been introduced in Plone 4.1.
Please
@@ -77,8 +77,8 @@
>migrate your comments
to fix this.
-
-
+
+
Portal status message
diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt
index dd0a7b1..d5c2065 100644
--- a/plone/app/discussion/browser/moderation.pt
+++ b/plone/app/discussion/browser/moderation.pt
@@ -25,18 +25,18 @@
Moderate comments
-
- - Warning
- -
+ Warning
+
Moderation workflow is disabled. You have to
enable the 'Comment Review Workflow' for the Comment content
type before you can moderate comments here.
-
-
+
+