[Esbox-commits] r2345 - in trunk: org.maemo.esbox.help/html/concepts org.maemo.esbox.help/html/context_help org.maemo.esbox.help/html/tasks org.maemo.esbox.product

Fri Oct 23 18:27:45 EEST 2009

Author: eswartz
Date: 2009-10-23 18:27:44 +0300 (Fri, 23 Oct 2009)
New Revision: 2345

Modified:
   trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html
   trunk/org.maemo.esbox.help/html/concepts/RemoteLaunching.html
   trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
   trunk/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html
   trunk/org.maemo.esbox.help/html/tasks/ValidatingPackages.html
   trunk/org.maemo.esbox.product/plugin.properties
Log:
Merge rev 2343 from work_Ed branch

Modified: trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html
===================================================================

--- trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html	2009-10-23 15:27:44 UTC (rev 2345)
@@ -18,7 +18,7 @@
 Another would be the ARMEL architecture for Fremantle under Scratchbox 2.
 Each uses (or may use) different compilers, invocation semantics, etc.
 </p>
-<p>The Nokia Internet Tablet also provides targets for accessing the device.
+<p>The Maemo device also provides targets for accessing the device.
 ESbox provides several RSE connections for the various networking connections
 that are used to access a device.
 </p>

Modified: trunk/org.maemo.esbox.help/html/concepts/RemoteLaunching.html
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/RemoteLaunching.html	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.help/html/concepts/RemoteLaunching.html	2009-10-23 15:27:44 UTC (rev 2345)
@@ -16,7 +16,7 @@
 <body>
 <h2 class="style1">Launching Applications Remotely</h2>
 
-<p>C/C++ or Python programs may be launched remotely, on a Nokia Internet Tablet.
+<p>C/C++ or Python programs may be launched remotely, on a Maemo device.
 You may only run or debug remotely when the project's current configuration
 refers to an ARMEL target.  </p>
 <p>ESbox will either <em>copy the program</em> to the device or <em>mount

Modified: trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
===================================================================
--- trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-23 15:27:44 UTC (rev 2345)
@@ -194,7 +194,7 @@
 
 <!-- PLUGIN: org.maemo.mica.maemosdk.flasher -->
 	<context id="wizard_flash_images_to_device" >
-		<description>Flash Images such as new rootstraps and kernels to the Nokia Internet Tablet.</description>
+		<description>Flash Images such as new rootstraps and kernels to the Maemo device.</description>
 		<topic label="Flash Images to Device"  		href="html/tasks/UsingFlahserWizard.html" />
 	</context>
 

Modified: trunk/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html	2009-10-23 15:27:44 UTC (rev 2345)
@@ -26,7 +26,7 @@
 <p>The <strong>Configure...</strong> option on RSE connections will let you
 edit the IP address and user name used for the device.  This is an 
 especially convenient shortcut for reconfiguring the address 
-for connections like <em>Nokia Internet Tablet (user-configured)</em>
+for connections like <em>Maemo device (user-configured)</em>
 if its address is controlled by DHCP and changes often.
 </p>
 

Modified: trunk/org.maemo.esbox.help/html/tasks/ValidatingPackages.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/ValidatingPackages.html	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.help/html/tasks/ValidatingPackages.html	2009-10-23 15:27:44 UTC (rev 2345)
@@ -17,7 +17,7 @@
 </p>
 <p>You may configure multiple projects at once and select which targets to update.  
 Repositories like Maemo Extras will be automatically added as needed.</p>
-<p><b>NOTE:</b> to install software to a Nokia Internet Tablet, you will need root access.  
+<p><b>NOTE:</b> to install software to a Maemo device, you will need root access.  
 Root access is not needed for Scratchbox targets.</p>
 <p>To validate installed packages:</p>
   <ol>

Modified: trunk/org.maemo.esbox.product/plugin.properties
===================================================================
--- trunk/org.maemo.esbox.product/plugin.properties	2009-10-23 15:22:05 UTC (rev 2344)
+++ trunk/org.maemo.esbox.product/plugin.properties	2009-10-23 15:27:44 UTC (rev 2345)
@@ -30,5 +30,5 @@
 
 productIntroTitle = Welcome to ESbox 2.0.0 (Integration)!
 productIntroBrandingText = ESbox
-introDescription-overview = ESbox is a product that helps you develop applications for the Maemo platform on Scratchbox Apophis and on the Nokia Internet Tablet. 
+introDescription-overview = ESbox is a product that helps you develop applications for the Maemo platform on Scratchbox Apophis and on Maemo devices. 
 introDescription-tutorials = Learn how to be productive using ESbox by completing end-to-end tutorials that will guide you along the way.

