update doc

diff --cc README.rst
index 7805c2d8488c9b2c79be9d90a36974f89355120a,f8baac0f1621e97c97a48d390fd15c8fac01c0d5..680a16ac09816dd90d0d034d2c0495c8a949c340
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -74,15 -72,15 +74,24 @@@ New
  1.6
  ++++
  
 -Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-)
 +* Provide a docker image and composition for the full Telemeta application bundle.
 +
 +  One month after the publication of docker-compose around march 2015, we had managed to build a prototyped composition which bundled all the dependencies of Telemeta and TimeSide. It took almost one year to deeply investigate all the capabilities of Docker and various images to finally release a propoer composition which bundles all the necessary applications and modules. So we can say that Telemeta is now usable on **any OS** in 5 mn! B-)
  
 -* Provide a docker image and composition for the full Telemeta application bundle including more useful modules and apps.
  * Full refactoring of the search engine and interface using django-haystack and ElasticSearch with new faceting and smart filtering features
  * Add an automatic EPUB3 ebook exporter for corpus and collections embedding metadata, image and audio materials.
- * Many, many bugfixes
+ * More inline forms and functional buttons
 +* Install new useful tools and modules like Conda, Jupyter notebook and `many others <https://github.com/Parisson/TimeSide/blob/master/conda-requirements.txt>`_
+ * Add resource sharing links
+ * Switch to Affero GPL licence
 +* Upgrade of every dependency bundle in the composition
+ * Many, many `bugfixes <https://github.com/Parisson/Telemeta/issues?q=is%3Aissue+is%3Aclosed>`_
++
++=======
++Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-)
++
++* Provide a docker image and composition for the full Telemeta application bundle including more useful modules and apps.
++>>>>>>> doc
  * Thanks to all partners for this **huge** release!
  
  1.5.1

diff --cc doc/content/README.rst
index e93f4d9e4148fc45135b7d7f65a61d5ed97b04e1,7ea2136555fdf956cf1913d412c328b6b4a2fa73..33e434c9ff801e2aae4b308cb23b5094cec3df6f
--- 1/doc/content/README.rst
--- 2/doc/content/README.rst
+++ b/doc/content/README.rst
@@@ -72,21 -40,7 +72,23 @@@ Thank you so much for your help
  
  
  News
 -======
 +=====
 +
 +1.6
 +++++
 +
 +* Provide a docker image and composition for the full Telemeta application bundle.
 +
 +  One month after the publication of docker-compose around march 2015, we had managed to build a prototyped composition which bundled all the dependencies of Telemeta and TimeSide. It took almost one year to deeply investigate all the capabilities of Docker and various images to finally release a propoer composition which bundles all the necessary applications and modules. So we can say that Telemeta is now usable on **any OS** in 5 mn! B-)
 +
 +* Full refactoring of the search engine and interface using django-haystack and ElasticSearch with new faceting and smart filtering features
 +* Add an automatic EPUB3 ebook exporter for corpus and collections embedding metadata, image and audio materials.
++* More inline forms and functional buttons
 +* Install new useful tools and modules like Conda, Jupyter notebook and `many others <https://github.com/Parisson/TimeSide/blob/master/conda-requirements.txt>`_
++* Add resource sharing links
++* Switch to Affero GPL licence
 +* Upgrade of every dependency bundle in the composition
- * Many, many bugfixes
- * Thanks to all partners for this **huge** release!
++* Many, many `bugfixes <https://github.com/Parisson/Telemeta/issues?q=is%3Aissue+is%3Aclosed>`_
  
  1.5.1
  ++++++