Merge pull request #4980 from yakky/feature/fix_typo

Fix typo

cms/toolbar_pool.py

@@ -41,7 +41,7 @@ def register(self, toolbar):
         if toolbar.__module__.split('.')[-1] == 'cms_toolbar':
             warnings.warn('cms_toolbar.py filename is deprecated, '
                           'and it will be removed in version 3.4; '
-                          'please rename it to cms_toolbar.py', DeprecationWarning)
+                          'please rename it to cms_toolbars.py', DeprecationWarning)
         if not self.force_register and get_cms_setting('TOOLBARS'):
             return toolbar
         from cms.toolbar_base import CMSToolbar

docs/upgrade/3.2.1.rst

@@ -14,7 +14,7 @@ Improvements
 - Add support for Django 1.9 (with some deprecation warnings).
 - Add support for django-reversion 1.10+ (required by Django 1.9+).
 - Add placeholder name to the edit tooltip.
-- Add attr['is_page']=True to CMS Page navigation nodes.
+- Add is_page attribute to CMS Page navigation nodes.
 - Add Django and Python versions to debug bar info tooltip
 
 Bug Fixes
@@ -28,7 +28,7 @@ Bug Fixes
 - Fix message with CMS version not showing up on hover in debug mode.
 - Fix messages not being positioned correctly in debug mode.
 - Fix an issue where plugin parent restrictions where not respected when pasting a plugin.
-- Fix an issue where "Copy all" menu item could've been clicked on empty placeholder.
+- Fix an issue where "Copy all" menu item could have been clicked on empty placeholder.
 - Fix a bug where page tree styles didn't load from STATIC_URL that pointed to a different host.
 - Fix an issue where the side-frame wouldn't refresh under some circumstances.
 - Honor CMS_RAW_ID_USERS in GlobalPagePermissionAdmin.