[Esbox-commits] r1861 - in branches/work_Ed/org.maemo.esbox.help/html: concepts reference tasks
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Fri Jul 10 00:26:53 EEST 2009
Author: eswartz
Date: 2009-07-10 00:26:51 +0300 (Fri, 10 Jul 2009)
New Revision: 1861
Modified:
branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html
branches/work_Ed/org.maemo.esbox.help/html/reference/FAQ.html
branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html
branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html
Log:
Merge rev 1841 from trunk
Modified: branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html 2009-07-09 21:22:21 UTC (rev 1860)
+++ branches/work_Ed/org.maemo.esbox.help/html/concepts/Sbrsh.html 2009-07-09 21:26:51 UTC (rev 1861)
@@ -68,7 +68,7 @@
<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/beta1/documentation_sbrsh.html">PC Connectivity documentation</a>
+ 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
Modified: branches/work_Ed/org.maemo.esbox.help/html/reference/FAQ.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/reference/FAQ.html 2009-07-09 21:22:21 UTC (rev 1860)
+++ branches/work_Ed/org.maemo.esbox.help/html/reference/FAQ.html 2009-07-09 21:26:51 UTC (rev 1861)
@@ -222,7 +222,7 @@
href="https://garage.maemo.org/news/?group_id=192" target="_blank">ESbox Garage Project News page</a>.
</p>
<p>For regular integration releases, see the
- <a href="http://esbox.garage.maemo.org/beta1/releases.html" target="_blank">ESbox releases page</a>
+ <a href="http://esbox.garage.maemo.org/2nd_edition/releases.html" target="_blank">ESbox releases page</a>
</div>
<hr>
<div id="support" dir="LTR">
@@ -237,9 +237,9 @@
projects or workspace must be visible to both Scratchbox and the host.
When Scratchbox is running on a virtual machine, we support this via
Samba sharing from the host to the VM.</p>
-<p>See the <a href="http://maemovmware.garage.maemo.org/beta1">Maemo SDK virtual image page</a>
+<p>See the <a href="http://maemovmware.garage.maemo.org/">Maemo SDK virtual image page</a>
for configured and supported images and the
-<a href="http://esbox.garage.maemo.org/beta1/virtual_machines.html">ESbox virtual machine support documentation</a>.
+<a href="http://esbox.garage.maemo.org/2nd_edition/virtual_machines.html">ESbox virtual machine support documentation</a>.
</div>
<hr>
<div id="ask" dir="LTR">
@@ -273,7 +273,7 @@
<h2>Download and Installation:</h2>
<div id="howtos" dir="LTR">
<h3>Are there complete HowTos for setting up ESbox?</h3>
-<p>Yes, please see the <a href="http://esbox.garage.maemo.org/beta1/installation.html">ESbox installation guide</a>.
+<p>Yes, please see the <a href="http://esbox.garage.maemo.org/2nd_edition/installation.html">ESbox installation guide</a>.
You may install either a fully packaged product or update an existing Eclipse 3.4.2 installation over the Internet.
</p>
</div>
@@ -337,7 +337,7 @@
> Build Machines </em> is the
gateway to configuring this facility. </p>
<p>Please see the
-<a href="http://esbox.garage.maemo.org/beta1/virtual_machines.html">ESbox virtual machine support documentation</a>
+<a href="http://esbox.garage.maemo.org/2nd_edition/virtual_machines.html">ESbox virtual machine support documentation</a>
for all the details.
<hr>
<div id="new-scratchbox-sdk" dir="LTR"><a
@@ -442,7 +442,7 @@
images or available in the <em>host-pc-connectivity</em> package.)</p>
<p><b>All the details
</b>are on the <a
- href="http://pc-connectivity.garage.maemo.org/beta1/">PC connectivity garage project page</a>.</p>
+ href="http://pc-connectivity.garage.maemo.org/">PC connectivity garage project page</a>.</p>
</div>
<hr>
<div id="configure-for-esbox" dir="LTR"><a
Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html 2009-07-09 21:22:21 UTC (rev 1860)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html 2009-07-09 21:26:51 UTC (rev 1861)
@@ -22,7 +22,7 @@
applet provided by the PC Connectivity project.
</p>
<p>
-See <a href="http://pc-connectivity.garage.maemo.org/beta1">the PC Connectivity home page</a>
+See <a href="http://pc-connectivity.garage.maemo.org/">the PC Connectivity home page</a>
for full instructions.
</p>
</body>
Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html 2009-07-09 21:22:21 UTC (rev 1860)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html 2009-07-09 21:26:51 UTC (rev 1861)
@@ -202,8 +202,12 @@
</li>
<li>For VirtualBox, this must match
the configuration established for a machine via VBoxManage before the machine is launched. (See
-<a href="http://maemovmware.garage.maemo.org/beta1/vbox_installers.html">the maemovmware VirtualBox configuration utility</a>, the
-<a href="http://maemovmware.garage.maemo.org/beta1/create_vbox_machine.html#portforwarding">the maemovmware port forwarding instructions</a>, or
+<a href="http://maemovmware.garage.maemo.org/beta1/vbox_installers.html" target="_blank">the maemovmware VirtualBox configuration utility</a>
+(or <a href="http://maemovmware.garage.maemo.org/2nd_edition/vbox_installers.html" target="_blank">here</a> if missing),
+the
+<a href="http://maemovmware.garage.maemo.org/beta1/create_vbox_machine.html#portforwarding" target="_blank">the maemovmware port forwarding instructions</a>
+(or <a href="http://maemovmware.garage.maemo.org/2nd_edition/create_vbox_machine.html#portforwarding" target="_blank">here</a> if missing),
+or
the Network Address Translation chapter of the VirtualBox manual.)
</li>
<li>For VMware, use the Virtual Network Editor > NAT>Edit>Port Forwarding... dialog to
More information about the Esbox-commits
mailing list