--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Fri Sep 03 14:14:14 2010 -0500
@@ -7,7 +7,6 @@
<link href="../book.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link href="../book.css" rel="stylesheet" type="text/css" />
- <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
<style type="text/css">
ul > li {font-weight: normal }
</style>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Fri Sep 03 14:14:14 2010 -0500
@@ -8,11 +8,10 @@
<ul><li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
<li><a href="menus/menus.htm">Menus</a></li>
<li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
- <li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
<li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
<li><a href="../concepts/cvs.htm">Software Configuration Management</a></li>
- <li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
- <li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</a></li>
+ <li><a href="../tasks/projects/prj_adding_symbian_class.htm">Symbian OS Class</a></li>
+ <li><a href="../tasks/CreatingNewProjects.html">Symbian OS C++ Project</a></li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Fri Sep 03 14:14:14 2010 -0500
@@ -41,7 +41,7 @@
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm Fri Sep 03 14:14:14 2010 -0500
@@ -52,8 +52,8 @@
<h5>Related references</h5>
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a></li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm Fri Sep 03 14:14:14 2010 -0500
@@ -50,7 +50,7 @@
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Install Remote Agents</a></li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm Fri Sep 03 14:14:14 2010 -0500
@@ -15,15 +15,15 @@
<ul>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
<li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
- <li><a href="#INSTALL">Install Remote Agents</a> - download and install remote agents</li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a> - download and install remote agents</li>
</ul>
<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
<p class="figure">Figure 1 - New Connection dialog</p>
<h5>Related references</h5>
<ul>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a></li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm Fri Sep 03 14:14:14 2010 -0500
@@ -9,9 +9,9 @@
</head>
<body >
<h2>Debug dialog </h2>
-<p>Use the <b>Debug</b> dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> 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 <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
+<p>Use the <b>Debug</b> dialog to create, edit, and manage a project's <a href="../projects/launch/launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> 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 <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
<p>Select the <b>Run > Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
-<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
+<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the type of launch configuration highlighted in the configurations list. See <a href="../projects/launch/launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
<p align="center" class="figure"><img src="images/wnd_debug_overview.png" alt="Debug window" width="864" height="471"></p>
<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
@@ -52,14 +52,14 @@
<li>Filter Deleted/Unavailable Projects</li>
<li>Filter Configuration Types</li>
<li>Apply Window Working Set(s)</li>
- <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
+ <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
</ul></td>
</tr>
</table>
<h4>Other references</h4>
<ul>
- <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
- <li><a href="pages_overview.htm">Configuration Pages</a> </li>
+ <li><a href="../projects/launch/launch_configs_overview.htm">Launch Configuration Overview</a></li>
+ <li><a href="../projects/launch/pages_overview.htm">Configuration Pages</a> </li>
</ul>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
</body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Sep 03 14:14:14 2010 -0500
@@ -7,7 +7,7 @@
<link href="../book.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link href="../book.css" rel="stylesheet" type="text/css" />
- <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+ <script language="JavaScript" src="../projects/launch/launch_configs_overview.htm"></script>
</head>
<body >
<h2>Carbide.c++ Release Notes 3.0.0</h2>
@@ -32,7 +32,7 @@
<p>The following features for Symbian development are provided within Carbide.c++:</p>
<h4>Milestone 2</h4>
<ul>
- <li>A new <a href="reference/view_carbide_portal.htm">Carbide Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
+ <li>A new <a href="reference/view_carbide_portal.htm">Carbide.c++ Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
<li>The <a href="reference/view_variables.htm">Variables</a> view and debug hover now supports the following Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</li>
</ul>
<h4>Milestone 1</h4>
@@ -67,8 +67,8 @@
</ul>
<h4><a name="new250" id="new"></a>2.5.0</h4>
<ul>
- <li><b>Plug-and-Play (PnP) On-device Debugging </b> supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. Refer to <a href="#pnpIssues">Known PnP Issues</a> for details if you experience problems.</li>
- <li><b>PnP Phone Launch Wizard</b> - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for <a href="projects/launch/launch_phone.htm">phones</a>. In addition the new <a href="projects/launch/wnd_config_launch_config.htm">Configure Launch Configuration</a> dialog provides a quick summary of the remote connection for easy review and modification.</li>
+ <li><b>Plug-and-Play (PnP) On-device Debugging </b> supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. </li>
+ <li><b>PnP Phone Launch Wizard</b> - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for <a href="projects/launch/launch_phone.htm">phones</a>. In addition the new <a href="projects/launch/launch_configs_overview.htm">Configure Launch Configuration</a> dialog provides a quick summary of the remote connection for easy review and modification.</li>
<li><b>Carbide automatically detects TRK on target phones and devices</b> - Carbide now detects the presence of either Application or System TRK on a connected device when TRK 3.2.6 or later are installed. Earlier TRK versions do not support this recognition feature.</li>
<li><b>TRK improvements</b> - TRK continues to evolve and now includes these improvements:
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Fri Sep 03 14:14:14 2010 -0500
@@ -115,9 +115,8 @@
<ul>
<li><a href="CreatingNewProjects.html">Creating Projects </a></li>
<li><a href="projects/prj_build.htm">Building Projects</a></li>
- <li><a href="projects/prj_import_exe.htm">Importing a Symbian Executable</a></li>
- </ul>
- <h5>Related references</h5>
+ </ul>
+ <h5>Related references</h5>
<ul>
<li><a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
<li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm Fri Sep 03 14:14:14 2010 -0500
@@ -14,11 +14,11 @@
org.eclipse.ui.preferencePages.Keys)")'>Keys</a> preference panel to select a shortcut set or modify the current set for your convenience. The Default set is extended by the other key bindings for commands not covered in the Default set or where the new set uses different key bindings for a command. </p>
<p>The options include:</p>
<ul>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_carbide.htm">Carbide.c++</a> (default) – Carbide + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_carbide.htm">Carbide.c++</a> (default) – Carbide + Default standard set</li>
<li><strong>Default </strong>– Eclipse standard set of key bindings</li>
<li><strong>Emacs</strong> - Emacs + Default key bindings</li>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_vs.htm">Microsoft Visual Studio</a> – Visual Studio + Default standard set</li>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_cw.htm">Nokia Codewarrior</a> – CodeWarrior + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_vs.htm">Microsoft Visual Studio</a> – Visual Studio + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_cw.htm">Nokia Codewarrior</a> – CodeWarrior + Default standard set</li>
</ul>
<p>In addition, you can modify any of the assigned key bindings to use different keys to better suit your work style. See the <strong>Workbench User Guide > Reference > Preferences ></strong> <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm">Keys</a> preference panel page for more information.</p>
<h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm Fri Sep 03 14:14:14 2010 -0500
@@ -29,7 +29,6 @@
<ul>
<li><a href="../CreatingNewProjects.html">Creating
Projects</a></li>
- <li><a href="prj_import_exe.htm">Importing Symbian Executables </a> </li>
</ul>
<div class="step"></div>
<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm Fri Sep 03 14:14:14 2010 -0500
@@ -35,10 +35,9 @@
<h5>Related tasks</h5>
<ul>
<li><a href="prj_debug_dlls.htm">Debugging DLLs </a></li>
- <li><a href="prj_import_exe.htm">Importing Symbian Executables </a></li>
<li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
</ul>
- <h5>Related references</h5>
+<h5>Related references</h5>
<ul>
<li><a href="../../reference/ProjectDirectories.html">Project Directories</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm Fri Sep 03 13:35:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm Fri Sep 03 14:14:14 2010 -0500
@@ -14,7 +14,7 @@
<div class="step">
<h4>Configuring to Debug Multiple Projects </h4>
<ol>
- <li><a href="prj_import_exe.htm">Import</a> one or more project executables into the current project</li>
+ <li><a href="../ImportingProjects.html">Import</a> one or more project executables into the current project</li>
<p>The debugger loads the executable into the project.</p>
<li> Debug the project using the same debug launch configuration </li>
<p>The debugger loads the project and all embedded executables for debugging.</p>