[Esbox-commits] r2313 - in branches/work_Ed: org.maemo.esbox.help org.maemo.esbox.help/META-INF org.maemo.esbox.help/html org.maemo.esbox.help/html/concepts org.maemo.esbox.help/html/context_help org.maemo.esbox.help/html/gettingstarted org.maemo.esbox.help/html/images org.maemo.esbox.help/html/images/interpreter org.maemo.esbox.help/html/images/pref_images org.maemo.esbox.help/html/images/vnc org.maemo.esbox.help/html/reference org.maemo.esbox.help/html/tasks org.maemo.esbox.product-feature org.maemo.esbox.product.repository-feature

eswartz at garage.maemo.org eswartz at garage.maemo.org
Thu Oct 15 19:55:01 EEST 2009


Author: eswartz
Date: 2009-10-15 19:54:53 +0300 (Thu, 15 Oct 2009)
New Revision: 2313

Added:
   branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/RSEConnection.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/concepts/USBNetworking.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/interpreter_preferences.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_change.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_configuration.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_create.png
   branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/interpreter.png
   branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/prefs-sbrsh.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-1.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-2.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-3.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-4.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-5.png
   branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml
   branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml
Removed:
   branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.html
   branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.html
   branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.html
   branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html
   branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.html
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.html
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.html
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/interpreter_preferences.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_change.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_configuration.png
   branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_create.png
   branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
   branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
   branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html
Modified:
   branches/work_Ed/org.maemo.esbox.help/META-INF/MANIFEST.MF
   branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
   branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoTargets.html
   branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html
   branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/LocalRunDebug.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html
   branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html
   branches/work_Ed/org.maemo.esbox.help/html/tocconcepts.html
   branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html
   branches/work_Ed/org.maemo.esbox.help/html/tocreference.html
   branches/work_Ed/org.maemo.esbox.help/html/toctasks.html
   branches/work_Ed/org.maemo.esbox.help/tocconcepts.xml
   branches/work_Ed/org.maemo.esbox.help/tocgettingstarted.xml
   branches/work_Ed/org.maemo.esbox.help/tocreference.xml
   branches/work_Ed/org.maemo.esbox.help/toctasks.xml
   branches/work_Ed/org.maemo.esbox.product-feature/feature.xml
   branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml
Log:
Merge revs 2293:2312 from trunk (help)

Modified: branches/work_Ed/org.maemo.esbox.help/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/META-INF/MANIFEST.MF	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/META-INF/MANIFEST.MF	2009-10-15 16:54:53 UTC (rev 2313)
@@ -4,7 +4,8 @@
 Bundle-SymbolicName: org.maemo.esbox.help;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.help;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: INdT / Nokia
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

Deleted: branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debian package management</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Debian package management</h2>
-
-<h3>Background</h3>
-<p>Maemo uses the Debian package management system for installing and managing 
-application packages and their dependencies. For end-users the actual package 
-management is invisible and the application installation and removal in the Internet 
-Tablet is done by the Application Manager. The Debian package management system uses 
-packages which consists of application binaries, optional libraries, meta data 
-describing the package, dependencies to other packages and optional pre-install and 
-post-install scripts. Packaging the applications is done with standard Debian 
-packaging tools.</p>
-
-
-<p>After creating the Debian package (creation is identical to the desktop Linux 
-environment) the application is ready to be installed on the Internet Tablet. 
-The Application is either copied to the device and installed using Application manager, 
-or by placing the package into the package repository (essentially a web or FTP site 
-containing application packages) and creating a single-click install-file. The 
-single-click install-file eliminates the need for user to manually configure 
-repositories in the Application manager, providing an easy-to-use way for end-user 
-to install the application.</p>
-
-<h3>Setting up a build environment with packages</h3>
-
-<p>Both Scratchbox and the device environment use Debian packages, through
-the apt package manager, to configure the build-time and run-time environment.
-Projects created or imported into ESbox might not build against the current
-configuration of a Scratchbox rootstrap or a device environment, or they might
-be easily debuggable with the end-user libraries provided in rootstraps.
-</p>
-<p>ESbox provides support for updating the installed packages to ensure they
-satisfy the build and runtime needs of a project.  Use the 
-<em>Project &gt; Validate Installed Packages</em>
-wizard to do this.
-</p>  
-
-
-<h3>Setting up projects to build packages</h3>
-
-<p>Projects created from ESbox C/C++ and Python project wizards will have the
-<tt>debian</tt> folder pre-configured for the project.</p>
-<p>In your own projects, you may use the <em>Debian Package &gt; Create Debian Structure</em>
-wizard to automatically create a set of skeleton Debian package build files.
-You will need to edit these to customize the build for your project.
-</p>
-
-<h3>Building packages</h3>
-
-<p>To build packages, use the <em>Debian Package &gt; Build Debian Package</em>
-wizard. After a successfully build there will be shown content of the built Debian package.   
-
-<h3>Deploying packages</h3>
-
-<p>To deploy packages to the device, use the <em>Debian Package &gt; Install Package On Device</em> 
-wizard.  This will copy a previously-built package to the device and then install it.
-</p>
-
-		<p>
-		See <a href="http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html">Basics of the Debian package management system</a> for details about Debian packaging.
-</p>
-
-<h3>Investigating Debian package content</h3>
-
-<p>To investigate content of the Debian package, use the <em>Debian Package &gt; Show Debian package content</em> dialog. 
-It provides to investigate content of a selected Debian package. There are list of ten last shown Debian package of each project.
-	
-        <h3>Related Topic</h3>
-<ul>
-          <li><a href="../tasks/DebianPackage.html">Creating Debian Package</a></li>
-          <li><a href="../tasks/ValidatingPackages.html">Validating and Installing Packages</a></li>
-        </ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/DebianPackage.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/DebianPackage.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Debian package management</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/DebianPackage.xhtml/debian_package"/>
+<h3>Related Topic</h3>
+<ul>
+          <li><a href="../tasks/DebianPackage.html">Creating Debian Package</a></li>
+          <li><a href="../tasks/ValidatingPackages.html">Validating and Installing Packages</a></li>
+        </ul>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Environment Variables</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Environment Variables</h2>
-
-<p>In ESbox, programs may launch in a variety of contexts (host, Scratchbox,
-device).  ESbox assumes a standard working environment for all of these.  If you
-have special development needs, you can modify the variables made visible to
-these contexts through the <em>Maemo &gt; Environment</em> panel.</p>
-
-<p>Variables specified here will be added, replace, or remove variables present
-in the environment.  Currently, no variable substitution is performed.</p>
-
-
-<p>A similar UI appears in Launch Configurations and in C/C++ Maemo Build Configurations
-UI.  This allows you to control variables exposed during application run/debug or during the
-project build.</p>
-
-
-<p><b>On Windows hosts</b>, you can configure access to a Cygwin installation
-by specifying <em>CYGWIN_HOME</em> in the <em>Maemo &gt; Environment</em> panel.  
-This will allow interaction with
-Cygwin tools like the X server, (native) sbrsh, and process listing to operate
-more effectively.</p> 
-
-
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/Environment.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/Environment.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Environment Variables</title>
+</head>
+<body>
+	<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Environment.xhtml/environment"/>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoBuilder.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoBuilder.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -93,7 +93,7 @@
  
   <h3>Related Topics</h3>
 <ul>
-    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+    <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
 </ul>
 
 </body>

Modified: branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoTargets.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoTargets.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/MaemoTargets.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -66,7 +66,7 @@
   <li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li> 
   <li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li> 
   <li><a href="../tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a></li> 
