New fix.
diff --git a/pages/_index.html b/pages/_index.html
index 7e29740..9494aa6 100755
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -1,7 +1,7 @@
<div id="bigbuttons">
<h3>Primary Links</h3>
-<ul>
+<!--ul>
<li><a id="buttonDownload"
href="http://wiki.eclipse.org/EGF_Installation" title="Download">
<strong>Download</strong> Eclipse Distribution, Update Site, Dropins </a>
@@ -14,24 +14,20 @@
href="http://wiki.eclipse.org/EGF" title="Support"> <strong>Support</strong>
Bug Tracker, Newsgroup, Professional Support </a>
</li>
- <li><a id="buttonDocumentation"
+ <li><a id="buttonIntroduction"
href="http://wiki.eclipse.org/images/6/66/EGF_Introduction.pdf"> <strong>Introduction</strong>
</a>
</li>
-</ul>
+</ul-->
</div>
<div id="midcolumn">
-<h3>EGF: a Software Factory Tool</h3>
-<div id="introText">
- <p>EGF (Eclipse Generation Factories) is a software factory tool with the purpose to generate software artifacts,
- such as code or application, in order to automate software development.
- <a title="Presentation of EGF" href="http://wiki.eclipse.org/images/6/66/EGF_Introduction.pdf">Introduction</a></p>
-</div>
+<h3>EMF Diff/Merge</h3>
+<iframe src="../project-info/overview.html"></iframe>
-<table>
+<!--table>
<tr>
<th><img src="resources/EGF_Overview.png" alt="EGF Overview" /></th>
<th>
@@ -45,60 +41,12 @@
</div>
</th>
</tr>
-</table>
-
-<div id="EGFConceptsText">
- <p>EGF is an engine based on four types of generation unit:
- <ul>
- <li><b>Task</b>: it enables to execute code written in a language (e.g., Java, Ant, JRuby) or tools (e.g., Acceleo, ATL, Jet)</li>
- <li><b>Factory component</b>: it declares generation parameters and orchestrates calls to tasks or other factory components</li>
- <li><b>Pattern</b>: it is a powerful formalism which enables to process resources (e.g., model, file), in a language (e.g., Java, Jet), with parameters (e.g., navigation strategy, post-processor, reporter)</li>
- <li><b>Generation Chain</b>: it is a domain-specific model which enables to abstract generations</li>
- </ul>
- EGF is designed to be extensible and accept new types of generation unit.
- On the other hand, because a task is able to execute code and tools, EGF is not strictly limited to generation.
- </p>
-</div>
-
-<table>
- <tr>
- <th><a title="Activity Workflow With Java and Ruby" href="http://vimeo.com/15705526">
- <img src="resources/EgfActivityWorkflowJavaRuby.png"/>
- <div class="overlay"></div>
- </a></th>
- <th><p>Video: <strong> Activity Workflow combining Java and JRuby</strong></p>
- <p>Example of dynamic execution</p>
- </th>
- </tr>
-</table>
-
-<div>
- <h3>Software Factories Portfolios</h3>
- <p>A software factory portfolio provides an off-the-shelf generation solution. EGF is released with two portfolios:
- <ul>
- <li><b>Enhanced EMF Generation</b>: 1) it enriches the EMF generation with new generation topics (e.g., html doc, ecoretools diagrams, Java doc), 2) it opens the EMF Generation customization with the EGF patterns</li>
- <li><b>Build chain editor and generator</b>: it provides 1) an editor to model a build chain for continuous integration, and 2) a generator with targets, by default, Hudson/jenkins and Buckminster</li>
- </ul>
- </p>
-</div>
-
-
-<table>
- <tr>
- <th><a title="Generation Chain" href="http://vimeo.com/29472598">
- <img src="resources/EgfGenerationChain.png"/>
- <div class="overlay"></div>
- </a></th>
- <th><p>Video: <strong> Generation Chain</strong></p>
- <p>Generation chain and the EMF generation</p>
- </th>
- </tr>
-</table>
+</table-->
</div>
-<div id="rightcolumn">
+<!--div id="rightcolumn">
<div>
<h3>
@@ -122,4 +70,4 @@
%%HEADLINES%%
</div>
-</div>
+</div-->
