Index: /anr/task-3.tex
===================================================================
--- /anr/task-3.tex	(revision 187)
+++ /anr/task-3.tex	(revision 188)
@@ -30,5 +30,4 @@
         custom instructions are specified by the user, and then automatically extracted (when
         beneficial) from the application intermediate representation. 
-        %\mustbecompleted{FIXME .....}
       \itemL{18}{24}{x}{\Sirisa}{ASIP compilation flow}{6:9:0}
         In this second version, the software will also be able to automatically identify 
Index: /anr/task-4.tex
===================================================================
--- /anr/task-4.tex	(revision 187)
+++ /anr/task-4.tex	(revision 188)
@@ -8,5 +8,5 @@
 \begin{objectif}
 The objectives of this task are to provide the two HAS back-ends of the COACH project and
-a tool that adapt the coprocessor frequency to the FPGA-SoC frequency as required \mustbecompleted {FIXME :: or defined}
+a tool that adapt the coprocessor frequency to the FPGA-SoC frequency as required 
 by the processors and the system BUS.
 %pourquoi en majuscule?
@@ -22,9 +22,9 @@
 UGH. These tools are complementary and not in competition because they cover respectively
 data and control dominated designs.
-The organization of the task is firstly to integrate quickly the existing HLS to the COACH
+The organization of the task is firstly to quickly integrate the existing HLS to the COACH
 framework. Secondly these tools will be improved to allows to treat data dominated application
 with a few control for GAUT and control dominated application with a few data processing
 for UGH. This will enlarge the domain the HLS can cover which is a strong limitation of the 
-tools currently avilable. \mustbecompleted {FIXME :: ajouter ref LIVRE, Design and Test, CATRENE Roadmap}
+tools currently avilable \cite{HLSBOOK} \cite{IEEEDT} \cite{CATRENE}. 
 \end{objectif}
 %
@@ -40,5 +40,5 @@
         Release of the UGH software that writes \xcoachplus format.
     \itemL{18}{33}{x}{\Supmc}{UGH integration}{0:2:4.0}
-        Maintenance work of the UGH software.
+        Final release of the UGH software.
     \end{livrable}
 \subtask The goal of this \ST is to integrate the GAUT HLS tool to the COACH framework. It
@@ -51,5 +51,5 @@
         Release of the GAUT software that is able to read \xcoach format and to write \xcoachplus format.
     \itemL{18}{33}{x}{\Subs}{GAUT integration}{0:0:0}
-        Maintenance work of the GAUT software.
+        Final release of the GAUT software.
     \end{livrable}
 \subtask The goal of this \ST is to improve the UGH and GAUT HLS tools.
@@ -63,20 +63,14 @@
         variable binding currently done by the designer.
     \itemL{6}{18}{x}{\Subs}{GAUT enhancement 1}{0:0:0}
-        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}
+        Release of the GAUT software that supports the \xcoach model during the binding and the scheduling steps.
     \itemL{18}{30}{x}{\Subs}{GAUT enhancement 2}{0:0:0}
-        Release of the GAUT software that supports the control and data flow formal model
-        and also supports new constraints and objectives defined in
-        \mustbecompleted{FIXME:USB utilise une macro svp: \ST1-1}
-        \mustbecompleted{FIXME:UBS: quel deliverable ??}.
-    \itemV{6}{18}{d}{\Subs}{Design Space Exploration}{0:0:0}
-        \mustbecompleted{FIXME:UBS  GAUT enhancement 3 serait peut-etre meilleur}
+        Release of the GAUT software that supports the \xcoach model during the binding and the scheduling steps
+        and also supports new constraints and objectives.
+    \itemV{6}{18}{d}{\Subs}{Micro-architecture Exploration}{0:0:0} \setMacroInAuxFile{MAE}
         Specification of a Design Space Exploration framework for the HAS Back-end: 
         The high level specification tools, such as GAUT, have to be able to use synthesis feed-back
         informations in order to explore the design space and to generate optimized architectures.
-    \itemL{18}{30}{x}{\Subs}{Design Space Exploration}{0:0:0}
-        Release of the GAUT software that supports the features defined in
-        \mustbecompleted{FIXME:UBS: macro ????} deliverable.
+    \itemL{18}{30}{x}{\Subs}{Micro-architecture Exploration}{0:0:0}
+        Release of the GAUT software that supports the features defined in \MAE
     \end{livrable}
 \subtask In FPGA-SoC, the frequency is given by the processor(s) and the system BUS. The coprocessors