279525 - User doc changes
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jsf.doc.user/META-INF/MANIFEST.MF
index 5d12339..bb6e48e 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.jsf.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.doc.user; singleton:=true
-Bundle-Version: 1.1.101.qualifier
+Bundle-Version: 1.1.2.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets.html
index c9673a1..020ab72 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets.html
@@ -19,7 +19,7 @@
 <br>
 The following features are available when the JSF facet is installed:
 <ul>
-<li>JSF Libraries support</li>
+<li>JSF Library configuration support</li>
 <li>Application Configuration Management</li>
 <li>JSP Source Page semantic validation and content assist for most of the JSF Core and JSF HTML tag library attribute values using Expression Language (EL) or not.</li>
 <li>"Run on Server" support of a JSF JSP page</li>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
index 5a27aac..4702b4d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_facets_install.html
@@ -10,26 +10,40 @@
 <br>
 When a JSF Facet is installed, the following occurs:
 <ul>
-<li>The user specified JSF Libraries are added to the build classpath if they are not deployed or, they are added as J2EE Module Dependencies which allows them to be added to the build classpath and deployed at module publish time</li>
-<li>The project's Web Deployment Descriptor (web.xml) is updated ensuring that the Faces Servlet is present along with the user's specification for:
+	<li>The user specified JSF Libraries are added to the build
+	classpath if they are not deployed or, they are added as J2EE Module
+	Dependencies which allows them to be added to the build classpath and
+	deployed at module publish time</li>
+	<li>The project's Web Deployment Descriptor (web.xml) is updated
+	ensuring that the Faces Servlet is present along with the user's
+	specification for:
 	<ul>
-	<li>Faces Servlet Name</li>
-	<li>Faces Servlet URL Mappings</li>
-	<li>Context Params for application configuration file</li>
+		<li>Faces Servlet Name</li>
+		<li>Faces Servlet URL Mappings</li>
+		<li>Context Params for application configuration file</li>
 	</ul>
-</li>
-<li>An empty Faces configuration file using the name and location specified by the user is created.   If a file with that name already exists at that location, this step is skipped.</li>
+	</li>
+	<li>An empty Faces configuration file using the name and location
+	specified by the user is created. If a file with that name already
+	exists at that location, this step is skipped.</li>
 </ul>
 <br>
-Either "Server Supplied JSF Implementation" must be selected (if server supplies a JSF implementation), or an implementation JSF Library must be specified, so that "Run on Server" of a JSF JSP page is possible.  
+The project should have the JSF implementation JAR files in its
+classpath. This can be configured by selecting the library type,"User Library" or if 
+the user has chosen a runtime adapter that is capable of supplying the
+JSF implementation libraries, the library configuration can be disabled
+by selecting the type, "Disable Library Configuration".
 <br>
-<img src="../../images/ngrelc.png"  alt="Related concepts" border="0"> 
-<p> <a href="./jsf_facets.html">JSF Facets</a><br>
-  <a href="./jsf_facets_uninstall.html">What happens when a JSF Facet is un-installed?</a><br> </p>
-
-<p> <img src="../../images/ngrelr.png"  alt="Related reference" border="0"> 
+<br>
+<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
+<p><a href="./jsf_facets.html">JSF Facets</a><br>
+<a href="./jsf_facets_uninstall.html">What happens when a JSF Facet
+is un-installed?</a><br>
 </p>
-<p> </p>
+
+<p><img src="../../images/ngrelr.png" alt="Related reference"
+	border="0"></p>
+<p></p>
 
 
 </body>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_library_management.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_library_management.html
new file mode 100644
index 0000000..c58513f
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_library_management.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="../../book.css" type="text/css">
+<title>JSF Library Management</title>
+</head>
+<body>
+<h1>JSF Library Management</h1>
+<br>
+The JSF Tools project helps users manage the JAR files for a Dynamic Web
+Project using the JDT User Library feature. This enables a user to add
+the JSF implementation JAR files, custom JSF-JSP Tag libraries and
+supporting JAR files to the classpath of the project. The user can
+optionally deploy the JAR files to the WEB-INF/lib directory at publish
+time using the J2EE Module Dependencies.
+<br></br>
+<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
+<p><a href="./jsf_facets.html">JSF Facets</a><br>
+</p>
+<p><img src="../../images/ngrelr.png" alt="Related reference"
+	border="0"><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">
+<br>
+<a href="../tasks/jsf_library_migration.html">Migrating a project using the JSF
+Library  to use the JDT User Library</a><br>
+<a href="../tasks/create_jsf_app.html">Create JSF Project</a><br>
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
index 140b97b..3470866 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/concepts/jsf_libs.html
@@ -8,25 +8,11 @@
 <body>
 <h1>JSF Libraries</h1>
 <br>
-A JSF Library is very similar in concept to the Eclipse JDT User Library.   They are meant to be named collections of jars that can be added as references to a Dynamic Web Project.  
-A JSF Library differs from a JDT User Library in the following ways:
-<ul>
-<li>A JSF Library can be marked for deployment to the WEB-INF/lib directory</li>
-<li>A JSF Library can be created procedurally by an extender</li>
-<li>A JSF Library can be marked as an implementation</li>
-<li>The JSF Library Registry, that is persisted for a workspace, is currently not importable or exportable</li>
-</ul>
-<br>
-<img src="../../images/ngrelc.png"  alt="Related concepts" border="0"> 
-<p> <a href="./jsf_facets.html">JSF Facets</a><br></p>
-<p> 
-<img src="../../images/ngrelr.png"  alt="Related reference" border="0"><br>
-<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
-</p>
-<p> 
-<img src="../../images/ngrelt.png"  alt="Related tasks" border="0"> <br>
-<a href="../tasks/jsf_libs.html">Create and Update JSF Libraries</a><br>
-<a href="../tasks/jsf_libs_refs.html">Adding and Removing JSF Library References from a Project</a><br> 
-</p>
+The JSF Library Framework is deprecated in the WTP 3.1 release. The JSF
+Project has adopted the WTP Libraries Management framework to provide
+similar capabilities. See
+<a href="./jsf_library_management.html">JSF Library Management</a>
+for details.
+
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
index b389958..38d1d8d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/getting_started.html
@@ -37,6 +37,6 @@
 </p>
 </li>
 </ul>
