Remove the markup control panel, as it was moved to Products.CMFPlone.

plone · Nov 14, 2014 · 67a35c3 · 67a35c3 · mister-roboto · Nov 14, 2014
1 parent 40cb0e9
commit 67a35c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,10 +4,14 @@ Changelog
 3.0.0 (unreleased)
 ------------------
 
+- Remove the markup control panel, as it was moved to Products.CMFPlone.
+  [thet]
+
 - Remove the control panel overview (moved to Products.CMFPlone)
   This breaks Plone 4 compatibility.
   PLIP 10359 (https://dev.plone.org/ticket/10359)
   https://github.com/plone/Products.CMFPlone/issues/290
+  [khink]
 
 
 2.4.6 (2014-11-01)

diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
@@ -20,7 +20,7 @@
 
   <!--<adapter factory=".maintenance.MaintenanceControlPanelAdapter" />-->
 
-  <adapter factory=".markup.MarkupControlPanelAdapter" />
+  <!-- adapter factory=".markup.MarkupControlPanelAdapter" /-->
 
   <adapter factory=".ram.RAMCacheControlPanelAdapter" />
 
@@ -62,12 +62,12 @@
       permission="plone.app.controlpanel.Mail"
       />
 
-  <browser:page
+  <!-- browser:page
       name="markup-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       class=".markup.MarkupControlPanel"
       permission="plone.app.controlpanel.Markup"
-      />
+      /-->
 
   <!--
   <browser:page

diff --git a/plone/app/controlpanel/tests/test_doctests.py b/plone/app/controlpanel/tests/test_doctests.py
@@ -23,7 +23,7 @@ def test_suite():
 #             'search.txt',
 #             'site.txt',
 #             'skins.txt',
-             'markup.txt',
+#             'markup.txt',
 #             'navigation.txt',
              'types.txt',
              'syndication.txt'