[ARVADOS] updated: 70ce2cc8559b74907458797f7fbd8abb6e2c5a23

[git at public.curoverse.com]

Summary of changes:
 doc/_includes/_install_ruby_and_bundler.liquid | 9 +++++++--
 doc/install/install-docker.html.textile.liquid | 6 +++++-
 doc/sdk/cli/install.html.textile.liquid        | 8 ++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

       via  70ce2cc8559b74907458797f7fbd8abb6e2c5a23 (commit)
       via  449c9871fb265f111251ee89669914652ac7b4c3 (commit)
      from  6dff0705fd3b4e0acde7bdf5821ef115ba74099b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 70ce2cc8559b74907458797f7fbd8abb6e2c5a23
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 30 17:43:55 2015 -0400

    Fix stale "Install Ruby and Bundler" links.
    
    Now that these instructions are an include, include them everywhere
    they're referenced.  No issue #.

diff --git a/doc/install/install-docker.html.textile.liquid b/doc/install/install-docker.html.textile.liquid
index 3744289..1566e80 100644
--- a/doc/install/install-docker.html.textile.liquid
+++ b/doc/install/install-docker.html.textile.liquid
@@ -11,7 +11,11 @@ h2. Prerequisites
 # A GNU/Linux (virtual) machine
 # A working Docker installation (see "Installing Docker":https://docs.docker.com/installation/)
 # A working Go installation (see "Install the Go tools":https://golang.org/doc/install)
-# A working Ruby installation (see "Install Ruby and bundler":install-manual-prerequisites-ruby.html)
+# A working Ruby installation, with the Bundler gem installed
+
+h3. Install Ruby and Bundler
+
+{% include 'install_ruby_and_bundler' %}
 
 h2. Download the source tree
 
diff --git a/doc/sdk/cli/install.html.textile.liquid b/doc/sdk/cli/install.html.textile.liquid
index df55077..9db56b9 100644
--- a/doc/sdk/cli/install.html.textile.liquid
+++ b/doc/sdk/cli/install.html.textile.liquid
@@ -8,9 +8,9 @@ title: "Installation"
 
 To use the @arv@ command, you can either install the @arvados-cli@ gem via RubyGems or build and install the package from source.
 
-h4. Prerequisites: Ruby >= 2.1.0 and curl libraries
+h3. Prerequisites: Ruby, Bundler, and curl libraries
 
-Make sure you have "Ruby and bundler":{{site.baseurl}}/install/install-manual-prerequisites-ruby.html installed.
+{% include 'install_ruby_and_bundler' %}
 
 Install curl libraries with your system's package manager. For example, on Debian or Ubuntu:
 
@@ -20,7 +20,7 @@ $ <code class="userinput">sudo apt-get install libcurl3 libcurl3-gnutls libcurl4
 </pre>
 </notextile>
 
-h4. Option 1: install with RubyGems
+h3. Option 1: Install with RubyGems
 
 <notextile>
 <pre>
@@ -28,7 +28,7 @@ $ <code class="userinput">sudo gem install arvados-cli</code>
 </pre>
 </notextile>
 
-h4. Option 2: build and install from source
+h3. Option 2: Build and install from source
 
 <notextile>
 <pre>

commit 449c9871fb265f111251ee89669914652ac7b4c3
Author: Brett Smith <brett at curoverse.com>
Date:   Thu Jul 30 17:34:50 2015 -0400

    RVM setup instructions tell you to install Bundler after activation.
    
    On hosts that do not have any Ruby installed, the previous
    instructions won't work, because the `gem` tool is only available
    through RVM.  RVM needs to be activated in the shell first.
    
    No issue #.

diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid
index 55627b4..369bf46 100644
--- a/doc/_includes/_install_ruby_and_bundler.liquid
+++ b/doc/_includes/_install_ruby_and_bundler.liquid
@@ -1,11 +1,10 @@
 Currently, only Ruby 2.1 is supported.
 
-h4(#rvm). *Option 1: Install with rvm*
+h4(#rvm). *Option 1: Install with RVM*
 
 <notextile>
 <pre><code><span class="userinput">sudo gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 \curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.1
-sudo -i gem install bundler
 sudo adduser "$USER" rvm
 </span></code></pre></notextile>
 
@@ -15,6 +14,12 @@ Either log out and log back in to activate RVM, or explicitly load it in all ope
 <pre><code><span class="userinput">source /usr/local/rvm/scripts/rvm
 </span></code></pre></notextile>
 
+Once RVM is activated in your shell, install Bundler:
+
+<notextile>
+<pre><code>~$ <span class="userinput">gem install bundler</span>
+</code></pre></notextile>
+
 h4(#fromsource). *Option 2: Install from source*
 
 Install prerequisites for Debian 7 or 8:

-----------------------------------------------------------------------


hooks/post-receive
--