-  <li><a href="../tasks/SettingPreferences.html#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Profiling Applications</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Profiling Applications</h2>
-
-<p>Application profiling is one of the most valuable techniques available for 
-programmers to get out of the world of premature optimization, and back into reality.
-By simply profiling an application, it becomes immediately apparent where the 
-overwhelming memory and CPU burdens exist, and allows you to quickly squash them.
-ESbox provides support for <a href="http://www.valgrind.org/">Valgrind</a> 
-memory profiler, <a href="http://oprofile.sourceforge.net/news/">OProfile</a> 
-system-wide profiler and <a href="http://www.ltrace.org">Ltrace</a> library call monitor
- for both C/C++ and Python Projects.</p>
-
-<h3 class="style1">Valgrind</h3>
-<p>Valgrind is an Open Source suite of tools for debugging and profiling Linux programs. 
-It works only on x86 (and PPC) and is a powerful and easy to use tool that can save 
-you a lot of debugging time.</p>
-
-<p>Because Valgrind works by simulating the x86 processor and instrumenting the binaries
-on the fly, it can control the program execution completely. On the downside it makes 
-program execution 10-300 times slower than normal, depending on the used Valgrind 
-tools (massif is the fastest, callgrind the slowest) and can take a huge amount of 
-memory.</p>
-
-<h3 class="style1">OProfile</h3>
-
-<p>OProfile is a system-wide profiler for Linux systems, capable of profiling all 
-running code at low overhead. OProfile is released under the GNU GPL.</p>
-
-<p>It consists of a kernel driver and a daemon for collecting sample data, and several 
-post-profiling tools for turning data into information.</p>
-
-<p>OProfile leverages the hardware performance counters of the CPU to enable profiling 
-of a wide variety of interesting statistics, which can also be used for basic 
-time-spent profiling. All code is profiled: hardware and software interrupt handlers, 
-kernel modules, the kernel, shared libraries, and applications.</p>
-
-
-
-<h3 class="style1">Ltrace</h3>
-<p>Ltrace is a debugging program which runs a specified command until it exits. 
-While the command is executing, ltrace intercepts and records the dynamic library calls 
-which are called by the executed process and the signals received by that process.</p>
-
-
-<h3>Related Topic</h3>
-<ul>
-  <li><a href="../tasks/ProfilingMaemoApplications.html">Profiling Maemo Applications</a>  </li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/ProfilingApplications.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/ProfilingApplications.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Profiling Applications</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/ProfilingApplications.xhtml/profiling_applications"/>
+<h3>Related Topic</h3>
+<ul>
+  <li><a href="../tasks/ProfilingMaemoApplications.html">Profiling Maemo Applications</a>  </li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/RSEConnection.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/RSEConnection.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/RSEConnection.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/RSEConnection.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css" />
+<title>RSE Connection</title>
+</head>
+<body>
+<include
+	path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/RSEConnection.xhtml/rse_connection" />
+<p></p>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Scratchbox Remote Shell (SBRSH)</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Scratchbox Remote Shell (SBRSH)</h2>
-
-<h3>Background</h3>
-
-<p>The Scratchbox Remote Shell (SBRSH) is a remote command execution system similar to rsh and 
-  ssh. It is designed with slow devices and Scratchbox's special requirements in mind. 
-  It supports common types of program execution (including terminal emulation), but it 
-  is optimized for non-interactive usage.
-  </p>
-  <p>
-  SBRSH works by allowing the host to run programs on the device by <b>mounting</b>
-  filesystems from the host onto the device.  Usually these mounts hide the device's
-  own filesystem (for the duration of an SBRSH session), so that programs can run
-  as if they are installed onto the device, but without compromising the actual
-  device filesystem.
-  </p>
-  
-  <h3>ESbox and SBRSH</h3>
-  <p>
-  In ESbox, SBRSH is used as one download model for launching remote programs during Run/Debug sessions.
-  The other option is copying programs to the device.
-  </p>
-  <p>
-  SBRSH may be used in a "sandbox" model, where the entire root
-  filesystem from a Scratchbox rootstrap, excluding essential system directories,
-  replaces the root filesystem on the device.
-  This allows a program to run as if it and all its libraries were installed.
-  (Of course, SBRSH cannot emulate the devices or daemons already running on the
-  device, so this metaphor goes only so far.)
-  </p>
-	<p>Unfortunately, sandbox mode can be quite slow 
-since all the files referenced by an application (libraries, data) 
-must be transferred over the wire to the device.  Additionally, the cache for
-these files uses up memory on the device.</p>
-  
-  <p>
-  SBRSH may also be used in "non-sandbox" mode.  Here, only the
-  project directory is mounted onto the device.  The original libraries and
-  binaries from the device are still visible to your program.  This may lead
-  to problems when you are building against a newer platform than is installed
-  on your device; you may encounter runtime errors, failures to launch, etc.
-  <i>Currently, ESbox does not validate that the project is compatible with
-  the device.</i>
-  </p>
-  
-  <h3>SBRSH launch configuration setup</h3>
-  <p>Currently you must edit a launch configuration to control the interesting
-  aspects of SBRSH communication, such as the Sandbox option, as well as the
-  mounting options.</p>
-  <p>ESbox can automatically create an SBRSH configuration for launching your
-  project.  Depending on whether the Sandbox option is enabled, it will expose
-  the rootstrap for the active build configuration.  It will also expose the
-  project directory.  Both directories will be exposed as SSHFS mounts.</p>
-  <p>You can supply your own manually-written SBRSH configuration as well.
-  The configuration file must live in a location visible to Scratchbox.
-  </p>
-  
-  <h3>SBRSH authentication setup</h3>
-  <p>SBRSH requires a bit of work to set up properly. 
-  See the <a href="http://pc-connectivity.garage.maemo.org/documentation_sbrsh.html">PC Connectivity documentation</a>
-  for details.
-  
-  If you have already added your host IP address or range in the
-  <tt>/etc/sbrshd.conf</tt> file, you can use the <em>Exchange SSH Keys</em> button 
-  in an SBRSH launch configuration
-  to do the SSH passwordless authentication.</p>
-  
-  <h3>Warning</h3>
-  
-  <p> The communication between sbrsh and the device happens on a TCP/IP 
-  connection and is not encrypted. Sbrsh is meant to be used only on trusted networks, 
-such as a company's LAN or an USB network between a PC and a handheld device.</p>
-
-<h3>Related Topic</h3>
-<ul>
-  <li><a href="../gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
-  <li><a href="BuildMachine.html">Build Machines</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Scratchbox Remote Shell (SBRSH)</title>
+</head>
+
+<body>
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/title"/>
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/background"/>
+
+<h3>ESbox and SBRSH</h3>
+  <p>
+  In ESbox, SBRSH is used as one download model for launching remote programs during Run/Debug sessions.
+  The other option is copying programs to the device.
+  </p>
+  <p>
+  SBRSH may be used in a "sandbox" model, where the entire root
+  filesystem from a Scratchbox rootstrap, excluding essential system directories,
+  replaces the root filesystem on the device.
+  This allows a program to run as if it and all its libraries were installed.
+  (Of course, SBRSH cannot emulate the devices or daemons already running on the
+  device, so this metaphor goes only so far.)
+  </p>
+	<p>Unfortunately, sandbox mode can be quite slow 
+since all the files referenced by an application (libraries, data) 
+must be transferred over the wire to the device.  Additionally, the cache for
+these files uses up memory on the device.</p>
+  
+  <p>
+  SBRSH may also be used in "non-sandbox" mode.  Here, only the
+  project directory is mounted onto the device.  The original libraries and
+  binaries from the device are still visible to your program.  This may lead
+  to problems when you are building against a newer platform than is installed
+  on your device; you may encounter runtime errors, failures to launch, etc.
+  <i>Currently, ESbox does not validate that the project is compatible with
+  the device.</i>
+  </p>
+  
+  <h3>SBRSH launch configuration setup</h3>
+  <p>Currently you must edit a launch configuration to control the interesting
+  aspects of SBRSH communication, such as the Sandbox option, as well as the
+  mounting options.</p>
+  <p>ESbox can automatically create an SBRSH configuration for launching your
+  project.  Depending on whether the Sandbox option is enabled, it will expose
+  the rootstrap for the active build configuration.  It will also expose the
+  project directory.  Both directories will be exposed as SSHFS mounts.</p>
+  <p>You can supply your own manually-written SBRSH configuration as well.
+  The configuration file must live in a location visible to Scratchbox.
+  </p>
+ 
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/authentication_setup"/> 
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/warning"/>  
+
+<h3>Related Topic</h3>
+<ul>
+  <li><a href="../gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
+  <li><a href="BuildMachine.html">Build Machines</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>String Externalization</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">String Externalization</h2>
-
-<p>The Maemo tools help you develop applications that can be run on international 
-platforms. Localization, or externalization, is an important part of global software distribution and opens up new 
-markets around the world.</p>
-<p> Externalization is the process of converting software user interfaces to 
-a user’s local culture. For the most part, localization involves converting text 
-strings into the language of the local culture, but it can also involve time, date, 
-and number formats. On Maemo, localization of strings is based on the standard 
-<strong>GNU gettext</strong> package, and all the 
-necessary tools are included in Scratchbox.</p>
-
-
-<p><b>For example:</b></p>
-<p>In your source code, you probably have many strings, which eventually are shown in the user interface. For example:</p>
-
-<p><b>hildon_app_set_title ( app, "MaemoPad" );</b></p>
-
-<p>To make your strings localizable, you need to wrap the strings you want translated 
-in gettext("String") calls. In practice, writing gettext() for every string is tedious. 
-The common practice is to set the following #define.</p>
-
-<p><b>#define _(String) gettext (String)</b></p>
-
-<p>Thus the i18n version of the example would be:</p>
-
-<p><b>hildon_app_set_title ( app, _("MaemoPad") );</b></p>
-
-
-<p>The Externalize Strings wizard allows you to refactor a compilation unit 
-such that strings used in the compilation unit will be wrapped in these
-macros, and the translatable strings will be moved into <tt>*.po</tt> files
-which can be edited to support new languages.</p>
-
-<h3>Related Topic</h3>
-<ul>
-  <li><a href="../tasks/ExternalizeString.html">Extracting Strings</a>  </li>
-  <li><a href="http://www.gnu.org/software/gettext/">GNU gettext documentation</a>  </li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/StringExternalization.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/StringExternalization.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>String Externalization</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/StringExternalization.xhtml/string_externalization"/>
+<h3>Related Topic</h3>
+<ul>
+  <li><a href="../tasks/ExternalizeString.xhtml">Extracting Strings</a>  </li>
+  <li><a href="http://www.gnu.org/software/gettext/">GNU gettext documentation</a>  </li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/concepts/USBNetworking.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/concepts/USBNetworking.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/USBNetworking.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/USBNetworking.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+ <title>USB Networking</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/USBNetworking.xhtml/usb_networking"/>
+</body>
+</html>

Modified: branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -13,7 +13,7 @@
 	<!-- ESbox preferences -->
 	<context id="global_pref_esbox_buildmachines" >
 		<description>Configure the build machine or virtual machine for ESbox.</description>
