Specify docker versions

diff --git a/README.rst b/README.rst
index f4348656b709b73f7d6d67b1f08f46a16c04e703..2302f801370eef3f68d769e15cb3dd6091ec60c5 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -126,7 +126,7 @@ Install
 
 Thanks to Docker, Telemeta is now fully available as a docker composition ready to work. The docker based composition bundles some powerfull applications and modern frameworks out-of-the-box like: Python, Conda, Numpy, Jupyter, Gstreamer, Django, Celery, Haystack, ElasticSearch, MySQL, Redis, uWSGI, Nginx and many more.
 
-* on **Linux**, first install `Git <http://git-scm.com/downloads>`_, `Docker engine <https://docs.docker.com/installation/>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_ and open a terminal.
+* on **Linux**, first install `Git <http://git-scm.com/downloads>`_, `Docker engine <https://docs.docker.com/installation/>`_ (>=1.9) and `docker-compose <https://docs.docker.com/compose/install/>`_ (>=1.8) and open a terminal.
 * on **MacOSX** or **Windows** install the `Docker Toolbox <https://www.docker.com/products/docker-toolbox>`_ and open a **Docker Quickstart Terminal**.
 
 Then clone Telemeta::

diff --git a/telemeta/pages b/telemeta/pages
index c2a0f19625f44ab2c3050b7784382ac7eb6939b0..47aec4d02719d4df3eef2fc0aa58a0a3ede2972e 160000 (submodule)
--- a/telemeta/pages
+++ b/telemeta/pages
@@ -1 +1 @@
-Subproject commit c2a0f19625f44ab2c3050b7784382ac7eb6939b0
+Subproject commit 47aec4d02719d4df3eef2fc0aa58a0a3ede2972e

diff --git a/telemeta/views/resource.py b/telemeta/views/resource.py
index dd9e9ce4ad58515c682200e92ba931aed66073a4..0489f737dc709ffc8ad76e1dd2b8fef1c24996e2 100644 (file)
--- a/telemeta/views/resource.py
+++ b/telemeta/views/resource.py
@@ -238,7 +238,7 @@ class ResourceSingleMixin(ResourceMixin):
         else:
             context['parents'] = []
         return context
-
+        
 
 class ResourceListView(ResourceMixin, ListView):
 
@@ -365,4 +365,3 @@ class ResourceEpubPasswordView(ResourceSingleMixin, FormView):
 class ResourceEpubListView(ResourceDetailView):
 
     template_name = 'telemeta/resource_epub_list.html'
-