--- a/core/com.nokia.carbide.cpp.doc.user/intro/carbide.css	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/carbide.css	Fri Jul 23 15:40:47 2010 -0500
@@ -1,3 +1,21 @@
-a#carbide-sample img { background-image : url(carbide_sample.gif); }
-a#carbide-sample:hover img { background-image : url(carbide_sample_hov.gif); }
+
+a#carbide img { background-image : url(images/carbide.png); }
+a#carbide:hover img { background-image : url(images/carbide_hov.png); }
+
+a#carbide-whatsnew img { background-image : url(images/carbide_new.png); }
+a#carbide-whatsnew :hover img { background-image : url(images/carbide_new_hov.png); }
+
+a#carbide-sample img { background-image : url(images/carbide_sample.png); }
+a#carbide-sample:hover img { background-image : url(../images/carbide_sample_hov.png); }
 
+a#carbide-tutorial img { background-image : url(images/carbide_tutorial.png); }
+a#carbide-tutorial:hover img { background-image : url(images/carbide_tutorial_hov.png); }
+
+a#carbide-keys img { background-image : url(images/carbide_keys.png); }
+a#carbide-keys:hover img { background-image : url(images/carbide_keys_hov.png); }
+
+a#carbide-web img { background-image : url(images/carbide_web.png); }
+a#carbide-web:hover img { background-image : url(images/carbide_web_hov.png); }
+
+a#carbide-people img { background-image : url(images/carbide_people.png); }
+a#carbide-people:hover img { background-image : url(images/carbide_people_hov.png); }

--- a/core/com.nokia.carbide.cpp.doc.user/intro/carbide.properties	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/carbide.properties	Fri Jul 23 15:40:47 2010 -0500
@@ -1,19 +1,24 @@
 
-tutorials.carbide-sample = intro/carbide_sample.gif
-tutorials.carbide-sample:hover = intro/carbide_sample_hov.gif
+overview.carbide = intro/images/images/carbide.png
+overview.carbide:hover = intro/images/carbide_hov.png
 
-whatsnew.carbide-sample = intro/carbide_sample.gif
-whatsnew.carbide-sample:hover = intro/carbide_sample_hov.gif
+whatsnew.carbide = intro/images/carbide_new.png
+whatsnew.carbide:hover = intro/images/carbide_new_hov.png
 
-migrate.carbide-sample = intro/carbide_sample.gif
-migrate.carbide-sample:hover = intro/carbide_sample_hov.gif
+webresources.carbide-web = intro/images/carbide_web.png
+webresources.carbide-web:hover = intro/images/carbide_web_hov.png
 
-overview.carbide-sample = intro/carbide_sample.gif
-overview.carbide-sample:hover = intro/carbide_sample_hov.gif
+webresources.carbide-people = intro/images/carbide_people.png
+webresources.carbide-people:hover = intro/images/carbide_people_hov.png
+
+firststeps.carbide = intro/images/carbide.png
+firststeps.carbide:hover = intro/images/carbide_hov.png
 
-webresources.carbide-sample = intro/carbide_sample.gif
-webresources.carbide-sample:hover = intro/carbide_sample_hov.gif
+migrate.carbide-keys = intro/images/carbide_keys.png
+migrate.carbide-keys:hover = intro/images/carbide_keys_hov.png
 
-firststeps.carbide-sample = intro/carbide_sample.gif
-firststeps.carbide-sample:hover = intro/carbide_sample_hov.gif
+tutorials.carbide = intro/images/carbide_tutorial.png
+tutorials.carbide:hover = intro/images/carbide_tutorial_hov.png
 
+samples.carbide-sample = intro/images/carbide_sample.png
+samples.carbide-sample:hover = intro/images/carbide_sample_hov.png

Binary file core/com.nokia.carbide.cpp.doc.user/intro/carbide_sample.gif has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/carbide_sample_hov.gif has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_keys.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_keys_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_new.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_new_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_people.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_people_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_sample.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_sample_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_tutorial.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_tutorial_hov.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_web.png has changed

