Index: /anr/task-0.tex
===================================================================
--- /anr/task-0.tex	(revision 46)
+++ /anr/task-0.tex	(revision 47)
@@ -37,5 +37,5 @@
 \item This \ST consists firstly in the building and maintenance of the 
 development and dissemination infrastructure. It is also in charge of
-consists in distributing the COACH releases.
+distributing the COACH releases.
     \begin{livrable}
     \item{}{0}{6}{}{\Supmc}{infrastructure setup} Building the
Index: /anr/task-1.tex
===================================================================
--- /anr/task-1.tex	(revision 46)
+++ /anr/task-1.tex	(revision 47)
@@ -72,15 +72,21 @@
         Last release of XML specification of the \xcoach format enhanced with
         the expression of loop potential parallelism.
-    \item{V1}{6}{12}{x}{\Subs}{C++ to/from \xcoach format}
-        \setMacroInAuxFile{specXcoachToCI}
-        This delivrable is composed of 2 softwares.
-        The first software is a GCC plugin that generates a \xcoach description
+    \item{V1}{6}{12}{x}{\Subs}{C++ to/from \xcoach format (1)}
+        \setMacroInAuxFile{specXcoachToCAI}
+        Proposition of a GCC plugin that generates a \xcoach description
         (defined in {\specXcoachDocI} deliverable) from a C++ task description
-        (defined in \specHasManual deliverable).
-        The second software regenerates a C description from a \xcoach
+        (defined in {\specHasManual} deliverable).
+    \item{VF}{12}{18}{x}{\Subs}{C++ to/from \xcoach format step 1}
+        \setMacroInAuxFile{specXcoachToCA}
+        The same software as the former (\specXcoachToCAI) but for \xcoach format defined
+        in the {\specXcoachDoc} deliverable and HAS input defined in the {\specHasManual}
+        deliverable.
+    \item{V1}{7}{12}{x}{\Subs}{C++ to/from \xcoach format (2)}
+        \setMacroInAuxFile{specXcoachToCBI}
+        This second tool regenerates a C description from a \xcoach
         description.
-    \item{VF}{12}{18}{x}{\Subs}{C++ to/from \xcoach format}
-        \setMacroInAuxFile{specXcoachToC}
-        The same softwares as the former (\specXcoachToCI) but for the \xcoach format as defined
+    \item{VF}{12}{18}{x}{\Subs}{C++ to/from \xcoach format (2)}
+        \setMacroInAuxFile{specXcoachToCB}
+        The same software as the former (\specXcoachToCBI) but for the \xcoach format as defined
         in the {\specXcoachDoc} deliverable and HAS input as defined in the {\specHasManual}
         deliverable.
Index: /anr/task-2.tex
===================================================================
--- /anr/task-2.tex	(revision 46)
+++ /anr/task-2.tex	(revision 47)
@@ -69,4 +69,18 @@
         The synthesizable VHDL description of the MWMR component corresponding to the
         SystemC module of the former delivrable (\csgAlteraSystemC);
+    \item{V1}{6}{12}{d}{\Subs}{UBS architecture}
+\mustbecompleted{FIXME:UBS ARGH!!!!!\\
+    1) Attention si vous touchez au MWMR, ils y a 3 composants MWMR. \\
+    2) UBS architecture} est tres mal choisit, ca fait un 4ieme template
+}
+       \setMacroInAuxFile{gautMWMRoptimization}
+       Specification of an optimized MWMR component to handle data interleaving (space and time).
+       This evolution aims to solve out of order communication weakness of the classical MWMR. 
+    \item{V2}{12}{24}{x}{\Subs}{UBS architecture}
+       Release of the tool that generates the VHDL description of the optimized MWMR component
+       and its corresponding SystemC module. 
+    \item{VF}{24}{30}{x}{\Subs}{UBS architecture}
+       Final release of the tool that generates the VHDL description of the optimized MWMR component
+       and its corresponding SystemC module (\gautMWMRoptimization).
     \end{livrable}
 \item This \ST consists of the configuration of the SocLib MUTEK and DNA operating
@@ -91,19 +105,3 @@
         Port of MUTEK OS on the NIOS2 and MICROBLAZE processors.
     \end{livrable}
-% moved in task 1
-%\item This \ST relies to definition and implementation of the enhanced communication
-%    schemes usable in the definition of communicante task graph.
-%    \begin{livrable}
-%    \item{}{0}{6}{d}{\Stima}{CSG user manual} A document that describes the CSG task
-%        graph inputs (task graph, task description, communication schemes). 
-%    \end{livrable}
-%\item This \ST relies to implementation of the MWMR component for the Xilinx and Altera
-%    architectural template.
-%    \begin{livrable}
-%    \item{}{0}{18}{x}{\Stima}{MWMR Altera} The VHDL synthesizable description and
-%        SystemC model of the MWMR with a PLB bus interface.
-%    \item{}{0}{18}{x}{\Sirisa}{MWMR Altera} The VHDL synthesizable description and
-%        SystemC model of the MWMR with an AVALON bus interface.
-%    \end{livrable}
-% FIXME:CITI
 \end{workpackage}
