merging 2.5 changes into 3.0
authorfturovic <frank.turovich@nokia.com>
Thu, 04 Feb 2010 12:59:43 -0600
changeset 892 04365e85d9b0
parent 865 ed312e9f8961
child 893 de3efc6897e8
merging 2.5 changes into 3.0
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_archive_file_project.png
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_general_archive_file.png
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_project_sources.png
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_source_project.jpg
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm
carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml
core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs
core/com.nokia.carbide.cpp/about.html
core/com.nokia.carbide.cpp/about.ini
core/com.nokia.carbide.cpp/book.css
core/com.nokia.carbide.cpp/html/helpDATA.xml
core/com.nokia.carbide.cpp/html/help_keys_Toc.htm
core/com.nokia.carbide.cpp/html/help_keys_carbide.htm
core/com.nokia.carbide.cpp/html/help_keys_cw.htm
core/com.nokia.carbide.cpp/html/help_keys_vs.htm
core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml
core/com.nokia.carbide.cpp/html/legal.htm
core/com.nokia.carbide.cpp/html/welcome_note.htm
core/com.nokia.carbide.cpp/plugin.xml
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css	Mon Feb 01 14:01:35 2010 -0600
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/book.css	Thu Feb 04 12:59:43 2010 -0600
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Geneva, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,28 +51,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_archive_file_project.png has changed
Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_general_archive_file.png has changed
Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_project_sources.png has changed
Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/import_source_project.jpg has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Carbide SDK Overview</title>
+    <link href="../book.css" rel="stylesheet" type="text/css">
+	<style>
+		table, td, th { border: 0px none #FFF; }
+	.f2 {font-family: "Verdana", sans-serif; font-size: 130%; font-weight: bold; color: #4477AA }
+    </style>
+</head>
+
+<body >
+<h2>Carbide SDK Overview</h2>
+<ul>
+  <li><a href="gettingStarted/gettingStarted.htm">Getting Started</a>  </li>
+  <li><a href="reference/api_Change_Notes.htm">Changes to the Carbide API</a></li>
+  <li><a href="reference/api/overview-summary.html">API Reference</a></li>
+  <li><a href="reference/component.xsd doc/index.html">XML Schema Documentation</a></li>
+  <li><a href="reference/extension-points/templatewizard_wizardTemplate.html">Wizard Template</a></li>
+  <li><a href="reference/CustomComponents/cc_refoverview.htm">Custom Components</a></li>
+  <li><a href="CustomComponents/customcomponents.htm">UI Designer Custom Components</a></li>
+  <li>Tasks
+    <ul>
+      <li><a href="tasks/sdkMainTopic.htm">Carbide Plug-in Overview</a>
+        <ul>
+          <li><a href="tasks/sdk_getprojinfo.htm">Getting Carbide Project Information</a></li>
+          <li><a href="tasks/sdk_getinfmmpinfo.htm">Retrieving INF and MMP Project Information</a></li>
+        </ul>
+      </li>
+      <li><a href="tasks/CarbideMenu.htm">Adding Items to the Carbide Menu</a></li>
+      <li><a href="tasks/CarbideExtensionPreferences.htm">Adding Global Preferences to the Carbide Extensions group</a></li>
+      <li><a href="tasks/CarbideHelp.htm">Adding Plug-in Help</a></li>
+      <li><a href="tasks/CreatingWizardTemplates.htm">Creating Wizard Templates</a></li>
+      <li><a href="tasks/carbide_adding_plugins.htm">Installing Your Own Carbide Plug-ins</a></li>
+    </ul>
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
\ No newline at end of file
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml	Mon Feb 01 14:01:35 2010 -0600
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml	Thu Feb 04 12:59:43 2010 -0600
@@ -6,6 +6,8 @@
   
 	<topic label="Carbide.c++ Plug-in Developer Guide" href="html/sdkMainTopic.htm">
  
+		<topic label="Carbide SDK Overview" href="html/sdkTOC.htm" />
+			   
 		<topic label="Getting Started" href="html/gettingStarted/gettingStarted.htm" >
 		   <anchor id="sdkGettingStarted" />
 		</topic>
--- a/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Thu Feb 04 12:59:43 2010 -0600
@@ -1,4 +1,5 @@
 #Wed Oct 21 14:27:41 CDT 2009
 eclipse.preferences.version=1
 encoding/about.ini=UTF-8
+encoding/config.ini=UTF-8
 encoding/plugin_customization.ini=UTF-8
--- a/core/com.nokia.carbide.cpp/about.html	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/about.html	Thu Feb 04 12:59:43 2010 -0600
@@ -15,7 +15,7 @@
     <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
       <p class="text">&nbsp;</p>
       <p class="text">&nbsp;</p>
-      <p class="titleSmall">Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).  
+      <p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).  
 All rights reserved. <br>
 License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
       <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