Binary file core/com.nokia.carbide.cpp.doc.user/intro/images/carbide_web_hov.png has changed

--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Fri Jul 23 15:40:47 2010 -0500
@@ -14,7 +14,7 @@
 			<link 
 				label="Emulator Application Projects" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm" 
-				id="carbide-sample" 
+				id="carbide-tutorial" 
 				style-id="content-link">
 				<text>Learn how to create, build, and debug programs on the emulator using Carbide project templates.</text>
 			</link>
@@ -22,7 +22,7 @@
 			<link 
 				label="DLL Projects" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm"  
-				id="carbide-sample" 
+				id="carbide-tutorial" 
 				style-id="content-link">
 				<text>Learn how to create and debug DLL projects.</text>
 			</link>
@@ -30,7 +30,7 @@
 			<link 
 				label="Remote Target Debugging (Run-mode)" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm"  
-				id="carbide-sample" 
+				id="carbide-tutorial" 
 				style-id="content-link">
 				<text>Learn how debug applications on remote devices using the TRK remote agent.</text>
 			</link>
@@ -39,7 +39,7 @@
 			<link 
 				label="Create a stop mode debugging application" 
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm"  
-				id="carbide-sample" 
+				id="carbide-tutorial" 
 				style-id="content-link">
 				<text>Learn how to create and build an application and debug it on a device using JTAG debug software on Lauterbach hardware.</text>
 			</link>

--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Fri Jul 23 15:40:47 2010 -0500
@@ -12,7 +12,7 @@
        		<link 
        		label="Carbide.c++ Release Notes (3.0b)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
-       		id="carbide-link" 
+       		id="carbide-whatsnew" 
        		style-id="content-link">
           	<text>Learn about what's new in Carbide.c++ for Symbian OS development.</text>
        		</link>
@@ -20,9 +20,19 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Plug-n-Play On-device Debugging (2.5)" 
+       		label="Improved Carbide Debugger  (3.0b)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
-       		id="carbide-link" 
+       		id="carbide-whatsnew" 
+       		style-id="content-link">
+          	<text>The Carbide debugger was completely rewritten using the CDT projects EDF and EDC.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Plug-n-Play On-device Debugging (in 2.5)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
+       		id="carbide-whatsnew" 
        		style-id="content-link">
           	<text>Debugging programs on a target device has never been easier with PnP on-device debugging.</text>
        		</link>

Binary file core/com.nokia.carbide.cpp/html/images/carbide.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_hov.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_keys.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_keys.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_keys_hov.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_keys_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_new.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_new_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_people.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_people.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_people_hov.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_people_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_sample.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_sample.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_sample_hov.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_sample_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_tutorial.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_tutorial_hov.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_web.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_web.png has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_web_hov.gif has changed

Binary file core/com.nokia.carbide.cpp/html/images/carbide_web_hov.png has changed

--- a/core/com.nokia.carbide.cpp/html/intro/carbide.css	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/intro/carbide.css	Fri Jul 23 15:40:47 2010 -0500
@@ -1,14 +1,20 @@
-a#carbide img { background-image : url(../images/carbide.gif); }
-a#carbide:hover img { background-image : url(../images/carbide_hov.gif); }
+a#carbide img { background-image : url(../images/carbide.png); }
+a#carbide:hover img { background-image : url(../images/carbide_hov.png); }
 
-a#carbide-sample img { background-image : url(../images/carbide_sample.gif); }
-a#carbide-sample:hover img { background-image : url(../images/carbide_sample_hov.gif); }
+a#carbide-whatsnew img { background-image : url(../images/carbide_new.png); }
+a#carbide-whatsnew :hover img { background-image : url(../images/carbide_new_hov.png); }
+
+a#carbide-sample img { background-image : url(../images/carbide_sample.png); }
+a#carbide-sample:hover img { background-image : url(../images/carbide_sample_hov.png); }
 
