Merge branch 'develop' into release/3.11.x

CHANGELOG.rst

@@ -1162,7 +1162,7 @@ Thanks to all contributors for their efforts!
 - Improves redirection as a result of changes to page slugs, etc.
 - Improves performance of "watched models"
 - Improves frontend performance relating to resizing the sideframe
-- Corrects an issue where items might not be visible in structue mode menus
+- Corrects an issue where items might not be visible in structure mode menus
 - Limits version of django-mptt used in CMS for 3.0.x
 - Prevent accidental upgrades to Django 1.8, which is not yet supported
 
@@ -1219,7 +1219,7 @@ Thanks to all contributors for their efforts!
 ==================
 
 - Add require_parent option to CMS_PLACEHOLDER_CONF
-- Fix django-mptt version depenency to be PEP440 compatible
+- Fix django-mptt version dependency to be PEP440 compatible
 - Fix some Django 1.4 compatibility issues
 - Add toolbar sanity check
 - Fix behavior with CMSPluginBase.get_render_template()
@@ -1247,7 +1247,7 @@ Thanks to all contributors for their efforts!
 - Fixes PageField to work in Django 1.7 environments
 - Updates to community and project governance documentation
 - Added list of retired core developers
-- Added branch policy documentaion
+- Added branch policy documentation
 
 
 3.0.6 (2014-10-07)
@@ -1457,7 +1457,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - CMS_FRONTEND_LANGUAGES limits django languages as well during language selection
 - Wymeditor updated to 1.0.4a
 - icon_url escape fixed
-- Ukranian translation added
+- Ukrainian translation added
 - Fixed wrong language prefix handling for form actions and admin preview
 - Admin icons in django 1.4 fixed
 - Added requirements.txt for pip and testing in test_requirements

docs/upgrade/3.10.1.rst

@@ -38,7 +38,7 @@ Bug Fixes:
 * Fixed Cache not invalidated when using a PlaceholderField outside the CMS #6912 (#6956) (3ce63d7d3) -- Benjamin PIERRE
 * Fixed unexpected behavior get_page_from_request (#6974) (#6073) (52f926e0d) -- Yuriy Mamaev
 * Fixed django treebeard 4.5.1 compatibility (#6988) (eeb86fd70) -- Aiky30
-* Fixed Bad Title.path in Multilanguage sites if parent slug is created or modified (#6968) (6e7b0ae48) -- fp4code
+* Fixed bad Title.path in Multilanguage sites if parent slug is created or modified (#6968) (6e7b0ae48) -- fp4code
 * Fixed redirect issues when i18n_patterns had prefix_default_language = False
 * Fixed not checking slug uniqueness when moving a page
 * Fixed builds on RTD