-<p>For additional information, please visit the <a href="http://wiki.eclipse.org/index.php/JSF_Tools_Project">WTP JSF home page.</a></p>
+<p>For additional information, please visit the <a href="http://www.eclipse.org/webtools/jsf/">WTP JSF home page.</a></p>
 </body>
 </html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
index 50eb333..84d7f6f 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/JSFTools_tutorial.html
@@ -47,7 +47,7 @@
 Project.
 <p><b> By Raghu Srinivasan, Oracle Corporation.</b> <br>
 
-<font size="-1">June 18, 2007</font></p>
+<font size="-1">June 15, 2009</font></p>
 
 </blockquote>
 
@@ -70,11 +70,11 @@
 <h3>Setup</h3>
 <p></p>
 <ul>
-	<li><a href="http://java.sun.com/javase/downloads/index_jdk5.jsp">The
-	Java SE 5 Development Kit (JDK)</a></li>
-	<li><a href="http://eclipse.org/downloads/">Eclipse 3.3 </a></li>
+	<li><a href="http://java.sun.com/javase/downloads/index.jsp">The
+	Java SE 6 Development Kit (JDK)</a></li>
+	<li><a href="http://eclipse.org/downloads/">Eclipse 3.5 </a></li>
 	<li><a href="http://download.eclipse.org/webtools/downloads/">Eclipse
-	Web Tools Platform Project(WTP) 2.0</a></li>
+	Web Tools Platform Project(WTP) 3.1</a></li>
 
 	<li><a href="http://tomcat.apache.org/">Apache Tomcat 6.0</a></li>
 	<li><a
@@ -85,40 +85,17 @@
 <p><a id="reglibs"></a></p>
 <h3>Make the Web Page Editor the default editor for JSP pages</h3>
 
-The JSF Tools Project-contributed Web Page Editor (WPE) is NOT registered as
-the default editor for JSP files. You can make the WPE the default
-editor for JSP files by following these steps:
+The JSF Tools Project-contributed Web Page Editor (WPE) is NOT
+registered as the default editor for JSP files. You can make the WPE the
+default editor for JSP files by following these steps:
 <ul>
-	<li>Navigate to "Window" -&gt; "Preferences..." -&gt; "General" -&gt;
-	"Editors" -&gt; "File Associations"</li>
+	<li>Navigate to "Window" -&gt; "Preferences..." -&gt; "General"
+	-&gt; "Editors" -&gt; "File Associations"</li>
 	<li>In the "File types" section, select "*.jsp"</li>
 	<li>In the "Associated editors" section, select "Web Page Editor"</li>
 	<li>Select the "Default" button</li>
 </ul>
 
-<h3>Register JSF libraries</h3>
-<p>This feature allows for a named sets of jars to be created for
-use with JSF Applications. We will be creating a library containing the
-Sun JSF RI<br>
-
-Select Windows-&gt;Preferences-&gt;Web and XML-&gt;-&gt;JavaServer Faces
-Tools-&gt;Libraries. Click on the New.. button to add a new library.
-Create the JSF Libraries as shown in the following figures. Check the <b>is
-JSF Implementation</b> check box when adding the Sun JSF RI library.</p>
-<br>
-<img alt="JSF Libraries-add" src="images/jsf-library-new.png"
-	height="538" width="626">
-
-
-<br>
-<br>
-Create another JSF Library called <b>JSTL</b> that has the JavaServer Pages Standard Tag Library jar as shown below.
-<br>
-<br>
-<img alt="JSF Libraries" src="images/jsf-libraries.png"
-	height="241" width="729">
-
-<br>
 <p><a id="newproject"></a></p>
 <h3>Create a JavaServer Faces Project</h3>
 
@@ -134,26 +111,43 @@
 
 <br>
 
-<p>On the JSF Capabilities page, select the radio button adjacent to
-the JSF Library <b>JSF-RI-1.2</b>. Add the <b>JSTL</b> library.
-<br>
+<p>On the JSF Capabilities page, from the drop-down for the Type of
+the JSF Library, select <b>User Library</b>. <br>
 <br>
 
 <img alt="JSF Capabilities page"
-	src="images/jsf-capabilities-library.png" height="268" width="616"></p>
+	src="images/jsf-capabilities-library.png"></p>
 
 
 <br>
-<p><img src="images/note.gif" height="13" width="62">If you
-deploy the JSF web application to a server runtime that includes the JSF
-1.2 reference implementation, then you should select the <b>Server
-Supplied JSF implementation</b> option.<br>
-<br>
-Click on the <b>Finish</b> button to create the JavaServer Faces
-Application. You may be prompted to accept the license for the Web App
-DTD from Sun. You may also be asked to choose the J2EE perspective upon
-completion. In both cases accept. <br>
+<p>Click on the <b>Download library</b> icon.
+The Download Library dialog is displayed with the list of providers for
+the JSF implementation JAR files. Select the library from Sun
+Microsystem. Click <b>Next</b>. Accept the license and hit <b>Finish</b> <br><br>
+<img alt="JSF Capabilities page"
+	src="images/jsf-download-library.png"></p>
 
