From b5e76a92ddb543e829e0a4cd9fe37417be86cd13 Mon Sep 17 00:00:00 2001
From: Dennis Kieselhorst <mail@dekies.de>
Date: Sun, 15 Oct 2017 12:30:39 +0200
Subject: [PATCH] update some old java.net links, add javaee 8 and replace
 outdated news with link to latest releases

---
 2.0/index.html                            | 12 ++--
 2.1/index.html                            | 12 ++--
 2.2/index.html                            | 12 ++--
 JavaServerFacesRI.html                    | 10 ++--
 JavaServerFacesSpecFaq.html               |  2 +-
 __modules/header.htmlx                    | 22 +++----
 __modules/left_sidebar.htmlx              | 10 ++--
 download.html                             | 22 +++++--
 downloads/ri/__modules/header.htmlx       | 20 +++----
 downloads/ri/__modules/left_sidebar.htmlx |  4 +-
 downloads/ri/index.html                   |  4 +-
 faq.html                                  | 12 ++--
 forum.html                                | 46 ++++-----------
 in/download.html                          | 70 +++++++++++------------
 in/index.html                             | 12 ++--
 index.html                                | 35 +++---------
 rlnotes/1.2_16/changelog.html             |  3 -
 rlnotes/1.2_16/community.html             |  5 +-
 rlnotes/1.2_16/index.html                 |  9 ++-
 rlnotes/2.0.10/index.html                 | 12 ++--
 rlnotes/2.0.11/index.html                 | 12 ++--
 rlnotes/2.0.4/index.html                  | 12 ++--
 rlnotes/2.0.5/index.html                  | 12 ++--
 rlnotes/2.0.6/index.html                  | 12 ++--
 rlnotes/2.0.7/index.html                  | 12 ++--
 rlnotes/2.0.8/index.html                  | 12 ++--
 rlnotes/2.0.9/index.html                  | 12 ++--
 users.html                                |  4 +-
 whats-new-in-jsf23.html                   |  2 +-
 29 files changed, 194 insertions(+), 230 deletions(-)

diff --git a/2.0/index.html b/2.0/index.html
index 45a591c..d991b84 100644
--- a/2.0/index.html
+++ b/2.0/index.html
@@ -88,32 +88,32 @@ <h2>Documentation</h2>
                 <a href="releasenotes.html">Release Notes</a> 
             </li> 
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
                     Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
                     Managed Bean Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                     JavaScript API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
                     VDL Tag Library Documentation for JSP
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
                     VDL Tag Library Documentation for Facelets2
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
                     Standard HTML Render Kit Documentation
                 </a>
             </li>
diff --git a/2.1/index.html b/2.1/index.html
index 6a2dca4..0f73fb2 100644
--- a/2.1/index.html
+++ b/2.1/index.html
@@ -155,32 +155,32 @@ <h2>Documentation</h2>
                 <a href="releasenotes.html">Release Notes</a> 
             </li> 
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/javadocs/index.html">
                     Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/managed-bean-javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/managed-bean-javadocs/index.html">
                     Managed Bean Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/jsdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/jsdocs/index.html">
                     JavaScript API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/vdldocs/jsp/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/vdldocs/jsp/index.html">
                     VDL Tag Library Documentation for JSP
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/vdldocs/facelets/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/vdldocs/facelets/index.html">
                     VDL Tag Library Documentation for Facelets2
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.1/renderkitdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.1/renderkitdocs/index.html">
                     Standard HTML Render Kit Documentation
                 </a>
             </li>
diff --git a/2.2/index.html b/2.2/index.html
index 990e237..0bfba5c 100644
--- a/2.2/index.html
+++ b/2.2/index.html
@@ -83,32 +83,32 @@ <h2>Documentation</h2>
                 <a href="releasenotes.html">Release Notes</a> 
             </li> 
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/javadocs/index.html">
                     Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/managed-bean-javadocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/managed-bean-javadocs/index.html">
                     Managed Bean Javadoc API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/jsdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/jsdocs/index.html">
                     JavaScript API Documentation
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/vdldocs/jsp/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/vdldocs/jsp/index.html">
                     VDL Tag Library Documentation for JSP
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/vdldocs/facelets/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/vdldocs/facelets/index.html">
                     VDL Tag Library Documentation for Facelets2
                 </a>
             </li>
             <li>
-                <a href="http://javaserverfaces.java.net/nonav/docs/2.2/renderkitdocs/index.html">
+                <a href="https://javaserverfaces.github.io/docs/2.2/renderkitdocs/index.html">
                     Standard HTML Render Kit Documentation
                 </a>
             </li>
diff --git a/JavaServerFacesRI.html b/JavaServerFacesRI.html
index f5f1fee..8dc5870 100644
--- a/JavaServerFacesRI.html
+++ b/JavaServerFacesRI.html
@@ -139,7 +139,7 @@
         <li><a href="#JavaServerFacesRI-MojarraCodeCoverageInformation">Mojarra Code Coverage Information</a></li> 
        </ul> 
       </ul>
-     </div> <h4><a name="JavaServerFacesRI-Workingwiththesourcecode"></a>Working with the source code</h2> <h4><a name="JavaServerFacesRI-HowdoIaccessthesourcetreeviaversioncontrol%3F"></a>How do I access the source tree via version control?</h3> <p>Access to the source code for Oracle's implementation of the JCP JSF Specification is subject to the terms of either the GNU<br> General Public License Version 2 only ("GPL") or the Common Development<br> and Distribution License("CDDL") (collectively, the "License"). You<br> may not use this file except in compliance with the License. You can obtain<br> a copy of the License at <a href="http://glassfish.java.net/public/CDDL+GPL_1_1.html">here</a>.</p> <p>Refer to the <a href="http://javaserverfaces.java.net/checkout.html">version control instructions</a> for details on configuring your client.</p> <p>If you don't have a java.net ID, you can check out the source anonymously by using the <em>guest</em> account.</p> <p>The <a href="http://javaserverfaces.java.net/checkout.html">version control instructions</a> also contains information pertaining<br> to branch names which will be important depending on which version of JSF you're interested in working with.</p> <h4><a name="JavaServerFacesRI-WhatarethetagsforthecurrentreleasesofMojarra%3F"></a>What are the tags for the current releases of Mojarra?</h3> 
+     </div> <h4><a name="JavaServerFacesRI-Workingwiththesourcecode"></a>Working with the source code</h2> <h4><a name="JavaServerFacesRI-HowdoIaccessthesourcetreeviaversioncontrol%3F"></a>How do I access the source tree via version control?</h3> <p>Access to the source code for Oracle's implementation of the JCP JSF Specification is subject to the terms of either the GNU<br> General Public License Version 2 only ("GPL") or the Common Development<br> and Distribution License("CDDL") (collectively, the "License"). You<br> may not use this file except in compliance with the License. You can obtain<br> a copy of the License at <a href="http://javaee.github.io/glassfish/public/CDDL+GPL_1_1.html">here</a>.</p> <p>Refer to the <a href="http://javaserverfaces.java.net/checkout.html">version control instructions</a> for details on configuring your client.</p> <p>If you don't have a java.net ID, you can check out the source anonymously by using the <em>guest</em> account.</p> <p>The <a href="http://javaserverfaces.java.net/checkout.html">version control instructions</a> also contains information pertaining<br> to branch names which will be important depending on which version of JSF you're interested in working with.</p> <h4><a name="JavaServerFacesRI-WhatarethetagsforthecurrentreleasesofMojarra%3F"></a>What are the tags for the current releases of Mojarra?</h3>
      <ul> 
       <li>Latest 2.2 
        <ul> 
@@ -596,7 +596,7 @@
       </div>
      </div> <h4><a name="JavaServerFacesRI-WhatisrequiredtobuildJSF1.2.x%3F"></a>What is required to build JSF 1.2.x?</h3> 
      <ul> 
-      <li><a href="https://glassfish.java.net/">GlassFish</a> or any JSP2.1/J2EE 5.0 based container</li> 
+      <li><a href="https://javaee.github.io/glassfish/">GlassFish</a> or any JSP2.1/J2EE 5.0 based container</li>
       <li><a href="http://java.sun.com/j2se/1.5.0/index.jsp">J2SE 5.0</a> or later</li> 
      </ul> <h4><a name="JavaServerFacesRI-HowdoIbuildthecode%3F"></a>How do I build the code?</h3> <p>Make sure you have installed everything outlined in <a href="#JavaServerFacesRI-WhatIsRequiredToBuildJSF1.1.xAndJSF1.2.x">What is required to build JSF 1.1.x and JSF 1.2.x?</a> and <a href="#JavaServerFacesRI-WhatIsRequiredToBuildJSF1.2.x">What is required to build JSF 1.2.x?</a>. Make it so JDK and Ant are runnable from the command line. This involves setting up the environment per the Ant instructions.</p> <p><b>Steps</b></p> 
      <ul> 
@@ -798,13 +798,13 @@
         </tr> 
         <tr> 
          <td class="confluenceTd"> com.sun.faces.injectionProvider </td> 
