From 89a18c889d1ecc0549a676499f3a4a39d493b808 Mon Sep 17 00:00:00 2001
From: Victor Fernandez de Alba <sneridagh@gmail.com>
Date: Wed, 15 Jul 2015 18:05:24 +0200
Subject: [PATCH 1/2] Change the category of the configlet to 'plone-general'

---
 CHANGES.rst                                            | 2 +-
 plone/app/discussion/profiles/default/controlpanel.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6ea47c1..fc5f8ff 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@ Changelog
 2.4.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Change the category of the configlet to 'plone-general' [sneridagh]
 
 
 2.4.3 (2015-06-05)
diff --git a/plone/app/discussion/profiles/default/controlpanel.xml b/plone/app/discussion/profiles/default/controlpanel.xml
index f06f000..91f1500 100644
--- a/plone/app/discussion/profiles/default/controlpanel.xml
+++ b/plone/app/discussion/profiles/default/controlpanel.xml
@@ -9,7 +9,7 @@
         title="Discussion"
         action_id="discussion"
         appId="plone.app.discussion"
-        category="Plone"
+        category="plone-general"
         condition_expr=""
         icon_expr="string:${portal_url}/discussionitem_icon.png"
         url_expr="string:${portal_url}/@@discussion-controlpanel"

From 35862dd6dc3dda57cbbf5cc941496033634b943e Mon Sep 17 00:00:00 2001
From: Victor Fernandez de Alba <sneridagh@gmail.com>
Date: Thu, 16 Jul 2015 12:17:59 +0200
Subject: [PATCH 2/2] Updated links for the renamed 'Types' control panel

---
 CHANGES.rst                                  | 2 ++
 plone/app/discussion/browser/controlpanel.pt | 4 ++--
 plone/app/discussion/browser/moderation.pt   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index fc5f8ff..e2c302f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,8 @@ Changelog
 
 - Change the category of the configlet to 'plone-general' [sneridagh]
 
+- Updated links for the renamed 'Types' control panel [sneridagh]
+
 
 2.4.3 (2015-06-05)
 ------------------
diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt
index 4d84e7e..f050f5a 100644
--- a/plone/app/discussion/browser/controlpanel.pt
+++ b/plone/app/discussion/browser/controlpanel.pt
@@ -11,7 +11,7 @@
      tal:attributes="class view/settings"
      metal:fill-slot="prefs_configlet_content">
 
-    
+
     <div class="portalMessage warning"
         tal:condition="view/mailhost_warning">
         <strong i18n:translate="">
@@ -44,7 +44,7 @@
             <tal:link i18n:name="label_discussion_control_panel_link">
                 <a href=""
                    i18n:translate="text_discussion_type_control_panel_link"
-                   tal:attributes="href string:${portal_url}/@@types-controlpanel?type_id=Discussion Item"
+                   tal:attributes="href string:${portal_url}/@@content-controlpanel?type_id=Discussion Item"
                 >Types control panel</a>
             </tal:link>
             to choose a workflow for the 'Discussion Item' type.
diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt
index d5c2065..81a1fca 100644
--- a/plone/app/discussion/browser/moderation.pt
+++ b/plone/app/discussion/browser/moderation.pt
@@ -32,7 +32,7 @@
                 Moderation workflow is disabled. You have to
                 <a i18n:name="enable_comment_workflow"
                    i18n:translate="message_enable_comment_workflow" href=""
-                   tal:attributes="href string:${context/portal_url}/@@types-controlpanel?type_id=Discussion Item">
+                   tal:attributes="href string:${context/portal_url}/@@content-controlpanel?type_id=Discussion Item">
                 enable the 'Comment Review Workflow' for the Comment content
                 type</a> before you can moderate comments here.
             </span>