+
+<br>
+
+The tool downloads the JAR files, creates a JDT User Library and adds it to the current project. Select the checkbox for the new library if it is not selected. Next, select the <b>Manage libraries</b> icon.<br>
+<br>
+<img alt="JSF Capabilities page"
+	src="images/jsf-capabilities-library-2.png"></p>
+<br>
+<br>
+
+Create a JDT User Library to hold the JSTL jar file. Seelct <b>OK.</b>
+<br><br>
+<img alt="JSF Capabilities page"
+	src="images/jsf-new-library.png"></p>
+<br>
+<br>
+The JSTL library is displayed in the JSF Capabilities dialog. Select the libray and hit <b>Finish</b>
+<br><br>
+<img alt="JSF Capabilities page"
+	src="images/jsf-add-jstl-library.png"></p>
+<br>
 <br>
 <p>Your JSF application has been created. Note that the web.xml file
 has been updated with the Faces Servlet and servlet-mapping, a stub JSF
@@ -177,47 +171,69 @@
 <p>Use the JSP Page wizard to create a page called <b>login.jsp</b>
 in the Web Content folder of the new application. In the Select
 Templates page of the wizard, select the <b>New JSP(html)</b> template.
-Click Finish. The page will be opened in the Web Page Editor as shown below<br>
+Click Finish. The page will be opened in the Web Page Editor as shown
+below<br>
 <br>
 <br>
 <img alt="Web Page Editor" src="images/web-page-editor.png" height="589"
 	width="957"></p>
 
 <br>
-Open the Properties View. Right-mouse click on the designer canvas and from the context menu, select Show-&gt;Properties. Wait for the "Reading Properties" dialog to disappear.
+Open the Properties View. Right-mouse click on the designer canvas and
+from the context menu, select Show-&gt;Properties. Wait for the "Reading
+Properties" dialog to disappear.
 <br>
 <br>
-<h5>Add a CommandButton to the canvas.</h5> <ul><li>In the <b>Palette View</b>, click on the section <b>JSF HTML</b>  to display the list of components.</li><li> Drag-and-drop the  CommandButton to the canvas.
-Note that the editor wraps the CommandButton with <b>&lt;f:view&gt;</b> and <b>&lt;h:form&gt;</b> tag.</li>
-<li>In the properties view, click on <b>Quick Edit</b>. </li><li>Set the <b>Value</b> attribute to <b>Login</b>.</li><li>Set the  <b>Action</b>  attribute to <b>login</b></li>
+<h5>Add a CommandButton to the canvas.</h5>
+<ul>
+	<li>In the <b>Palette View</b>, click on the section <b>JSF
+	HTML</b> to display the list of components.</li>
+	<li>Drag-and-drop the CommandButton to the canvas. Note that the
+	editor wraps the CommandButton with <b>&lt;f:view&gt;</b> and <b>&lt;h:form&gt;</b>
+	tag.</li>
+	<li>In the properties view, click on <b>Quick Edit</b>.</li>
+	<li>Set the <b>Value</b> attribute to <b>Login</b>.</li>
+	<li>Set the <b>Action</b> attribute to <b>login</b></li>
 </ul>
 <br>
 <br>
-<img alt="WPE-Add CommandButton" src="images/wpe-add-cmd.png" height="447"
-	width="854"></p>
+<img alt="WPE-Add CommandButton" src="images/wpe-add-cmd.png"
+	height="447" width="854">
+</p>
 
 <br>
 <h5>Add a PanelGrid</h5>
 <ul>
-<li>From the Palette View, Drag-and-drop  the PanelGrid to the canvas. Notice the feedback on the drop target.</li>
-<li>Drop the Panel Grid before the Command Button, but inside the Form tag. The Panel Grid is created with a predefined set of OutputText components.</li>
+	<li>From the Palette View, Drag-and-drop the PanelGrid to the
+	canvas. Notice the feedback on the drop target.</li>
+	<li>Drop the Panel Grid before the Command Button, but inside the
+	Form tag. The Panel Grid is created with a predefined set of OutputText
+	components.</li>
 </ul>
-<h5>Modify the components inside the Panel Grid </h5>
+<h5>Modify the components inside the Panel Grid</h5>
 <ul>
-<li>Click on the OutputText <b>Item2</b> and hit Delete</li> 
-<li>Add a InputText (Text Input in the Palette view) tag after <b>Item1</b> and before <b>Item3</b></li>
-<li>Delete the OutputText, <b>Item 4</b></li>
-<li>Add a InputSecret (Secret Input in the Palette view) tag after <b>Item3</b></li>
-<li>Click on the OutputText, <b>Item1</b>. Change its value in the Source View to <b>Name</b></li>
-<li>Click on the OutputText, <b>Item3</b>. Change its value in the Source View to <b>Password</b></li>
-<li>Click on the <b>Preview</b> tab to see the page rendered in a browser</li>
-<li>Click on the InputText tag next to <b>Name</b>. In the Property View, set the value attribute to <b>#{loginBean.name}</b>.</li>
-<li>Save the page. The editor will flag a warning indicating that the variable, <b>loginBean</b> cannot be resolved. </li>
+	<li>Click on the OutputText <b>Item2</b> and hit Delete</li>
+	<li>Add a InputText (Text Input in the Palette view) tag after <b>Item1</b>
+	and before <b>Item3</b></li>
+	<li>Delete the OutputText, <b>Item 4</b></li>
+	<li>Add a InputSecret (Secret Input in the Palette view) tag after
+	<b>Item3</b></li>
+	<li>Click on the OutputText, <b>Item1</b>. Change its value in the
+	Source View to <b>Name</b></li>
+	<li>Click on the OutputText, <b>Item3</b>. Change its value in the
+	Source View to <b>Password</b></li>
+	<li>Click on the <b>Preview</b> tab to see the page rendered in a
+	browser</li>
+	<li>Click on the InputText tag next to <b>Name</b>. In the
+	Property View, set the value attribute to <b>#{loginBean.name}</b>.</li>
+	<li>Save the page. The editor will flag a warning indicating that
+	the variable, <b>loginBean</b> cannot be resolved.</li>
 </ul>
 <br>
 <br>
 <img alt="WPE-Add PanelGrid" src="images/wpe-add-panel.png" height="438"