-         <td class="confluenceTd"> This parameter specifies a class that implements the <a href="https://javaserverfaces.java.net/nonav/rlnotes/1.2_01-changelog.html#serialization">InjectionProvider </a>for more details </td> 
+         <td class="confluenceTd"> This parameter specifies a class that implements the <a href="https://javaserverfaces.github.io/rlnotes/1.2_01-changelog.html#serialization">InjectionProvider </a>for more details </td>
          <td class="confluenceTd"> NONE </td> 
          <td class="confluenceTd"> 1.2_01 </td> 
         </tr> 
         <tr> 
          <td class="confluenceTd"> com.sun.faces.serializationProvider </td> 
-         <td class="confluenceTd"> This parameter specifies a class that implements the <a href="https:://javaserverfaces.java.net/nonav/rlnotes/1.2_01-changelog.html#serialization">SerializationProvider </a>SPI. This implementation represents a hook the JSF implementation will use in order to allow the use of alternate Serialization implementations. See the documentation of the <a href="https://javaserverfaces.java.net/nonav/rlnotes/1.2_01/changelog.html#serialization">interface </a>for more details </td> 
+         <td class="confluenceTd"> This parameter specifies a class that implements the <a href="https:://javaserverfaces.github.io/rlnotes/1.2_01-changelog.html#serialization">SerializationProvider </a>SPI. This implementation represents a hook the JSF implementation will use in order to allow the use of alternate Serialization implementations. See the documentation of the <a href="https://javaserverfaces.github.io/rlnotes/1.2_01/changelog.html#serialization">interface </a>for more details </td>
          <td class="confluenceTd"> NONE </td> 
          <td class="confluenceTd"> 1.2_01 </td> 
         </tr> 
@@ -1141,7 +1141,7 @@
 &lt;/sun-web-app&gt;</pre> 
        </div> 
       </div>
-     </div> <p>and bundle Mojarra 2.0 into the WAR as well, and it should work.</p> <p>For upgrading the whole app server to Mojarra 2.0, see <a href="https://javaserverfaces.java.net/nonav/rlnotes/2.0.2/releasenotes.html">the release notes</a></p> <h4><a name="JavaServerFacesRI-IwanttouseMojarra2.0withthenewELinTomcat"></a>I want to use Mojarra 2.0 with the new EL in Tomcat</h3> <p>Please see <a href="http://weblogs.java.net/blog/cayhorstmann/archive/2009/12/29/jsf-20-and-tomcat">Cay's blog on the topic</a></p> <h4><a name="JavaServerFacesRI-Hudsonconcerns"></a>Hudson concerns</h2> <h4><a name="JavaServerFacesRI-IkeepgettingOutOfMemoryError.HowdoIfixit%3F"></a>I keep getting OutOfMemoryError. How do I fix it?</h3> <p>Make sure your -Xmx is high enough. 4096 works. Also, I've seen the need to add ulimit -h 4096 to the system.</p> <h4><a name="JavaServerFacesRI-Mojarra2.0.0Schedule"></a>Mojarra 2.0.0 Schedule</h2> <p><a href="MojarraSchedule200.html" title="MojarraSchedule200">Mojarra 2.0.0 Schedule</a></p> <h4><a name="JavaServerFacesRI-MojarraCodeCoverageInformation"></a>Mojarra Code Coverage Information</h2> <p><a href="mojarraCodeCoverage.html" title="mojarraCodeCoverage">Mojarra Code Coverage Information</a></p> </td> 
+     </div> <p>and bundle Mojarra 2.0 into the WAR as well, and it should work.</p> <p>For upgrading the whole app server to Mojarra 2.0, see <a href="https://javaserverfaces.github.io/rlnotes/2.0.2/releasenotes.html">the release notes</a></p> <h4><a name="JavaServerFacesRI-IwanttouseMojarra2.0withthenewELinTomcat"></a>I want to use Mojarra 2.0 with the new EL in Tomcat</h3> <p>Please see <a href="http://weblogs.java.net/blog/cayhorstmann/archive/2009/12/29/jsf-20-and-tomcat">Cay's blog on the topic</a></p> <h4><a name="JavaServerFacesRI-Hudsonconcerns"></a>Hudson concerns</h2> <h4><a name="JavaServerFacesRI-IkeepgettingOutOfMemoryError.HowdoIfixit%3F"></a>I keep getting OutOfMemoryError. How do I fix it?</h3> <p>Make sure your -Xmx is high enough. 4096 works. Also, I've seen the need to add ulimit -h 4096 to the system.</p> <h4><a name="JavaServerFacesRI-Mojarra2.0.0Schedule"></a>Mojarra 2.0.0 Schedule</h2> <p><a href="MojarraSchedule200.html" title="MojarraSchedule200">Mojarra 2.0.0 Schedule</a></p> <h4><a name="JavaServerFacesRI-MojarraCodeCoverageInformation"></a>Mojarra Code Coverage Information</h2> <p><a href="mojarraCodeCoverage.html" title="mojarraCodeCoverage">Mojarra Code Coverage Information</a></p> </td>
    </tr> 
   </tbody>
  </table>    
diff --git a/JavaServerFacesSpecFaq.html b/JavaServerFacesSpecFaq.html
index 6f6f028..94e4b11 100644
--- a/JavaServerFacesSpecFaq.html
+++ b/JavaServerFacesSpecFaq.html
@@ -109,7 +109,7 @@
      <ol> 
       <li>Please sign up as a java.net member at &lt;<a href="https://java.net/people/new">https://java.net/people/new</a> &gt;.</li> 
       <li>Click the "Bookmark This Project" link on &lt;<a href="http://jsf-spec.java.net">http://jsf-spec.java.net</a> &gt; to join the project as an Observer.</li> 
-      <li>Visit &lt;<a href="http://jsf-spec.java.net/lists">http://jsf-spec.java.net/lists</a> &gt; and join the list of your choice.&nbsp; This includes the issuetracker list. Observers of the project can subscribe to the <em>users@javaserverfaces-spec-public.net</em> email list. This list is a reflector for the expert group email list (<em>jsr344-experts@javaserverfaces-spec-public.java.net</em>) and receives all emails that are sent to the experts list. It can also be used for community discussion related to the JSR.</li> 
+      <li>Visit &lt;<a href="http://jsf-spec.java.net/lists">http://jsf-spec.java.net/lists</a> &gt; and join the list of your choice.&nbsp; This includes the issuetracker list. Observers of the project can subscribe to the <em>users@javaserverfaces-spec-public.net</em> email list. This list is a reflector for the expert group email list (<em>jsr344-experts@javaee.github.io/javaserverfaces-spec</em>) and receives all emails that are sent to the experts list. It can also be used for community discussion related to the JSR.</li>
      </ol> <h4><a name="JavaServerFacesSpecFaq-Usetheissuetracker"></a>Use the issuetracker</h4> <p>The issuetracker of record for the JavaServer Faces specification is at &lt;<a href="http://jsf.java.net/issues/">http://jsf.java.net/issues/</a> &gt;.</p> <h4><a name="JavaServerFacesSpecFaq-WhatarethedifferencesbetweenJavaServerFacestechnologyandStruts%3F"></a>What are the differences between JavaServer Faces technology and Struts?</h2> <p>Struts is an open-source Java web application framework whose architecture is based on the Model-View-Controller design pattern in which requests are routed through a controller that provides overall application management and dispatches the requests to application components. JavaServer Faces technology is a user-interface framework for Java web applications. It is focussed on the view tier of an MVC-based architecture. The Struts and JavaServer Faces technology frameworks do have some overlapping functionality; however each framework has its advantages, and developers can use certain features of both frameworks in a single application.</p> <p>The primary advantages of Struts as compared to JavaServer Faces technology are as follows:</p> 
      <ul> 
       <li>Because Struts is a web application framework, it has a more sophisticated controller architecture than does JavaServer Faces technology. It is more sophisticated partly because the application developer can access the controller by creating an Action object that can integrate with the controller, whereas JavaServer Faces technology does not allow access to the controller. In addition, the Struts controller can do things like access control on each Action based on user roles. This functionality is not provided by JavaServer Faces technology.</li> 
diff --git a/__modules/header.htmlx b/__modules/header.htmlx
index 92da54a..3734498 100755
--- a/__modules/header.htmlx
+++ b/__modules/header.htmlx
@@ -10,34 +10,34 @@
 		      <div style="z-index: 11;" id="qm0" class="qmmc">
 			<a id="regions-leadin">&nbsp;</a>
 			<a id="" class="qmparent" href="https://blogs.oracle.com/theaquarium/">Aquarium</a>
-			<a id="current-region" class="qmparent" href="https://glassfish.java.net/">Core</a>
+			<a id="current-region" class="qmparent" href="https://javaee.github.io/glassfish/">Core</a>
 		        <div style="z-index: 21;" id="">
-			  <a id="" href="https://glassfish.java.net/">GlassFish</a>
+			  <a id="" href="https://javaee.github.io/glassfish/">GlassFish</a>
 			  <a id="" href="https://glassfish-samples.java.net/">Samples</a>
-			  <a id="" href="https://grizzly.java.net/">Grizzly</a>
-			  <a id="" href="https://jersey.java.net/">Jersey</a>
-			  <a id="" href="https://mq.java.net/">OpenMQ</a>
+			  <a id="" href="https://javaee.github.io/grizzly/">Grizzly</a>
+			  <a id="" href="https://jersey.github.io/">Jersey</a>
+			  <a id="" href="https://javaee.github.io/openmq/">OpenMQ</a>
 			  <a id="" href="https://sailfin.java.net/">SailFin</a>
 			  <a id="" href="https://shoal.java.net/">Shoal</a>
 			  <a id="" href="https://hk2.java.net/">HK2</a>
 			  <a id="" href="https://wikis.oracle.com/display/GlassFish/GlassFishWiki">Wiki</a>
 			</div>
