Merge "Update Papyrus for Robotics links"
diff --git a/download.html b/download.html
index 4c57a92..23495fa 100644
--- a/download.html
+++ b/download.html
@@ -101,28 +101,6 @@
                     <div class="panel panel-default panel-default-custom">
 
                         <div class="panel-heading">
-                            <b>2019-12 release (4.6.0)</b>
-                        </div>
-                        <div class="panel-body panel-body-custom">
-                            <p>
-                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-win64.zip'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-linux64.tar.gz'">64 Bits</button>
-                            </p>
-                            <p>
-                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
-                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2019-12/4.6.0/papyrus-2019-12-4.6.0-macosx64.tar.gz'">64 Bits</button>
-                            </p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div class="panel panel-default panel-default-custom">
-
-                        <div class="panel-heading">
                             <b>2020-03 release (4.7.0)</b>
                         </div>
                         <div class="panel-body panel-body-custom">
@@ -141,6 +119,28 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-md-6">
+                    <div class="panel panel-default panel-default-custom">
+
+                        <div class="panel-heading">
+                            <b>2020-06 release (4.8.0)</b>
+                        </div>
+                        <div class="panel-body panel-body-custom">
+                            <p>
+                                <img src="img/win.png" alt="Windows">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-06/4.8.0/papyrus-2020-06-4.8.0-win64.zip'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/linux.png" alt="Linux">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-06/4.8.0/papyrus-2020-06-4.8.0-linux64.tar.gz'">64 Bits</button>
+                            </p>
+                            <p>
+                                <img src="img/osx.png" alt="OS X">&nbsp;:&nbsp;
+                                <button type="button" class="btn btn-lg btn-success custom-success-btn" onclick="location.href='https://www.eclipse.org/downloads/download.php?file=/modeling/mdt/papyrus/rcp/2020-06/4.8.0/papyrus-2020-06-4.8.0-macosx64.tar.gz'">64 Bits</button>
+                            </p>
+                        </div>
+                    </div>
+                </div>
             
 
             <h2 class="subsection-title wrap">Weekly RCP</h2>
@@ -152,7 +152,7 @@
                     <div class="panel panel-default panel-default-custom">
 
                         <div class="panel-heading">
-                            <b>2020-06 (4.8.0) nightly</b>
+                            <b>2020-12 (5.0.0) nightly</b>
                         </div>
                         
                         <div class="panel-body panel-body-custom">
@@ -202,9 +202,6 @@
             <p class="text-justify">
                 Eclipse provides facilities for adding new software to the platform or updating software in the system. In all cases, the site location (i.e. the Web URL or the archived Update Site provided above) is the only required item to update or install a software within Eclipse.
             </p>
-            <p class="text-justify">
-                To add the Eclipse Papyrus site, one of the procedures described from the <a href="http://help.eclipse.org/galileo/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-129.htm">Install Manager documentation</a> must be followed.
-            </p>
 
             <div class="panel-group wrap" id="accordion">
                 <div class="panel panel-default">
@@ -239,10 +236,10 @@
                     </a>
                     <div id="member2" class="panel-collapse collapse in" role="tabpanel">
                         <div class="panel-body panel-body-custom">
-                            <p class="text-justify"><b>Eclipse Papyrus 2020-03 (4.7.X)</b></p>
+                            <p class="text-justify"><b>Eclipse Papyrus 2020-06 (4.8.X)</b></p>
                             
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03</a></li>
+                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06</a></li>
                             </ul>
                         </div>
                     </div>
@@ -250,7 +247,7 @@
                 <div class="panel panel-default">
                     <a data-toggle="collapse" data-parent="#accordion" href="#member3">
                         <div class="panel-heading  panel-heading-custom">
-                            <h1 class="solution-heading">Old Release Update Sites</h1>
+                            <h1 class="solution-heading">Previous Releases Update Sites</h1>
 
                             <b>&nbsp;<span class="caret"></span></b>
                         </div>
@@ -258,94 +255,100 @@
                     <div id="member3" class="panel-collapse collapse" role="tabpanel">
                         <div class="panel-body panel-body-custom">
                             