-	width="892"></p>
+	width="892">
+</p>
 
 <br>
 
@@ -238,38 +254,45 @@
 Click on the
 <b>Add</b>
 button. This will launch the New Managed Bean wizard. Select the option,
-<b>Create a new Java class</b>. In the next wizard panel, enter the package as,
-<b>com.tutorial</b> and the Name of the class as  <b>LoginBean</b>
-. Click the Finish button. 
+<b>Create a new Java class</b>
+. In the next wizard panel, enter the package as,
+<b>com.tutorial</b>
+and the Name of the class as
+<b>LoginBean</b>
+. Click the Finish button.
 <br>
 <br>
 <img alt="New Managed Bean" src="images/new-managedbean.png"
 	height="234" width="495">
 <br>
 <br>
-This
-will create the Java class and register it as a managed bean. Save the Faces Configuration editor.To edit the Java class, click on the hyperlink, <b>ManagedBean class</b> in the Managed bean page as shown in the figure below. This will launch the Java editor.
+This will create the Java class and register it as a managed bean. Save
+the Faces Configuration editor.To edit the Java class, click on the
+hyperlink,
+<b>ManagedBean class</b>
+in the Managed bean page as shown in the figure below. This will launch
+the Java editor.
 <br>
 <br>
-<img alt="Faces Configuration Editor - Managed Bean tab" src="images/fce-managedbean-class.png"
-	height="181" width="599">
+<img alt="Faces Configuration Editor - Managed Bean tab"
+	src="images/fce-managedbean-class.png" height="181" width="599">
 <br>
 <br>
 
 <p><a id="createbean"></a></p>
 <br>
-Edit the  Java class,
-<b>com.tutorial.LoginBean</b>.
-Add the following code and save.
+Edit the Java class,
+<b>com.tutorial.LoginBean</b>
+. Add the following code and save.
 <br>
 <br>
 <img alt="LoginBean" src="images/loginbean.png" height="491" width="405">
 
 <br>
 <a id='el-validate-bean'></a>
-In the Project Explorer view, right-mouse click on the  
-JSP page, <b>login.jsp</b> and from the context menu,
-select the
+In the Project Explorer view, right-mouse click on the JSP page,
+<b>login.jsp</b>
+and from the context menu, select the
 <b>Validate</b>
 option. Note that the page should now be valid.
 <br>
@@ -385,7 +408,9 @@
 <br>
 Add the JSF tag,
 <b>loadBundle</b>
