Changeset 721eb43 for telemeta/pages/en/help.rst

Timestamp:

02/14/12 16:02:30 (15 months ago)

Author:

yomguy <yomguy@…>

Branches:

crem, crem2, diadems

Children:

3afcd54

Parents:

f5ee84d (diff), adf00f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (02/14/12 16:02:30)

git-committer:

yomguy <yomguy@…> (02/14/12 16:02:30)

Message:

Merge branch 'master' into crem
fix help pages

Conflicts:

telemeta/pages/en/home.rst
telemeta/pages/fr/home.rst

File:

• telemeta/pages/en/help.rst (modified) (1 diff)

telemeta/pages/en/help.rst

@@ +1 @@
+.. image:: images/help.png
+    :align: left
+
 ========================
 Help pages for Telemeta
 ========================
 
-Coming soon...
+In order to get access to some resticted items on this site, please contact:
+    
+    Aude Julien <aude.da-cruz-lima (at) mae.u-paris10.fr>
 
-Please register to our mailing list to get help now:
+For technical assistance, please join our mailing list:
+        
+    `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
+        
+or contact the hotline by email:
+            
+     support@parisson.com
+            
+or twitter :
+                
+    `http://twitter.com/telemeta <http://twitter.com/telemeta>`_
 
-`http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
-
-For more informations, see also `telemeta.org <http://telemeta.org>`_
+For more informations about the Telemeta system, see `telemeta.org <http://telemeta.org>`_
 
 Telemeta uses the audio librairy TimeSide : `code.google.com/p/timeside/ <http://code.google.com/p/timeside/>`_