update news

diff --git a/doc/content/DevBox.rst b/doc/content/DevBox.rst
index 4d900b6e01c313fb3794b82c4f84f59a5f916eeb..989ff7b2122f1fe2e7275f9c5c6c7d249e52ef74 100644 (file)
--- a/doc/content/DevBox.rst
+++ b/doc/content/DevBox.rst
@@ -1,9 +1,12 @@
-Telemeta has been dockerized
+Telemeta has been dockerized!
 #############################
 
 :category: Development
-:date: 2015-05-20 10:40
-:status: draft
 
-Only one month after the publication of the docker-compose tools by docker and one more month of hard development and test period, we are very pleased to launch the docker version of Telemeta which makes it compatible with ANY platform.
+Only 1 month after the publication of the `docker-compose <https://docs.docker.com/compose/>`_ tools by `Docker <https://www.docker.com/>`_ and after 1 month more of hard development and test by the Parisson team, we are very pleased to launch the docker based distribution of Telemeta which should make it compatible with **ANY** platform.
 
+To test, use, develop or even deploy your own Telemeta based project, please use our `DevBox <https://github.com/Parisson/DevBox>`_.
+
+For more infos about our docker images, please check the `Parisson registry <https://registry.hub.docker.com/u/parisson/>`_
+
+NB: we need so more tweaks and tests on OSX, please ping us if you need to try the DevBox on this platform.

diff --git a/doc/content/FMA2015.rst b/doc/content/FMA2015.rst
index 0503348bc9c0f58e469591106f02b83b361cef59..1a240c0b49e56e16ed0ac3b7c0cab21770e87d22 100644 (file)
--- a/doc/content/FMA2015.rst
+++ b/doc/content/FMA2015.rst
@@ -1,10 +1,10 @@
-Telemeta at the 5th Folk Music Analysis workshop
-#################################################
+Telemeta at the 5th Folk Music Analysis international workshop
+###############################################################
 
 :category: Research
 
-Telemeta and the DIADEMS team participate to the `FMA conference 2015 <http://fma2015.sciencesconf.org/>`_ in Paris from the 10th to the 12th june 2015.
+Telemeta, Parisson and the DIADEMS team participate to the `5th Folk Music Analysis international workshop <http://fma2015.sciencesconf.org/>`_ (FMA) at the University Pierre et Marie Curie in Paris from the 10th to the 12th june 2015.
 
 The FMA workshop is intended for exchanging information that advances our understanding of oral tradition music and their importance in cultural events. The goal is to encourage interdisciplinary approaches to solve technical problems related to the study of ethnomusicology, especially the use of relevant sensors to get audio-video recordings from in-situ observations, the development of new theoretical approaches to analyze these recordings and the proposition of tools to be used for musical studies.
 
-The FMA workshop will held at the University Pierre et Marie Curie, in Paris, FRANCE
+Guillaume Pellerin and Thomas Fillon present: `Web analysis tools for ethnomusicology <https://github.com/Parisson/Telemeta-doc/raw/master/Conferences/2015_FMA/slides_FMA_2015.pdf>`_.

diff --git a/doc/content/GitHub.rst b/doc/content/GitHub.rst
index 65056d47cd43660c6c16b737cac96e84f4345788..8da5b85686c0d172cbab4d5ac4ba82a84f0a8be1 100644 (file)
--- a/doc/content/GitHub.rst
+++ b/doc/content/GitHub.rst
@@ -8,7 +8,7 @@ Telemeta on GitHub
 We now use GitHub for the development process of all Telemeta related projects:
 
 * https://github.com/Parisson/Telemeta
-* https://github.com/Parisson/Telemeta
+* https://github.com/Parisson/TimeSide
 * https://github.com/ANR-DIADEMS/timeside-diadems
 
 Feel free to post issues and good ideas to help us improving the platform.

diff --git a/doc/content/Partners.rst b/doc/content/Partners.rst
index 9a5ec540051e07c92da41317fefc32269dee48c6..bb5d04f8f91b82d5ac821e094efcf07b9f5618dd 100644 (file)
--- a/doc/content/Partners.rst
+++ b/doc/content/Partners.rst
@@ -7,35 +7,36 @@ Partners
 
 Telemeta is sponsored by:
 