--- a/core/com.nokia.carbide.cpp/about.ini	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/about.ini	Thu Feb 04 12:59:43 2010 -0600
@@ -26,4 +26,4 @@
 
 # Link to tips and tricks help page
 # optional
-# tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
+tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
--- a/core/com.nokia.carbide.cpp/book.css	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/book.css	Thu Feb 04 12:59:43 2010 -0600
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -48,28 +47,29 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
 .step	{
 	/* background-color: #EEE; */
 	/* margin: 10px 0px; */
-	color: #111;
+	/* color: #111; */
 	/* border-bottom:2px solid #EEE; */
 	}
 	
@@ -88,7 +88,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +96,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FDDD1F;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +114,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FFFF66;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +124,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +135,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +156,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +172,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+aa:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp/html/helpDATA.xml	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/helpDATA.xml	Thu Feb 04 12:59:43 2010 -0600
@@ -6,17 +6,30 @@
 
 <extensions>
    <tocOrder>
+      <category id="carbide.references"/>
+      <toc id="/org.eclipse.workbench/XXX.xml" />
+      <toc id="/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml" />
+	  <toc id="/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml" />
+	  
+      <category id="carbide.plugins"/>
       <toc id="/com.nokia.carbide.help.common/carbideHelpTOC.xml" />
-      <category id="carbide.reference"/>
-      <toc id="/com.nokia.carbide.cpp.doc.user/debuggerTOC.xml" />
+      <toc id="/com.nokia.carbide.cpp.debug.crashdebugger/help/tocCDB.xml" />	   
+      <toc id="/com.nokia.carbide.cpp.epocwindDisplay/html/toolTOC.xml" />
+	  <toc id="/com.nokia.carbide.apiquery.help/html/toolTOC.xml" />
+
+      <category id="carbide.s60tools"/>
+      <toc id="/com.nokia.s60tools.appdep.help/toc.xml" />	   
+      <toc id="/com.nokia.s60tools.symbianfoundationtemplates.help/toc.xml" />	   
+	    
+      <category id="carbide.tools"/>
       <toc id="/com.nokia.carbide.cpp.uidesigner.doc.user/toc.xml" />
-      <toc id="/com.nokia.carbide.cpp.pi.doc.user/tocPI.xml" />	   
-      <category id="carbide.extensions"/>
-      <toc id="/com.nokia.carbide.cpp.doc.user.crashdebugger/helptocCDB.xml" />	   
+      <toc id="/com.nokia.carbide.cpp.pi.doc.user/tocPI.xml" />	
       <toc id="/com.nokia.carbide.cpp.codescanner/tocCodeScanner.xml" />	   
