Index: openacs-4/packages/acs-admin/www/server-restart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/server-restart.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-admin/www/server-restart.adp	9 Jun 2016 08:52:50 -0000	1.5.2.1
+++ openacs-4/packages/acs-admin/www/server-restart.adp	18 Jan 2017 08:11:02 -0000	1.5.2.2
@@ -2,12 +2,15 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<p> The server has been shut down. Normally, it should come back up by itself after a minute or so. </p>
+<p> The server has been shut down.</p>
 
-<p> If not, please check your server error log, or contact your system administrator. </p>
+<p>When this OpenACS instance is installed as a service (recommended),
+the server should come back up by itself after a minute or so.  If
+not, please check your server error log, or contact your system
+administrator. </p>
 
 <p> 
-  Please wait for your server to get back up, then ...
+  Please wait for your server to get back up, or start the server again manually...
 </p>
 
 <p>
Index: openacs-4/packages/acs-admin/www/install/install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-3.tcl,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/acs-admin/www/install/install-3.tcl	27 Sep 2016 07:54:35 -0000	1.10.2.3
+++ openacs-4/packages/acs-admin/www/install/install-3.tcl	18 Jan 2017 08:11:02 -0000	1.10.2.4
@@ -90,12 +90,25 @@
     array set version $repository($package_key)
     
     if { ([info exists version(download_url)] && $version(download_url) ne "") } {
+        ns_write [subst {
+            <p>Transferring $version(download_url) ...
+            <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+        }]
         set spec_file [apm_load_apm_file -url $version(download_url)]
         if { $spec_file eq "" } {
-            ns_log Error "Error downloading package $package_key from $version(download_url). Installing package failed."
+            set msg "Error downloading package $package_key from $version(download_url). Installing package failed."
+            ns_write [subst {
+                <p>$msg
+                <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+            }]
+            ns_log Error $msg
             set success_p 0
             continue
         }
+        ns_write [subst {
+            Done<br>
+            <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
+        }
         set package_path "[apm_workspace_install_dir]/$package_key"
     } else {
         set spec_file $version(path)
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.25.2.2 -r1.25.2.3
--- openacs-4/packages/acs-admin/www/users/one.adp	9 Jun 2016 08:52:50 -0000	1.25.2.2
+++ openacs-4/packages/acs-admin/www/users/one.adp	18 Jan 2017 08:11:02 -0000	1.25.2.3
@@ -10,8 +10,8 @@
 <li>User ID:  @user_id;literal@</li>
 <li><a href="@user_info.url;noi18n@">View community member page</a></li>
 <li>Registration date:  @user_info.creation_date_pretty@</li>
-<li>Registration IP: @user_info.creation_ip@ (<a href="@user_info.by_ip_url@" title="Other registrations from this IP address">others</a>)</li>
-<li>Last visit: @user_info.last_visit_pretty@</li>
+<li>Registration IP: <a href="./ip-info?ip=@user_info.creation_ip@">@user_info.creation_ip@</a> (<a href="@user_info.by_ip_url@" title="Other registrations from this IP address">others</a>)</li>
+<li>Last visit: @user_info.last_visit_pretty@ from </li>
 
 
 <if @portrait_url@ not nil>