Index: openacs-4/packages/acs-admin/www/server-restart.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/server-restart.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/server-restart.tcl	18 Sep 2003 17:18:40 -0000	1.1
+++ openacs-4/packages/acs-admin/www/server-restart.tcl	22 Sep 2003 16:50:30 -0000	1.2
@@ -9,7 +9,7 @@
 
 set page_title "Restart Server"
 
-set context [list [list "." "Package Manager"] $page_title]
+set context [list $page_title]
 
 
 # We do this as a schedule proc, so the server will have time to serve the page
Index: openacs-4/packages/acs-admin/www/install/local-install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/Attic/local-install-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/install/local-install-2.adp	18 Sep 2003 17:33:37 -0000	1.2
+++ openacs-4/packages/acs-admin/www/install/local-install-2.adp	22 Sep 2003 16:50:30 -0000	1.3
@@ -10,7 +10,7 @@
 </if>
 <else>
   <if @extras_p@ true >
-    <p> The packages you wanted to install require some other
+    <p> The packages you want to install require some other
     packages. These have been added to the list, and are marked
     below. </p>
  </if>
Index: openacs-4/packages/acs-admin/www/install/local-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/Attic/local-install-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/install/local-install-2.tcl	18 Sep 2003 21:02:30 -0000	1.3
+++ openacs-4/packages/acs-admin/www/install/local-install-2.tcl	22 Sep 2003 16:50:30 -0000	1.4
@@ -102,7 +102,7 @@
         $key \
         $package_name($key) \
         $problem_p \
-        [join $comment "<br>"] \
+        [join $comment "\n"] \
         $extra_p
 }
 
Index: openacs-4/packages/acs-admin/www/install/local-install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/Attic/local-install.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/install/local-install.tcl	21 Sep 2003 18:24:19 -0000	1.3
+++ openacs-4/packages/acs-admin/www/install/local-install.tcl	22 Sep 2003 16:50:30 -0000	1.4
@@ -22,8 +22,7 @@
 
 set upgrades_p 0
 
-# For testing without caching
-#nsv_unset apm_version_properties
+array set package [list]
 
 foreach spec_file [apm_scan_packages "[acs_root_dir]/packages"] {
     with_catch errmsg {
@@ -47,12 +46,13 @@
 
                 # If in upgrade mode, only add to list if it's an upgrade
                 if { !$installed_p && (!$upgrade_p || ![empty_string_p $upgrade_text]) } {
-                    multirow append packages \
-                        $version(package.key) \
-                        $version(package-name) \
-                        $version(name) \
-                        $version(package.type) \
-                        $upgrade_text
+                    
+                    set package([string toupper $version(package-name)]) [list \
+                                                                              $version(package.key) \
+                                                                              $version(package-name) \
+                                                                              $version(name) \
+                                                                              $version(package.type) \
+                                                                              $upgrade_text]
                 }
             }
         }
@@ -62,6 +62,18 @@
     }
 }
 
+# Sort the list alphabetically (in case package_name and package_key doesn't sort the same)
+foreach name [lsort -ascii [array names package]] {
+    set row $package($name)
+    multirow append packages \
+        [lindex $row 0] \
+        [lindex $row 1] \
+        [lindex $row 2] \
+        [lindex $row 3] \
+        [lindex $row 4]
+}
+
+
 template::list::create \
     -name packages \
     -multirow packages \