+                            <p class="text-justify"><b>Eclipse Papyrus 2020-03 (4.7.X)</b></p>
+                            
+                            <ul class="text-justify">
+                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03</a></li>
+                            </ul>
+                            
                             <p class="text-justify"><b>Eclipse Papyrus 2019-12 (4.6.X)</b></p>
                             
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12</a></li>
                             </ul>
                             
                             <p class="text-justify"><b>Eclipse Papyrus 2019-09 (4.5.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09</a></li>
                             </ul>
                             
                             <p class="text-justify"><b>Eclipse Papyrus 2019-06 (4.4.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06</a></li>
                             </ul>
                             
                             <p class="text-justify"><b>Eclipse Papyrus 2019-03 (4.3.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03</a></li>
                             </ul>
                             
                             <p class="text-justify"><b>Eclipse Papyrus 2018-12 (4.2.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12</a></li>
                             </ul>
                         
                             <p class="text-justify"><b>Eclipse Papyrus 2018-09 (4.1.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09</a></li>
                             </ul>
                         
                             <p class="text-justify"><b>Eclipse Papyrus Photon (4.0.0)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/photon">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/photon</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Oxygen (3.X.0)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Neon (2.0.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/neon">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/neon</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Mars (1.1.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/mars">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/mars</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Luna (1.0.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/luna">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/luna</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/luna">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/luna</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Kepler (0.10.X)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/kepler">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/kepler</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/kepler">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/kepler</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Juno (0.9.2)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/juno">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/juno</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/juno">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/juno</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Indigo (0.8.2)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/indigo">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/indigo</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/indigo">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/indigo</a></li>
                             </ul>
 
                             <p class="text-justify"><b>Eclipse Papyrus Helios (0.7.3)</b></p>
 
                             <ul class="text-justify">
-                                <li><a href="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/helios">http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/helios</a></li>
+                                <li><a href="https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/helios">https://archive.eclipse.org/modeling/mdt/papyrus/updates/releases/helios</a></li>
                             </ul>
                         </div>
                     </div>
@@ -354,14 +357,16 @@
             
         </div>
         
-    </section>
-    
-
     <section id="otherResources" class="custom-section">
         <div class="container">
             <h1 class="section-title wrap">Other resources</h1>
             <div class="row">
                 <div class="col-md-12">
+                    <h2 class="subsection-title wrap">Archived resources</h2>
+                    <ul class="text-justify">
+                        If you are interested in previously released content and you can't find it in the links above, you should be able to find it in the <a href="https://archive.eclipse.org/modeling/mdt/papyrus/">Papyrus archives</a>.
+                    </ul>
+
                     <h2 class="subsection-title wrap">Artwork</h2>
                     <ul class="text-justify">
                         <li> Eclipse Papyrus logo (<a href="artwork/papyrus-logo-text.svg">SVG</a>|<a href="artwork/papyrus-logo-text.png">PNG</a>)
diff --git a/news/news.xml b/news/news.xml
index 50c03b4..4f32176 100644
--- a/news/news.xml
+++ b/news/news.xml
@@ -16,6 +16,27 @@
 -->
 <news>
     <item
+        date="2020-06-18"
+        title="Papyrus 5.0.0"
+        link="http://projects.eclipse.org/projects/modeling.mdt.papyrus/releases/5.0.0">
+        <p>
+            We will now begin to work on the next major release of Papyrus (5.0.0) in order to allow us some API changes and other corrections. This version will be available in time to integrate the 2020-12 release train.
+            Because we need to focus on this goal, there is no release planned for the 2020-09 train.
+            The 5.0.0 release will contain, for example, the refactoring of some dependencies such as removing the reexports wherever possible and removing deprecated APIs lingering for far too long in the code base.
+            We will inform you about any work undertaken on the wiki page <a href="https://wiki.eclipse.org/Papyrus/2020.12_Work_Description">Incoming work for 2020-12</a>. 
+        </p>
+    </item>
+    <item
+        date="2020-06-18"
+        title="Papyrus 4.8.0 2020-06 Released"
+        link="http://projects.eclipse.org/projects/modeling.mdt.papyrus/releases/4.8.0">
+        <p>
+            The Eclipse Papyrus 4.8.0 2020-06 release is now available!
+            Go to the <a href="https://www.eclipse.org/papyrus/download.html#accordion">Download page</a> to install it as an update site or a zip archive. 
+            The associated RCP is available from the <a href="https://www.eclipse.org/papyrus/download.html#rcp">RCP download page</a> as well.
+        </p>
+    </item>
+    <item
         date="2020-03-19"
         title="Papyrus 4.7.0 2020-03 Released"
         link="http://projects.eclipse.org/projects/modeling.mdt.papyrus/releases/4.7.0">