[Esbox-commits] r1584 - www/beta1

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-05-12 15:51:02 +0300 (Tue, 12 May 2009)
New Revision: 1584

Modified:
   www/beta1/installation.html
   www/beta1/installation_prereqs.html
Log:
Fix some confusion and menu references

Modified: www/beta1/installation.html
===================================================================
--- www/beta1/installation.html	2009-05-11 19:30:49 UTC (rev 1583)
+++ www/beta1/installation.html	2009-05-12 12:51:02 UTC (rev 1584)
@@ -261,7 +261,7 @@
 		<li>OS2008 Diablo</li>
 		<li>Fremantle</li>
 		<li class="note">ESbox can flash these environments onto your device.
-		<p><span class="code">File &gt; New &gt; Maemo Installers &gt; Flash Images to Device</span></p></li>
+		<p><span class="code">File&nbsp;&gt;&nbsp;New&nbsp;&gt;&nbsp;Other&nbsp;&gt;&nbsp;Maemo&nbsp;Installers&nbsp;&gt;&nbsp;Flash&nbsp;Images&nbsp;to&nbsp;Device</span></p></li>
 	</ul>
 	</li>
 	<li>Maemo PC Connectivity 

Modified: www/beta1/installation_prereqs.html
===================================================================
--- www/beta1/installation_prereqs.html	2009-05-11 19:30:49 UTC (rev 1583)
+++ www/beta1/installation_prereqs.html	2009-05-12 12:51:02 UTC (rev 1584)
@@ -55,14 +55,12 @@
 
 <h3 id="heading">Java</h3>
 <ul>
-	  <li>Installing JDK in Ubuntu Hardy or newer:
-	       <div style="float: right">Note that JRE must be installed outside Scratchbox
-environment.</div>
+	  <li>Installing JDK in Ubuntu Gutsy or newer:
 		<ol>
         <li style="font-style: italic;">gcj is not supported with Eclipse. Sun's JRE or IBM's
 JRE are known to work.</li>
-        <li>Add the following line to your <span style="code">/etc/apt/sources.list</span>:
-          <span class="code">deb http://us.archive.ubuntu.com/ubuntu gutsy universe multiverse</span>
+        <li>Ensure a line like the following is in your <span style="code">/etc/apt/sources.list</span> <em>(replacing "gutsy" with your distribution; the "universe" and "multiverse" components are needed)</em>: <br/>
+          <span class="code">deb http://us.archive.ubuntu.com/ubuntu gutsy universe multiverse</span> 
         </li>
         <li>Install JRE 1.5.0 or newer:<br/>
           <span class="code">sudo apt-get update<br/>sudo apt-get install sun-java5-jre<br/></span>