--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Tue Aug 17 10:53:45 2010 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Tue Aug 17 14:51:17 2010 -0500
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+      Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
    </copyright>
 
    <license url="license.txt">

--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Tue Aug 17 10:53:45 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Tue Aug 17 14:51:17 2010 -0500
@@ -13,7 +13,7 @@
 		</description>
 	</item>
 	
-	<item title="Define a Trace32 Launch Configuration" href="/com.nokia.carbide.cpp.doc.user/html/reference/wnd_Trace32_config.htm" >
+	<item title="Define a Launch Configuration" >
 		<description>
 		Define debug launch configurations for the selected project.
 		</description>

--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Tue Aug 17 10:53:45 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Tue Aug 17 14:51:17 2010 -0500
@@ -14,44 +14,37 @@
     Carbide.c++ you have (see Table 1). Further, if you use an OS devkit,
   it must use SBSv2.</p>
 <h5>Table 1. Support packages used for development with each Carbide.c++ Editions </h5>
-<table width="100%"  border="0" cellpadding="3" cellspacing="0">
+<table width="800"  border="0" cellpadding="3" cellspacing="0">
   <tr>
-    <th width="28%" rowspan="3" valign="middle" scope="col"><p><b>Carbide.c++</b></p></th>
-    <th width="35%" scope="col">Support Packages <br />
+    <th width="20%" rowspan="2" valign="middle" scope="col"><p><b>Carbide.c++</b></p></th>
+    <th width="40%" scope="col">Support Packages <br />
     Used for Software Development </th>
-    <th width="37%" scope="col">What You Can Do...</th>
+    <th width="40%" scope="col">What You Can Do...</th>
   </tr>
   <tr>
-    <td rowspan="2" valign="middle"><p>An SDK or OS developer kit (DevKit) including:</p>
+    <td valign="middle"><p>An SDK or OS developer kit (DevKit) including:</p>
       <ul><li>9.x or higher for Platform Security </li>
     </ul></td>
     <td height="65"><p>Targets: Symbian ^3, S60 5th Ed., Qt</p>
-      <p>Debugger: Emulators, on-device debugging</p>
-    <p>UI Designer: create graphical interfaces quickly using standard UI components</p></td>
-  </tr>
-  <tr>
-    <td><p>Targets: Symbian ^3, S60 5th Ed., Qt</p>
-    <p>Debugger: Emulators, on-device debugging, device debugging in ROM, kernel debugging </p>
-    <p>Performance Investigator: application performance data, memory usage, power usage, button event reporting </p></td>
+      <p>Debugger: Emulators, on-device debugging</p>      </td>
   </tr>
 </table>
 <h5>Table 2. System Requirements</h5>
-<table width="85%"  border="0" cellpadding="2">
+<table width="800"  border="0" cellpadding="2">
   <tr>
-    <th width="27%" scope="row">Hardware</th>
-    <td width="73%"><ul>
+    <th width="30%" scope="row">Hardware</th>
+    <td width="70%"><ul>
         <li>x86-based personal computer </li>
-        <li>2GHz</li>
-        <li> 1GB of RAM minimum, recommend 2GB or more</li>
-        <li>CD-ROM drive </li>
+        <li>2GHz or faster CPU</li>
+        <li> 2GB of RAM or more recommended, 1GB minimum</li>
         </ul>
-    </td>
+        <p class="note"><strong>NOTE</strong> The larger your project the more RAM may be required to maximize efficiency and operational speed. </p></td>
   </tr>
   <tr>
     <th scope="row">Operating System </th>
     <td><p>Microsoft&reg; Windows&reg; XP (Service Pack 2/3) recommended,  Microsoft&reg; Windows&reg; 7 supported </p>
-      <p class="note"><b>NOTE</b> While Carbide.c++ supports many different OS configurations, only the ones listed here provide for optimal Symbian development. </p>
-        <p class="note"><b>NOTE</b> If you experience any VM issues, see the <a href="../../hints_tips.htm#VMissues">Tips &amp; Hints</a> page for info on modifying Carbide's default memory setup. </p></td>
+      <p class="note"><b>NOTE</b> If you experience any VM issues, see the <a href="../../hints_tips.htm#VMissues">Tips &amp; Hints</a> page for info on modifying Carbide's default memory setup. </p>
+        </td>
   </tr>
   <tr>
     <th scope="row">Other Software </th>
@@ -74,17 +67,18 @@
           <ul>
               <li><a href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a></li>
           </ul></li>
-          <li>Symbian Connect software 
-          <p>Software that communicates between a PC and a target device. For example, <a href="http://europe.nokia.com/support/download-software/nokia-ovi-suite">Ovi&nbsp;Suite</a>. </p>
+          <li>Ovi Suite software 
+              <p>Software that communicates between a PC and a target device. For example, <a href="http://europe.nokia.com/support/download-software/nokia-ovi-suite">Ovi&nbsp;Suite</a>. </p>
           </li>
       </ul></td>
   </tr>
   <tr>
     <th scope="row">Disk Space </th>
     <td><ul>
-        <li>800 MB for Carbide.c++</li>
-        <li>Up to 2.0 GB for each  SDK installation</li>
-    </ul></td>
+        <li>1 GB for Carbide.c++</li>
+        <li>Up to 3.0 GB for each  SDK installation</li>
+        </ul>
+        <p class="note"><strong>NOTE</strong> Avoid the use of encrypted disk software as it can significantly slow down the development process.</p></td>
   </tr>
 </table>
 <h4>References</h4>