merge commit
authortimkelly
Thu, 14 Oct 2010 11:27:24 -0500
changeset 2158 ac14826aa14b
parent 2157 90c82caa6918 (current diff)
parent 2156 76029713f570 (diff)
child 2159 db61d072b92b
merge commit
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Thu Oct 14 11:27:24 2010 -0500
@@ -15,7 +15,7 @@
   <li>The debugger will target any executable not already started whenever a &quot;process load&quot; event occurs, resolving its breakpoints as well.</li>
 </ul>
 <h4>Debugging DLLs</h4>
-<p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../projects/views/view_executables.htm">Executables</a> view. See <a href="../tasks/processes/attach_to_process.htm">Attaching  to a Process</a> for more details.</p>
+<p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you don't know which process to attach to or start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../projects/views/view_executables.htm">Executables</a> view. See <a href="../tasks/processes/attach_to_process.htm">Attaching  to a Process</a> for more details.</p>
 <h5>Other References</h5>
 <ul>
   <li><a href="../projects/launch/page_executables.htm">Executables</a></li>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/new_project_template_01.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Thu Oct 14 11:27:24 2010 -0500
@@ -17,6 +17,7 @@
 <h2>Build preferences</h2>
 <p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.ui.BuilderPreferencePage)")'> Build
 </a> page in the <b>Preferences</b> window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.</p>
+<p class="note"><b>NOTE</b> Based on which SDKs the project uses, one or both of the SBSvX tabs are shown.</p>
 <p align="center"><img src="images/prefs_build_workspace.png" width="696" height="554" alt="" /></p>
 <p class="figure">Figure 1 - Build workspace preferences page </p>
 <p>The following options are available in both the global Build preference panel and the project <b>Properties &gt; Carbide.c++ &gt; </b><b><a href="build_properties/prop_carb_project_settings.htm">Project Settings</a></b> panel. </p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step2.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Thu Oct 14 11:27:24 2010 -0500
@@ -9,11 +9,10 @@
 </head>
 <body >
 <h2>Attaching  to a Process</h2>
-<div>
-  <p>Use a <b>Symbian Attach to Process</b> launch configuration to attach the debugger to an already running Symbian process or thread on a target device. This is useful for debugging DLLs where the main process is unknown or for servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate.</p>
-  <p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../projects/views/view_executables.htm">Executables</a> view.</p>
+Use a <b>Symbian Attach to Process</b> launch configuration to attach the debugger to an already running Symbian process or thread on a target device or simulator. This is useful for debugging DLLs where the main process is unknown or for servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate.
+<p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../projects/views/view_executables.htm">Executables</a> view.</p>
   <p>You can also attach to a process in the <a href="../../debugger/views/view_symbian_kernel.htm">Symbian Data</a> view when debugging.</p>
-  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian and the CODA software.</p>
+  <p class="note"><b>NOTE</b> You cannot attach to a process running on an emulator. It must be a target device or simulator running the Symbian and the CODA software.</p>
   <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
   <div class="step">
     <h4>Attaching to any Running Process</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Thu Oct 14 11:27:24 2010 -0500
@@ -12,6 +12,7 @@
 <h2> Build Configuration Filtering </h2>
 <p> Use the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchConfigurations)")'>
 Build Configuration Filtering</a> preference panel in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. </p>
+<p class="note"><b>NOTE</b> Based on which SDKs the project uses, one or both of the SBSvX tabs are shown.</p>
 <h3>SBSv2 tab</h3>
 <p>Use the <strong>SBSv2</strong> tab to select  configurations for the build system. SBSv2 is the prefered build system for the most current SDKs.</p>
 <p>The SBSv2 configurations and variants available on this page represent the pool of all available configurations for discovered Symbian SDKs. Not all configurations apply to all SDKs; Carbide will filter configurations appropriate for each SDK in the SDK/Configuration tree selection.</p>
--- a/core/com.nokia.carbide.cpp/plugin.properties	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Thu Oct 14 11:27:24 2010 -0500
@@ -6,7 +6,7 @@
 CHEAT_SHEETS = Cheat Sheets
 CHEAT_SHEETS_MENU = &Cheat Sheets...
 
-productBlurb=\nCarbide.c++ Version 3.0.0\n\
+productBlurb=\nCarbide.c++ Version 3.1.0\n\
 Build {0} {1}\n\n\n\
 Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://developer.symbian.org/\n\
--- a/core/com.nokia.carbide.cpp/plugin.xml	Thu Oct 14 11:26:55 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Thu Oct 14 11:27:24 2010 -0500
@@ -34,7 +34,7 @@
 		<!-- Product attributes that support themes and universal intro -->
 		<property
 			name="introTitle"
-			value="Carbide.c++ v3.0.0 for Symbian"/> 
+			value="Carbide.c++ v3.1.0 for Symbian"/> 
 		<property
 			name="introBrandingImage"
 			value="intro/css/graphics/rootpage/brandmark.png"/>