-* `Parisson <http://parisson.com>`_ : R&D for custom media solution
-* CNRS : Centre National de la Recherche Scientifique (the french Natianal Research and Scientific Center)
-* MCC : Ministère de la Culture et de la Communication (the french Ministry of the Culture and Communication
-* CREM : Centre de Recherche en Ethnomusicology (the french Ethnomusicology Research Center)
-* HumaNum : TGIR des humanités numériques
-
-Telemeta is part of the ​DIADEMS project granted by the ANR (French Research Agency). The academic laboratories involved are:
-
-* IRIT
-* LIMSI
-* LAM (IJLRDA)
-* CREM (LESC)
-* LABRI
-* MNHN
-
-Telemeta is supported by:
-
-* LAM : Equipe Lutherie, Acoustique et Musique de l'Université Pierre et Marie Curie de Paris / Sorbonne universités
-* MMSH : Maison Méditerranéenne des Sciences de l'Homme
-
-The Telemeta project is managed by:
-
-* Guillaume Pellerin <yomguy (at) parisson.com>
-* Joséphine Simonnot <josephine.simonnot (at) mae.u-paris10.fr>.
+* `Parisson <http://parisson.com>`_, french startup for open archives solutions
+* `CNRS <http://www.cnrs.fr/>`_, Centre National de la Recherche Scientifique (French Natianal Research and Scientific Center)
+* `MCC <http://www.culturecommunication.gouv.fr/>`_, Ministère de la Culture et de la Communication (French Ministry of Culture and Communication)
+* `CREM <http://crem-cnrs.fr/>`_, LESC, Université de Nanterre, France (French Ethnomusicology Research Center)
+* `Huma-Num <http://www.huma-num.fr/>`_, TGIR des humanités numériques
+* `ANR <http://www.agence-nationale-recherche.fr/>`_, Agence Nationale de la Recherche (French Research Agency) through the ​DIADEMS project
+
+Partners:
+
+* LAM, Institut d'Alembert, Sorbonne Universités, France
+* IRIT, Université de Toulouse, France
+* LIMSI, Université Paris Sud, France
+* LABRI, Université de Bordeaux, France
+* CREM, LESC, Université de Nanterre, France
+* Museum d'Histoire Naturelle, Paris, France
+* Musée de l'Homme, Paris, France
+* Musée d'Orsay, Paris, France
+* Bibliothèque Nationale de France (BNF) Paris, France
+* CMAM - ISMS, Tunis, Tunisie
+
+Management board:
+
+* Guillaume Pellerin <guillaume.pellerin@parisson.com>
+* Joséphine Simonnot <josephine.simonnot@mae.u-paris10.fr>.
 
 The Telemeta application is or has been developed by :
 
 * Guillaume Pellerin (​Parisson)
-* Thomas Fillon (​UPMC, ​Parisson)
+* Thomas Fillon (​​Parisson)
 * Paul Brossier (​Parisson)
+* Anas Ghrab (CMAM - ISMS)
 * Riccardo Zaccarelli (​Parisson)
 * Olivier Guilyardi (​Samalyse)

diff --git a/doc/content/README.rst b/doc/content/README.rst
index b93e9b44bdc0766a8819c1d51f041afb6ab867e2..3b3e2d4d7f9920c92277fc05e3574a00baf29296 100644 (file)
--- a/doc/content/README.rst
+++ b/doc/content/README.rst
@@ -3,7 +3,7 @@ Telemeta: open web audio platform with semantics
 =================================================
 
 :category: About
-:pin_to_top: True
+:Pin: true
 
 .. image:: /Telemeta/images/logo_telemeta_2.png
     :alt: Telemeta logo

diff --git a/doc/pelicanconf.py b/doc/pelicanconf.py
index d3ab84f804b57322816b84946012c22ec3ac5f76..9a1afc15f85accad43b7f4476f3783e79fe8a5c4 100644 (file)
--- a/doc/pelicanconf.py
+++ b/doc/pelicanconf.py
@@ -38,7 +38,7 @@ LINKS =  (('Python', 'http://python.org/'),
 SOCIAL = (('GitHub', 'https://github.com/Parisson/Telemeta'),
           ('Twitter', 'https://twitter.com/telemeta/'),
           ('Google+', 'https://plus.google.com/+Parisson'),
-          ('LinkedIn', 'http://www.linkedin.com/in/Parisson'),
+          ('LinkedIn', 'https://www.linkedin.com/company/parisson'),
           )
 
 # Uncomment following line if you want document-relative URLs when developing
@@ -58,7 +58,7 @@ CUSTOM_CSS = 'css/custom.css'
 
 FAVICON = 'images/favicon.ico'
 
-DISQUS_SITENAME = 'telemetaorg'
+DISQUS_SITENAME = 'telemeta'
 
 TWITTER_CARDS = True
 TWITTER_USERNAME = 'telemeta'

diff --git a/telemeta/static/telemeta/css/telemeta_epub.css b/telemeta/static/telemeta/css/telemeta_epub.css
index 671d73ed3b9a5eeb281c6eaf7f8cdf0a06517185..6cafd50c41bcbdceba82f7952bd5b35bf8dcc332 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta_epub.css
+++ b/telemeta/static/telemeta/css/telemeta_epub.css
@@ -10,7 +10,6 @@ body {
 }
 
 h2 {
-    text-transform: uppercase;
     font-family : sans-serif;
     text-align: left;
     font-size:110%;