-as shown below. You can drag-and-drop the tag from the <b>JSF Core</b> section of the Palette View.
+as shown below. You can drag-and-drop the tag from the
+<b>JSF Core</b>
+section of the Palette View.
 <br>
 <br>
 <img alt="Content assist for resource bundle"
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-add-jstl-library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-add-jstl-library.png
new file mode 100644
index 0000000..9782e45
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-add-jstl-library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library-2.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library-2.png
new file mode 100644
index 0000000..a585c83
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library-2.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
index 0f36d6b..142c5e0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-capabilities-library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-download-library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-download-library.png
new file mode 100644
index 0000000..bf64e3c
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-download-library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-new-library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-new-library.png
new file mode 100644
index 0000000..3609785
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/tutorial/images/jsf-new-library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ProjectProps.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ProjectProps.png
new file mode 100644
index 0000000..4293574
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ProjectProps.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton.png
new file mode 100644
index 0000000..a1e0f40
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton_Menu.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton_Menu.png
new file mode 100644
index 0000000..a4c39b3
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_ToolbarButton_Menu.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_WPE_ContextMenu.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_WPE_ContextMenu.png
new file mode 100644
index 0000000..5ace704
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/DTSkinningUI_WPE_ContextMenu.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_disable_library_configuration.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_disable_library_configuration.png
new file mode 100644
index 0000000..cff248b
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_disable_library_configuration.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_download_library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_download_library.png
new file mode 100644
index 0000000..82c8c1b
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_download_library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_configuration.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_configuration.png
new file mode 100644
index 0000000..fa69acc
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_configuration.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_jeemodule.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_jeemodule.png
new file mode 100644
index 0000000..493ed2d
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_jeemodule.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_legacy.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_legacy.png
new file mode 100644
index 0000000..427b757
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_library_legacy.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library,png.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library,png.png
new file mode 100644
index 0000000..cc06450
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library,png.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library.png b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library.png
new file mode 100644
index 0000000..fefd520
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/images/jsf_validate_library.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_design_time_skinning.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_design_time_skinning.html
new file mode 100644
index 0000000..3a8366f
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_design_time_skinning.html
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="../../book.css" type="text/css">
+<title>JSF Design-Time Skinning Support</title>
+</head>
+<body>
+
+<h1>JSF Design-Time Skinning Support</h1>
+<p>
+JSF Application developers use JSF components that support skins to give
+their application a uniform look and feel. A Skin is typically one or
+more CSS stylesheets with pre-defined selectors and often a set of
+images that are referenced by the stylesheet(s). A JSF Component Library
+that supports skinning would use these pre-defined selectors in
+rendering the JSF component. The
+<a href="http://myfaces.apache.org/trinidad/index.html">Apache
+MyFaces Trinidad</a>
+("Trinidad") JSF library supports skinning.
+</p><p>
+The Web Page Editor (WPE) has design-time support for skins. This allows
+a JSF developer to visually see the effect of applying a particular skin
+on a JSF page that has JSF components that support skinning.
+</p>
+<h2>Display and Change Current Skin for a Project</h2>
+<h3>Project Properties</h3>
+The Project Properties dialog contains a new <b>Web Page Editor</b> node which displays skins provided for tag libraries and allows setting a <b>current</b> skin for each tag library.
+<br>
+<br>
+<img src="./images/DTSkinningUI_ProjectProps.png"
+	alt="Set current skin for a project">
+<br>
+<h3>Toolbar Button</h3>
+A new <b>Manage Skins</b> toolbar button (in the WPE toolbar) allows quick access to the Project Properties dialog and to a drop-down menu providing additional functionality as described below.
+<br>
+<br>
+<img src="./images/DTSkinningUI_ToolbarButton.png"
+	alt="Toolbar Button">
+<br>
+<h3>Toolbar Button Menu</h3>
+The toolbar button's drop-down menu provides access to the Project Properties dialog and also allows the user to quickly see and set the <b>current</b> skin for each tag library that supports design-time skinning.
+<br>
+<br>
+<img src="./images/DTSkinningUI_ToolbarButton_Menu.png"
+	alt="Toolbar Button">
+<br>
+<h3>WPE Context Menu</h3>
+The Web Page Editor's context menu (Design pane) allows the user to quickly see and set the "current" skin for each tag library that supports design-time skinning.
+<br>
+<br>
+<img src="./images/DTSkinningUI_WPE_ContextMenu.png"
+	alt="Toolbar Button">
+<br>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html
deleted file mode 100644
index 6dd0150..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_libraries.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>JSF Libraries</title>
-</head>
-<body>
-
-<h1>JSF Libraries</h1>
-<br>
-A JSF Library is very similar in concept to the Eclipse JDT User Library. They
-are meant to be named collections of jars that can be added as references to a
-Dynamic Web Project. A JSF Library differs from a JDT User Library in the
-following ways:
-<ul>
-<li>A JSF Library can be marked for deployment to the WEB-INF/lib directory</li>
-<li>A JSF Library can be created procedurally by an extender</li>
-<li>A JSF Library can be marked as an implementation</li>
-<li>The JSF Library Registry, that is persisted for a workspace, is currently not importable or exportable</li>
-</ul>
-<br>
-<a id="ImplVsComponents"></a><h2>Implementations vs Component Libraries</h2>
-<br>
-<p>A JSF Library is simply a set of jars that will be put on the classpath and optionally deployed to the WEB-INF/lib directory at publish time using the J2EE Module Dependencies.</p>
-As of the WTP 2.0 release, a JSF Library is created as a classpath container and is managed just like any classpath container library.
-<p>Why do some libraries have the "implementation" flag?</p>
-A library marked as a JSF implementation differentiates it from a normal set of jars that make up a library.  This flag is meant as an on-your-honor marking that this set of jars meets the JSF specification for an implementation.  
-The JSF tooling requires a Faces Servlet implementation for compilation and "Run on Server" feature of a JSF JSP page.  
-In cases where the server runtime adapter supplies the JSF implementation, it is possible to specify that the server-supplied implementation be used.
-A library marked as an implementation will appear with [implementation] in the label.   There can be more than one implementation in the registry.   One of them can be marked as the default so that it will be chosen automatically during JSF Facet installation allowing JSF Facet Finish to be enabled.
-<br><br>
-<img alt="JSF Implementation Library" src="./images/jsfimpl.png">
-<br>
-To make one of the implementations the default, select the desired default implementation library and press the enabled "Make Default" button.   This button is only available when the selected library is an implementation.
-<p><br><br>
-<img alt="Make Default Implementation" src="./images/jsfimplmakedefault.png">
-</p>
-<a id="pluginprovided"></a><h2>Plugin-Provided Libraries</h2>
-<br>
-<p>
-An adopter of the WTP JSF Tooling may create a plugin that extends <code>org.eclipse.jst.jsf.core.jsflibraries</code> which would allow a developer to procedurally create a JSF Library.   This, in theory, would simplify project configuration and could also enable the adopter to provide other tool extensions to improve the development experience. 
-</p>
-<p>Plugin-provided libraries are not editable or deletable by an end user.</p>
-<br>
-
-<a id="missingjars"></a><h2>Missing Jars</h2>
-<br>
-A JSF Library keeps references to jars somewhere on the local file system.   Should the files be moved or the directory renamed, you will see:
-<br>
-<img alt="Missing Jars" src="./images/jsflibsmissingjars.png">
-<br>
-<p>
-It will be necessary to edit the JSF Library and fix the references before the library will be useable.
-</p>
-
-<a id="projectrefs"></a><h2>Project References</h2>
-<br>
-<p>
-When a library is referenced by a project, either at JSF Facet install time, or at a later time by adding it using projects Java Build Path property page, the library is placed on the project's build classpath as a classpath container.   
-In order for the jars in the library to be deployed with the application, the library must <b>also</b> be selected in the J2EE Module Dependencies page.   
-This handles placing each jar in the library into the WEB-INF/lib directory of the deployed application.     
-</p>
-<p>
-<img src="../../images/ngrelc.png"  alt="Related concepts" border="0"><br> 
-<a href="../concepts/jsf_facets.html">JSF Facets</a><br>
-</p>
-
-<p> 
-<img src="../../images/ngrelr.png"  alt="Related reference" border="0"><br>
-</p>
-
-<p> 
-<img src="../../images/ngrelt.png"  alt="Related tasks" border="0"> <br>
-<a href="../tasks/jsf_libs.html">Create and Update JSF Libraries</a><br>
-<a href="../tasks/create_jsf_app.html">Create JSF Project</a><br>
-</p>
-
-  
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_library_management.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_library_management.html
new file mode 100644
index 0000000..7ec6969
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/jsf_library_management.html
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="../../book.css" type="text/css">
+<title>JSF Library Management</title>
+</head>
+<body>
+
+<h1>JSF Library Management</h1>
+<br>
+The JSF Tools project helps users manage the JAR files for a Dynamic Web
+Project using the JDT User Library feature. This enables a user to add
+the JSF implementation JAR files, custom JSF-JSP Tag libraries and
+supporting JAR files to the classpath of the project. The user can
+optionally deploy the JAR files to the WEB-INF/lib directory at publish
+time using the J2EE Module Dependencies.
+<br>
+<br>
+<img src="./images/jsf_library_configuration.png"
+	alt="Configure JSF Libraries">
+<br>
+<h2>Validation</h2>
+The tool validates that the project has the JSF implementation JAR files
+on the classpath.
+<br>
+<br>
+<img src="./images/jsf_validate_library.png" alt="Validate JSF Library">
+<br>
+<h2>Download Library</h2>
+This feature allows user to download the JSF implementation JAR files.
+<br>
+<br>
+<img src="./images/jsf_download_library.png" alt="Download Library">
+<br>
+<a id="projectrefs"></a>
+<h2>Library Provided By Target Runtime</h2>
+<br>
+If the user has chosen a runtime adapter that is capable of supplying
+the JSF implementation libraries, the library configuration can be
+disabled by selecting the option, "Disable Library Configuration" . This
+replaces the "Server Supplied" option of previous releases.
+<br>
+<br>
+<img src="./images/jsf_disable_library_configuration.png"
+	alt="Disable Library Configuration">
+<br>
+<a id="projectrefs"></a>
+<h2>Project References</h2>
+<br>
+<p>When a JDT User Library is referenced by a project, either at JSF
+Facet install time, or at a later time by adding it using projects Java
+Build Path property page, the library is placed on the project's build
+classpath as a classpath container. In order for the jars in the library
+to be deployed with the application, the library must <b>also</b> be
+selected in the Java EE Module Dependencies page. This handles placing
+each jar in the library into the WEB-INF/lib directory of the deployed
+application.</p>
+<br>
+<img src="./images/jsf_library_jeemodule.png"
+	alt="Set Java EE Module dependencies">
+<br>
+<a id="legacysupport"></a>
+<h2>Legacy Library Configuration</h2>
+<br>
+<p>Existing JSF applications that use the JSF Library feature from
+earlier releases (WTP 3.1 and earlier), will continue to work in this
+release. The tool will detect an older workspace and configure the
+existing JSF application to use a 'Legacy Library Configuration' as the
+library type. Users are encouraged to switch to the 'Use Library' type.</p>
+<br>
+<img src="./images/jsf_library_legacy.png"
+	alt="Support for Legacy Library configuration">
+<br>
+<br>
+<p><img src="../../images/ngrelc.png" alt="Related concepts"
+	border="0"><br>
+<a href="../concepts/jsf_facets.html">JSF Facets</a><br>
+</p>
+
+<p><img src="../../images/ngrelr.png" alt="Related reference"
+	border="0"><br>
+<a
+	href="../../../org.eclipse.jdt.doc.user/reference/preferences/java/buildpath/ref-preferences-user-libraries.htm">JDT
+User Library</a></p>
+
+<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0">
+<br>
+<a href="../tasks/jsf_library_migration.html">Migrating a project
+using JSF Library to use JDT User Library</a><br>
+<a href="../tasks/create_jsf_app.html">Create JSF Project</a><br>
+</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
index afc08df..50aff0c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/reference/references.html
@@ -21,14 +21,18 @@
 </p>
 <ul>
 <li>