Index: /anr/task-4.tex
===================================================================
--- /anr/task-4.tex	(revision 46)
+++ /anr/task-4.tex	(revision 47)
@@ -42,8 +42,9 @@
     them by \xcoach and \xcoachplus drivers.
     \begin{livrable}
-    \item{V1}{6}{12}{x}{\Stima}{GAUT integration} The GAUT software that is able to read
+    \item{V1}{6}{12}{x}{\Subs}{GAUT integration} The GAUT software that is able to read
         \xcoach format.
-    \item{VF}{12}{18}{x}{\Stima}{GAUT integration} The GAUT software that is able to read
+    \item{VF}{12}{18}{x}{\Subs}{GAUT integration} The GAUT software that is able to read
         \xcoach format and to write \xcoachplus format.
+    \item{VF}{18}{33}{x}{\Subs}{GAUT integration} Maintenance work of the GAUT software.
     \end{livrable}
 \item The goal of this \ST is to improve the UGH and GAUT HLS tools.
@@ -56,10 +57,14 @@
         generate a micro-architecture without the variable binding currently done by the
         designer.
-    \item{}{18}{24}{x}{\Subs}{GAUT enhancement 1} A GAUT excutable that is able to
-        \mustbecompleted{FIXME:UBS: ........}.
-    \item{}{21}{27}{x}{\Subs}{GAUT enhancement 2} A GAUT excutable that is able to
-        \mustbecompleted{FIXME:UBS: ........}.
-    \item{}{21}{27}{x}{\Subs}{GAUT enhancement 2} A GAUT excutable that is able to
-        \mustbecompleted{FIXME:UBS: ........}.
+    \item{}{6}{18}{x}{\Subs}{GAUT enhancement 1} Release of the GAUT software that supports the control 
+    and data flow formal model.
+\mustbecompleted{FIXME:USB ca ne va pas avec l'intro de la tache, UGH n'a
+plus aucune utilite si ceci reste}
+    \item{}{18}{30}{x}{\Subs}{GAUT enhancement 2} Release of the GAUT software that supports the control 
+    and data flow formal model and also supports new constraints and objectives defined in \ST1-1 \mustbecompleted{FIXME:UBS: quel
+    delivrable ??}.
+%   FIXME:USB redondant avec le delivrable "GAUT integration" ou alors
+%   c'est en enhancement et il faut le decrire.
+%    \item{VF}{30}{36}{x}{\Subs}{GAUT enhancement 3} Final release of the GAUT software
     \end{livrable}
 \item In FPGA-SoC, the frequency is given by the processors and the BUS. The coprocessors
Index: /anr/task-7.tex
===================================================================
--- /anr/task-7.tex	(revision 47)
+++ /anr/task-7.tex	(revision 47)
@@ -0,0 +1,44 @@
+\begin{taskinfo}
+\let\UPMC\leader
+\let\ALL\enable
+\end{taskinfo}
+%
+\begin{objectif}
+This task relies to the diffusion the of results.
+
+\end{objectif}
+%
+\begin{workpackage}{D1}
+\item This \ST relies on the management of the web site
+    \begin{livrable}
+    \item{V1}{0}{2}{d}{\Supmc}{COACH wiki} Creation of a wiki.
+    \item{V1}{0}{6}{d}{\Supmc}{COACH web site} Creation and management of the COACH web site.
+    \end{livrable}
+\item This \ST relies on the diffusion of the COACH System Generator throught tutorials.
+    \begin{livrable}
+    \item{V1}{0}{24}{d}{\Supmc}{UGH - COACH tutorial}
+        Tutorial presenting UGH.
+    \item{V2}{0}{30}{d}{\Supmc}{UGH - COACH tutorial}
+        Tutorial presenting UGH in the CSG.
+    \item{}{0}{36}{d}{\Supmc}{UGH - COACH tutorial}
+        Tutorial presenting the final version of COACH using UGH.
+    \item{V1}{0}{24}{d}{\Subs}{GAUT - COACH tutorial}
+        Tutorial presenting GAUT.
+    \item{V2}{0}{30}{d}{\Subs}{GAUT - COACH tutorial}
+        Tutorial presenting GAUT in the CSG.
+    \item{}{0}{36}{d}{\Subs}{GAUT - COACH tutorial}
+        Tutorial presenting the final version of COACH using GAUT.
+    \end{livrable}
+\item This \ST relies on the diffusion of the COACH System Generator throught publications.
+    \begin{livrable}
+    \item{V1}{0}{6}{d+x}{\Subs}{specification of \xcoach format} 
+        \setMacroInAuxFile{specXcoachDocI}
+        First release of the XML specification of the \xcoach format (DTD)
+        and its associated documentation allowing to start HLS tools development.
+    \end{livrable}
+\item The role of this \ST is to ... \mustbecompleted{FIXME:   A VOIR} 
+    \begin{livrable}
+    \item{}{0}{6}{d}{\Subs}{macro-cell definition}
+        The document define the macro cell and the file format describing them.
+    \end{livrable}
+\end{workpackage}