Small documentation fixes for installing. refs #2221

diff --git a/docker/build.rb b/docker/build.rb
index 7c5f3c547210619e84d0d42c44c62b03457d6f6e..ee2cc783eef8f753eb1a3c0d330501ec4d1633cf 100755 (executable)
--- a/docker/build.rb
+++ b/docker/build.rb
@@ -6,6 +6,7 @@ require 'yaml'
 def sudo(*cmd)
   # user can pass a single list in as an argument
   # to allow usage like: sudo %w(apt-get install foo)
+  warn "You may need to enter your password here."
   if cmd.length == 1 and cmd[0].class == Array
     cmd = cmd[0]
   end
@@ -53,7 +54,7 @@ end
 
 if not ip_forwarding_enabled?
   warn "NOTE: IP forwarding must be enabled in the kernel."
-  warn "Turning IP forwarding on. You may be asked to enter your password."
+  warn "Turning IP forwarding on now."
   sudo %w(/sbin/sysctl net.ipv4.ip_forward=1)
 end
 

diff --git a/docker/build.sh b/docker/build.sh
index a6bb5b843ac55fe2a263aa82a53fd0d04cb1d798..0e3d4cb6b5d2a72b3503e043d7801628c2546905 100755 (executable)
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -5,7 +5,7 @@ if ! ruby -e 'exit RUBY_VERSION >= "1.9.3"' 2>/dev/null
 then
     echo "Installing Arvados requires at least Ruby 1.9.3."
     echo "You may need to enter your password."
-    read -p "Press Ctrl-C to abort, otherwise we will install ruby1.9.3 now..." unused
+    read -p "Press Ctrl-C to abort, or else press ENTER to install ruby1.9.3 and continue. " unused
     
     sudo apt-get update
     sudo apt-get -y install ruby1.9.3