file sync with changes in 2.5
authorfturovic <frank.turovich@nokia.com>
Thu, 25 Feb 2010 11:49:17 -0600
changeset 1023 59ff8c87a2ce
parent 1022 059005448a09
child 1024 48b401835d0a
file sync with changes in 2.5
core/com.nokia.carbide.cpp/html/helpDATA.xml
core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml
core/com.nokia.carbide.cpp/html/welcome_note.htm
core/com.nokia.carbide.cpp/themes/carbide/html/root.css
core/com.nokia.carbide.cpp/themes/carbide/html/shared.css
core/com.nokia.carbide.cpp/themes/carbide/html/standby.css
--- a/core/com.nokia.carbide.cpp/html/helpDATA.xml	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/helpDATA.xml	Thu Feb 25 11:49:17 2010 -0600
@@ -11,21 +11,19 @@
       <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"/>
+      <category id="carbide.tools"/>
       <toc id="/com.nokia.carbide.help.common/carbideHelpTOC.xml" />
+	  <toc id="/com.nokia.carbide.apiquery.help/html/toolTOC.xml" />
+      <toc id="/com.nokia.carbide.cpp.codescanner/tocCodeScanner.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" />
+      <toc id="/com.nokia.carbide.cpp.pi.doc.user/tocPI.xml" />	
+      <toc id="/com.nokia.carbide.cpp.uidesigner.doc.user/toc.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" />	
-      <toc id="/com.nokia.carbide.cpp.codescanner/tocCodeScanner.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" />	   
--- a/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/intro/migrateExtensionContent.xml	Thu Feb 25 11:49:17 2010 -0600
@@ -10,14 +10,13 @@
 		path="migrate/@">
 		
 		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
-		
-			
+					
 			<link 
 				label="Carbide.c++ Shortcuts" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp/html/help_keys_Toc.htm"  
 				id="carbide-keys" 
 				style-id="content-link">
-				<text>Carbide.c++ shortcuts include support for Microsoft Visual Studio as well as Nokia CodeWarrior.</text>
+				<text>Carbide.c++ shortcuts include support for Microsoft Visual Studio.</text>
 			</link>
 			
 		</group>
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm	Thu Feb 25 11:49:17 2010 -0600
@@ -8,7 +8,7 @@
 </head>
 <body>
 <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>Thank you for installing Carbide.c++ 3.0! It's an improvement over 2.5 with many improvements including support for Eclipse 3.6 and CDT 7.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>
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Thu Feb 25 11:49:17 2010 -0600
@@ -22,7 +22,7 @@
 #page-links a .link-label, #action-links a .link-label {
 	font-size : 13pt;
 	font-weight : 600;
-	color : #EEEEEE;
+	color : #0A94D6;
 }
 #page-links a p .text, #action-links a p .text {
 	font-size : 13pt;
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Thu Feb 25 11:49:17 2010 -0600
@@ -25,7 +25,7 @@
 h2 {
 	font-size : 13pt;
 	font-weight : normal;
-	color : #EEEEEE;
+	color : #0A94D6;
 }
 /* For regular div labels */
 H4 .div-label {
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css	Thu Feb 25 11:39:48 2010 -0600
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css	Thu Feb 25 11:49:17 2010 -0600
@@ -28,7 +28,7 @@
 #page-links a p .text, #action-links a p .text {
 	font-size : 13pt;
 	font-weight : 500;
-	color : #EEEEEE;
+	color : #0A94D6;
 }
 
 /*