[bug 9366] melded TOC with menu options shown in manual
authorfturovic <frank.turovich@nokia.com>
Tue, 30 Jun 2009 12:44:21 -0500
changeset 327 653e5573ae3c
parent 326 ab7c9b8bd24f
child 328 31403302c38e
[bug 9366] melded TOC with menu options shown in manual
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Mon Jun 29 16:17:23 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Tue Jun 30 12:44:21 2009 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Clean Symbian Component</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Clean Symbian Component </h2>
-<p>You can s elect a .mmp or .mk  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
-<p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a>  </li>
-  <li><a href="clean_symbian_comp.htm">Build Symbian Component</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Clean Symbian Component</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Clean Symbian Component </h2>
+<p>You can select a MMP or MK  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
+<p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a>  </li>
+  <li><a href="clean_symbian_comp.htm">Build Symbian Component</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 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>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Mon Jun 29 16:17:23 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Tue Jun 30 12:44:21 2009 -0500
@@ -19,13 +19,13 @@
   <li><a href="compile_source.htm">Compile</a></li>
   <li><a href="freeze_exports.htm">Freeze Exports</a></li>
   <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
-  <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections</a> </li>
+  <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections...</a> </li>
   <li><a href="open_cmd_window.htm">Open Command Window</a></li>
-  <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
   <li><a href="preprocess_source.htm">Preprocess</a></li>
   <li><a href="run_codescanner.htm">Run Codescanner</a></li>
   <li><a href="run_leavescan.htm">Run Leavescan</a></li>
   <li><a href="s60_ui_designer.htm">S60 UI Designer</a></li>
+  <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
   <li><a href="new_symbian_class.htm">Symbian OS C++ Class</a></li>
   <li><a href="new_symbian_project.htm">Symbian OS C++ Project</a></li>
   <li><a href="new_symbian_project.htm">Symbian OS MMP File </a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jun 29 16:17:23 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jun 30 12:44:21 2009 -0500
@@ -28,20 +28,35 @@
 	</topic>
 
 	<topic label="Carbide Menus " 					href="html/reference/menus/menus.htm" >
+		<topic label="ABLD Actions" 				href="html/reference/menus/abld.htm" />
 
-     	<topic href="html/reference/trk/wnd_on_device_setup.htm" label="On-Device Connection..."/>
+		<topic label="Build All Configurations" 	href="html/reference/menus/build_all_targets.htm" />
+		<topic label="Build PKG File" 				href="html/reference/menus/build_pkg_file.htm" />
+		<topic label="Build Symbian Component" 		href="html/reference/menus/build_symbian_comp.htm" />
+
+		<topic label="Clean Symbian Component" 		href="html/reference/menus/clean_symbian_comp.htm" />
+		<topic label="Compile" 						href="html/reference/menus/compile_source.htm" />
 		<topic label="Context menus" 				href="html/concepts/contextual_menus.htm" />
 
+		<topic label="Freeze Exports" 				href="html/reference/menus/freeze_exports.htm" />
+		<topic label="Freeze Symbian Component" 	href="html/reference/menus/freeze_symbian_comp.htm" />
+
+     	<topic label="On-Device Connections..."		href="html/reference/trk/wnd_on_device_setup.htm" />
 		<topic label="Open Command Window"			href="html/reference/menus/open_cmd_window.htm" />
+
+		<topic label="Preprocess" 					href="html/reference/menus/preprocess_source.htm" />
+
 		<topic label="Run CodeScanner"				href="html/reference/menus/run_codescanner.htm" />
 		<topic label="Run Leavescan"				href="html/reference/menus/run_leavescan.htm" />
+
 		<topic label="S60 UI Designer"				href="html/reference/menus/s60_ui_designer.htm" />
 		<topic label="Show in Explorer"				href="html/reference/menus/open_explorer_window.htm" />
-
 		<topic label="Symbian OS C++ Class"			href="html/tasks/projects/prj_adding_symbian_class.htm"  />
 		<topic label="Symbian OS C++ Project"		href="html/tasks/CreatingNewProjects.html" />
 		<topic label="Symbian OS MMP File"			href="html/reference/NewMMP_wizard.html" />
 
+		<topic label="Toggle HW Breakpoint"          href="html/reference/menus/hardware_breakpoints.htm" />
+
 		<topic label="Update Projects"          	href="html/reference/olderproject_updater.html" />
 
 	</topic>