Merge branch 'master' of https://git.eclipse.org/r/www.eclipse.org/gendoc
# Conflicts:
# downloads/download.php
# roadmap/roadmap.php
diff --git a/downloads/download.php b/downloads/download.php
index e105064..e4b9d56 100644
--- a/downloads/download.php
+++ b/downloads/download.php
@@ -38,8 +38,9 @@
<h3>Releases</h3>
<ul class="fa-ul hidden-print">
- <li> <i class="fa fa-angle-double-right orange fa-fw"></i><a href="#">Gendoc v0.6.0</a>
+ <li> <i class="fa fa-angle-double-right orange fa-fw"></i>Gendoc v0.6.0 (Not released yet)
<ul>
+ <li><a href='https://projects.eclipse.org/projects/modeling.gendoc/releases/0.6.0/bugs'>Release content</a></li>
<li><a href="http://download.eclipse.org/gendoc/updates/releases/0.6.0-RC1">Gendoc v0.6.0-RC1 </a> (release candidate) update site ( or download as <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.6.0-RC1/org.eclipse.gendoc.incubation.update-site-0.6.0-RC1.zip">archive</a>)</li>
</li>
</ul>
@@ -52,22 +53,14 @@
<ul class="fa-ul hidden-print">
<li> <i class="fa fa-angle-double-right orange fa-fw"></i><a href="http://download.eclipse.org/gendoc/updates/releases/0.5.1-juno/">Gendoc v0.5.1-juno </a>update site ( or download as <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.5.1-juno/org.eclipse.gendoc.incubation.update-site-0.5.1-juno.zip">archive</a>)</li>
- </li>
+ <ul>
+ <li> Compatibility with Capella 1.0.2 </li>
+ <li class="bugzilla-record bugzilla-Normal bugzilla-fixed bugzilla-resolved"><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=496192">496192</a> Provide a juno update site <span>[resolved/fixed]</span></li>
+ </ul>
+ </li>
</ul>
<ul class="fa-ul hidden-print">
- <li> <i class="fa fa-angle-double-right orange fa-fw"></i>Gendoc v0.5.0 </a>update site ( or download as <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.5/org.eclipse.gendoc.incubation.update-site-0.5.0.zip">archive</a>)</li>
- <ul>
- <li>
-
- <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.5RC1/org.eclipse.gendoc.incubation.update-site-0.5.0RC1.zip">Gendoc v0.5RC1</a> (release candidate) update site as archive.
-
- </li>
- <li>
-
- <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.5RC2/org.eclipse.gendoc.incubation.update-site-0.5.0RC2.zip">Gendoc v0.5RC2</a> (second release candidate) update site as archive.
-
- </li>
- </ul>
+ <li> <i class="fa fa-angle-double-right orange fa-fw"></i>Gendoc v0.5.0 </a>update site ( download as <a href="http://www.eclipse.org/downloads/download.php?file=/gendoc/releases/0.5/org.eclipse.gendoc.incubation.update-site-0.5.0.zip">archive</a>)</li>
</li>
</ul>
See how to add a new update site to your Eclipse installation <a href='http://help.eclipse.org/juno/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-127.htm'>on Eclipse Help page </a>.
diff --git a/roadmap/roadmap.php b/roadmap/roadmap.php
index b228ecd..fa4d6a1 100644
--- a/roadmap/roadmap.php
+++ b/roadmap/roadmap.php
@@ -37,11 +37,11 @@
<div id="midcolumn">
<h3> Future releases </h3
<ul>
- <li> <b>Gendoc v0.6</b> (September 1st 2016)
+ <li> <b>Gendoc v0.6</b> (Target : 1/09/2016)
<ul>
<li><a href='https://projects.eclipse.org/projects/modeling.gendoc/releases/0.6.0/bugs'>Addressed issues </a></li>
+ <li>3/08/2016 : First release candidate available. See <a href="/gendoc/downloads/download.php">Downloads</a> page.</li>
</ul>
- <ul>03/08/2016 : First release candidate available. See <a href="/gendoc/downloads/download.php">Downloads</a> page.</ul>
</li>
<li> <b>Gendoc v1.0</b> (2017)
<ul>
