Merge branch 'master' into 6588-documentation

[arvados.git] / apps / workbench / app / views / users / _manage_virtual_machines.html.erb

diff --git a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
index 2257df90d0c7f54954c9599a6e6eef0ae58f691b..295311d33d62b848e7e47baab25a8662a7f6043c 100644 (file)
--- a/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_manage_virtual_machines.html.erb
@@ -9,12 +9,9 @@
 
 <div id="manage_virtual_machines" class="panel-body">
   <p>
-    For more information see <%= link_to raw('Arvados Docs &rarr; User Guide &rarr; SSH access'),
-  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html",
+    For more information see <%= link_to raw('Arvados Docs &rarr; User Guide &rarr; VM access'),
+  "#{Rails.configuration.arvados_docsite}/user/getting_started/vm-login-with-webshell.html",
   target: "_blank"%>.
-    <% if @my_virtual_machines.any? or true %>
-      A sample <code>~/.ssh/config</code> entry is provided below.
-    <% end %>
   </p>
 
   <% if !@my_virtual_machines.any? %>
@@ -90,7 +87,7 @@
             <% if Rails.configuration.shell_in_a_box_url %>
               <td>
                 <% @my_vm_logins[vm[:uuid]].andand.each do |login| %>
-                  <%= link_to webshell_virtual_machine_path(vm, login: login), title: "Open a terminal session in your browser", class: 'btn btn-xs btn-default' do %>
+                  <%= link_to webshell_virtual_machine_path(vm, login: login), title: "Open a terminal session in your browser", class: 'btn btn-xs btn-default', target: "_blank" do %>
                     Log in as <%= login %><br />
                   <% end %>
                 <% end %>
@@ -101,7 +98,7 @@
       </tbody>
     </table>
 
-    <p><i>~/.ssh/config:</i></p>
+    <p>Sample SSH Conig  <i>~/.ssh/config:</i></p>
     <pre>Host *.arvados
       TCPKeepAlive yes
       ServerAliveInterval 60