-		<topic label="Build Machines"  		href="html/tasks/SettingPreferences.html#build_machines" />
+		<topic label="Build Machines"  		href="html/tasks/SettingPreferences.xhtml#build_machines" />
  		 <topic href="html/tasks/UsingVirtualMachines.html" label="Using Virtual Machines with ESbox"/>
 	</context>
 
@@ -24,12 +24,12 @@
 
 	<context id="global_pref_esbox_xserver" >
 		<description>Display settings for X server</description>
-		<topic label="X server"	  href="html/tasks/SettingPreferences.html#x_server" />
+		<topic label="X server"	  href="html/tasks/SettingPreferences.xhtml#x_server" />
 	</context>
     <!-- PLUGIN: org.maemo.esbox.scratchbox.sb1 -->
 	<context id="global_pref_esbox_scratchbox_1" >
 		<description>Options to configure scratchbox 1.</description>
-		<topic label="Scratchbox 1"  		href="html/tasks/SettingPreferences.html#sbox1" />
+		<topic label="Scratchbox 1"  		href="html/tasks/SettingPreferences.xhtml#sbox1" />
 	</context>
 	<context id="wizard_install_scratchbox_1" >
 		<description>Install Scratchbox 1 on the build machine.</description>
@@ -43,7 +43,7 @@
     <!-- PLUGIN: org.maemo.esbox.scratchbox.sb2 -->
 	<context id="global_pref_esbox_scratchbox_2" >
 		<description>Options to configure scratchbox 2.</description>
-		<topic label="Scratchbox 2"	  href="html/tasks/SettingPreferences.html#sbox2" />
+		<topic label="Scratchbox 2"	  href="html/tasks/SettingPreferences.xhtml#sbox2" />
 	</context>
 	<context id="wizard_install_scratchbox_2_target" >
 		<description>Install Scratchbox 2 targets on the build machine.</description>
@@ -55,7 +55,7 @@
 
 	<context id="global_pref_esbox_sbrsh" >
 		<description>Scratchbox Remote Shell connection settings</description>
-		<topic label="SBRSH settings"	  href="html/tasks/SettingPreferences.html#sbrsh" />
+		<topic label="SBRSH settings"	  href="html/tasks/SettingPreferences.xhtml#sbrsh" />
 		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
 	</context>
 
@@ -119,7 +119,7 @@
 <!-- Global preference => Maemo => ssh -->
 	<context id="global_pref_maemo_ssh" >
 		<description>Secure shell connection settings</description>
-		<topic label="SSH settings"	  href="html/tasks/SettingPreferences.html#ssh" />
+		<topic label="SSH settings"	  href="html/tasks/SettingPreferences.xhtml#ssh" />
 		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
 	</context>
 
@@ -164,19 +164,19 @@
     <!--  Global preference => Maemo -->
 	<context id="global_pref_maemo" >
 		<description>General options for Maemo Eclipse integration</description>
-		<topic label="Maemo Preferences"	  href="html/gettingstarted/SettingPreferences.html#maemo" />
+		<topic label="Maemo Preferences"	  href="html/gettingstarted/SettingPreferences.xhtml#maemo" />
 	</context>
 
     <!-- Global preference => Maemo => Environment -->
 	<context id="global_pref_maemo_environment" >
 		<description>Environment variables passed to programs</description>
-		<topic label="Environment variables preferences"	  href="html/gettingstarted/SettingPreferences.html#environment" />
+		<topic label="Environment variables preferences"	  href="html/gettingstarted/SettingPreferences.xhtml#environment" />
 	</context>
 
     <!-- Global preference => Maemo => Installed Targets -->
 	<context id="global_pref_maemo_installed_targets" >
 		<description>Configure, add, or remove targets for use with the Maemo IDE Common Architecture</description>
-		<topic label="Installed targets Preferences"	  href="html/gettingstarted/SettingPreferences.html#installed_targets" />
+		<topic label="Installed targets Preferences"	  href="html/gettingstarted/SettingPreferences.xhtml#installed_targets" />
 	</context>
 
 

Modified: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -26,7 +26,7 @@
 Installing Scratchbox 2 Targets
 </a></strong></li>
 
-<li><strong><a href="../tasks/SettingPreferences.html">
+<li><strong><a href="../tasks/SettingPreferences.xhtml">
 Setting Up Preferences
 </a></strong></li>
 

Modified: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -71,6 +71,7 @@
 </ul>
 <h3>Related Topics</h3>
 <ul>
+  <li><a href="../tasks/ConfigurePythonInterpreter.xhtml">Configure Python Interpreter</a></li>	
   <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
   <li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
 </ul>

