updated docs and changelog

flosch · Dec 20, 2013 · 7115d5d · 7115d5d
1 parent f23f42b
commit 7115d5d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -192,9 +192,11 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - PageAdmin uses the same Plugin API as PlaceholderAdmin
 - Toolbar API for your own apps added
 - twitter plugin removed
-- New stacks application
 - Object level permission support for Placeholder
 - Configuration for plugin custom modules and labels in the toolbar UI
 - Added copy-lang subcommand to copy content between languages
 - Added static_placeholder templatetag
-- Moved render_placeholder from placeholder_tags to cms_tags
+- Moved render_placeholder from placeholder_tags to cms_tags
+- django 1.6 support added
+- Frontedit editor for Django models
+- Extending the page & title model API
diff --git a/docs/advanced/templatetags.rst b/docs/advanced/templatetags.rst
@@ -87,6 +87,30 @@ Example::
 
 .. templatetag:: show_placeholder
 
+render_placeholder
+==================
+
+`{% render_placeholder %}` is used if you have a PlaceholderField in your own model and want
+to render it in the template.
+
+The :ttag:`render_placeholder` tag takes the following parameters:
+
+* :class:`~cms.models.fields.PlaceholderField` instance
+* ``width`` parameter for context sensitive plugins (optional)
+* ``language`` keyword plus ``language-code`` string to render content in the
+  specified language (optional)
+
+
+The following example renders the my_placeholder field from the mymodel_instance and will render
+only the english plugins:
+
+.. code-block:: html+django
+
+    {% load cms_tags %}
+
+    {% render_placeholder mymodel_instance.my_placeholder language 'en' %}
+
+
 
 show_placeholder
 ================

diff --git a/docs/extending_cms/extending_page_title.rst b/docs/extending_cms/extending_page_title.rst
@@ -2,6 +2,8 @@
 Extending the page & title model
 ################################
 
+.. versionadded:: 3.0
+
 If you want to extend the page or title model with your own fields e.g. adding
 an icon for every page the extension models are the way to go.
 

diff --git a/docs/upgrade/3.0.rst b/docs/upgrade/3.0.rst
@@ -190,12 +190,6 @@ See :setting:`CMS_PLACEHOLDER_CONF` for details.
 New copy-lang subcommand
 ========================
 
-A new copy-lang subcommand exists to copy content between languages.
-
-
-Added language copy command
-===========================
-
 Added a management command to copy content (titles and plugins) from one
 language to another.