-<p><a href="jsf_libraries.html">JSF Libraries</a>
+<p><a href="jsf_library_management.html">JSF Library Management</a>
 </p>
 </li>
 <li>
 <p><a href="taglibsupport.html">JSF Tag Library Support</a>
 </p>
 </li>
+<li>
+<p><a href="jsf_design_time_skinning.html">JSF Design-Time Skinning Support</a>
+</p>
+</li>
 </ul>
-<p>For additional information, please visit the <a href="http://wiki.eclipse.org/index.php/JSF_Tools_Project">WTP JSF home page.</a></p>
+<p>For additional information, please visit the <a href="http://www.eclipse.org/webtools/jsf/">WTP JSF home page.</a></p>
 </body>
 </html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
index 7865308..e88304c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/add_jsf_facet.html
@@ -28,7 +28,7 @@
 <br>
 <img src="./images/jsffacetsettings.png" alt="Specify JSF Facet Settings" >
 <br><br>
-Complete settings and press finish to add the JSF Facet to the project.
+Complete settings and press OK to add the JSF Facet to the project.
 </p>
 <img src="../../images/ngrelc.png" alt="Related concepts" border="0">
 <p><a href="../concepts/jsf_facets_install.html">What happens when a JSF
@@ -36,13 +36,12 @@
 <p><img src="../../images/ngrelr.png" alt="Related reference"
 	border="0"></p>
 <p>
-<a href="../reference/jsf_libraries.html">JSF Libraries</a>
+<a href="../reference/jsf_library_management.html">JSF Library Management</a>
 </p>
 <br>
 <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="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_app.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html
index fac3e61..1fa8a4f 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
@@ -22,8 +22,8 @@
 <br>This dialog allows you to specify:
 </p>
 <ul>
-<li>either that the JSF implementation is supplied by the server runtime adapter or a specific JSF implementation Library</li>
-<li>the JSF Libraries to be added to the classpath and, if checked which ones are deployed to the WEB-INF/lib directory at deployment time</li>
+<li>the JSF implementation and other JAR files that should be in the project classpath</li>
+<li>if the JSF Libraries to be deployed to the WEB-INF/lib directory at deployment time</li>
 <li>the name and location of the Faces configuration file</li>
 <li>the name to give the Faces Servlet</li>
 <li>the URL mapping patterns to use for the Faces Servlet</li>
@@ -42,7 +42,6 @@
 <p> <img src="../../images/ngrelr.png"  alt="Related reference" border="0"> 
 </p>
 <p>
