# HG changeset patch # User timkelly # Date 1283543846 18000 # Node ID 5363a66d25da235179d600e98e9015d1593be8a4 # Parent bb7feef4fb1d016d4d47dd79b3c49bcf9a9cc1ff# Parent 4809919782c075417fb5df6fce812993dacd4f61 merge commit diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Fri Sep 03 14:57:26 2010 -0500 @@ -7,7 +7,6 @@ - diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Fri Sep 03 14:57:26 2010 -0500 @@ -8,11 +8,10 @@ diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Sep 03 14:57:26 2010 -0500 @@ -41,7 +41,7 @@ diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm Fri Sep 03 14:57:26 2010 -0500 @@ -52,8 +52,8 @@
Related references
diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm Fri Sep 03 14:57:26 2010 -0500 @@ -50,7 +50,7 @@ diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm Fri Sep 03 14:57:26 2010 -0500 @@ -15,15 +15,15 @@

Figure 1 - New Connection dialog

Related references
diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm Fri Sep 03 14:57:26 2010 -0500 @@ -9,9 +9,9 @@

Debug dialog

-

Use the Debug dialog to create, edit, and manage a project's launch configurations. A launch configuration defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one launch configuration in order to debug a project and can have many more. Projects that have no launch configuration invoke the New Launch Configuration Wizard when either the Run or Debug command is selected.

+

Use the Debug dialog to create, edit, and manage a project's launch configurations. A launch configuration defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one launch configuration in order to debug a project and can have many more. Projects that have no launch configuration invoke the New Launch Configuration Wizard when either the Run or Debug command is selected.

Select the Run > Debug Configuration... menu option to open the Debug dialog.

-

The tabs shown in the Debug dialog vary depending upon the type of launch configuration highlighted in the configurations list. See Launch Configuration Overview for more information on the various launch configuration types.

+

The tabs shown in the Debug dialog vary depending upon the type of launch configuration highlighted in the configurations list. See Launch Configuration Overview for more information on the various launch configuration types.

Click Debug to start a new debug session using the selected launch configuration.

Debug window

Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)

@@ -52,14 +52,14 @@
  • Filter Deleted/Unavailable Projects
  • Filter Configuration Types
  • Apply Window Working Set(s)
  • -
  • Filtering Preferences...
  • +
  • Filtering Preferences...
  • Other references

    diff -r bb7feef4fb1d -r 5363a66d25da core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Sep 03 14:56:39 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Sep 03 14:57:26 2010 -0500 @@ -7,7 +7,7 @@ - +

    Carbide.c++ Release Notes 3.0.0

    @@ -32,7 +32,7 @@

    The following features for Symbian development are provided within Carbide.c++:

    Milestone 2

    Milestone 1

    @@ -67,8 +67,8 @@

    2.5.0