-a#carbide-keys img { background-image : url(../images/carbide_keys.gif); }
-a#carbide-keys:hover img { background-image : url(../images/carbide_keys_hov.gif); }
+a#carbide-tutorial img { background-image : url(../images/carbide_tutorial.png); }
+a#carbide-tutorial:hover img { background-image : url(../images/carbide_tutorial_hov.png); }
+
+a#carbide-keys img { background-image : url(../images/carbide_keys.png); }
+a#carbide-keys:hover img { background-image : url(../images/carbide_keys_hov.png); }
 
-a#carbide-web img { background-image : url(../images/carbide_web.gif); }
-a#carbide-web:hover img { background-image : url(../images/carbide_web_hov.gif); }
+a#carbide-web img { background-image : url(../images/carbide_web.png); }
+a#carbide-web:hover img { background-image : url(../images/carbide_web_hov.png); }
 
-a#carbide-people img { background-image : url(../images/carbide_people.gif); }
-a#carbide-people:hover img { background-image : url(../images/carbide_people_hov.gif); }
+a#carbide-people img { background-image : url(../images/carbide_people.png); }
+a#carbide-people:hover img { background-image : url(../images/carbide_people_hov.png); }

--- a/core/com.nokia.carbide.cpp/html/intro/carbide.properties	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/intro/carbide.properties	Fri Jul 23 15:40:47 2010 -0500
@@ -1,24 +1,24 @@
 
-overview.carbide = html/images/carbide.gif
-overview.carbide:hover = html/images/carbide_hov.gif
+overview.carbide = html/images/carbide.png
+overview.carbide:hover = html/images/carbide_hov.png
 
-whatsnew.carbide = html/images/carbide.gif
-whatsnew.carbide:hover = html/images/carbide_hov.gif
+whatsnew.carbide-whatsnew = html/images/carbide_new.png
+whatsnew.carbide-whatsnew:hover = html/images/carbide_new_hov.png
 
-webresources.carbide-web = html/images/carbide_web.gif
-webresources.carbide-web:hover = html/images/carbide_web_hov.gif
+webresources.carbide-web = html/images/carbide_web.png
+webresources.carbide-web:hover = html/images/carbide_web_hov.png
 
-webresources.carbide-people = html/images/carbide_people.gif
-webresources.carbide-people:hover = html/images/carbide_people_hov.gif
+webresources.carbide-people = html/images/carbide_people.png
+webresources.carbide-people:hover = html/images/carbide_people_hov.png
 
-firststeps.carbide = html/images/carbide.gif
-firststeps.carbide:hover = html/images/carbide_hov.gif
+firststeps.carbide-first = html/images/carbide.png
+firststeps.carbide-first:hover = html/images/carbide_hov.png
 
-migrate.carbide-keys = html/images/carbide_keys.gif
-migrate.carbide-keys:hover = html/images/carbide_keys_hov.gif
+migrate.carbide-keys = html/images/carbide_keys.png
+migrate.carbide-keys:hover = html/images/carbide_keys_hov.png
 
-tutorials.carbide = html/images/carbide.gif
-tutorials.carbide:hover = html/images/carbide_hov.gif
+tutorials.carbide-tutorial = html/images/carbide_tutorial.png
+tutorials.carbide-tutorial:hover = html/images/carbide_tutorial_hov.png
 
-samples.carbide-sample = html/images/carbide_sample.gif
-samples.carbide-sample:hover = html/images/carbide_sample_hov.gif
+samples.carbide-sample = html/images/carbide_sample.png
+samples.carbide-sample:hover = html/images/carbide_sample_hov.png

--- a/core/com.nokia.carbide.cpp/html/intro/whatsnewExtensionContent.xml	Fri Jul 23 12:42:38 2010 -0500
+++ b/core/com.nokia.carbide.cpp/html/intro/whatsnewExtensionContent.xml	Fri Jul 23 15:40:47 2010 -0500
@@ -18,7 +18,7 @@
 			<link 
 				label="Carbide.c++ Release Notes" 
 	       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
-				id="carbide">
+				id="carbide-whatsnew">
 				style-id="content-link" 
           		<text>Learn about what's new in Carbide.c++</text>
 			</link>

Binary file core/com.nokia.carbide.cpp/icons/Carbide_c_icon_32x32.png has changed