319586, 319589, 319588, 319590
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial_JSF20.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial_JSF20.html
index 744dcf3..5d4da83 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial_JSF20.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial_JSF20.html
@@ -37,7 +37,7 @@
<h3>Setup</h3>
<p></p>
<ul>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp.jsp">The
+ <li><a href="http://java.sun.com/javase/downloads/index.jsp">The
Java SE 6 Development Kit (JDK)</a></li>
<li><a href="http://tomcat.apache.org/">Apache Tomcat 6.0</a></li>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
index 1fa8a4f..52d87fb 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
@@ -42,14 +42,14 @@
<p> <img src="../../images/ngrelr.png" alt="Related reference" border="0">
</p>
<p>
-<a href="jsf_app_configs.html">JSF Application Configuration</a><br>
+<a href="../concepts/jsf_app_config_mgr.html">JSF Application Configuration</a><br>
<a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a><br>
</p>
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
</p>
<p>
-<a href="jsf_libs.html">Create or Update JSF Libraries</a><br>
+<a href="../reference/jsf_library_management.html">Create or Update JSF Libraries</a><br>
<a href="create_jsf_jsp_page.html">Create JSF JSP page</a><br>
</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
index 742c419..87442a4 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_jsp_page.html
@@ -41,14 +41,13 @@
<p><img src="../../images/ngrelr.png" alt="Related reference" border="0"></p>
<p>
<a href="../reference/taglibsupport.html">Tag Library Support</a><br>
- <a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
+ <a href="../reference/jsf_library_management.html">JSF Library Management</a><br>
</p>
<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0">
</p>
<p>
<a href="../tasks/create_jsf_app.html">Create JSF Application</a><br>
- <a href="../tasks/jsf_libs_refs.html">JSF Library References</a><br>
<a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a>
</p>
</body>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
index c01f167..1dafde0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_validation.html
@@ -46,12 +46,11 @@
</p>
<p>
<a href="../reference/taglibsupport.html">Tag Library Support</a><br>
-<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
+<a href="../reference/jsf_library_management.html">JSF Libraries</a><br>
</p>
<p> <img src="../../images/ngrelt.png" alt="Related tasks" border="0">
</p>
<p>
-<a href="../tasks/jsf_libs_refs.html">JSF Library References</a><br>
<a href="../tasks/create_jsf_app.html">Create JSF Application</a><br>
<a href="../tasks/create_jsf_jsp_page.html">Create JSF JSP Page</a><br>
</p>
