# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1265834233 21600
# Node ID ddd7e0935476d71d2632a21a863f829fdea6892d
# Parent  bf6f52f3f23bac8d29a305e85a8b70fa7223700d
daily merge

diff -r bf6f52f3f23b -r ddd7e0935476 core/com.nokia.carbide.cpp/html/help_home.html
--- a/core/com.nokia.carbide.cpp/html/help_home.html	Wed Feb 10 14:36:43 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_home.html	Wed Feb 10 14:37:13 2010 -0600
@@ -22,6 +22,7 @@
     <ul>
       <li>New technologies support:
         <ul>
+          <li>PnP On-device Debugging</li>
           <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/index.html">Hover Help</a></li>
           <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm">Qt SDK for S60</a></li>
         </ul>
diff -r bf6f52f3f23b -r ddd7e0935476 core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml
--- a/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Wed Feb 10 14:36:43 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Wed Feb 10 14:37:13 2010 -0600
@@ -9,7 +9,6 @@
 		style="carbide.css" 
 		path="migrate/@">
 		
-		<!-- Removed 20091201 since links are no longer valid
 		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
 					
 			<link 
@@ -21,7 +20,6 @@
 			</link>
 			
 		</group>
-		-->
 		
 	</extensionContent>
 		
diff -r bf6f52f3f23b -r ddd7e0935476 core/com.nokia.carbide.cpp/plugin.xml
--- a/core/com.nokia.carbide.cpp/plugin.xml	Wed Feb 10 14:36:43 2010 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Wed Feb 10 14:37:13 2010 -0600
@@ -139,11 +139,9 @@
 			configId="org.eclipse.ui.intro.universalConfig"
 			content="html/intro/webresourcesExtensionContent2.xml" />
 
-		<!-- Removed 20091201 as links were outdated
 		<configExtension
             configId="org.eclipse.ui.intro.universalConfig"
 			content="html/intro/migrateExtensionContent.xml" /> 
-		-->
 			
 	</extension>