New bugfix release 1.6.2

batiste · Jul 27, 2014 · 58ace7d · greut · Jul 28, 2014 · 58ace7d
1 parent 7f0e13a
commit 58ace7d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -7,17 +7,19 @@ This file describe new features and incompatibilites between released version of
 Release 1.6.2
 =============
 
-Released the XXX 2014.
+Released the 27 of July 2014.
 
-    * Fix several bugs related to placeholders and cache
+    * Added a ckeditor placeholder using django-ckeditor
+    * The project now use transifex to handle it's translations (https://www.transifex.com/projects/p/django-page-cms-1/)
+    * Fix several bugs related to placeholders and cache.
     * Fix a bug with files using non ascii characters.
     * Fix a bug with the loading icon.
 
 
 Release 1.6.1
 =============
 
-Released the 2 June 2014.
+Released the 2 of June 2014.
 
     * Fix a bug with the image upload.
     * Fix a bug with files using non ascii characters.

diff --git a/doc/installation.rst b/doc/installation.rst
@@ -52,8 +52,8 @@ This CMS has extra dependencies that unlock extra features. Use::
     $ curl -O https://github.com/batiste/django-page-cms/raw/master/requirements/extra_apps.txt
     $ sudo pip install -r extra_apps.txt
 
-    
-Add django-page-cms into your INSTALLED_APPS   
+
+Add django-page-cms into your INSTALLED_APPS
 ==================================================
 
 To activate django-page-cms you will need to add those application::

diff --git a/doc/placeholders.rst b/doc/placeholders.rst
@@ -255,14 +255,14 @@ and then you can simply use the placeholder syntax::
     {% placeholder custom_widget_example with CustomTextarea %}
 
 .. note::
-    
+
     You have to make sure your `widgets.py` file is executed before using the widget. To be sure of this, you might
     import your file into the models.py of your application.
-    
+
 .. note::
 
     More examples of custom widgets are available in :mod:`pages.widgets.py <pages.widgets>`.
-    
+
 
 .. _placeholder-widgets-list:
 
@@ -308,7 +308,7 @@ A file browsing widget::
 
 .. note::
 
-    The following django application needs to be installed: http://code.google.com/p/django-filebrowser/    
+    The following django application needs to be installed: http://code.google.com/p/django-filebrowser/
 
 RichTextarea
 ------------
@@ -319,8 +319,6 @@ A simple `Rich Text Area Editor <http://batiste.dosimple.ch/blog/posts/2007-09-1
 
 .. image:: images/rte_light.png
 
-List of custom placeholders shipped with the CMS
-================================================
 
 CKEditorPlaceholderNode
 -----------------------
@@ -349,7 +347,7 @@ default configuration has to be defined in ``CKEDITOR_CONFIGS``. For example::
     }
 
 .. note::
-    
+
     In order to use this placeholder, the application `django-ckeditor updated
     fork <https://github.com/riklaunim/django-ckeditor>`_ needs to be
     installed and configured (trivial). `See the docs

diff --git a/pages/__init__.py b/pages/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Django page CMS module."""
-VERSION = (1, 6, 1)
+VERSION = (1, 6, 2)
 __version__ = '.'.join(map(str, VERSION))
 __author__ = "Batiste Bieler"
 __contact__ = "batiste.bieler@gmail.com"