Undo content changes to index.html

diff --git a/www/index.html b/www/index.html
index 7bd0eec..1f27b41 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -22,7 +22,7 @@ $(document).ready(function() {
     // Rounded Corners
     $("div#content,div#devmenu").corner("round");
     
-    // Tabs\r
+    // Tabs
        $('#tabs').tabs({ fx: { opacity: 'toggle' } });
 });
 </script>
@@ -73,7 +73,7 @@ $(document).ready(function() {
         <h2>In Detail</h2>
         <p>Hermes will connect your Contacts app to your Facebook and Twitter accounts, matching existing Contacts entries to the ones on the social networking sites that are configured in the application settings. Hermes is smart and will deal intelligently with even the smallest name variations.</p>
         <p>If a contact is matched between the Contacts app and an online identity, Hermes will update the contact on the device with a photo (from Facebook or Twitter), birthday (from Facebook), profile URLs (on Facebook and Twitter) and homepage (from Twitter). As an added bonus, all birthdates will also appear automatically in your Calendar.</p>
-        <p>There are two modes of operation, "Retrieve" and "Update." Retrieve will fill in <strong>missing</strong> data for a contact. Update will <strong>overwrite</strong> any contacts that have matches on the social networks (i.e., your Contacts entries will be reset to the information found online).</p>
+        <p>There are two modes of operation, "Retrieve" and "Refresh." Retrieve will fill in <strong>missing</strong> data for a contact. Refresh will <strong>overwrite</strong> any contacts that have matches on the social networks (i.e., your Contacts entries will be reset to the information found online).</p>
         <p>Hermes uses the official Facebook and Twitter APIs, designed and intended by these companies to allow third party applications such as Hermes.</p>
     </div>
 
@@ -81,7 +81,9 @@ $(document).ready(function() {
     <div id="download">
         <img src="ui/application_install.png" alt="" class="download" />
         <p>Hermes is currently under development. It can be installed from the <a href="http://maemo.org/packages/view/hermes/">Extras Testing</a> repository.</p>
-        <p class="note"><strong>Note:</strong> It is not yet suitable for end-users.</p>
+        <p class="note"><strong>Note:</strong> It is not yet suitable for end-users, but will be very
+        shortly.</p>
+
     </div>
 
     <!-- Tab #4 -->
@@ -97,31 +99,36 @@ $(document).ready(function() {
 
         <h2>Roadmap</h2>
         <h3>Current developments</h3>
-        <ul class="strike">
-            <li>Improved error handling &amp; user messages.</li>
-            <li>Slightly clearer "Accounts" dialogue.</li>
-            <li>Pull down homepage from Facebook as well as Twitter.</li>
-            <li>Handling of accents being present/missing between online and Contacts.</li>
-            <li>Allow creation of "empty" contacts containing birthday &amp; homepage info so that Facebook friends' birthdays will appear in Calendar, even if you have no other contact info for them.</li>
-            <li>Improved web page at <a href="http://hermes.garage.maemo.org/">hermes.garage.maemo.org</a>.</li>
+        <ul>
+            <li>Match email address against <a href="http://www.gravatar.com/">gravatar.com</a>. [<a href="https://bugs.maemo.org/show_bug.cgi?id=5983">MB#5983</a>]</li>
         </ul>
 
         <h3>Immediate plans</h3>
         <ul>
-            <li>Manual matching for contacts which the heuristic doesn't pick up.</li>
+            <li>Store a history of all images that Hermes has ever downloaded to allow the user to pick from them. [<a href="https://bugs.maemo.org/show_bug.cgi?id=5452">MB#5452</a>]</li>
+            <li>Add an "auto-update" mode for people who regularly change their Facebook profile pictures to allow Hermes to track them.</li>
         </ul>
 
         <h3>Long-term plans/possibilities</h3>
         <ul>
             <li>Match "nickname" against <a href="http://maemo.org/profile/list/">maemo.org username</a>.</li>
-            <li>Match email address against <a href="http://www.gravatar.com/">gravatar.com</a>.</li>
-            <li>Investigate pulling contact images from Google Contacts (apparently Mail for Exchange doesn't download images).</li>
-            <li>Add an "auto-update" mode for people who regularly change their Facebook profile pictures to allow Hermes to track them.</li>
-            <li>Store a history of all images that Hermes has ever downloaded to allow the user to pick from them.</li>
+            <li>Investigate pulling contact images from Google Contacts (apparently Mail for Exchange doesn't download images). [<a href="https://bugs.maemo.org/show_bug.cgi?id=5453">MB#5453</a>]</li>
+        </ul>
+        
+        <h3>Historical developments</h3>
+        <p>All of these developments have now been implemented:</p>
+        <ul>
+            <li>Improved error handling &amp; user messages.</li>
+            <li>Slightly clearer "Accounts" dialogue.</li>
+            <li>Pull down homepage from Facebook as well as Twitter.</li>
+            <li>Handling of accents being present/missing between online and Contacts.</li>
+            <li>Allow creation of "empty" contacts containing birthday &amp; homepage info so that Facebook friends' birthdays will appear in Calendar, even if you have no other contact info for them.</li>
+            <li>Improved web page at <a href="http://hermes.garage.maemo.org/">hermes.garage.maemo.org</a>.</li>
+            <li>Manual matching for contacts which the heuristic doesn't pick up.</li>
         </ul>
     </div>
-
-</div>
+    
+    </div>
 </div>
 
 <!-- Footer Content -->
@@ -141,4 +148,4 @@ pageTracker._trackPageview();
 } catch(err) {}</script>
 
 </body>
-</html>
\ No newline at end of file
+</html>