Simple fix.
diff --git a/_projectCommon.php b/_projectCommon.php
index 3eefe38..3acaa98 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -34,7 +34,7 @@
# Define keywords, author and title here, or in each PHP page specifically
$pageKeywords = "modeling, merge, diff";
$pageAuthor = "Olivier Constant";
- # $pageTitle = "EMF Diff/Merge";
+ $pageTitle = "EMF Diff/Merge";
# top navigation bar
diff --git a/pages/_index.html b/pages/_index.html
index ae43dd6..aee8780 100755
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -8,11 +8,11 @@
</li>
<li><a id="buttonDocumentation"
class="bigButton" href="http://wiki.eclipse.org/EMF_DiffMerge#Usage"
- title="Documentation"> <strong>Documentation</strong> Tutorials, Reference Documentation </a>
+ title="Documentation"> <strong>Documentation</strong> Tutorials, Examples, Videos, Reference Documentation </a>
</li>
<li><a id="buttonSupport"
href="http://wiki.eclipse.org/EMF_DiffMerge#Links" title="Support"> <strong>Support</strong>
- Bug Tracker, Newsgroup </a>
+ Bug Tracker, Newsgroup, Professional Support </a>
</li>
<li><a id="buttonDocumentation"
href="http://wiki.eclipse.org/EMF_DiffMerge#Introduction"> <strong>Introduction</strong>
@@ -23,33 +23,25 @@
<div id="midcolumn">
- <h3>EMF Diff/Merge</h3>
- <iframe src="http://eclipse.org/diffmerge/project-info/overview.html"></iframe>
+ <h3>EMF Diff/Merge: a Diff/Merge Tool for Models</h3>
+ <div>
+ Merging models is a common need in model-based activities, not only for version control but for model
+ manipulation in general. However, merging models is much more complex than merging source code.
+ Since EMF models are rich data structures with constraints and behavior, merging them consistently is a delicate problem.
+ </div>
+ <div>
+ EMF Diff/Merge aims to help solve that problem. Check the
+ <a href="http://wiki.eclipse.org/EMF_DiffMerge">Wiki page</a>
+ for more information.
+ </div>
</div>
-<!--div id="rightcolumn">
-
- <div>
+<div id="rightcolumn">
+ <div>
<h3>
- <a href="/projects/project_summary.php?projectid=modeling.emf.egf">About This Project</a>
+ <a href="/projects/project_summary.php?projectid=modeling.emf.diffmerge">About This Project</a>
</h3>
+ </div>
- <div id="stats">
- <div id="newAndNoteworthy"><!-- <h3>New And Noteworthy</h3> -->
- <a href="http://wiki.eclipse.org/EGF_New_And_Noteworthy">New and Noteworthy</a>
- </div>
- <h4>Commit stats</h4>
- <a href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emf.egf">
- <img src="http://dash.eclipse.org/dash/commits/web-app/active-graph.cgi?project=modeling.emf.egf"/>
- </a>
- </div>
-
- </div>
-
- <div id="headlines">
- <h3>News</h3>
- %%HEADLINES%%
- </div>
-
-</div-->
+</div>
