fix homes

diff --git a/telemeta/pages/en/home.rst b/telemeta/pages/en/home.rst
index 254ca12c45929e1ee175fe3a6f700329e6f34c33..bb44690031fe57a290fae8c4d72cdeafeb488366 100644 (file)
--- a/telemeta/pages/en/home.rst
+++ b/telemeta/pages/en/home.rst
@@ -2,11 +2,7 @@
 Sound archives of the CNRS - Musée de l'Homme 
 ==============================================
 
-<<<<<<< HEAD
 The establishment of the `CREM <http://www.crem-cnrs.fr>`_’s audio archives is the result of a long history of scientific research on music. Since the birth of ethnomusicology (then "comparative musicology"), which coincided with the invention of the first recorders in the late nineteenth century, recording music materials and their classification and preservation are central in our knowledge of the musical Man. 
-=======
-`Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
->>>>>>> master
 
 .. image:: home_img.jpg
     :align: left

diff --git a/telemeta/pages/fr/home.rst b/telemeta/pages/fr/home.rst
index 2f93726a0a6ce63f789997facc6ddb5f9f9847c0..65d29d4d41f664b0ac1f2506387c1fdf234a3ea8 100644 (file)
--- a/telemeta/pages/fr/home.rst
+++ b/telemeta/pages/fr/home.rst
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ============================================
 Archives sonores du CNRS - Musée de l'Homme 
 ============================================
@@ -20,29 +19,3 @@ La plateforme collaborative `Telemeta <http://telemeta.org>`_ vise à rendre ces
 La gestion de la plateforme est assurée par le `CREM <http://www.crem-cnrs.fr>`_. Le site accueille toutes les collaborations visant à enrichir et valoriser ce précieux patrimoine musical commun à toute l'Humanité. Actuellement, un millier d’heures est consultable en ligne avec un code d’accès, mais aussi `sur place au CREM (Université Paris-Ouest Nanterre-La Défense, bâtiment C, rez-de-chaussée, pièce 20) <http://goo.gl/maps/ZgHg>`_, ainsi qu’à la Bibliothèque centrale du Muséum National d’Histoire Naturelle, et à la Bibliothèque François Mitterand (rez de jardin).
 
 |
-=======
-===================================================
-Telemeta : Web Audio Content Management System
-===================================================
-
-`Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
-
-Key features of Telemeta:
-    
- * Secure archiving, editing and publishing of audio files over internet.
- * User friendly web frontend including workflows and high level search methods
- * Smart dynamical and skinnable audio player (thanks to `TimeSide <http://code.google.com/p/timeside/>`_ and `SoundManager2 <http://www.schillmania.com/projects/soundmanager2/>`_)
- * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture
- * Temporal and collaborative indexation with fast user marker management
- * Multi-format support : FLAC, OGG, MP3, WAV and more
- * User management with individual profiles and rights
- * Playlist management for users with CSV data export
- * Geo-Navigator for audio geolocalization
- * `DublinCore <http://dublincore.org/>`_ compatibility
- * `OAI-PMH <http://www.openarchives.org/pmh/>`_ data provider
- * RSS feeds generator
- * XML serialized backup
- * Strong SQL or Oracle backend
-
-The Telemeta data model is now based on *collection* and *item* elements. A *collection* is described by its metadata and is related to audio *items*. An *item* embeds audio files with its metadata. This model has been designed to fit the one of the French Centre of Ethnomusicology (`CREM <http://www.crem-cnrs.fr>`_) of the University of Paris Ouest - Nanterre but could be easily adapted or overrided to suit other data structures.
->>>>>>> master