merge again, sigh
authorfturovic <frank.turovich@nokia.com>
Tue, 16 Jun 2009 14:07:31 -0500
changeset 257 e86c41ddbcbc
parent 251 fff928c91e29 (current diff)
parent 256 a78ee2a087c7 (diff)
child 258 7da6c27a7cd6
merge again, sigh
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_preferences.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Tue Jun 16 10:37:25 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Tue Jun 16 14:07:31 2009 -0500
@@ -1,54 +1,62 @@
-<!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>Carbide.c++ preference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ preferences</h2>
-<p>The <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.cpp.project.ui.preferences.CarbidePreferencePage)")'>
-Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure 1 shows the Carbide.c++ preference panel.</p>
-<p align="center"><img src="images/carbide_preferences.png" width="627" height="544" alt="" /></p>
-<p class="figure">Figure 1 - Carbide.c++ preferences page </p>
-<h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Keep Symbian OS project files (bld.inf/mmp) in sync with project changes</b></td>
-    <td>Select this option to update project files (bld.inf and mmp) when you add, remove, rename or move files and directories in your current workspace.</td>
-  </tr>
-  <tr>
-    <td><b>When files are added to the project </b></td>
-    <td><p>The following options are available when files are added to a project:</p>
-      <ul>
-        <li>Ask before changing bld.inf/mmp - You will be prompted to allow changes </li>
-        <li>Always change bld.inf/mmp - Changes will be made wthout asking you to allow change </li>
-        <li>Never change bld.inf/mmp - No changes will be made </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>When files in the project are moved/ renamed/  deleted </b></td>
-    <td><p>The following options are available that effect the bld.inf or mmp files when files in a project are moved, renamed, or deleted:</p>
-      <ul>
-        <li>Ask before changing bld.inf/mmp - You will be prompted to allow changes </li>
-        <li>Always change bld.inf/mmp - Changes will be made wthout asking you to allow change </li>
-        <li>Never change bld.inf/mmp - No changes will be made </li>
-      </ul></td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="SDKPreferences.html">SDK Preferences</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>
+<!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>Carbide.c++ preference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide.c++ preferences</h2>
+<p>The <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.cpp.project.ui.preferences.CarbidePreferencePage)")'>
+Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure 1 shows the Carbide.c++ preference panel.</p>
+<p align="center"><img src="images/carbide_preferences.png" width="627" height="544" alt="" /></p>
+<p class="figure">Figure 1 - Carbide.c++ preferences page </p>
+<h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
+<table width="700"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Keep Symbian OS project files (bld.inf/mmp) in sync with project changes</b></td>
+    <td>Select this option to update project files (bld.inf and mmp) when you add, remove, rename or move files and directories in your current workspace.</td>
+  </tr>
+  <tr>
+    <td><b>When files are added to the project </b></td>
+    <td><p>The following options are available when files are added to a project:</p>
+      <ul>
+        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
+        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
+        <li>Never change bld.inf/mmp - No changes are made </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>When files in the project are moved/renamed/deleted </b></td>
+    <td><p>The following options are available that effect the bld.inf or mmp files when files in a project are moved, renamed, or deleted:</p>
+      <ul>
+        <li>Ask before changing bld.inf/mmp - You are prompted to allow changes </li>
+        <li>Always change bld.inf/mmp - Changes are made wthout asking you to allow change </li>
+        <li>Never change bld.inf/mmp - No changes are made </li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><b>Indexing Options</b></td>
+    <td><p>The following options control how the project mmp files are indexed:</p>
+      <ul>
+        <li>Index only source files from mmp files being built (default)</li>
+        <li>Index source files from all mmp files </li>
+    </ul></td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
+  <li><a href="SDKPreferences.html">SDK Preferences</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>
--- a/project/com.nokia.carbide.cpp.project.ui/plugin.properties	Tue Jun 16 10:37:25 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/plugin.properties	Tue Jun 16 14:07:31 2009 -0500
@@ -35,4 +35,4 @@
 
 #Keywords for Carbide preferences
 carbcPreference.common=carbide symbian c cpp cplusplus
-carbcPreference.carbidecpp=project bld.inf mmp moved modified
+carbcPreference.carbidecpp=project bld inf mmp moved modified rename copy copied index sync