-			<a id="" class="qmparent" href="https://glassfish.java.net/javaee5/webtier/webtierhome.html">Webtier</a>
+			<a id="" class="qmparent" href="https://javaee.github.io/glassfish/javaee5/webtier/webtierhome.html">Webtier</a>
 			<div style="z-index: 21;" id="">
 			  <a id="" href="https://jsp.java.net/">JSP</a>
 			  <a id="" href="https://uel.java.net/">EL</a>
 			  <a id="" href="https://jstl.java.net/">JSTL</a>
-			  <a id="" href="https://javaserverfaces.java.net/">JSF</a>
+			  <a id="" href="https://javaserverfaces.github.io">JSF</a>
 			  <a id="" href="https://jsftemplating.java.net/">JSFTemplating</a>
 			  <a id="" href="https://woodstock.java.net/">Woodstock</a>
-			  <a id="" href="https://jersey.java.net/">Jersey</a>
+			  <a id="" href="https://jersey.github.io/">Jersey</a>
 			  <a id="" href="https://phobos.java.net/">Phobos</a>
 			  <a id="" href="https://wadl.java.net/">WADL</a>
 			  <a id="" href="https://lrwpinjava.java.net/">LRWPinJava</a>
 			</div>
 			<a id="" class="qmparent" href="https://metro.java.net/">WS/XML</a>
 			<div style="z-index: 21;" id="">
-			  <a id="" href="https://jersey.java.net/">Jersey</a>
+			  <a id="" href="https://jersey.github.io/">Jersey</a>
 			  <a id="" href="https://metro.java.net/">Metro</a>
 			  <a id="" href="https://jax-ws.java.net/">JAX-WS</a>
 			  <a id="" href="https://wsit.java.net/">WSIT</a>
@@ -45,7 +45,7 @@
 			  <a id="" href="https://jaxp.java.net/">JAXP</a>
 			  <a id="" href="https://wiseman.java.net/">Wiseman</a>
 			</div>
-			<a id="" class="qmparent" href="https://glassfish.java.net/">Tools</a>
+			<a id="" class="qmparent" href="https://javaee.github.io/glassfish/">Tools</a>
 			<div style="z-index: 21;" id="">
 			  <a id="" href="https://hudson.java.net/">Hudson</a>
 			  <a id="" href="https://japex.java.net/">Japex</a>
@@ -108,7 +108,7 @@
 
     <script>
 