Deleted: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>How to Download and Install Help Documentation</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-	<style type="text/css">
-		
-		<!--
-			.style1 {font-weight: bold}
-			-->
-	</style>
-</head>
-
-<body>
-	<h2 class="style1">How to Download and Install Help Documentation</h2>
-	
-	<p>
-	The Help documentation is avaible as Eclipse features on Mica Update site, so open  <strong>Help &gt; Software Update </strong> page
-	 and add the site url  (<a href="http://mica.garage.maemo.org/update/help/" >http://mica.garage.maemo.org/update/help/</a>). Thus, you can navigate and select which documentations you want to install.
-         Notice that If you install API Reference features, the hover help on Editor will automatically use them.
-        <p><img src="../images/maemo-help-install.png" alt="Maemo Help Installation"> </p>
-        You can also click <strong>Automatic Updates</strong> and enable it. Thus, you will be noticed every time a Maemo Documentation needs to be updated. <br> 
-            
-	
-<h3>Related Topics</h3>
-<ul>
-	<li><a href="UsingHoverHelp.html">Using Hover Help</a></li>
-</ul> 
-</body>
-</html>

Copied: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>How to Download and Install Help Documentation</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/gettingstarted/HowToDownloadHelpDocumentation.xhtml/download_help_doc"/>
+<h3>Related Topics</h3>
+<ul>
+	<li><a href="UsingHoverHelp.xhtml">Using Hover Help</a></li>
+</ul> 
+</body>
+</html>

Modified: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -50,6 +50,7 @@
 
 <h3>Related Topics</h3>
 <ul>
+  <li><a href="../tasks/ConfigurePythonInterpreter.xhtml">Configure Python Interpreter</a></li>
   <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
   <li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
 </ul>

Deleted: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Using Hover Help for Maemo API Libraries</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-	<style type="text/css">
-		
-		<!--
-			.style1 {font-weight: bold}
-			-->
-	</style>
-</head>
-
-<body>
-	<h2 class="style1">Using Hover Help for Maemo API Libraries</h2>
-	<ol>
-		<li>
-			<div align="justify">
-				Go to <strong>Maemo &gt; Hover Help</strong> preference page and click
-				<strong>Activate Hover Help</strong>.
-			</div>
-		</li>
-		
-		<li>
-			<div align="justify">
-				In this preference page, you can also choose what kind of <strong>help content</strong> you want to
-				search while using hover help:
-				<ul>
-					<li><strong>Show only local:</strong> If you do not want to use remote documentation but just local installed documentation.</li>
-					<li><strong>Show local/remote:</strong> To use both local and remote documentation available, be sure your network connection is
-						working and you are able to access the internet.</li>
-					<li> On <strong>Hover Help Sources</strong> section, you can see a tree of help documentation available.
-						You can check what content and versions you want to enable for each language. </li>
-				</ul>
-			</div>
-		</li>
-		<p> <img src="../images/hover-maemo-prefs.png" alt="Maemo Hover Preferences"> <br></p>		
-		
-		<li>
-			<div align="left">				
-					You must be sure that the Editor has the <strong>Maemo SDK Hover Help</strong>
-					option enabled, e.g., to configure for C/C++ click <strong> C/C++ Editor Hover Preferences</strong>.
-			</div>
-		</li>
-		<p> <img src="../images/hover-maemo-prefs2.png" alt="Maemo Hover Preferences"><br>   </p>
-		
-		<li>
-			<div align="left">				
-				And enable <strong>Maemo SDK Hover Help</strong>. You can do the same for Python Editor preferences.
-			</div>
-		</li>
-		<p><img src="../images/hover-c-prefs.png" alt="C/C++ Hover preferences"> </p>  
-				
-		<li>
-			<div align="left">				
-				 Click <strong> OK </strong> and you should see the hover help working on editor.				
-			</div>
-		</li>
-		<p><img src="../images/hover-editor.png" alt="Hover Help on Editor"><br></p>  
-	</ol> 
-	
-	<h3>Related Topics</h3>
-	<ul>
-		<li><a href="HowToDownloadHelpDocumentation.html">How to download and install help documentation</a></li>
-	</ul>
-</body>
-</html>

Copied: branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/gettingstarted/UsingHoverHelp.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>How to Download and Install Help Documentation</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/gettingstarted/UsingHoverHelp.xhtml/using_hover_help"/>
+	<h3>Related Topics</h3>
+	<ul>
+		<li><a href="HowToDownloadHelpDocumentation.xhtml">How to download and install help documentation</a></li>
+	</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter (from rev 2312, trunk/org.maemo.esbox.help/html/images/interpreter)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/interpreter_preferences.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/interpreter_preferences.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/interpreter/interpreter_preferences.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_change.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_change.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/interpreter/python_interpreter_change.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_configuration.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_configuration.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/interpreter/python_interpreter_configuration.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_create.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/interpreter/python_interpreter_create.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/interpreter/python_interpreter_create.png)
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/interpreter.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/pref_images/interpreter.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/pref_images/prefs-sbrsh.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-sbrsh.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-1.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/vnc/vnc-1.png)
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-2.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/vnc/vnc-2.png)
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-3.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/vnc/vnc-3.png)
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-4.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/vnc/vnc-4.png)
===================================================================
(Binary files differ)

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/vnc/vnc-5.png (from rev 2312, trunk/org.maemo.esbox.help/html/images/vnc/vnc-5.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Glossary</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Glossary</h2>
-
-<ul>
-<li><b>ARMEL:</b>
-A name that, for example, Debian uses for the little-endian ARM EABI (ABI for the ARM architecture).</li>
-
-<li><b>devkit:</b>
-Part of the Maemo SDK that contains software development tools. The SDK contains multiple devkits; e.g., doctools devkit.</li>
-
-<li><b>GTK+ (Gimp ToolKit+):</b>
-A library of object-oriented graphical interface elements (widgets) for developing X Window applications.</li>
-
-<li><b>Hildon:</b>
-Application framework used in the Maemo platform. Developed by Nokia and based on GNOME/GTK+ technologies, currently in the process of becoming an upstream project in <a href="http://www.gnome.org/">gnome.org</a>.</li>
-
-<li><b>Hildon Desktop:</b>
-The main user interface component of the Maemo release Chinook, rewrite of Maemo desktop.</li>
-
-<li><b>Internet Tablet:</b>
-Product category for Internet optimized mobile devices with touchscreen. The term was coined by Nokia but is being used more widely to include other devices.</li>
-
-<li><b>Linux:</b>
-Strictly speaking, Linux is the kernel of a Unix-like operating system, though the word is more commonly used to describe  the whole Linux operating system, consisting of a kernel, application programs and utilities.</li>
-
-<li><b>Maemo:</b>
-Software platform for mobile devices developed by Nokia, based on GNU/Linux and GNOME/GTK+ technologies. It includes proprietary components to make it work on the Nokia Internet Tablets.</li>
-
-<li><b>maemo.org:</b>
-Developer community web site maintained by Nokia, main point of reference for open source and third party developers in general.
-
-<li><b>maemo desktop:</b>
-This is the main user interface component of the Maemo release.</li>
-
-<li><b>maemo-af-desktop, Maemo Application Framework:</b>
-Same as Maemo desktop.</li>
-
-<li><b>Maemo SDK:</b>
-Software Development Kit to create and port applications to the Maemo platform using a PC.</li>
-
-<li><b>Nokia Internet Tablet OS:</b>
-Maemo platform + proprietary applications packaged to an official device image provided by Nokia.</li>
-
-<li><b>OSSO:</b>
-Open Source Software Operations, Nokia organization developing and integrating software for Internet Tablets.</li>
-
-<li><b>rootstrap:</b>
-Part of the SDK that contains selected software components from the root filesystem. Rootstrap is the root file system of a target inside Scratchbox.</li>
-
-<li><b>toolchain:</b>
-Part of the SDK that contains ARM cross compilation tools like compiler and linker.</li>
-
-<li><b>Widget</b>
-Element of a graphical user interface (GUI) that displays information or provides a way for a user to interact with the application. Examples of widgets: buttons, menus, scrollbars, forms, etc.</li>
-
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/reference/Glossary.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/reference/Glossary.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+ <title>Glossary</title>
+</head>
+<body>
+<h2 class="style1">Glossary</h2>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/reference/Glossary.xhtml/glossary"/>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Configuring Python Interpreter</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/ConfigurePythonInterpreter.xhtml/configure_python_interpreter"/>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	
-	<title>Externalize Strings</title>
-	
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    
-    <style type="text/css">
-	<!--
-
-		.title {
-			font-weight: bold
-		}
-		
-		.separate {
- 			margin-bottom: 3em;
-		}
-			
-	-->
-    </style>
-</head>
-
-<body>
-
-<h2 class="title">
-	Extracting Strings
-</h2>
-
-<p>
-	The Externalize Strings wizard allows you to refactor a compilation unit 
-	such that strings used in the compilation unit can be translated to different
-	languages using	the GNU gettext mechanism. The wizard supports C/C++ and
-	Python projects. 
-</p>
-
-<p>
-	To externalize strings:
-</p>
-
-<ol>
-	<li class="separate">
-		<p>	
-			Select a project in Project Explorer and right-click project root to display 
-			the popup menu and select <strong>Source &gt; Externalize Strings</strong>.	
-		<p/>
-		
-		<img src="../images/externalize/es-menu.png" alt="Externalize String">
-	</li>
-	
-    <li class="separate">
-    	<p>
-    		Select the file(s) that should be externalized to enable the Externalize 
-    		button, then click Externalize.
-		<p/>
-		
-		<img src="../images/externalize/es-select.png"
-		     alt="File that should be externalized">
-	</li>
-	
-    <li class="separate">
-    	<p>
-    		A Wizard will appear showing strings that will be externalized. You can
-    		define the name of the output file and <tt>msgstr</tt> (translation). Click on a
-    		message string to make a change. Insert missing definitions option checks
-    		source code for missing headers and insert those if needed.
-		</p>
-		<p>
-			There are three actions for each string. 
-			</p>
-			<ul style="list-style-type:none">
-				<li>
-					<img src="../images/externalize/translate.gif" alt="Translate button">
-					<em>Externalize</em>: 
-					Translate string.
-				</li>
-				
-				<li>
-					<img src="../images/externalize/never_translate.gif"
-					     alt="Never translate button">
-					<em>Internalize</em>:
-					Do not translate the string and do not include string next time. 
-				</li>
-				
-				<li>
-					<img src="../images/externalize/skip.gif" alt="Skip button">
-					<em>Skip</em>:
-					Do not change the string.
-				</li>
-			</ul>
-
-		<img src="../images/externalize/es-translate.png" alt="Externalize Wizard">
-	</li>
-	
-	<li class="separate">
-		<p>
-			Next page shows translation changes. Cancel discard changes and finish
-			applies changes into selected files.
-		</p>
-		
-		<img src="../images/externalize/es-view.png" alt="Externalize Wizard">
-	</li>
-	
-	<li class="separate">
-		<p>
-			Click Finish.
-		</p>
-	</li>
-</ol>
-
-<p>
-	This generates or updates translation file <tt><em>outputName</em>.po</tt> and
-	files for Automake (<tt>POTFILE.in</tt>, and <tt>LINGUAS</tt>) which will be
-	placed in the <strong><em>ProjectName</em>/po/</strong> directory.
-</p>
-
-<ul>
-	<li>
-		<tt>POTFILES.in</tt> contains the list of source code files that will be localized.
-	</li>
-	<li>
-		<tt><em>outputName</em>.po</tt> includes translated text.
-	</li>
-	<li>
-		<tt>LINGUAS</tt> contains the list of languages that will be generated.
-	</li>
-</ul>
-
-<p>
-	Externalize Strings wizard does not add gettext initialization. See
-	<a href="http://www.gnu.org/software/gettext/manual/gettext.html#Triggering">
-		GNU gettext documentation (4.2 Triggering gettext Operations)
-	</a>
-	how to do this.  
-</p>
-
-</body>
-</html>
-

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/ExternalizeString.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/ExternalizeString.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+	<link rel="stylesheet" type="text/css" href="../help.css"/>
+	<title>Externalize Strings</title>
+	<style type="text/css">
+	<!--
+
+		.title {
+			font-weight: bold
+		}
+		
+		.separate {
+ 			margin-bottom: 3em;
+		}
+			
+	-->
+    </style>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/ExternalizeString.xhtml/externalize_string"/>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Installing PC Connectivity</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2>Installing PC Connectivity</h2>
-
-<p>
-In order to communicate with your Nokia Internet Tablet, you need to
-install a set of metapackages on the device and on the Build Machine to
-configure the networking settings and daemons.
-</p>
-<p>
-ESbox provides preconfigured Remote System Connections which correspond to
-the default static IP addresses defined by the <strong>PC Connectivity Manager</strong>
-applet provided by the PC Connectivity project. 
-</p>
-<p>
-See <a href="http://pc-connectivity.garage.maemo.org/">the PC Connectivity home page</a>
-for full instructions.
-</p>
-</body>
-</html>

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Installing PC Connectivity</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/InstallingPCConnectivity.xhtml/installing_pc_connectivity"/>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -63,7 +63,7 @@
  <h3>Related Topics</h3>
 <ul>
   <li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li>
-  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -59,7 +59,7 @@
  <h3>Related Topics</h3>
 <ul>
   <li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li>
-  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -39,7 +39,7 @@
  
  <h3>Related Topics</h3>
 <ul>
-  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/LocalRunDebug.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/LocalRunDebug.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/LocalRunDebug.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -64,7 +64,7 @@
   <h3>Related Topics</h3>
 <ul>
     <li><a href="../concepts/LocalLaunching.html">Local Launching</a></li>
-    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+    <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
     <li><a href="LocalDebugging.html">Local Debugging</a> </li>
     <li><a href="RemoteLaunching.html">Remote Launching</a></li>
     <li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -71,7 +71,7 @@
 <h3>Related Topics</h3>
 <ul>
   <li><a href="../tasks/UsingVirtualMachines.html">Using Virtual Machines with ESbox</a></li>
-  <li><a href="../tasks/SettingPreferences.html#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -71,8 +71,8 @@
   <h3>Related Topics</h3>
 <ul>
     <li><a href="../concepts/RemoteLaunching.html">Local Launching</a></li>
-    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
-    <li><a href="../concepts/UsingVNCViewer.html">Using the VNC Viewer</a> </li>
+    <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
+    <li><a href="../concepts/UsingVNCViewer.xhtml">Using the VNC Viewer</a> </li>
     <li><a href="LocalRunDebug.html">Running/Debugging a Local Program</a> </li>
     <li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>
 </ul>

Deleted: branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,128 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Setting Up Preferences</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-
-<h1>Setting Up Preferences</h1>
-<p>
-The first thing a user should do is set the preferences for using Scratchbox, since the rest
-of the functionality of the plug-ins depends on these settings. Once the Eclipse IDE is
-running with the plug-ins, the preferences may be set by selecting <strong>Window &gt; Preferences...</strong> and expanding the ESbox and Maemo groups.</p>
-<p>The ESbox group contains preferences to select the build machine for ESbox, define options for Scratchbox1 and Scratchbox 2, and define settings for X Server.</p>
-<h2><a name="build_machines"></a>Build Machines</h2>
-<p>The Build Machines page allows you to select a build machine for ESbox. 
-If you select VMware, VirtualBox, or QEMU Linux Build Machine then 
-additional tabs will appear for further setup. Additional information about
-virtual build machines is provided in the topic 
-<a href="UsingVirtualMachines.html">Running ESbox on other operating systems</a>.</p>
-<p>&nbsp;</p>
-<p><img src="../images/pref_images/prefs-esbox-build-machines.png" alt="build machines"></p>
-<h2><a name="sbox1"></a>Scratchbox 1</h2>
-<p>This page controls where Scratchbox 1 is located and how it is invoked.</p>
-<p>The <em>Scratchbox Search path</em> is a colon-separated
-list of paths on the current Build Machine where Scratchbox installations exist.</p>
-<p>The <em>Command template</em> defines the pattern for the command line that
-controls any program launched inside Scratchbox 1.  Usually this does not need
-to be edited.</p> 
-<p><img src="../images/pref_images/prefs-esbox-scratchbox1.png" alt="sbox1"></p>
-<p>&nbsp;</p>
-<h2><a name="sbox2"></a>Scratchbox 2</h2>
-<p>This page controls the way Scratchbox 2 is invoked.  Usually none of these items
-need to be modified, unless you are debugging or developing the Maemo SDK+.
-</p>
-<p><img src="../images/pref_images/prefs-esbox-scratchbox2.png" alt="sbox2"></p>
-<p>&nbsp;</p>
-<h2><a name="sbrsh"></a>SBRSH</h2>
-<p>The SBRSH page controls the defaults for the Remote Launches which use the <em>Mount via SBRSH</em>
-download method.</p>
-<p>The <em>Launch Command</em> tells where the sbrsh binary is located.  This is 
-relative to the current Build Machine.</p>
-<p>The <em>Remote User</em> tells under which device user programs are launched.</p>
-<p>Set <em>Use Sandbox Mode as Default</em> to control the corresponding setting
-which is applied to new SBRSH Remote Launches. </p>
-<p>See <a href="../concepts/Sbrsh.html">SBRSH concepts</a> for more information.</p>
-<p><img src="../images/pref_images/prefs-esbox-sbrsh.png" alt="sbrsh"></p>
-<p>&nbsp;</p>
-
-
-<h2><a name="x_server"></a>X Server</h2>
-<p>The X Server page contains commands for starting the X Server.</p>
-<p>The server is launched on the host machine.</p>
-<p><b>NOTE:</b> The variables <tt>${RESOLUTION}</tt> and <tt>${PLATFORM_PARAMETERS}</tt> automatically take specific values for X extension and resolution <br>
-			  parameters (e.g.: <tt>800x480x16</tt>, <tt>-extension Composite</tt>) depending on target platform. But you can have complete control<br> 
-			  if you wish, by removing the variable and manually defining the parameters values.</p>
-<p><img src="../images/pref_images/prefs-esbox-xserver.png" alt="xserver"></p>
-<p>&nbsp;</p>
-
-<h2><a name="maemo"></a>Maemo</h2>
-<p>The Maemo page controls some miscellanous settings.</p>
-<p>The <em>'Launch shell' command pattern</em> controls how the <em>Launch Terminal Here</em>
-command will run.</p>
-<p>The <em>Log commands</em> setting tells whether an entry will be recorded for every
-program invoked by ESbox or Mica.  The log is invaluable for diagnosing some problems
-with commands invoked by various wizards and build commands.</p>
-<p>The <em>Path for command log</em> specifies a file to which entries are appended
-when <em>Log commands</em> is enabled.</p>
-<p>The <em>Suppress warning when build platform and device platform do not match</em>
-setting disables notifications during a remote launch of a program when it was
-built or developed against a platform which is newer or older than that of the device.
-</p>
-<p>
-Such mismatches may result in programs that fail to launch, due to
-illegal instructions used in newer platforms, or due to libraries which are
-not available in the device.
-</p>
-<p>If you select the checkbox labeled "Do not tell me again", this preference is set.
-</p>
-<p></p>
-<img src="../images/pref_images/prefs-maemo.png" alt="maemo">
-<p/>
-
-<h2><a name="environment"></a>Environment</h2>
-<p>The Environment page allows you to define and control environment variables
-applied during any command launched by ESbox or Mica.
-Variables may be replaced/added or undefined.</p>
-<p>See <a href="../concepts/Environment.html">Environment Variables</a> concepts for more information.</p>
-<p><img src="../images/pref_images/prefs-maemo-environment.png" alt="environment"></p>
-<p>&nbsp;</p>
-
-<h2><a name="installed_targets"></a>Installed Targets</h2>
-<p>The Installed Targets page allows you to see, add/remove, and configure targets. </p>
-<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK target will be removed from your filesystem!</p>
-<p>See the <a href="../concepts/MaemoTargets.html">Maemo Targets</a> concepts for more information.</p> 
-<p>In this page, or anywhere else a selection of targets appears, 
- you can <a href="../tasks/UsingTargetContextMenus.html">use a context menu to perform operations
-on the SDKs or targets</a>. 
- </p>
-<p><img src="../images/pref_images/prefs-maemo-installed-targets.png" alt="installed targets"></p>
-
-<p>&nbsp;</p>
-
-<h2><a name="ssh"></a>SSH</h2>
-<p>Use the SSH page to configure secure shell settings for communicating with a device,
-primarily when using the SSH or RSE download methods in Remote Launch Configurations.</p>
-<p>The <em>Username for device access</em> controls under which account the executable is
-executed.  <strong>user</strong> is the typical account for the Nokia Internet Tablet.</p>
-<p>The <em>Destination folder for executable</em> controls the base directory where files
-will be copied.  The <tt>./</tt> default value corresponds to the HOME of the given user name.</p>  
-<p>The <em>Connection timeout</em> controls how many seconds' delay ESbox or Mica will
-wait before considering a connection to the device to have failed.</p>  
-<p><img src="../images/pref_images/prefs-maemo-ssh.png" alt="ssh"></p>
-
-
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Setting Up Preferences</title>
+</head>
+<body>
+
+<h1>Setting Up Preferences</h1>
+<p>
+The first thing a user should do is set the preferences for using Scratchbox, since the rest
+of the functionality of the plug-ins depends on these settings. Once the Eclipse IDE is
+running with the plug-ins, the preferences may be set by selecting <strong>Window &gt; Preferences...</strong> and expanding the ESbox and Maemo groups.</p>
+<p>The ESbox group contains preferences to select the build machine for ESbox, define options for Scratchbox1 and Scratchbox 2, and define settings for X Server.</p>
+
+<h2><a name="build_machines"></a>Build Machines</h2>
+<p>The Build Machines page allows you to select a build machine for ESbox. 
+If you select VMware, VirtualBox, or QEMU Linux Build Machine then 
+additional tabs will appear for further setup. Additional information about
+virtual build machines is provided in the topic 
+<a href="UsingVirtualMachines.html">Running ESbox on other operating systems</a>.</p>
+<p>&nbsp;</p>
+<p><img src="../images/pref_images/prefs-esbox-build-machines.png" alt="build machines"/></p>
+
+
+<h2><a name="sbox1"></a>Scratchbox 1</h2>
+<p>This page controls where Scratchbox 1 is located and how it is invoked.</p>
+<p>The <em>Scratchbox Search path</em> is a colon-separated
+list of paths on the current Build Machine where Scratchbox installations exist.</p>
+<p>The <em>Command template</em> defines the pattern for the command line that
+controls any program launched inside Scratchbox 1.  Usually this does not need
+to be edited.</p> 
+<p><img src="../images/pref_images/prefs-esbox-scratchbox1.png" alt="sbox1"/></p>
+<p>&nbsp;</p>
+
+
+<h2><a name="sbox2"></a>Scratchbox 2</h2>
+<p>This page controls the way Scratchbox 2 is invoked.  Usually none of these items
+need to be modified, unless you are debugging or developing the Maemo SDK+.
+</p>
+<p><img src="../images/pref_images/prefs-esbox-scratchbox2.png" alt="sbox2"/></p>
+<p>&nbsp;</p>
+
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/sbrsh"/>
+
+<h2><a name="x_server"></a>X Server</h2>
+<p>The X Server page contains commands for starting the X Server.</p>
+<p>The server is launched on the host machine.</p>
+<p><b>NOTE:</b> The variables <tt>${RESOLUTION}</tt> and <tt>${PLATFORM_PARAMETERS}</tt> automatically take specific values for X extension and resolution <br/>
+			  parameters (e.g.: <tt>800x480x16</tt>, <tt>-extension Composite</tt>) depending on target platform. But you can have complete control<br/> 
+			  if you wish, by removing the variable and manually defining the parameters values.</p>
+<p><img src="../images/pref_images/prefs-esbox-xserver.png" alt="xserver"/></p>
+<p>&nbsp;</p>
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/maemo"/>
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/environment"/>
+
+<h2><a name="installed_targets"></a>Installed Targets</h2>
+<p>The Installed Targets page allows you to see, add/remove, and configure targets. </p>
+<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK target will be removed from your filesystem!</p>
+<p>See the <a href="../concepts/MaemoTargets.html">Maemo Targets</a> concepts for more information.</p> 
+<p>In this page, or anywhere else a selection of targets appears, 
+ you can <a href="../tasks/UsingTargetContextMenus.html">use a context menu to perform operations
+on the SDKs or targets</a>. 
+ </p>
+<p><img src="../images/pref_images/prefs-maemo-installed-targets.png" alt="installed targets"/></p>
+
+<p>&nbsp;</p>
+
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/ssh"/>
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -155,8 +155,8 @@
 	
  <h3>Related Topics</h3>
 <ul>
-  <li><a href="../concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a></li>
-  <li><a href="../tasks/SettingPreferences.html#sbrsh">Setting Up SBRSH Preferences</a></li>
+  <li><a href="../concepts/Sbrsh.xhtml">Scratchbox Remote Shell (SBRSH)</a></li>
+  <li><a href="../tasks/SettingPreferences.xhtml#sbrsh">Setting Up SBRSH Preferences</a></li>
 </ul>
 	
 </body>

Deleted: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-  <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-  <meta http-equiv="Content-Language" content="en-us">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Using the Flasher Wizard</title>
-  <link rel="stylesheet" type="text/css" href="../help.css">
-  
-  <style type="text/css">
-    img {
-      margin: 0.7em;
-    }
-    
-    img.inline {
-      margin: 0em;
-    }
-    
-    h2, h3 {
-      margin-bottom: 1.5em;
-    }
-  </style>
-  
-</head>
-
-<body>
-  <h2>Using the Flasher Wizard</h2>
-  
-  <p>
-    The Maemo IDE Common Architecture includes a wizard which you can use to flash updated 
-    kernels and rootstraps onto your Nokia Internet Tablet.  You should use this to
-    ensure your tablet software is up-to-date before starting serious development,
-    as bugs may have fixed and features added. 
-  </p>
-  <p>
-    The wizard uses the same flasher tools and process as you may have done manually
-    from various <b>maemo.org</b> tutorials, but it provides a friendlier and more
-    easily repeatable UI.
-  </p>
-  <p>
-  <b>NOTE:</b> The flasher requires special drivers and software to talk
-  to the device and flash images to it.  The wizard will automatically locate and install these for you.
-  </p>
-  <p>
-    All you need to do to prepare is to back up any personal settings and
-    files on your device which may be overwritten by the new image. 
-  </p>
-  <p>
-    The wizard is accessible from <strong>File &gt; New &gt; Other &gt; Maemo Installers 
-    &gt; Flash Images to Device</strong> or from the
-    <img class="inline" src="../images/flash/flasher-icon.png" /> icon on the toolbar.
-  </p>
-  
-  <ul>
-    <li>
-      <p>
-        On the first page, prepare for the flashing session:
-      </p>
-      
-      <img src="../images/flash/wiz-flash-1.png" />
-      
-      <p>
-        Please read the instructions carefully.  Flashing the device will usually overwrite the
-        filesystem, including your home directory.  Back up anything important first.
-      </p>
-      
-      <p>
-      	<b>NOTE:</b> If you are using <b>build machine</b> to flash the device then the USB connection to
-      	the device will need to be "attached" to the virtual machine. VirtualBox and VMWare support USB,
-      	but QEMU 0.9.x does not support USB at all.
-      </p>
-  
-    </li>
-    
-    <li>
-      <p>
-        Click <strong>Next</strong>. Select the way you will configure the flashing session.
-      <p/>
-      
-      <img src="../images/flash/wiz-flash-1b.png" />
-      
-      <ul>
-        <li>
-          In the Basic mode, the wizard will find the newest rootstrap image
-          for the device for you.
-        </li>
-
-        <li>
-          In the Advanced mode, you can configure a flashing session, fully controlling
-          which images to flash and what flasher options to use.
-          <p>
-            <em>
-              In this release of the Maemo IDE Common Architecture, this mode allows
-              you to run a custom flasher binary, including one on a non-Linux host.
-            </em>
-          </p>
-        </li>
-
-        <li>
-          <p>
-            The Predefined tasks lists a convenient task for installing a kernel
-            image for Diablo which fixes a bug with USB networking with Windows.  (Without
-            the fix, Windows will not be able to properly configure the RNDIS driver for
-            the Nokia Internet Tablet.)
-          </p>
-          <p>
-            See
-            <a href="http://pc-connectivity.garage.maemo.org/documentation_usbnet.html#Setup_USB_Network_on_Windows">
-              the PC Connectivity page
-            </a>
-            for information about setting up Windows networking after using the
-            flasher wizard.
-          </p>
-          <p>
-            See <a href="https://bugs.maemo.org/show_bug.cgi?id=3243">the original bug report</a> as well.
-          </p> 
-  
-          <ul>  
-            <li>
-              Basic Mode
-              <p>
-                If you select the Basic mode, you will see the Product ID page next.
-              </p>
-            </li>
-          
-            <li>
-              Advanced Mode
-              <p>
-                If you select the Advanced mode, you will see the Session configuration page next.
-                See below.
-              </p>
-            </li>
-            <li>
-              Predefined Tasks &gt; Update Diablo Kernel
-              <p>
-                If you select this task, a predefined session will be used, and you
-                will see the Product ID page next.
-              </p>
-            </li> 
-          </ul>
-        </li>
-      </ul>
-    </li>
-    
-    <li>
-      <p>
-        Click <strong>Next</strong>. On the next page, provide the Product ID 
-        (WLAN MAC ID).  This will be remembered between sessions.
-      <p/>
-      <img src="../images/flash/wiz-flash-2.png"/> 
-    </li>
-    
-    <li>
-      <p>
-        Click <strong>Next</strong>. Accept the license for using the flasher
-        and device binaries.
-      <p/>
-      <img src="../images/flash/wiz-flash-3.png" /> 
-    </li>
-    
-    <li>
-      <p>
-        Click <strong>Next</strong>. The wizard will now download the flasher binary (once)
-        and also install any driver software required for communicating with
-        the device in flashing mode.  This may install additional software,
-        such as the <a href="http://pc-connectivity.garage.maemo.org/">Host PC Connectivity software</a>.
-      <p/>
-      <img src="../images/flash/dialog-flash-get-flasher.png" />
-    </li>
-    
-    <li>
-      <p> 
-        The <strong>Retry</strong> button will let you start over if you need
-        to restart the device or adjust settings.
-      <p/>
-      
-      <img src="../images/flash/wiz-flash-4.png"/>
-      <br />
-      <img src="../images/flash/wiz-flash-4b.png"/>
-    </li>
-    
-    <li>
-      <p>
-        Select <strong>Next</strong>.  You will see a summary of the changes
-        that will be made to the software on the device.
-      <p/>
-      <img src="../images/flash/wiz-flash-5.png" />
-      <p>
-        By default,
-        the device will be configured for R&amp;D mode and rebooted once the flashing
-        is complete.  You can configure this behavior in an Advanced session.
-      </p>
-    </li>
-    
-    <li>
-      <p>
-        Once you hit <strong>Finish</strong>, the wizard will download the
-        image(s) and invoke the flasher. 
-      <p/>
-      
-      <img src="../images/flash/wiz-flash-6.png"/>
-      <img src="../images/flash/wiz-flash-7.png"/>
-      <img src="../images/flash/wiz-flash-8.png"/>
-    </li>
-  </ul>
-  
-  <h3>Session Configurations</h3>
-  
-  <p>
-    If you use the <strong>Advanced</strong> configuration mode, you may define
-    a set of <strong>sessions</strong> for particular images or options with which
-    you flash your device.
-  </p>
-  
-  <img src="../images/flash/wiz-flash-sessions.png" />
-  
-  <ul>
-    <li>
-      <p>
-        On the <strong>OS Images</strong> tab, select the kinds of images to flash.
-      <p/>
-      <img src="../images/flash/wiz-flash-session-osimage.png" />
-      
-      <ul>
-        <li>
-          <strong>FIASCO</strong> images are combined images which update all the
-          standard boot files, kernel, and filesystems contributing to a platform
-          release.  This is the standard "*.bin" format distributed by Nokia.
-        </li>
-        
-        <li>
-          <strong>kernel</strong> images are the Linux kernel (in zImage format). 
-        </li>
-        <li>
-          <strong>initfs</strong>, <strong>rootfs</strong>, <strong>NOLO</strong>,
-          <strong>X-Loader</strong>, <strong>NOLO Secondary</strong>, and <strong>2nd</strong>
-          images control more advanced portions of the filesystem.  
-        </li>
-      </ul>
-    </li>
-    
-    <li>
-      <p>
-        On the <strong>Modes</strong> tab, select how the flashing will be performed.
-      <p/>
-      <img src="../images/flash/wiz-flash-session-modes.png" />
-      
-      <ul>
-        <li>
-          In <strong>Components which will be flashed</strong>, you can control whether
-          selected portions of a FIASCO image will be flashed, or the whole image.
-        </li>
-        
-        <li>
-          <strong>Reboot after flashing</strong> controls whether the device is automatically
-          rebooted once flashing is finished.
-        </li>
-        
-        <li>
-          <strong>Enable R&amp;D mode</strong> controls whether the device will allow you
-          to log in as <tt>root</tt> using <tt>sudo gainroot</tt> and have more
-          control over the package manager in the <strong>Application Manager</strong>.  
-          If not, you will need third-party tools to enable root access.
-          <p>
-            <b>NOTE:</b> Mica generally requires R&amp;D mode to be set, since several
-            operations like Validating Packages and Installing Debian Packages requires
-            root access.
-          </p>
-        </li> 
-      </ul>  
-    </li>
-  
-    <li>
-      <p>
-        On the <strong>Options</strong> tab, control how the flasher is launched.
-      <p/>
-      <img src="../images/flash/wiz-flash-session-options.png" />
-      <ul>
-        <li>
-          The <strong>Flasher tool location</strong> will override the location
-          of the flasher binary.  If not set, the flasher will be downloaded from
-          the Internet.
-        </li>
-        
-        <li>
-          <strong>Additional command line arguments</strong> will be passed on the 
-          flasher command line, in addition to those derived from settings on other
-          tabs.  
-        </li> 
-      </ul>
-    </li>
-  </ul>
-  
-  <br />
-  <br />
-</body>
-</html>

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Using the Flasher Wizard</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/UsingFlasherWizard.xhtml/using_flasher_wizard"/>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Using the VNC Viewer</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2>Using the VNC Viewer</h2>
-
-<p>
-ESbox includes a VNC viewer from the Eclipse Target Management project.
-You can use this to see the Tablet screen on your desktop.
-</p>
-<p>
-The VNC Viewer is a view in the default ESbox perspective.  
-</p>
-<img src="../images/vnc/esbox-vnc-1.png"/>
-<p>
-Click the Maemo icon to launch the viewer with one of the remote connections:
-</p>
-<img src="../images/vnc/esbox-vnc-2.png"/>
-<p>
-The viewer will connect, possibly asking for a password to launch programs
-on the tablet, and then show up in the view:
-</p>
-<img src="../images/vnc/esbox-vnc-3.png"/>
-<p>
-You can detach the view for easier viewing:
-</p>
-<img src="../images/vnc/esbox-vnc-4.png"/>
-<p/>
-<img src="../images/vnc/esbox-vnc-5.png"/>
-
-<p>You can use the Zoom icons to shrink or grow the view, the Close icon to
-disconnect, and the Open Connection icon to open a custom connection.
-</p>
-<p>
-<b>NOTE:</b> Only one connection may be open at a time.
-</p>
-</body>
-</html>

Copied: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml (from rev 2312, trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml)
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml	                        (rev 0)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Using the VNC Viewer</title>
+</head>
+<body>
+<h2>Using the VNC Viewer</h2>
+<p>
+ESbox includes a VNC viewer from the Eclipse Target Management project.
+You can use this to see the Tablet screen on your desktop.
+</p>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/UsingVNCViewer.xhtml/using_vnc_viewer"/>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Ed/org.maemo.esbox.help/html/tocconcepts.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tocconcepts.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tocconcepts.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -15,12 +15,12 @@
 <li><h3><a href="../html/concepts/MaemoTargets.html">Maemo Targets</a>
 </h3><li><h3><a href="../html/concepts/MaemoProjects.html">Maemo Projects</a>
 </h3><li><h3><a href="../html/concepts/MaemoBuilder.html">Maemo Builder</a>
-</h3><li><h3><a href="../html/concepts/DebianPackage.html">Debian Package Management</a>
+</h3><li><h3><a href="../html/concepts/DebianPackage.xhtml">Debian Package Management</a>
 </h3><li><h3><a href="../html/concepts/LocalLaunching.html">Local Launching</a>
 </h3><li><h3><a href="../html/concepts/RemoteLaunching.html">Remote Launching</a>
-</h3><li><h3><a href="../html/concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a>
-</h3><li><h3><a href="../html/concepts/StringExternalization.html">String Externalization</a>
-</h3><li><h3><a href="../html/concepts/ProfilingApplications.html">Profiling Applications</a>
+</h3><li><h3><a href="../html/concepts/Sbrsh.xhtml">Scratchbox Remote Shell (SBRSH)</a>
+</h3><li><h3><a href="../html/concepts/StringExternalization.xhtml">String Externalization</a>
+</h3><li><h3><a href="../html/concepts/ProfilingApplications.xhtml">Profiling Applications</a>
 </h3></ul>
 
 

Modified: branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tocgettingstarted.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -25,11 +25,12 @@
 </li>
 <li><a href="../html/tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a>
 </li>
-<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
+<li><a href="../html/tasks/UsingFlasherWizard.xhtml">Using the Flasher Wizard</a>
 </li>
-<li><a href="../html/tasks/InstallingPCConnectivity.html">Installing PC Connectivity</a>
+<li><a href="../html/tasks/InstallingPCConnectivity.xhtml">Installing PC Connectivity</a>
 </li>
-</ul><li><h3><a href="../html/tasks/SettingPreferences.html">Configuring Settings</a>
+</ul><li><h3><a href="../html/tasks/SettingPreferences.xhtml">Configuring Settings</a>
+</h3><li><h3><a href="../html/tasks/ConfigurePythonInterpreter.xhtml">Configuring Python Interpreter</a>
 </h3><li><h3><a href="../html/concepts/MaemoTargets.html">Understanding Maemo Targets</a>
 </h3><li><h3><a href="../html/concepts/MaemoProjects.html">Understanding Maemo Projects</a>
 </h3><li><h3><a href="../html/tasks/CreatingCProject.html">Creating a C Maemo Project</a>
@@ -38,8 +39,8 @@
 </h3><li><h3><a href="../html/gettingstarted/RunningPythonMaemoProject.html">Running Python Maemo Project</a>
 </h3><li><h3><a href="../html/gettingstarted/DebuggingCMaemoProject.html">Debugging a C/C++ Maemo Project</a>
 </h3><li><h3><a href="../html/gettingstarted/DebuggingPythonMaemoProject.html">Debugging a Python Maemo Project</a>
-</h3><li><h3><a href="../html/gettingstarted/UsingHoverHelp.html">Using Hover Help for Maemo API Libraries</a>
-</h3><li><h3><a href="../html/gettingstarted/HowToDownloadHelpDocumentation.html">How to Download and Install Help Documentation</a>
+</h3><li><h3><a href="../html/gettingstarted/UsingHoverHelp.xhtml">Using Hover Help for Maemo API Libraries</a>
+</h3><li><h3><a href="../html/gettingstarted/HowToDownloadHelpDocumentation.xhtml">How to Download and Install Help Documentation</a>
 </h3></ul>
 
 

Modified: branches/work_Ed/org.maemo.esbox.help/html/tocreference.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tocreference.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/tocreference.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -14,7 +14,7 @@
 <h2>Reference</h2>
 <ul>
 <li><h3><a href="../html/reference/FAQ.html">Frequently-Asked Questions: ESbox</a>
-</h3><li><h3><a href="../html/reference/Glossary.html">Glossary</a>
+</h3><li><h3><a href="../html/reference/Glossary.xhtml">Glossary</a>
 </h3></ul>
 
 

Modified: branches/work_Ed/org.maemo.esbox.help/html/toctasks.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/toctasks.html	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/html/toctasks.html	2009-10-15 16:54:53 UTC (rev 2313)
@@ -19,7 +19,8 @@
 </h3><li><h3><a href="../html/tasks/InstallingScratchbox1Targets.html">Install Scratchbox 1 Targets</a>
 </h3><li><h3><a href="../html/tasks/InstallingScratchbox2Targets.html">Install Scratchbox 2 Targets</a>
 </h3><li><h3><a href="../html/tasks/InstallingMaemoSDKVMImage.html">Install Maemo SDK Virtual Image</a>
-</h3><li><h3><a href="../html/tasks/SettingPreferences.html">Setting Up Preferences</a>
+</h3><li><h3><a href="../html/tasks/SettingPreferences.xhtml">Setting Up Preferences</a>
+</h3><li><h3><a href="../html/tasks/ConfigurePythonInterpreter.xhtml">Configuring Python Interpreter</a>
 </h3><li><h3><a href="../html/tasks/MakingProjectsVisible.html">Making Projects Visible to Multiple Targets</a>
 </h3><li><h3><a href="../html/tasks/CreatingCProject.html">Create a Maemo C Project</a>
 </h3><li><h3><a href="../html/tasks/CreatingCppProject.html">Create a Maemo C++ Project</a>
@@ -32,15 +33,15 @@
 </h3><li><h3><a href="../html/tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a>
 </h3><li><h3><a href="../html/tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></h3>
 <ul>
-<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
+<li><a href="../html/tasks/UsingFlasherWizard.xhtml">Using the Flasher Wizard</a>
 </li>
 <li><a href="../html/tasks/SettingsSbrshConfiguration.html">Setting Up an SBRSH Launch</a>
 </li>
-<li><a href="../html/tasks/UsingVNCViewer.html">Using the VNC Viewer</a>
+<li><a href="../html/tasks/UsingVNCViewer.xhtml">Using the VNC Viewer</a>
 </li>
 </ul>
 <li><h3><a href="../html/tasks/DebianPackage.html">Debian Package Management</a>
-</h3><li><h3><a href="../html/tasks/ExternalizeString.html">Extracting Strings</a>
+</h3><li><h3><a href="../html/tasks/ExternalizeString.xhtml">Extracting Strings</a>
 </h3><li><h3><a href="../html/tasks/ProfilingMaemoApplications.html">Profiling Maemo Applications</a>
 </h3></ul>
 

Modified: branches/work_Ed/org.maemo.esbox.help/tocconcepts.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/tocconcepts.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/tocconcepts.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -8,18 +8,22 @@
 	</topic>
 	<topic label="Maemo Builder"  href="html/concepts/MaemoBuilder.html">
 	</topic>
-	<topic label="Debian Package Management"  href="html/concepts/DebianPackage.html">
+	<topic label="Debian Package Management"  href="html/concepts/DebianPackage.xhtml">
 	</topic>
+	<topic href="html/concepts/USBNetworking.xhtml" label="USB Networking">
+    </topic>
 	<topic label="Local Launching"  href="html/concepts/LocalLaunching.html">
 	</topic>	
 	<topic label="Remote Launching"  href="html/concepts/RemoteLaunching.html">
 	</topic>	
-	<topic label="Scratchbox Remote Shell (SBRSH)"  href="html/concepts/Sbrsh.html">
+	<topic label="Scratchbox Remote Shell (SBRSH)"  href="html/concepts/Sbrsh.xhtml">
 	</topic>
-	<topic label="String Externalization"  href="html/concepts/StringExternalization.html">
+	<topic label="String Externalization"  href="html/concepts/StringExternalization.xhtml">
 	</topic>
-	<topic label="Profiling Applications"  href="html/concepts/ProfilingApplications.html">
+	<topic label="Profiling Applications"  href="html/concepts/ProfilingApplications.xhtml">
 	</topic>
-	<topic label="Environment Variables"  href="html/concepts/Environment.html">
+	<topic label="Environment Variables"  href="html/concepts/Environment.xhtml">
 	</topic>
+	<topic href="html/concepts/RSEConnection.xhtml" label="RSE Connections">
+    </topic>
 </toc>

Modified: branches/work_Ed/org.maemo.esbox.help/tocgettingstarted.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/tocgettingstarted.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/tocgettingstarted.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -10,12 +10,12 @@
     </topic>
     <topic href="html/tasks/InstallingScratchbox2Targets.html" label="Installing Scratchbox 2 Targets">
     </topic>
-    <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
+    <topic href="html/tasks/UsingFlasherWizard.xhtml" label="Using the Flasher Wizard">
     </topic>
-    <topic href="html/tasks/InstallingPCConnectivity.html" label="Installing PC Connectivity">
+    <topic href="html/tasks/InstallingPCConnectivity.xhtml" label="Installing PC Connectivity">
     </topic>
   </topic>
-  <topic href="html/tasks/SettingPreferences.html" label="Configuring Settings">
+  <topic href="html/tasks/SettingPreferences.xhtml" label="Configuring Settings">
   </topic>
   <topic href="html/concepts/MaemoTargets.html" label="Understanding Maemo Targets">
   </topic>
@@ -26,7 +26,7 @@
   <topic label="Running Python Maemo Project" href="html/gettingstarted/RunningPythonMaemoProject.html" />
   <topic label="Debugging a C/C++ Maemo Project" href="html/gettingstarted/DebuggingCMaemoProject.html" />
   <topic label="Debugging a Python Maemo Project" href="html/gettingstarted/DebuggingPythonMaemoProject.html" />
-  <topic label="Using Hover Help for Maemo API Libraries" href="html/gettingstarted/UsingHoverHelp.html" />
-  <topic label="How to Download and Install Help Documentation" href="html/gettingstarted/HowToDownloadHelpDocumentation.html" />
+  <topic label="Using Hover Help for Maemo API Libraries" href="html/gettingstarted/UsingHoverHelp.xhtml" />
+  <topic label="How to Download and Install Help Documentation" href="html/gettingstarted/HowToDownloadHelpDocumentation.xhtml" />
   	
 </toc>

Modified: branches/work_Ed/org.maemo.esbox.help/tocreference.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/tocreference.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/tocreference.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -5,6 +5,6 @@
 
 	<topic label="Frequently-Asked Questions: ESbox" href="html/reference/FAQ.html"> 
 	</topic> 
-	<topic label="Glossary" href="html/reference/Glossary.html"> 
+	<topic label="Glossary" href="html/reference/Glossary.xhtml"> 
 	</topic> 
 </toc>

Modified: branches/work_Ed/org.maemo.esbox.help/toctasks.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/toctasks.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.help/toctasks.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -12,7 +12,7 @@
     </topic>
      <topic href="html/tasks/InstallingScratchbox2Targets.html" label="Install Scratchbox 2 Targets">
     </topic>
-    <topic href="html/tasks/SettingPreferences.html" label="Setting Up Preferences">
+    <topic href="html/tasks/SettingPreferences.xhtml" label="Setting Up Preferences">
     </topic>
     <topic href="html/tasks/MakingProjectsVisible.html" label="Making Projects Visible to Multiple Targets">
 	</topic>
@@ -35,16 +35,20 @@
 	<topic label="Locally Launching a Maemo Application"  href="html/tasks/LocalRunDebug.html">
 	</topic> 
 	<topic label="Remotely Launching a Maemo Application"  href="html/tasks/RemoteRunDebug.html">
-    <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
+	
+	<topic href="html/tasks/ConfigurePythonInterpreter.xhtml" label="Configuring Python Interpreter">
+	</topic>
+	
+    <topic href="html/tasks/UsingFlasherWizard.xhtml" label="Using the Flasher Wizard">
     </topic>
     <topic href="html/tasks/SettingsSbrshConfiguration.html" label="Setting Up an SBRSH Launch">
     </topic>
-    <topic href="html/tasks/UsingVNCViewer.html" label="Using the VNC Viewer">
+    <topic href="html/tasks/UsingVNCViewer.xhtml" label="Using the VNC Viewer">
     </topic>
     </topic>     
 	<topic label="Debian Package Management" href="html/tasks/DebianPackage.html">	
 	</topic>
-    <topic label="Extracting Strings" href="html/tasks/ExternalizeString.html">
+    <topic label="Extracting Strings" href="html/tasks/ExternalizeString.xhtml">
 	</topic>
     <topic label="Profiling Maemo Applications" href="html/tasks/ProfilingMaemoApplications.html">
 	</topic>
@@ -52,7 +56,7 @@
 	</topic>
 	<topic label="Installing Maemo SDK Virtual Image" href="html/tasks/InstallingMaemoSDKVMImage.html">
 	</topic>
-	<topic label="Installing PC-Connectivity" href="html/tasks/InstallingPCConnectivity.html">
+	<topic label="Installing PC-Connectivity" href="html/tasks/InstallingPCConnectivity.xhtml">
 	</topic>
 	<topic label="Using SDK and Target Context Menus" href="html/tasks/UsingTargetContextMenus.html">
 	</topic>

Modified: branches/work_Ed/org.maemo.esbox.product-feature/feature.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.product-feature/feature.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.product-feature/feature.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -26,6 +26,10 @@
    <includes
          id="org.maemo.mica.common"
          version="0.0.0"/>
+   
+   <includes
+         id="org.maemo.mica.common.help"
+         version="0.0.0"/>
 
    <includes
          id="org.maemo.mica.protocol"

Modified: branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml	2009-10-15 16:03:33 UTC (rev 2312)
+++ branches/work_Ed/org.maemo.esbox.product.repository-feature/feature.xml	2009-10-15 16:54:53 UTC (rev 2313)
@@ -1,65 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.product.repository"
-      label="ESbox 2nd Edition"
-      version="2.0.0.qualifier"
-      provider-name="INdT / NOKIA">
-
-   <description>
-      Feature that builds the P2 repository for ESbox.
-   </description>
-
-   <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.product.repository"
+      label="ESbox 2nd Edition"
+      version="2.0.0.qualifier"
+      provider-name="INdT / NOKIA">
+
+   <description>
+      Feature that builds the P2 repository for ESbox.
+   </description>
+
+   <copyright>
       Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
-reserved.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      For legal terms, see the Eclipse Public License.
-   </license>
-
-   <url>
-      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
-   </url>
-
-   <includes
-         id="org.maemo.esbox"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.scratchbox"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.vm"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.cdt" version="5.0.2" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.4.2" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rse" version="3.0.2" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.cpp" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux.autotools" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk.device" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.protocol.rse" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.python" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.supplement" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.cpp.autotools" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.cpp.qt" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.dd.dsf.gdb" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.dd.dsf.gdb_launch" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.dd.dsf.sdk" version="1.1.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.maemo.esbox.product"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <includes
+         id="org.maemo.esbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.scratchbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.vm"
+         version="0.0.0"/>
+
+   <requires>
+      <import feature="org.eclipse.cdt" version="5.0.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.4.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rse" version="3.0.2" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.cpp" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.linux.autotools" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk.device" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.protocol.rse" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.python" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.supplement" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.cpp.autotools" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.cpp.qt" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.dd.dsf.gdb" version="1.1.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.dd.dsf.gdb_launch" version="1.1.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.dd.dsf.sdk" version="1.1.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.common.help" version="2.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.maemo.esbox.product"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>



More information about the Esbox-commits mailing list