-      <toc id="/com.nokia.s60tools.appdep.help/toc.xml" />	   
-      <toc id="/com.nokia.carbide.epocwindDisplay/html/toolTOC.xml" />
-	  <toc id="/com.nokia.carbide.cpp.sdk.doc.user/sdkTOC.xml" />	   
+
+      <category id="carbide.languages"/>
+      <toc id="/org.eclipse.cdt.doc.user/toc.xml" />	
+      <toc id="/com.nokia.carbide.cpp.compiler.doc.user/compilerTOC.xml" />	   
+	     
    </tocOrder>
    <hidden>
    </hidden>
--- a/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_Toc.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -36,7 +36,7 @@
   <li><b>Browse</b> or enter the <b>From preference file</b> name in the <b>Select Import</b> page</li>
   <li>Click <b>Finish</b></li>
 </ol>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_carbide.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -120,7 +120,7 @@
   <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
   <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_cw.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_cw.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -205,7 +205,7 @@
   <li><a href="help_keys_vs.htm">Microsoft Visual Studio Shortcuts</a></li>
   <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/help_keys_vs.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/help_keys_vs.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -196,7 +196,7 @@
   <li><a href="help_keys_carbide.htm">Nokia Carbide.c++ Shortcuts</a></li>
   <li><a href="help_keys_cw.htm">Nokia Codewarrior Shortcuts</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Thu Feb 04 12:59:43 2010 -0600
@@ -11,13 +11,6 @@
 		
 		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
 		
-			<link 
-				label="Switching to Carbide.c++" 
-				url="http://sw.nokia.com/id/efb22f32-66d4-4dab-ac3f-9f107b81e4c6/Switching_to_Carbide_cpp_White_Paper_v1_0_en.pdf"  
-				id="carbide" 
-				style-id="content-link">
-				<text>Download this whitepaper to learn how Carbide.c++ compares to Microsoft Visual Studio and Nokia CodeWarrior for Symbian development.</text>
-			</link>
 			
 			<link 
 				label="Carbide.c++ Shortcuts" 
--- a/core/com.nokia.carbide.cpp/html/legal.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/legal.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -10,12 +10,12 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+<p>Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
 <h5>NOTICES</h5>
 <p>Portions of this product are covered by the following licenses:</p>
 <ul>
-  <li>Eclipse 3.4 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
-  <li>Eclipse CDT 5.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+  <li>Eclipse 3.5 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
+  <li>Eclipse CDT 6.0 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>)</li>
   <li>Eclipse EMF 2.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
   <li>Eclipse GEF 3.3 (available at <a href="http://www.eclipse.org/legal/epl/notice.php">http://www.eclipse.org/legal/epl/notice.php</a>) </li>
   <li>Eclipse Remote System Explorer-1.0 (available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)</li>
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm	Thu Feb 04 12:59:43 2010 -0600
@@ -7,9 +7,9 @@
   <link href="../book.css" rel="stylesheet" type="text/css">
 </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.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>
+<h2>Welcome to Carbide.c++ 3.0</h2>
+<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 <a href="http://carbidehelp.nokia.com/help/topic/com.nokia.carbide.cpp.sdk.doc.user/html/sdkTOC.htm">Carbide.c++ Development Kit</a> (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 <b>Carbide.c++ Update Site</b> to get a copy of the <b>Carbide.c++ Development Kit &gt; Carbide.c++ Plug-in SDK</b>. Take a look, and let us know what you build!</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>
 <p> Thank you again for choosing Carbide.c++! We hope you like it. </p>
--- a/core/com.nokia.carbide.cpp/plugin.xml	Mon Feb 01 14:01:35 2010 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Thu Feb 04 12:59:43 2010 -0600
@@ -40,7 +40,7 @@
 			value="product:themes/carbide/graphics/root/brandmark.gif"/>
 		<property
 			name="introBrandingImageText"
-			value="Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>
+			value="Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved."/>
 		<property
 			name="introDescription-overview"
 			value="Carbide.c++ provides C/C++ developer tools for creating programs that operate on the Symbian OS. Carbide.c++ is based on Eclipse - an open extensible IDE for anything and nothing in particular."/>