-if(window.location.href.indexOf("https://glassfish.java.net/ja/")==0) {
+if(window.location.href.indexOf("https://javaee.github.io/glassfish/ja/")==0) {
   document.getElementById("main-menubar").style.display = "none";
   document.getElementById("ja-menubar").style.display = "";
 }
diff --git a/__modules/left_sidebar.htmlx b/__modules/left_sidebar.htmlx
index e2fedd3..15c5d1c 100755
--- a/__modules/left_sidebar.htmlx
+++ b/__modules/left_sidebar.htmlx
@@ -1,19 +1,19 @@
     <script>
         var info = {
 	title: "Oracle Mojarra JavaServer Faces",
-	logo: "https://javaserverfaces.java.net/images/glassfish_logo.gif"
+	logo: "https://javaserverfaces.github.io/images/glassfish_logo.gif"
         }
     </script>
 
 	  <div id="navcol">
 	    <dl id="projecttools" class="navgroup" style="text-align: left;">
 	      <dt id="current-zone" class="depth0">
-		<a href="https://glassfish.java.net/">GlassFish Community</a>
+		<a href="https://javaee.github.io/glassfish/">GlassFish Community</a>
 	      </dt>
 	      <dd class="depth0 parent parent" id="menubar">
 <ul id="main-menubar">
     <li>
-	<a href="https://javaserverfaces.java.net/download.html">Downloads</a>
+	<a href="https://javaserverfaces.github.io/download.html">Downloads</a>
     <li>
       <a href="https://java.net/projects/javaserverfaces/lists">Mailing lists</a>
     <li>
@@ -29,13 +29,13 @@
     <li>
         <a href="https://java.net/jira/browse/JAVASERVERFACES/">IssueTracker</a>
     <li>
-	<a href="https://javaserverfaces-spec-public.java.net">JSF Specification</a>
+	<a href="https://javaee.github.io/javaserverfaces-spec">JSF Specification</a>
 </ul>
 
 <script>
 var info = {
 	title: "Oracle Mojarra JavaServer Faces",
-	logo: "https://javaserverfaces.java.net/images/glassfish_logo.gif"
+	logo: "https://javaserverfaces.github.io/images/glassfish_logo.gif"
 }
 </script>
 <script src="https://glassfish-theming.java.net/zone-webtier.js"></script>
diff --git a/download.html b/download.html
index c05ef0f..5016b81 100644
--- a/download.html
+++ b/download.html
@@ -29,8 +29,8 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</a>
-					<div class="brand"><a href="https://javaserverfaces.java.net"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
-					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://glassfish.java.net" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.java.net" title="Jersey">Jersey</a></li><li><a href="https://tyrus.java.net" title="Tyrus">Tyrus</a></li><li><a href="https://grizzly.java.net" title="Grizzly">Grizzly</a></li><li><a href="https://mq.java.net" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
+					<div class="brand"><a href="https://javaserverfaces.github.io"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
+					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://javaee.github.io/glassfish/" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.github.io" title="Jersey">Jersey</a></li><li><a href="https://tyrus-project.github.io" title="Tyrus">Tyrus</a></li><li><a href="https://javaee.github.io/grizzly/" title="Grizzly">Grizzly</a></li><li><a href="https://javaee.github.io/openmq/" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
 				</div>
 
 
@@ -99,7 +99,7 @@ <h4>The Best Way to Satisfy A Dependency on JSF</h4>
 <pre><code>&lt;dependency&gt;
 &nbsp;&nbsp;&lt;groupId&gt;javax&lt;/groupId&gt;
 &nbsp;&nbsp;&lt;artifactId&gt;javaee-api&lt;/artifactId&gt;
-&nbsp;&nbsp;&lt;version&gt;7.0&lt;/version&gt;
+&nbsp;&nbsp;&lt;version&gt;8.0&lt;/version&gt;
 &nbsp;&nbsp;&lt;scope&gt;provided&lt;/scope&gt;
 &lt;/dependency&gt;
 </code></pre>
@@ -151,6 +151,18 @@ <h4>The Best Way to Satisfy A Dependency on JSF</h4>
 </code></pre>
 </dd>
 
+<dt>Java EE 8 (also satisfies JSF 2.3 compile-time dependencies)</dt>
+<dd>
+
+<pre><code>&lt;dependency&gt;
+&nbsp;&nbsp;&lt;groupId&gt;javax&lt;/groupId&gt;
+&nbsp;&nbsp;&lt;artifactId&gt;javaee-api&lt;/artifactId&gt;
+&nbsp;&nbsp;&lt;version&gt;8.0&lt;/version&gt;
+&nbsp;&nbsp;&lt;scope&gt;provided&lt;/scope&gt;
+&lt;/dependency&gt;
+</code></pre>
+</dd>
+
 <dt>Java EE 7 (also satisfies JSF 2.2 compile-time dependencies)</dt>
 <dd>
 
@@ -299,7 +311,7 @@ <h4>Current Release</h4>
         <li>
             <font style="font-weight:bold;">2.3.x releases</font>
             <ul>
-                <li>Download <a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.3.2/javax.faces-2.3.2.jar">https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.3.2/javax.faces-2.3.2.jar</a></li>
+                <li>Download <a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.3.3/javax.faces-2.3.3.jar">https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.3.3/javax.faces-2.3.3.jar</a></li>
                 <li>Release notes page at <a href="2.3/releasenotes.html">2.3/releasenotes.html</a></li>
 	        <li>Maven GAV 
 <br/>
@@ -388,7 +400,7 @@ <h4>Archived Releases</h4>
         <li>
             <font style="font-weight:bold;">2.1.2 - and beyond</font>
             <p>
-                See <a href="http://javaserverfaces.java.net/nonav/2.1/download.html">here</a>
+                See <a href="https://javaserverfaces.github.io/2.1/download.html">here</a>
             </p>
         </li>
         <li>
diff --git a/downloads/ri/__modules/header.htmlx b/downloads/ri/__modules/header.htmlx
index 5d4d9a1..3e37288 100755
--- a/downloads/ri/__modules/header.htmlx
+++ b/downloads/ri/__modules/header.htmlx
@@ -10,19 +10,19 @@
 		      <div style="z-index: 11;" id="qm0" class="qmmc">
 			<a id="regions-leadin">&nbsp;</a>
 			<a id="" class="qmparent" href="http://blogs.sun.com/theaquarium/">Aquarium</a>
-			<a id="current-region" class="qmparent" href="http://glassfish.java.net/">Core</a>
+			<a id="current-region" class="qmparent" href="http://javaee.github.io/glassfish/">Core</a>
 		        <div style="z-index: 21;" id="">
-			  <a id="" href="http://glassfish.java.net/">GlassFish</a>
+			  <a id="" href="http://javaee.github.io/glassfish/">GlassFish</a>
 			  <a id="" href="http://glassfish-samples.java.net/">Samples</a>
-			  <a id="" href="http://grizzly.java.net/">Grizzly</a>
-			  <a id="" href="http://jersey.java.net/">Jersey</a>
-			  <a id="" href="http://mq.java.net/">OpenMQ</a>
+			  <a id="" href="http://javaee.github.io/grizzly/">Grizzly</a>
+			  <a id="" href="http://jersey.github.io/">Jersey</a>
+			  <a id="" href="http://javaee.github.io/openmq/">OpenMQ</a>
 			  <a id="" href="http://sailfin.java.net/">SailFin</a>
 			  <a id="" href="http://shoal.java.net/">Shoal</a>
 			  <a id="" href="http://hk2.java.net/">HK2</a>
 			  <a id="" href="http://wikis.oracle.com/display/GlassFish/GlassFishWiki">Wiki</a>
 			</div>
-			<a id="" class="qmparent" href="http://glassfish.java.net/javaee5/webtier/webtierhome.html">Webtier</a>
+			<a id="" class="qmparent" href="http://javaee.github.io/glassfish/javaee5/webtier/webtierhome.html">Webtier</a>
 			<div style="z-index: 21;" id="">
 			  <a id="" href="http://jsp.java.net/">JSP</a>
 			  <a id="" href="http://uel.java.net/">EL</a>
@@ -30,14 +30,14 @@
 			  <a id="" href="http://javaserverfaces.java.net/">JSF</a>
 			  <a id="" href="http://jsftemplating.java.net/">JSFTemplating</a>
 			  <a id="" href="http://woodstock.java.net/">Woodstock</a>
-			  <a id="" href="http://jersey.java.net/">Jersey</a>
+			  <a id="" href="http://jersey.github.io/">Jersey</a>
 			  <a id="" href="http://phobos.java.net/">Phobos</a>
 			  <a id="" href="http://wadl.java.net/">WADL</a>
 			  <a id="" href="http://lrwpinjava.java.net/">LRWPinJava</a>
 			</div>
 			<a id="" class="qmparent" href="http://metro.java.net/">WS/XML</a>
 			<div style="z-index: 21;" id="">
-			  <a id="" href="http://jersey.java.net/">Jersey</a>
+			  <a id="" href="http://jersey.github.io/">Jersey</a>
 			  <a id="" href="http://metro.java.net/">Metro</a>
 			  <a id="" href="http://jax-ws.java.net/">JAX-WS</a>
 			  <a id="" href="http://wsit.java.net/">WSIT</a>
@@ -45,7 +45,7 @@
 			  <a id="" href="http://jaxp.java.net/">JAXP</a>
 			  <a id="" href="http://wiseman.java.net/">Wiseman</a>
 			</div>
-			<a id="" class="qmparent" href="http://glassfish.java.net/">Tools</a>
+			<a id="" class="qmparent" href="http://javaee.github.io/glassfish/">Tools</a>
 			<div style="z-index: 21;" id="">
 			  <a id="" href="http://hudson.java.net/">Hudson</a>
 			  <a id="" href="http://japex.java.net/">Japex</a>
@@ -108,7 +108,7 @@
 
     <script>
 
-if(window.location.href.indexOf("http://glassfish.java.net/ja/")==0) {
+if(window.location.href.indexOf("http://javaee.github.io/glassfish/ja/")==0) {
   document.getElementById("main-menubar").style.display = "none";
   document.getElementById("ja-menubar").style.display = "";
 }
diff --git a/downloads/ri/__modules/left_sidebar.htmlx b/downloads/ri/__modules/left_sidebar.htmlx
index 0c85ab0..eefdc22 100755
--- a/downloads/ri/__modules/left_sidebar.htmlx
+++ b/downloads/ri/__modules/left_sidebar.htmlx
@@ -8,7 +8,7 @@
 	  <div id="navcol">
 	    <dl id="projecttools" class="navgroup" style="text-align: left;">
 	      <dt id="current-zone" class="depth0">
-		<a href="http://glassfish.java.net/">GlassFish Community</a>
+		<a href="http://javaee.github.io/glassfish/">GlassFish Community</a>
 	      </dt>
 	      <dd class="depth0 parent parent" id="menubar">
 <ul id="main-menubar">
@@ -29,7 +29,7 @@
     <li>
         <a href="http://java.net/jira/browse/JAVASERVERFACES/">IssueTracker</a>
     <li>
-	<a href="http://javaserverfaces-spec-public.java.net">JSF Specification</a>
+	<a href="http://javaee.github.io/javaserverfaces-spec">JSF Specification</a>
 </ul>
 
 <script>
diff --git a/downloads/ri/index.html b/downloads/ri/index.html
index 4942276..8a2c180 100644
--- a/downloads/ri/index.html
+++ b/downloads/ri/index.html
@@ -12,10 +12,10 @@
      <h1>The JavaServer Faces Reference Implementation</h1> 
         <p>This page provides links to download the binary and source distributions
             of the Reference Implementation (RI) for JSR 314 and JSR-252: JavaServer Faces, which represents a subset of the
-            <a href="https://javaserverfaces.java.net/">Mojarra</a> project.</p> 
+            <a href="https://javaserverfaces.github.io">Mojarra</a> project.</p>
         <p>To utilize Mojarra distributions, the recommended approach to getting
             started and using JSF, please goto the
-            <a href="https://javaserverfaces.java.net/">Mojarra project page</a> and
+            <a href="https://javaserverfaces.github.io">Mojarra project page</a> and
             click on the "Download Now" buttons.</p> 
 
         <h2>JSR 344 RI 2.2.0, implementing Spec corresponding to the
diff --git a/faq.html b/faq.html
index 737d0fa..494002f 100644
--- a/faq.html
+++ b/faq.html
@@ -29,8 +29,8 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</a>
-					<div class="brand"><a href="https://javaserverfaces.java.net"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
-					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://glassfish.java.net" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.java.net" title="Jersey">Jersey</a></li><li><a href="https://tyrus.java.net" title="Tyrus">Tyrus</a></li><li><a href="https://grizzly.java.net" title="Grizzly">Grizzly</a></li><li><a href="https://mq.java.net" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
+					<div class="brand"><a href="https://javaserverfaces.github.io"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
+					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://javaee.github.io/glassfish/" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.github.io" title="Jersey">Jersey</a></li><li><a href="https://tyrus-project.github.io" title="Tyrus">Tyrus</a></li><li><a href="https://javaee.github.io/grizzly/" title="Grizzly">Grizzly</a></li><li><a href="https://javaee.github.io/openmq/" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
 				</div>
 
 
@@ -53,12 +53,12 @@
 
 
 <br>
-<p><h5><a name="The_official_FAQ_for_JSF_is_spre"></a> The official FAQ for JSF is spread across several FAQ sites : </h5> 
+<p><h5><a name="The_official_FAQ_for_JSF_is_spre"></a> The official FAQ for JSF is spread across several FAQ sites: </h5>
 </p>
 <ul> 
-<li>The Official FAQ for the JSF Specification (Implementation Agnostic) : <a href="JavaServerFacesSpecFaq.html" rel="nofollow" target="_top">JavaServerFacesSpecFaq.html</a></li>
-<li>The Official FAQ for Oracle's Mojarra Implementation : <a href="JavaServerFacesRI.html" rel="nofollow" target="_top">JavaServerFacesRI.html</a></li>
-<li>The Official FAQ for Apache's MyFaces Implementation : <a href="http://myfaces.apache.org/faq.html" rel="nofollow" target="_top">http://myfaces.apache.org/faq.html</a></li>
+<li>The Official FAQ for the JSF Specification (Implementation Agnostic): <a href="JavaServerFacesSpecFaq.html" rel="nofollow" target="_top">JavaServerFacesSpecFaq.html</a></li>
+<li>The Official FAQ for Oracle's Mojarra Implementation: <a href="JavaServerFacesRI.html" rel="nofollow" target="_top">JavaServerFacesRI.html</a></li>
+<li>The Official FAQ for Apache's MyFaces Implementation: <a href="http://myfaces.apache.org/faq.html" rel="nofollow" target="_top">http://myfaces.apache.org/faq.html</a></li>
 </ul> 
 <br>
 <!-- original content-->
diff --git a/forum.html b/forum.html
index f57bf25..75ce170 100644
--- a/forum.html
+++ b/forum.html
@@ -29,8 +29,8 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <div class="brand"><a href="https://javaserverfaces.java.net"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
-                    <div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://glassfish.java.net" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.java.net" title="Jersey">Jersey</a></li><li><a href="https://tyrus.java.net" title="Tyrus">Tyrus</a></li><li><a href="https://grizzly.java.net" title="Grizzly">Grizzly</a></li><li><a href="https://mq.java.net" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
+                    <div class="brand"><a href="https://javaserverfaces.github.io"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
+                    <div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://javaee.github.io/glassfish/" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.github.io" title="Jersey">Jersey</a></li><li><a href="https://tyrus-project.github.io" title="Tyrus">Tyrus</a></li><li><a href="https://javaee.github.io/grizzly/" title="Grizzly">Grizzly</a></li><li><a href="https://javaee.github.io/openmq/" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
                 </div>
 
 
@@ -60,49 +60,25 @@ <h3 class= "gf-orange">Forum and Mailing Lists</h3>
 
                 <div class="row">
                     <div class="span4" style="text-align:right">
-                        <b>Mojarra users list</b>
+                        <b>Mojarra list</b>
                     </div>
                     <div class="span7">
                         <p>
-                            <i>users@javaserverfaces.java.net</i> mailing list : 
-                            <a href="http://java.net/projects/javaserverfaces/lists/users/archive" class="gf-orange">Check archive</a>
-                            <a href="mailto:sympa@javaserverfaces.java.net?subject=sub users" class="gf-orange">Subscribe</a> &raquo;
-                            <a href="mailto:users@javaserverfaces.java.net" class="gf-orange">Post a message</a>
+                            <i>mojarra@javaee.groups.io</i> mailing list:
+                            <a href="https://javaee.groups.io/g/mojarra/messages" class="gf-orange">Check archive</a>
+                            <a href="mailto:mojarra+subscribe@javaee.groups.io" class="gf-orange">Subscribe</a> &raquo;
+                            <a href="mailto:mojarra@javaee.groups.io" class="gf-orange">Post a message</a>
                         </p>
                     </div>
                 </div>
 
-                <div class="row">
-                    <div class="span4" style="text-align:right">
-                        <b>Mojarra development, aka implementation details</b>
-                    </div>
-                    <div class="span7">
-                        <p><i>dev@javaserverfaces.java.net</i> mailing list : 
-                            <a href="http://java.net/projects/javaserverfaces/lists/dev/archive" class="gf-orange">Check archive</a> &raquo; 
-                            <a href="mailto:sympa@javaserverfaces.java.net?subject=sub dev" class="gf-orange">Subscribe</a> &raquo;
-                            <a href="mailto:dev@javaserverfaces.java.net" class="gf-orange">Post a message</a></p>
-
-                        <p><i>issues@javaserverfaces.java.net</i> mailing list : 
-                            <a href="http://java.net/projects/javaserverfaces/lists/issues/archive" class="gf-orange">Check archive</a> &raquo; 
-                            <a href="mailto:sympa@javaserverfaces.java.net?subject=sub issues" class="gf-orange">Subscribe</a>&raquo;
-                            <a href="mailto:issues@javaserverfaces.java.net" class="gf-orange">Post a message (usually to send a reproducer war file)</a>
-                        </p>
-
-                        <p><i>commits@javaserverfaces.java.net</i> mailing list : 
-                            <a href="http://java.net/projects/javaserverfaces/lists/commits/archive" class="gf-orange">Check archive</a> &raquo; 
-                            <a href="mailto:sympa@javaserverfaces.java.net?subject=sub commits" class="gf-orange">Subscribe</a>
-                        </p>
-                    </div>
-
-                </div> <!-- row -->
-
                 <div class="row">
                     <div class="span4" style="text-align:right">
                         <b>Oracle Tech Network Forum</b>
                     </div>
                     <div class="span7">
-                        <p><i>Web forum : </i>
-                            <a href="https://community.oracle.com/community/developer/english/java/java_enterprise_%26_remote_computing/javaserver_faces/content" class="gf-orange">View and post</a>                         </p>
+                        <p><i>Web forum: </i>
+                            <a href="https://community.oracle.com/community/java/java-ee-java-enterprise-edition/javaserver_faces" class="gf-orange">View and post</a>                         </p>
 
                     </div>
 
@@ -113,8 +89,8 @@ <h3 class= "gf-orange">Forum and Mailing Lists</h3>
                         <b>FreeNode IRC channel</b>
                     </div>
                     <div class="span7">
-                        <p><i>##jsf : </i>
-                            <a href="https://wikis.oracle.com/display/GlassFish/JavaServerFacesSpecFaq#JavaServerFacesSpecFaq-IsthereapublicchatroomforJSFdevelopersandusers%3F" class="gf-orange">Instructions for joining</a>                         </p>
+                        <p><i>##jsf </i>
+                            channel on the Freenode IRC network (irc.freenode.net)</p>
 
                     </div>
 
diff --git a/in/download.html b/in/download.html
index 704c3da..2e05c91 100644
--- a/in/download.html
+++ b/in/download.html
@@ -217,7 +217,7 @@ <h4>Current Release</h4>
             <font style="font-weight:bold;">2.2.x releases</font>
             <ul>
                 <li>Download <a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.1/javax.faces-2.2.1.jar">https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.1/javax.faces-2.2.1.jar</a></li>
-                <li>Release notes page at <a href="https://javaserverfaces.java.net/2.2/releasenotes.html">https://javaserverfaces.java.net/2.2/releasenotes.html</a></li>
+                <li>Release notes page at <a href="https://javaserverfaces.github.io/2.2/releasenotes.html">https://javaserverfaces.github.io/2.2/releasenotes.html</a></li>
 	        <li>Maven GAV 
 <br/>
 <pre><code>&lt;dependency&gt;
@@ -235,7 +235,7 @@ <h4>Current Release</h4>
             <font style="font-weight:bold;">2.1.x releases</font>
             <ul>
                 <li>Download page at <a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.1.24/javax.faces-2.1.24.jar">https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.1.24/javax.faces-2.1.24.jar</a></li>
-                <li>Release notes page at <a href="https://javaserverfaces.java.net/2.1/releasenotes.html">https://javaserverfaces.java.net/2.1/releasenotes.html</a></li>
+                <li>Release notes page at <a href="https://javaserverfaces.github.io/2.1/releasenotes.html">https://javaserverfaces.github.io/2.1/releasenotes.html</a></li>
 	        <li>Maven GAV <br/>
 <pre><code>&lt;dependency&gt;
 &nbsp;&nbsp;&lt;groupId&gt;org.glassfish&lt;/groupId&gt;
@@ -251,7 +251,7 @@ <h4>Current Release</h4>
             <ul>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.11/javax.faces-2.0.11.jar">2.0.11 binary</a></li>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.11/javax.faces-2.0.11-sources.jar">2.0.11 sources</a></li>
-                <li><a href="https://javaserverfaces.java.net/nonav/rlnotes/2.0.11/index.html">2.0.11 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.11/index.html">2.0.11 Release Notes</a></li>
 	        <li>Maven GAV <br/>
 <pre><code>&lt;dependency&gt;
 &nbsp;&nbsp;&lt;groupId&gt;org.glassfish&lt;/groupId&gt;
@@ -269,7 +269,7 @@ <h4>Current Release</h4>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_16/mojarra-1.2_16-binary.zip">1.2_16 binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_16/mojarra-1.2_16-source.zip">1.2_16 source</a></li>
 <!-- PENDING(rogerk): add relnotes for 1.2_16
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_16/index.html">1.2_16 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_16/index.html">1.2_16 Release Notes</a></li>
 -->
 
     </ul>
@@ -287,7 +287,7 @@ <h4>Archived Releases</h4>
         <li>
             <font style="font-weight:bold;">2.1.2 - and beyond</font>
             <p>
-                See <a href="http://javaserverfaces.java.net/nonav/2.1/download.html">here</a>
+                See <a href="https://javaserverfaces.github.io/2.1/download.html">here</a>
             </p>
         </li>
         <li>
@@ -295,7 +295,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.1.1-FCS-binary.zip">2.1.1 binary bundle</a></li>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.1.1-FCS-source.zip">2.1.1 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.1.1/index.html">2.1.1 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.1.1/index.html">2.1.1 Release Notes</a></li>
 	        <li>Maven GAV<br/>
 
 <pre><code>&lt;dependency&gt;
@@ -322,7 +322,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.1.0-FCS-binary.zip">2.1.0 binary bundle</a></li>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.1.0-FCS-source.zip">2.1.0 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.1.0/index.html">2.1.0 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.1.0/index.html">2.1.0 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.1.0-b11&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -332,7 +332,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.10/javax.faces-2.0.10.jar">2.0.10 binary</a></li>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.10/javax.faces-2.0.10-sources.jar">2.0.10 sources</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.10/index.html">2.0.10 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.10/index.html">2.0.10 Release Notes</a></li>
 	        <li>Maven GAV <br/>
 <pre><code>&lt;dependency&gt;
 &nbsp;&nbsp;&lt;groupId&gt;org.glassfish&lt;/groupId&gt;
@@ -350,7 +350,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.9/javax.faces-2.0.9.jar">2.0.9 binary</a></li>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.9/javax.faces-2.0.9-sources.jar">2.0.9 sources</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.9/">2.0.9 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.9/">2.0.9 Release Notes</a></li>
 	        <li>Maven GAV <br/>
 
 <pre><code>&lt;dependency&gt;
@@ -367,7 +367,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.8/javax.faces-2.0.8.jar">2.0.8 binary</a></li>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.8/javax.faces-2.0.8-sources.jar">2.0.8 sources</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.8/">2.0.8 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.8/">2.0.8 Release Notes</a></li>
 	        <li>Maven GAV <br/>
 
 <pre><code>&lt;dependency&gt;
@@ -384,7 +384,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.7/javax.faces-2.0.7.jar">2.0.7 binary</a></li>
                 <li><a href="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.0.7/javax.faces-2.0.7-sources.jar">2.0.7 sources</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.7/">2.0.7 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.7/">2.0.7 Release Notes</a></li>
 	        <li>Maven GAV <br/>
 
 <pre><code>&lt;dependency&gt;
@@ -401,7 +401,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.6-FCS-binary.zip">2.0.6 binary bundle</a></li>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.6-FCS-source.zip">2.0.6 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.6/index.html">2.0.6 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.6/index.html">2.0.6 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.6&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -410,7 +410,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.5-FCS-binary.zip">2.0.5 binary bundle</a></li>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.5-FCS-source.zip">2.0.5 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.5/index.html">2.0.5 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.5/index.html">2.0.5 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.5&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -419,7 +419,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.4-FCS-binary.zip">2.0.4 binary bundle</a></li>
                 <li><a href="http://java.net/projects/javaserverfaces/downloads/download/release%252Fmojarra-2.0.4-FCS-source.zip">2.0.4 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.4/index.html">2.0.4 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.4/index.html">2.0.4 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.4-b09&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -430,7 +430,7 @@ <h4>Archived Releases</h4>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_15/mojarra-1.2_15-b01-FCS-binary.zip">1.2_15 binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_15/mojarra-1.2_15-b01-FCS-source.zip">1.2_15 source</a></li>
 <!-- PENDING(rogerk): add relnotes for 1.2_15 
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_15/index.html">1.2_15 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_15/index.html">1.2_15 Release Notes</a></li>
 -->
 	        <li>Maven GAV<br/>
 
@@ -459,7 +459,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.3/mojarra-2.0.3-FCS-binary.zip">2.0.3 binary bundle</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.3/mojarra-2.0.3-FCS-source.zip">2.0.3 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.3/index.html">2.0.3 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.3/index.html">2.0.3 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.3-b05&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -468,7 +468,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.2/mojarra-2.0.2-FCS-binary.zip">2.0.2 binary bundle</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.2/mojarra-2.0.2-FCS-source.zip">2.0.2 source bundle</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.2/index.html">2.0.2 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.2/index.html">2.0.2 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.2-b10&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -477,7 +477,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.1/mojarra-2.0.1-FCS-binary.zip">2.0.1 FCS binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.1/mojarra-2.0.1-FCS-source.zip">2.0.1 FCS source</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.1/index.html">2.0.1 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.1/index.html">2.0.1 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.1-b02&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -486,7 +486,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.0/mojarra-2.0.0-FCS-binary.zip">2.0.0 FCS binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/2.0.0/mojarra-2.0.0-FCS-source.zip">2.0.0 FCS source</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/2.0.0/index.html">2.0.0 RC2 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/2.0.0/index.html">2.0.0 RC2 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;2.0.0-b23&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -495,7 +495,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_14/mojarra-1.2_14-binary.zip">1.2_14 binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_14/mojarra-1.2_14-source.zip">1.2_14 source</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_14/index.html">1.2_14 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_14/index.html">1.2_14 Release Notes</a></li>
                 <li>Maven GAV<br/>
 
 <pre><code>&lt;dependency&gt;
@@ -522,7 +522,7 @@ <h4>Archived Releases</h4>
             <ul>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_13/mojarra-1.2_13-binary.zip">1.2_13 binary</a></li>
                 <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_13/mojarra-1.2_13-source.zip">1.2_13 source</a></li>
-                <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_13/index.html">1.2_13 Release Notes</a></li>
+                <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_13/index.html">1.2_13 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_13&lt;/version&gt;</code></li>
             </ul>
         </li>
@@ -531,7 +531,7 @@ <h4>Archived Releases</h4>
         <ul>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_12/mojarra-1.2_12-binary.zip">1.2_12 binary</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_12/mojarra-1.2_12-source.zip">1.2_12 source</a></li>
-            <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_12/index.html">1.2_12 Release Notes</a></li>
+            <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_12/index.html">1.2_12 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_12&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -540,7 +540,7 @@ <h4>Archived Releases</h4>
         <ul>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_11/mojarra-1.2_11-b01-FCS-binary.zip">1.2_11 binary</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_11/mojarra-1.2_11-b01-FCS-source.zip">1.2_11 source</a></li>
-            <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_11/index.html">1.2_11 Release Notes</a></li>
+            <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_11/index.html">1.2_11 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_11-FCS&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -549,7 +549,7 @@ <h4>Archived Releases</h4>
         <ul>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_10/mojarra-1.2_10-b01-FCS-binary.zip">1.2_10 binary</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_10/mojarra-1.2_10-b01-FCS-source.zip">1.2_10 source</a></li>
-            <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_10/index.html">1.2_10 Release Notes</a></li>
+            <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_10/index.html">1.2_10 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_10&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -559,7 +559,7 @@ <h4>Archived Releases</h4>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_09/mojarra-1.2_09-b02-FCS-binary.zip">1.2_09 binary</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_09/mojarra-1.2_09-b02-FCS-source.zip">1.2_09 source</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_09/mojarra-1.2_09-b02-FCS-glassfish-updater.jar">1.2_09 GlassFish Updater</a></li>
-            <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_09/index.html">1.2_09 Release Notes</a></li>
+            <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_09/index.html">1.2_09 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_09-b01&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -569,7 +569,7 @@ <h4>Archived Releases</h4>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_08/mojarra-1.2_08-FCS-binary.zip">1.2_08 binary</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_08/mojarra-1.2_08-FCS-source.zip">1.2_08 source</a></li>
             <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_08/mojarra-1.2_08-FCS-glassfish-updater.jar">1.2_08 GlassFish Updater</a></li>
-            <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_08/index.html">1.2_08 Release Notes</a></li>
+            <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_08/index.html">1.2_08 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_08&lt;/version&gt;</code></li>
         </ul>
     <li>
@@ -578,7 +578,7 @@ <h4>Archived Releases</h4>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_07/jsf-1_2_07.zip">1.2_07 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_07/jsf-1_2_07-src.zip">1.2_07 source</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_07/jsf-glassfish-updater-1.2_07-b03-FCS.jar">1.2_07 GlassFish Updater</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_07/index.html">1.2_07 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_07/index.html">1.2_07 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_07&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -588,7 +588,7 @@ <h4>Archived Releases</h4>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_06/jsf-1_2_06.zip">1.2_06 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_06/jsf-1_2_06-src.zip">1.2_06 source</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_06/jsf-glassfish-updater-1.2_06-b02-FCS.jar">1.2_06 GlassFish Updater</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_06/index.html">1.2_06 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_06/index.html">1.2_06 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_06&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -597,7 +597,7 @@ <h4>Archived Releases</h4>
         <ul>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_05/jsf-1_2_05.zip">1.2_05 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_05/jsf-1_2_05-src.zip">1.2_05 source</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_05/index.html">1.2_05 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_05/index.html">1.2_05 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_05&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -607,7 +607,7 @@ <h4>Archived Releases</h4>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P02/jsf-1_2_04-p02.zip">1.2_04 P02 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P02/jsf-1_2_04-p02-src.zip">1.2_04 P02 source</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P02/jsf-glassfish-updater-1.2_04-b16-p02.jar">1.2_04 P02 GlassFish Updater</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
            <li>maven version: <code>&lt;version&gt;1.2_04-p02&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -617,7 +617,7 @@ <h4>Archived Releases</h4>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P01/jsf-1.2_04-b10-p01.zip">1.2_04 P01 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P01/jsf-1.2_04-b10-p01-src.zip">1.2_04 P01 source</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04%20P01/jsf-glassfish-updater-1.2_04-b10-p01.jar">1.2_04 P01 GlassFish Updater</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
            <li>maven version: <code>&lt;version&gt;1.2_04-p01&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -627,7 +627,7 @@ <h4>Archived Releases</h4>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04/jsf-1.2_04-b07-FCS.zip">1.2_04 binary</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04/jsf-1.2_04-b07-FCS-src.zip">1.2_04 source</a></li>
            <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_04/jsf-glassfish-updater-1.2_04-b07-FCS.jar">1.2_04 GlassFish Updater</a></li>
-           <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
+           <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_04/index.html">1.2_04 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_04&lt;/version&gt;</code></li>
         </ul>
     </li>
@@ -637,7 +637,7 @@ <h4>Archived Releases</h4>
 	    <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_03/jsf-1_2_03.zip">1.2_03 binary</a></li>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_03/jsf-1_2_03-src.zip">1.2_03 source</a></li>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_03/jsf-glassfish-updater-1.2_03-FCS.jar">1.2_03 GlassFish Updater</a></li>
-        <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_03/index.html">1.2_03 Release Notes</a></li>
+        <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_03/index.html">1.2_03 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_03&lt;/version&gt;</code></li>
     </ul>
     </li>
@@ -646,7 +646,7 @@ <h4>Archived Releases</h4>
     <ul>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_02/jsf-1_2_02.zip">1.2_02 binary</a></li>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_02/jsf-1_2_02-src.zip">1.2_02 source</a></li>
-        <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_02/index.html">1.2_02 Release Notes</a></li>
+        <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_02/index.html">1.2_02 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_02&lt;/version&gt;</code></li>
     </ul>
     </li>
@@ -655,7 +655,7 @@ <h4>Archived Releases</h4>
     <ul>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_01/jsf-1_2_01.zip">1.2_01 binary</a></li>
         <li><a href="http://java.net/downloads/javaserverfaces/release/1.2_01/jsf-1_2_01-src.zip">1.2_01 source</a></li>
-        <li><a href="http://javaserverfaces.java.net/nonav/rlnotes/1.2_01/index.html">1.2_01 Release Notes</a></li>
+        <li><a href="https://javaserverfaces.github.io/rlnotes/1.2_01/index.html">1.2_01 Release Notes</a></li>
 	        <li>maven version: <code>&lt;version&gt;1.2_01-B04&lt;/version&gt;</code></li>
     </ul>
     </li>
diff --git a/in/index.html b/in/index.html
index fe5773d..036b06d 100644
--- a/in/index.html
+++ b/in/index.html
@@ -37,17 +37,17 @@
 
 <div class="row">
 	<div class="span2 right-text" style="font-weight: 600;color: #666;">March 4th, 2014</div>
-	<div class="span5">Mojarra 2.2.6 released : <a href="https://javaserverfaces.java.net/nonav/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.2/download.html">Download Page</a>
+	<div class="span5">Mojarra 2.2.6 released : <a href="https://javaserverfaces.github.io/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.github.io/nonav/2.2/download.html">Download Page</a>
 	</div>
 </div>
 
 <div class="row">
 	<div class="span2 right-text" style="font-weight: 600;color: #666;">March 3rd, 2014</div>
-	<div class="span5">Mojarra 2.1.28 released : <a href="https://javaserverfaces.java.net/nonav/2.1/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.1/download.html">Download page</a></div>
+	<div class="span5">Mojarra 2.1.28 released : <a href="https://javaserverfaces.github.io/2.1/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.github.io/2.1/download.html">Download page</a></div>
 </div>
 <div class="row">
 	<div class="span2 right-text" style="font-weight: 600;color: #666;">January 8th, 2014</div>
-	<div class="span5">Mojarra 2.2.5 released : <a href="https://javaserverfaces.java.net/nonav/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.2/download.html">Download page</a><br>Mojarra 2.1.27 released : <a href="https://javaserverfaces.java.net/nonav/2.1/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.1/download.html">Download page</a></div>
+	<div class="span5">Mojarra 2.2.5 released : <a href="https://javaserverfaces.github.io/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.github.io/2.2/download.html">Download page</a><br>Mojarra 2.1.27 released : <a href="https://javaserverfaces.github.io/nonav/2.1/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.github.io/nonav/2.1/download.html">Download page</a></div>
 </div>
 
   </div>
@@ -73,7 +73,7 @@ <h3><a href="download.html"><p class="ico-download">&nbsp;&nbsp;&nbsp;&nbsp;&nbs
 		</div>
 		
 		<div class="span4">
-			<h3><a href="https://javaserverfaces.java.net/nonav/docs/2.2/javadocs/index.html"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Documentation</p></a></h3>
+			<h3><a href="https://javaserverfaces.github.io/nonav/docs/2.2/javadocs/index.html"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Documentation</p></a></h3>
 			<p>JavaServer Faces API 2.2 Javadoc</p>
 			<div class="section"></div>
 		</div>
@@ -101,7 +101,7 @@ <h3><a href="https://wikis.oracle.com/display/GlassFish/JavaServerFacesRI#JavaSe
 		
 	<div class="row">
 		<div class="span4">
-			<h3><a class="externalLink" href=" http://javaserverfaces-spec-public.java.net/"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specification</p></a></h3>
+			<h3><a class="externalLink" href=" http://javaee.github.io/javaserverfaces-spec/"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specification</p></a></h3>
 			<p>JCP activity to advance the JSF specification</p>
 			<div class="section"></div>
 		</div>
@@ -113,7 +113,7 @@ <h3><a href="faq.html"><p class="ico-projects" style="white-space:nowrap;">&nbsp
 		</div>
 		
 		<div class="span4">
-			<h3><a class="externalLink" href="https://glassfish.java.net">
+			<h3><a class="externalLink" href="https://javaee.github.io/glassfish/">
 				<p class="ico-gf shift_right_24" style="white-space:nowrap;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;GlassFish Server</a></p></h3>
 			<p>GlassFish Server 4.0 Open Source Edition</p>
 		</div>
diff --git a/index.html b/index.html
index 4544332..549bb26 100644
--- a/index.html
+++ b/index.html
@@ -30,8 +30,8 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </a>
-                    <div class="brand"><a href="https://javaserverfaces.java.net"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
-                    <div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://glassfish.java.net" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.java.net" title="Jersey">Jersey</a></li><li><a href="https://tyrus.java.net" title="Tyrus">Tyrus</a></li><li><a href="https://grizzly.java.net" title="Grizzly">Grizzly</a></li><li><a href="https://mq.java.net" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse ...  -->
+                    <div class="brand"><a href="https://javaserverfaces.github.io"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
+                    <div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://javaee.github.io/glassfish/" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.github.io" title="Jersey">Jersey</a></li><li><a href="https://tyrus-project.github.io" title="Tyrus">Tyrus</a></li><li><a href="https://javaee.github.io/grizzly/" title="Grizzly">Grizzly</a></li><li><a href="https://javaee.github.io/openmq/" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse ...  -->
                 </div>
 
 
@@ -56,7 +56,7 @@
                             <p class="centered-text" style="height:10px;"><span style="font-size:16px;font-weight:350;color:#333;">JavaServer&#8482; Faces</span><span style="font-size:16px;font-weight:200;color: #333;"> technology simplifies building user interfaces for JavaServer applications.</span></p>
                             <div class="row">
                                 <p style="line-height:0.5">&nbsp;</p>
-                                <div class="span6 offset1" style="font-size:16px;font-weight:200;color: #333;"><ul>
+                                <div class="span6 offset1" style="font-size:16px;font-weight:200;color: #333;">
                                         Developers of various skill levels can quickly build web applications by:
                                         <ul>
                                             <li>Assembling reusable UI components in a page</li>
@@ -71,29 +71,10 @@
                             <ul class="nav nav-list top-margin"><li class="divider"></li></ul>
 
                             <div class="row">
-                                <div class="span2 right-text" style="height:22px;"><p style="font-weight: 600;color: #666;text-decoration:underline">Latest News</hp></div>
+                                <div class="span2 right-text" style="height:22px;"><p style="font-weight: 600;color: #666;text-decoration:underline">Latest Releases: </hp></div>&nbsp;
+                                <a href="https://github.com/javaserverfaces/mojarra/releases">https://github.com/javaserverfaces/mojarra/releases</a>
+                                <!-- TODO: use Jekyll to integrate this here https://help.github.com/articles/repository-metadata-on-github-pages/ -->
                             </div>
-
-    <div class="row"> 
-        <div class="span2 right-text" style="font-weight: 600;color: #666;">Jan 6th 2017</div> 
-        <div class="span5">Mojarra 2.3.0-m09 released.
-       </div> 
-    </div>
-    <div class="row"> 
-        <div class="span2 right-text" style="font-weight: 600;color: #666;">Nov 15th, 2016</div> 
-        <div class="span5">Mojarra 2.2.14 released : <a href="https://javaserverfaces.java.net/nonav/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.2/download.html">Download Page</a> 
-       </div> 
-    </div>
-    <div class="row">
-        <div class="span2 right-text" style="font-weight: 600;color: #666;">Aug 18th, 2016</div>
-        <div class="span5">Mojarra 2.2.8 Milestone 18 released : <a href="https://javaserverfaces.java.net/nonav/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.2/download.html">Download Page</a>
-       </div>
-    </div>
-    <div class="row">
-        <div class="span2 right-text" style="font-weight: 600;color: #666;">Aug 4th, 2016</div>
-        <div class="span5">Mojarra 2.2.8 Milestone 17 released : <a href="https://javaserverfaces.java.net/nonav/2.2/releasenotes.html">Release Notes</a> - <a href="https://javaserverfaces.java.net/nonav/2.2/download.html">Download Page</a>
-       </div>
-    </div>
                     </div>
                 </div>
 
@@ -144,7 +125,7 @@ <h3><a href="https://wikis.oracle.com/display/GlassFish/JavaServerFacesRI#JavaSe
 
                     <div class="row">
                         <div class="span4">
-                            <h3><a class="externalLink" href=" http://javaserverfaces-spec-public.java.net/"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specification</p></a></h3>
+                            <h3><a class="externalLink" href=" http://javaee.github.io/javaserverfaces-spec/"><p class="ico-docs">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specification</p></a></h3>
                             <p>JCP activity to advance the JSF specification</p>
                             <div class="section"></div>
                         </div>
@@ -156,7 +137,7 @@ <h3><a href="faq.html"><p class="ico-projects" style="white-space:nowrap;">&nbsp
                         </div>
 
                         <div class="span4">
-                            <h3><a class="externalLink" href="https://glassfish.java.net">
+                            <h3><a class="externalLink" href="https://javaee.github.io/glassfish/">
                                     <p class="ico-gf shift_right_24" style="white-space:nowrap;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;GlassFish Server</a></p></h3>
                             <p>GlassFish Server 4.0 Open Source Edition</p>
                         </div>
diff --git a/rlnotes/1.2_16/changelog.html b/rlnotes/1.2_16/changelog.html
index d2d3f23..fa6c2a8 100644
--- a/rlnotes/1.2_16/changelog.html
+++ b/rlnotes/1.2_16/changelog.html
@@ -2,9 +2,6 @@
 <HEAD>
     <link rel="stylesheet" href="style/sun.css" type="text/css">
     <title>JavaServer(TM) Faces Release Notes 1.2_16 -- Change Log</title>
-    <link rel="alternate"
-          href="https://javaserverfaces.java.net/servlets/ProjectNewsRSS"
-          type="application/rss+xml">
 </HEAD>
 <style type="text/css">
     .red {
diff --git a/rlnotes/1.2_16/community.html b/rlnotes/1.2_16/community.html
index 1ec28af..63b9fec 100644
--- a/rlnotes/1.2_16/community.html
+++ b/rlnotes/1.2_16/community.html
@@ -3,8 +3,7 @@
   <HEAD>
     <link rel="stylesheet" href="style/sun.css" type="text/css"> 
     <title>JavaServer(TM) Faces Release Notes 1.2_16 -- Community</title>
-    <link rel="alternate" href="https://javaserverfaces.java.net/servlets/ProjectNewsRSS" type="application/rss+xml">
-  </HEAD> 
+  </HEAD>
   <BODY>
     <h1>
       <banner> JavaServer
@@ -53,7 +52,7 @@ <h1>
     <p>This document contains information about the JSF Community.
       <DL>
         <dt>
-          <a href="https://javaserverfaces.java.net/">JSF Project at java.net</a> 
+          <a href="https://javaserverfaces.github.io">JSF Project</a>
         </dt> 
         <dd>Join the JSF Community on java.net! This community is the ideal place for people interested in JSF to share their ideas and ask each other questions.
           <a href="https://www.java.net/servlets/Join">Join now!</a> 
diff --git a/rlnotes/1.2_16/index.html b/rlnotes/1.2_16/index.html
index 495a251..cdf5334 100644
--- a/rlnotes/1.2_16/index.html
+++ b/rlnotes/1.2_16/index.html
@@ -3,8 +3,7 @@
   <HEAD>
     <link rel="stylesheet" href="style/sun.css" type="text/css"> 
     <title>JavaServer(TM) Faces Release Notes 1.2_16 -- Overview</title>
-    <link rel="alternate" href="https://javaserverfaces.java.net/servlets/ProjectNewsRSS" type="application/rss+xml">
-  </HEAD> 
+  </HEAD>
   <BODY>
     <h1>
       <banner> JavaServer
@@ -103,13 +102,13 @@ <h2>Documentation</h2>
     <h2>Software Licenses</h2> 
     <ul>
       <li>
-        <a href="https://javaserverfaces.java.net/COPYRIGHT">Copyright 2006 Oracle America, Inc. All rights reserved.</a> 
+        <a href="https://javaserverfaces.github.io/COPYRIGHT">Copyright 2006 Oracle America, Inc. All rights reserved.</a>
       </li> 
       <li>The JSF 1.2_16 release is covered by the
-        <a href="https://javaserverfaces.java.net/LICENSE.txt">Common Development and Distribution License (CDDL) + GPLv2</a> 
+        <a href="https://javaserverfaces.github.io/LICENSE.txt">Common Development and Distribution License (CDDL) + GPLv2</a>
       </li> 
       <li>Additional copyright notices and license terms applicable to portions of the software are set forth in the
-        <a href="https://javaserverfaces.java.net/THIRDPARTYLICENSEREADME.txt">Third Party License README</a> 
+        <a href="https://javaserverfaces.github.io/THIRDPARTYLICENSEREADME.txt">Third Party License README</a>
       </li> 
     </ul> 
     <hr>
diff --git a/rlnotes/2.0.10/index.html b/rlnotes/2.0.10/index.html
index 8078314..9d5ed0c 100644
--- a/rlnotes/2.0.10/index.html
+++ b/rlnotes/2.0.10/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.11/index.html b/rlnotes/2.0.11/index.html
index 99be063..5472286 100644
--- a/rlnotes/2.0.11/index.html
+++ b/rlnotes/2.0.11/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.4/index.html b/rlnotes/2.0.4/index.html
index 0a132f7..2b8267d 100644
--- a/rlnotes/2.0.4/index.html
+++ b/rlnotes/2.0.4/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.5/index.html b/rlnotes/2.0.5/index.html
index 7c3496e..700cb83 100644
--- a/rlnotes/2.0.5/index.html
+++ b/rlnotes/2.0.5/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.6/index.html b/rlnotes/2.0.6/index.html
index 972a1be..c333baf 100644
--- a/rlnotes/2.0.6/index.html
+++ b/rlnotes/2.0.6/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.7/index.html b/rlnotes/2.0.7/index.html
index 9573515..c6b7435 100644
--- a/rlnotes/2.0.7/index.html
+++ b/rlnotes/2.0.7/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.8/index.html b/rlnotes/2.0.8/index.html
index ad9dff4..00f97f3 100644
--- a/rlnotes/2.0.8/index.html
+++ b/rlnotes/2.0.8/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/rlnotes/2.0.9/index.html b/rlnotes/2.0.9/index.html
index 401af37..5e60927 100644
--- a/rlnotes/2.0.9/index.html
+++ b/rlnotes/2.0.9/index.html
@@ -159,32 +159,32 @@ <h2>Documentation</h2>
           <a href="releasenotes.html">Release Notes</a> 
         </li> 
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/javadocs/index.html">
               Javadoc API Documentation
           </a>
         </li>
          <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/managed-bean-javadocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/managed-bean-javadocs/index.html">
               Managed Bean Javadoc API Documentation
           </a>
         </li>
         <li>
-            <a href="http://javaserverfaces.java.net/nonav/docs/2.0/jsdocs/index.html">
+            <a href="https://javaserverfaces.github.io/docs/2.0/jsdocs/index.html">
                 JavaScript API Documentation
             </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/jsp/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/jsp/index.html">
               VDL Tag Library Documentation for JSP
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/pdldocs/facelets/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/pdldocs/facelets/index.html">
               VDL Tag Library Documentation for Facelets2
           </a>
         </li>
         <li>
-          <a href="http://javaserverfaces.java.net/nonav/docs/2.0/renderkitdocs/index.html">
+          <a href="https://javaserverfaces.github.io/docs/2.0/renderkitdocs/index.html">
               Standard HTML Render Kit Documentation
           </a>
         </li>
diff --git a/users.html b/users.html
index 300dc50..24600b1 100644
--- a/users.html
+++ b/users.html
@@ -29,8 +29,8 @@
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</a>
-					<div class="brand"><a href="https://javaserverfaces.java.net"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
-					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://glassfish.java.net" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.java.net" title="Jersey">Jersey</a></li><li><a href="https://tyrus.java.net" title="Tyrus">Tyrus</a></li><li><a href="https://grizzly.java.net" title="Grizzly">Grizzly</a></li><li><a href="https://mq.java.net" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
+					<div class="brand"><a href="https://javaserverfaces.github.io"><img src="images/jsf-logo-no-text-32.png"><span style="color:#E88A43;font-size:18px;padding-left:11px;;padding-top:15px;font-weight:bold;">Mojarra JavaServer Faces</span> - <span style="font-size:18px;">Oracle's open source implementation of the JSF standard</span></a></div>
+					<div class="nav-collapse"><ul class="nav pull-right"><li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Related Projects<b class="caret"></b></a><ul class="dropdown-menu"><li><a href="https://javaee.github.io/glassfish/" title="GlassFish">GlassFish</a></li><li><a href="https://jersey.github.io" title="Jersey">Jersey</a></li><li><a href="https://tyrus-project.github.io" title="Tyrus">Tyrus</a></li><li><a href="https://javaee.github.io/grizzly/" title="Grizzly">Grizzly</a></li><li><a href="https://javaee.github.io/openmq/" title="Open MQ">Open MQ</a></li></ul></li></ul></div><!--/.nav-collapse -->
 				</div>
 			</div>
 		</div>
diff --git a/whats-new-in-jsf23.html b/whats-new-in-jsf23.html
index 299fe4a..d5babd0 100644
--- a/whats-new-in-jsf23.html
+++ b/whats-new-in-jsf23.html
@@ -527,7 +527,7 @@ <h3> Lifecycle </h3>
 <strong>System event published after view rendered</strong> (<a href="http://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC-1135">spec issue 1135</a>)
 
 <p>
-JSF 2 introduced the concept of <a href="http://javaserverfaces.java.net/nonav/docs/2.1/javadocs/javax/faces/event/SystemEvent.html" title="SystemEvent (JavaServer Faces API (2.1))">system events</a>, which are events that can be fired by arbitrary objects at arbitrary points during the request processing lifecycle.
+JSF 2 introduced the concept of <a href="https://javaserverfaces.github.io/docs/2.1/javadocs/javax/faces/event/SystemEvent.html" title="SystemEvent (JavaServer Faces API (2.1))">system events</a>, which are events that can be fired by arbitrary objects at arbitrary points during the request processing lifecycle.
 
 <p>
 In JSF 2.2 there are some 20 events defined, e.g. <em>PostAddToViewEvent</em>, <em>PostConstructViewMapEvent</em>, <em>PreValidateEvent</em>, and specifically <em>PreRenderViewEvent</em>.