daily merge
authorfturovic <frank.turovich@nokia.com>
Mon, 01 Feb 2010 14:01:35 -0600
changeset 865 ed312e9f8961
parent 864 f38db24e5dbf (diff)
parent 856 74d8d653d11a (current diff)
child 867 14f10a1d075c
child 892 04365e85d9b0
daily merge
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Feb 01 13:12:03 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Feb 01 14:01:35 2010 -0600
@@ -20,11 +20,21 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Performance Improvements (2.1)" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm#210" 
+       		label="Plug-n-Play On-device Debugging (2.5)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-link" 
        		style-id="content-link">
-          	<text>Carbide performance improvements in 2.1 for large project importing, building, and other critical areas.</text>
+          	<text>Debugging programs on a target device has never been easier with PnP on-device debugging.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Performance Improvements (2.1)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm#new210" 
+       		id="carbide-link" 
+       		style-id="content-link">
+          	<text>Complete Carbide performance improvements are explained under the notes for Carbide.c++ 2.1.</text>
        		</link>
        	</group>
 
@@ -38,16 +48,6 @@
        		</link>
        	</group>
 
-		<group style-id="content-group" id="carbide-cpp">
-       		<link 
-       		label="On-Device Connection (2.0)" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm" 
-       		id="carbide-link" 
-       		style-id="content-link">
-          	<text>Create remote connection settings and update Carbide software services on devices.</text>
-       		</link>
-       	</group>
-
   	</extensionContent>
 
 </introContent>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_home.html	Mon Feb 01 13:12:03 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_home.html	Mon Feb 01 14:01:35 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>
--- a/core/com.nokia.carbide.cpp/html/online_banner.html	Mon Feb 01 13:12:03 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/online_banner.html	Mon Feb 01 14:01:35 2010 -0600
@@ -38,7 +38,7 @@
 	<table width="100%" cellspacing="0" cellpadding="8" border="0">
 		<tr>
 			<td align="left" valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon">			</td>
-			<td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v2.1</B></td>
+			<td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v3.0</B></td>
 	  </tr>
 	</table>
 
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Feb 01 13:12:03 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Feb 01 14:01:35 2010 -0600
@@ -8,7 +8,7 @@
 </head>
 <body>
 <h2>Welcome to Carbide.c++ 3.0.0</h2>
-<p>Thank you for installing Carbide.c++3.0! It's an improvement over 2.3 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes. </p>
+<p>Thank you for installing Carbide.c++3.0! It's an improvement over 2.5 with many improvements including support for Eclipse 3.5 and CDT 6.0, as well as numerous bug fixes. </p>
 <p>However, perhaps the best part about Carbide.c++ is the Carbide.c++ Development Kit (CDK) that you can use to build custom extensions for Carbide.c++. <a href="PLUGINS_ROOT/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm">Update</a> your installation of Carbide through the Carbide.c++ update site to get a copy of the CDK. Take a look, and let us know what you built!</p>
 <p>Finally, if you find bugs, please let us know by submitting it at the new Carbide Bugzilla bug tracking site located at <a href="https://xdabug001.ext.nokia.com/bugzilla">https://xdabug001.ext.nokia.com/bugzilla</a> </p>
 <p>For any other questions, please don't hesitate to contact us.</p>