-<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
 <a href="jsf_app_configs.html">JSF Application Configuration</a><br>
 <a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a><br>
 </p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
index d5121d6..536cefe 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/jsffacetsettings.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step1.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step1.png
new file mode 100644
index 0000000..32e8a14
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step1.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step11.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step11.png
new file mode 100644
index 0000000..b57714a
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step11.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step2.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step2.png
new file mode 100644
index 0000000..a71a811
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step2.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step21.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step21.png
new file mode 100644
index 0000000..ccd754d
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step21.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step22.png b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step22.png
new file mode 100644
index 0000000..d2bb4ed
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/images/migration_jsflib_step22.png
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_library_migration.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_library_migration.html
new file mode 100644
index 0000000..293d017
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_library_migration.html
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="../../book.css" type="text/css">
+<title>Migrating a project using the JSF Library to use the JDT User Library </title>
+</head>
+<body>
+<h1>Migrating a project using JSF Library to use JDT User Library</h1>
+<br>
+Existing JSF applications that use the JSF Library feature from
+earlier releases (WTP 3.1 and earlier), will continue to work in this
+release. The tool will detect an older workspace and configure the
+existing JSF application to use a 'Legacy Library Configuration' as the
+library type. Users are encouraged to switch to the 'Use Library' type. <br> 
+<h2>Step 1: Open Project Properties and Switch Library type to 'User Library'</h2>
+<br>
+<img src="./images/migration_jsflib_step1.png" alt="Switch library type to 'User Library'" >
+<br><br>
+<br>
+<img src="./images/migration_jsflib_step11.png" alt="Switch library type to 'User Library'" >
+<br><br>
+<p>
+<br>
+<h2>Step 2: Download JSF implementation JAR files</h2>
+<p>
+Click on the 'Download library..' icon to downlaod the JAR files of a JSF implementation. Select the provider, update the download destination folder and click 'Next'.
+<br><br>
+<img src="./images/migration_jsflib_step2.png" alt="Download  JSF implementation" >
+<br><br>
+Accept the license and press 'Finish' to download the JAR files to the project.
+<br><br>
+<img src="./images/migration_jsflib_step21.png" alt="Download  JSF implementation" >
+<br><br>
+<p>The tool will download the JAR files, create the User Library and add it to the project.</p>
+<br>
+<img src="./images/migration_jsflib_step22.png" alt="Download  JSF implementation" >
+<br><br>
+</p>
+<img src="../../images/ngrelc.png" alt="Related concepts" border="0">
+<p><a href="../concepts/jsf_facets_install.html">What happens when a JSF
+Facet is installed?</a><br>
+<p><img src="../../images/ngrelr.png" alt="Related reference"
+	border="0"></p>
+<p>
+<a href="../reference/jsf_library_management.html">JSF Library Management</a>
+</p>
+<br>
+<p><img src="../../images/ngrelt.png" alt="Related tasks" border="0">
+</p>
+<p> 
+<a href="create_jsf_jsp_page.html">Create JSF JSP page</a><br>
+</p>
+
+</body>
+</html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html
deleted file mode 100644
index 11dbd2c..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>Creating and Updating JSF Libraries</title>
-</head>
-<body>
-
-<h1>Creating and Updating JSF Libraries</h1>
-<p>
-To create or update a JSF Library, 
-<b>Window -&gt; Preferences... -&gt; Web and XML -&gt; JavaServer Faces Tools -&gt; Libraries</b>
-</p>
-<img alt="JSF Libraries Preference Page" src="./images/jsflibs_prefs.png">
-<p>Initially your list of libraries may be empty unless there is a plugin-provided library present.</p>
-
-<h3>New Library</h3>
-<p>To create a new JSF Library, select "New..." button.</p>
-<img alt="New JSF Library" src="./images/newjsflib.png"><br><br>
-<p>On this dialog you must:
-<ul>
-<li>provide a workspace unique name for the library</li>
-<li>using the "Add..." button, choose one or more JAR files to be included in this library</li>
-</ul>
-</p>
-<p>Optionally you may:
-<ul>
-<li>specify the JSF version that this collection of jars supports  <i>(At this time this is unused)</i></li>
-<li>mark this as an implementation using the "is JSF Implementation" checkbox </li>
-</ul>
-</p>
-<p>Click "Finish" button to create your new JSF Library</p>
-
-<h3>Update JSF Library</h3>
-<p>There may be a need to update the jars associated with this library. This can occur if:
-<ul>
-<li>you want to add or remove libraries, or,</li>
-<li>you need to update the location of a jar reference</li>
-</ul>
-</p>
-<p>To update the selected JSF Library, choose "Edit..."</p>
-<img alt="Update JSF Library" src="./images/jsflibsmissingjarsedit.png" >
-<p>There is currently no way to update a jar entry to locate a missing jar. You must first remove the missing jar and then add it back.</p>
-<p>Changes will be saved after you click "Finish" button.</p>
-
-<img src="../../images/ngrelc.png"  alt="Related concepts" border="0"> 
-<p>
-<a href="../concepts/jsf_facets.html">JSF Facets</a>
-</p>
-  
-<p>
-<img src="../../images/ngrelr.png"  alt="Related reference" border="0"> 
-</p>
-<p>
-<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
-</p>
-
- <p> <img src="../../images/ngrelt.png"  alt="Related tasks" border="0"> 
-</p>
-<p>
-<a href="../gettingstarted/tutorial/JSFTools_tutorial.html">Tutorial</a></p>
-  
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html
deleted file mode 100644
index 4695fb4..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/jsf_libs_refs.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel="stylesheet" href="../../book.css" type="text/css">
-<title>Creating and Updating JSF Libraries</title>
-</head>
-<body>
-<h1>Adding and Removing JSF Library References from a Project</h1>
-<br>
-JSF Library References for a project are managed as Java Build Path Libraries and J2EE Module Dependencies.
-
-<h2>Adding a JSF Library Reference</h2>
-<p><b>Project -&gt; Properties -&gt; Java Build Path</b></p>
-<img src="./images/jsflibref_javabuildpath.png" alt="Project -&gt; Properties -&gt; Java Build Path">
-<p>Click "Add Library..." button.</p>
-<img src="./images/jsflibref_addlibrary.png" alt="Add Library">
-<p>Select "JSF Libraries" and click "<u>N</u>ext &gt;" button.</p>
-<img src="./images/jsflibref_addlibrary_2.png" alt="Add Library">
-<p>Select desired JSF Library and click "<u>F</u>inish" button.</p>
-
-<h2>Removing a JSF Library Reference</h2>
-<p><b>Project -&gt; Properties -&gt; Java Build Path</b></p>
-<img src="./images/jsflibref_javabuildpath.png" alt="Project -&gt; Properties -&gt; Java Build Path">
-<p>Select desired JSF Library and click "<u>R</u>emove" button.</p>
-
-<h2>Selecting JSF Library Deployment Options</h2>
-<p>
-To control which JSF Libraries are deployed to the web application and which
-are not, use the "J2EE Module Dependencies" functionality.
-</p>
-<p><b>Project -&gt; Properties -&gt; J2EE Module Dependencies</b></p>
-<img src="./images/jsflibref_j2eemoddeps.png" alt="Project -&gt; Properties -&gt; J2EE Module Dependencies">
-<p>Select/deselect JSF Libraries as desired (selected means deploy, deselected means do not deploy).</p>
-
-<img src="../../images/ngrelc.png"  alt="Related concepts" border="0"> 
-<p> <br></p>
-  
-  <p> <img src="../../images/ngrelr.png"  alt="Related reference" border="0"> 
-</p>
-<p> 
-<a href="../reference/jsf_libraries.html">JSF Libraries</a><br>
-</p>
-
- <p> <img src="../../images/ngrelt.png"  alt="Related tasks" border="0"> 
-</p>
-<p>
-<a href="../tasks/jsf_libs.html">Create and Update JSF Libraries</a></p>
-  
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
index 8c3d497..fa610fb 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/tasks/tasks.html
@@ -29,11 +29,7 @@
 </p>
 </li>
 <li>
