# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1244058891 18000
# Node ID bd0210e4c71e833dc57d4cb24101982eaec43318
# Parent  9a882d9560d4e4589b6ac14bfef1070afcae8b0d# Parent  e58c537ddd6e4ad695a0662552448ded5cac24aa
merge heads

diff -r e58c537ddd6e -r bd0210e4c71e core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jun 02 10:01:32 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Jun 03 14:54:51 2009 -0500
@@ -189,7 +189,7 @@
 			<topic label="New Launch Configuration Wizard"	href="html/projects/launch/wiz_new_launch_config.htm" />
 			<topic label="Debug dialog"						href="html/projects/launch/wnd_debug_configuration.htm" />
 
-		    <topic label="Launch configurations"			href="html/concepts/launch_configuration.htm" >
+		    <topic label="Launch types"			href="html/concepts/launch_configuration.htm" >
 				<topic label="Applications"					href="html/projects/launch/applications.htm" />
 				<topic label="Application TRK"				href="html/projects/launch/run_mode.htm" />
 				<topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />