Amend Changelog and fixes from merged PRs (#6755)

* add missing changelog entries * update docs * updated changelog * updates from comments
django-cms · FinalAngel · Nov 12, 2019 · Nov 6, 2019 · Nov 6, 2019 · Nov 7, 2019
commit df0b1e7c283378ee3d89a90be427a1e2c7d077c4
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,7 +1,10 @@
-=== 3.8.0 (unreleased) ===
-
-* ...
+=== 3.7.1 (unreleased) ===
 
+* Updated branch policy
+* Improved and simplified permissions documentation
+* Improved apphooks documentation
+* Improved CMSPluginBase documentation
+* Improved documentation related to nested plugins
 
 === 3.7.0 (2019-09-25) ===
 

diff --git a/docs/contributing/development-policies.rst b/docs/contributing/development-policies.rst
@@ -98,8 +98,8 @@ We maintain a number of branches on `our GitHub repository <https://github.com/d
     The default target branch for on-going development.
 
 the latest (highest-numbered) ``release/x.y.z``
-    This is the branch that will become the next release on PyPI. ``develop`` will be merged into ``release/x.y.z``
-    regularly.
+    This is the branch that will become the next release on PyPI. Commits will be cherrypicked from ``develop``
+    and merged into ``release/x.y.z`` during the next iterative release.
 
 Older ``release/x.y.z`` branches
      These represent the final point of development (the highest ``y`` of older versions). Releases in the full set of

diff --git a/docs/how_to/custom_plugins.rst b/docs/how_to/custom_plugins.rst
@@ -706,7 +706,7 @@ achieve this functionality:
 
 
 If you have attributes of the parent plugin which you need to access in the
-child you can access the parent instance using ``get_plugin_instance``:
+child you can access the parent instance using ``get_bound_plugin``:
 
 .. code-block:: django
 
@@ -719,7 +719,7 @@ child you can access the parent instance using ``get_plugin_instance``:
         def __init__(self, *args, **kwargs):
             super(ChildPluginForm, self).__init__(*args, **kwargs)
             if self.instance:
-                parent, parent_cls = self.instance.parent.get_plugin_instance()
+                parent, parent_cls = self.instance.parent.get_bound_plugin()
 
 
 .. _extending_context_menus:

diff --git a/docs/reference/plugins.rst b/docs/reference/plugins.rst
@@ -494,7 +494,7 @@ CMSPlugin Attributes and Methods Reference
 
             from djangocms_text_ckeditor.models import Text
 
-            plugin = Text.objects.get(pk=1).get_plugin_instance()[0]
+            plugin = Text.objects.get(pk=1).get_bound_plugin()[0]
             plugin.get_translatable_content()
             # returns {'body': u'<p>I am text!</p>\n'}
 
@@ -530,7 +530,7 @@ CMSPlugin Attributes and Methods Reference
 
             from djangocms_text_ckeditor.models import Text
 
-            plugin = Text.objects.get(pk=1).get_plugin_instance()[0]
+            plugin = Text.objects.get(pk=1).get_bound_plugin()[0]
             plugin.set_translatable_content({'body': u'<p>This is a different text!</p>\n'})
             # returns True