-<p><a href="jsf_libs.html">Creating and Updating JSF Libraries</a>
-</p>
-</li>
-<li>
-<p><a href="jsf_libs_refs.html">Adding and Removing JSF Library References from a Project</a>
+<p><a href="jsf_library_migration.html">Migrating a project using JSF Library to use JDT User Library</a>
 </p>
 </li>
 <li>
@@ -61,6 +57,6 @@
 </p>
 </li>
 </ul>
-<p>For additional information, please visit the <a href="http://wiki.eclipse.org/index.php/JSF_Tools_Project">WTP JSF home page.</a></p>
+<p>For additional information, please visit the <a href="http://www.eclipse.org/webtools/jsf/">WTP JSF home page.</a></p>
 </body>
 </html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm b/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
index 440001e..51c87fb 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/whats_new.htm
@@ -17,7 +17,20 @@
 	</tr>
 </table>
 <hr/>
-This section contains descriptions of the following significant changes made to the JavaServer Faces Tooling for Release 2.0:
+This section contains descriptions of the following significant changes made to the JavaServer Faces Tooling for Release WTP 3.1:
+<p/><p/>
+<ul>
+<li>
+<p><a href="./reference/jsf_library_management.html">JSF Library Management</a>
+</p>
+</li>
+<li>
+<p><a href="./reference/jsf_design_time_skinning.html">JSF Design-Time Skinning Support</a>
+</p>
+</li>
+</ul>
+<hr/>
+This section contains descriptions of the following significant changes made to the JavaServer Faces Tooling for Release WTP 3.0:
 <p/><p/>
 <h3>Support for alternate view description language for JSF</h3>
 <ul class="indent">
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/tocconcepts.xml b/plugins/org.eclipse.jst.jsf.doc.user/tocconcepts.xml
index 3e52a7c..62787fc 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/tocconcepts.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.user/tocconcepts.xml
@@ -16,8 +16,6 @@
 <!--
 		<topic label="Snippets" href="html/concepts/jsf_source_editing.html#snippets" />
 -->
-		<topic href="html/concepts/jsf_source_editing.html#futures" label="Future Features">
-  </topic> 
 	</topic> 
 	<topic label="JSF Application Configuration" href="html/concepts/jsf_app_config_mgr.html" />
  <topic href="html/concepts/jsf_tag_registry.html" label="JSF Tag Registry">
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml b/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
index 7a21ae4..86e6e07 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.user/tocreference.xml
@@ -6,10 +6,12 @@
 		<topic label="JSF Core" href="html/reference/jsf-c.html" /> 
 		<topic label="JSF HTML" href="html/reference/jsf-h.html" />
 	</topic>
-	<topic label="JSF Libraries" href="html/reference/jsf_libraries.html" >
+	<topic label="JSF Library Management" href="html/reference/jsf_library_management.html" >
 		<topic label="Implementations vs. Component Libraries" href="html/reference/jsf_libraries.html#ImplVsComponents" />
 		<topic label="Plugin-Provided Libraries" href="html/reference/jsf_libraries.html#pluginprovided" />
 		<topic label="Missing Jars" href="html/reference/jsf_libraries.html#missingjars" />
 		<topic label="Project References" href="html/reference/jsf_libraries.html#projectrefs" />				
-	</topic> 
+	</topic>
+ <topic href="html/reference/jsf_design_time_skinning.html" label="JSF Design-Time Skinning Support">
+ </topic> 
 </toc>