# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1264107685 21600
# Node ID 1fdd2927e980e367cc78f6fcda697a41d171a029
# Parent  043c5c3bb50bc8fdc743ac02df9519654d564475# Parent  f90a80bff7529fbde6f68eb8bd1a912e54e279d3
merge again

diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_remote_connections.png has changed
diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Mon Jan 18 15:55:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Thu Jan 21 15:01:25 2010 -0600
@@ -26,7 +26,7 @@
   <li>Status - current connection status, i.e. Available, Not available, In Use, etc.</li>
   <li>Description - provides information on the current connection test status.</li>
 </ul>
-<p align="center"><img src="../images/view_remote_connections.png" width="431" height="252"></p>
+<p align="center"><img src="../images/view_remote_connections.png" width="588" height="177"></p>
 <p class="figure">Figure 1 - Remote Connections view</p>
 <h3>Remote Connections view toolbar icons</h3>
 <p>The following commands appear on the toolbar within the Remote Connections view: </p>
@@ -58,6 +58,44 @@
     <td><p>Click to edit the selected remote connection.</p>    </td>
   </tr>
 </table>
+<h3>Remote Connections view Status icons</h3>
+<p>The following status indicators appear in the Remote Connections view: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="13%" scope="col">Icon</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connection</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_connection.png" width="16" height="16">
+    </center></td>
+    <td><p>Indicates an inactive remote connection setting.</p></td>
+  </tr>
+  <tr>
+    <td><strong>Not Active</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_not_active.png" width="17" height="17">
+    </center></td>
+    <td>Indicates an inactive connection type.</td>
+  </tr>
+  <tr>
+    <td><strong>Ready / Available</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_available.png" width="17" height="18">
+    </center></td>
+    <td><p>Indicates an active remote connection is ready or that a particular connection type is available.</p></td>
+  </tr>
+  <tr>
+    <td><b>Not Accessible</b></td>
+    <td><center>
+      <img src="../images/icon_rc_not_accessible.png" width="16" height="16">
+    </center>
+    </td>
+    <td>Cannot access the connection type within the connection setup.</td>
+  </tr>
+</table>
 <h3>Remote Connections view context menu options</h3>
 <p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. Right-click on a connection name and the additional <b>Enable Service Testing</b> and <b>Disable Service Testing</b> are available.</p>
 <p align="center"><img src="../images/context_menu_remote_conn_view.png" width="211" height="104"></p>
@@ -115,9 +153,10 @@
 <h5>Related references</h5>
 <ul>
   <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections</a><a href="wnd_on_device_setup.htm"></a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a></li>
+  <li><a href="../../tasks/trk/trk_plug_n_play_01.htm">Plug-n-Play TRK Setup</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>
+<div id="footer">Copyright &copy; 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>
 </html>
diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Mon Jan 18 15:55:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Thu Jan 21 15:01:25 2010 -0600
@@ -37,12 +37,10 @@
 <p> See the <a href="hints_tips.htm">Tips &amp; tricks</a> page for more helpful information.</p>
 <h3><a name="whatsNew" id="whatsNew2"></a>What's New in 2.5.0 </h3>
 <p>The following features for Symbian  development are provided within Carbide.c++:</p>
-<blockquote>
-  <ul>
-    <li><b>RVCT 4.0 (ARMv5)</b> supported</li>
-    <li><b>SmartInstaller for Qt</b> supported</li>
-  </ul>
-</blockquote>
+<ul>
+  <li><b>RVCT 4.0 (ARMv5)</b> supported</li>
+  <li><b>SmartInstaller for Qt</b> supported</li>
+</ul>
 <h4><a name="240" id="210222"></a>2.4.0</h4>
 <ul>
   <li>    <span class="style5"><b>IMPORTANT WINSCW COMPILER</b></span> change - the WINSCW compiler 3.2.5 build 487  provides new name mangling to support critical exception handling. Without this change an exception can cause a program or system crash. For more information visit the <a href="http://developer.symbian.org/wiki/index.php/WINSCW_(build_version_information)">WINSCW</a> wiki page.</li>
diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Jan 18 15:55:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Thu Jan 21 15:01:25 2010 -0600
@@ -10,11 +10,11 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Carbide.c++ Release Notes (2.4)" 
+       		label="Carbide.c++ Release Notes (2.5)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-link" 
        		style-id="content-link">
-          	<text>Learn about what's new in Carbide.c++ for Symbian OS developers.</text>
+          	<text>Learn about what's new in Carbide.c++ for Symbian OS development.</text>
        		</link>
        	</group>
 		  
diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp/about.ini
--- a/core/com.nokia.carbide.cpp/about.ini	Mon Jan 18 15:55:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp/about.ini	Thu Jan 21 15:01:25 2010 -0600
@@ -1,29 +1,29 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%productBlurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/Carbide_c_icon_32x32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-aboutImage=icons/about.png
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-# Link to tips and tricks help page
-# optional
-# tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%productBlurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=icons/Carbide_c_icon_32x32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+aboutImage=icons/about.png
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Link to tips and tricks help page
+# optional
+tipsAndTricksHref=/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
diff -r f90a80bff752 -r 1fdd2927e980 core/com.nokia.carbide.cpp/plugin.properties
--- a/core/com.nokia.carbide.cpp/plugin.properties	Mon Jan 18 15:55:22 2010 -0600
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Thu Jan 21 15:01:25 2010 -0600
@@ -6,9 +6,9 @@
 CHEAT_SHEETS = Cheat Sheets
 CHEAT_SHEETS_MENU = &Cheat Sheets...
 
-productBlurb=\nCarbide.c++ Version 2.4.0\n\
+productBlurb=\nCarbide.c++ Version 2.5.0\n\
 Build {0} {1}\n\n\n\n\n\n\n\
-Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
+Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://developer.symbian.org/\n\
 This product includes software developed by Eclipse Project.\n\
 Visit http://www.eclipse.org/