[ARVADOS] updated: 425cd406f61d2de51cd8d5923a22d6d54b9f6809

[git at public.curoverse.com]

Summary of changes:
 doc/user/getting_started/community.textile  |    2 +-
 doc/user/getting_started/ssh-access.textile |   18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

       via  425cd406f61d2de51cd8d5923a22d6d54b9f6809 (commit)
       via  7a8a6173026630b649a25d2c70d796d7f21dfb97 (commit)
      from  4068171eb8ee0cb9fd57e10ff024e04464438891 (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 425cd406f61d2de51cd8d5923a22d6d54b9f6809
Merge: 7a8a617 4068171
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jan 10 12:21:25 2014 -0500

    Merge branch 'master' of git.clinicalfuture.com:arvados
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.


commit 7a8a6173026630b649a25d2c70d796d7f21dfb97
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jan 10 12:19:55 2014 -0500

    Documentation tweaks based on Nadia's feedback.

diff --git a/doc/user/getting_started/community.textile b/doc/user/getting_started/community.textile
index 46aa0d7..9a2aeca 100644
--- a/doc/user/getting_started/community.textile
+++ b/doc/user/getting_started/community.textile
@@ -22,4 +22,4 @@ The "#arvados":irc://irc.oftc.net:6667/#arvados IRC (Internet Relay Chat) channe
 
 h2. Bug tracking
 
-If you think you have found a bug, or would like to make a feature request, you may file a ticket on the "Arvados issue tracker.":https://arvados.org/projects/arvados/issues
+If you think you have found a bug, or would like to make a feature request, check the "Arvados issue tracker":https://arvados.org/projects/arvados/issues to see if has already been reported or "add a new issue.":https://arvados.org/projects/arvados/issues/new
diff --git a/doc/user/getting_started/ssh-access.textile b/doc/user/getting_started/ssh-access.textile
index 59f976f..430e80f 100644
--- a/doc/user/getting_started/ssh-access.textile
+++ b/doc/user/getting_started/ssh-access.textile
@@ -45,6 +45,18 @@ Enter same passphrase again:
 
 We strongly recommend that you protect your key with a passphrase.  This means that when the key is used, you will be required to enter the passphrase.  However, unlike logging into remote system using a password, the passphrase is never sent over the network, it is only used to decrypt your private key.
 
+Display the contents of @~/.ssh/id_rsa.pub@ (this is your public key) using @cat@ and then copy it onto the clipboard:
+
+<notextile>
+<pre><code>$ <span class="userinput">cat ~/.ssh/id_rsa.pub</span>
+ssh-rsa AAAAB3NzaC1ycEDoNotUseExampleKeyDoNotUseExampleKeyDoNotUseExampleKeyDoNotUse9lmzkpBq983bQradKGT3LuKda9QOGe8MatI6wzSrJLSGhHm3hk6D8OWWUG4SneuCtKIk2bH0pgBj1G29+uzDIez90WzfCTZKbz4RcVQmPkowSSUAQDwb0ffwvRDhCgcJ1loT1wQAJzqJmljQ7xEYaCOIMqnfYE0lX7B3MSvCV6Ie2rWL33YecLp48LVtqiCOZU4XRyO8RSDFRFLVW+mjkLirwtDHZCRtORScaIEN0jw51p+T+9X5iA9QH/Mn+xlgk7fCgH+JtpBj808N/Qds2Gpff+Kb6ulUrVVfMK6L you at example.com
+</code></pre>
+</notextile>
+
+Now you can set up @ssh-agent@ (next) or proceed to "adding your key to the Arvados Workbench.":#workbench
+
+h3. Setting up ssh-agent (optional)
+
 If you find you are entering your passphrase frequently, you can use @ssh-agent@ to manage your credentials.  Use @ssh-add -l@ to test if you already have ssh-agent running:
 
 notextile. <pre><code>$ <span class="userinput">ssh-add -l</span></code></pre>
@@ -72,7 +84,7 @@ When everything is set up, @ssh-add -l@ should yield output that looks something
 </code></pre>
 </notextile>
 
-Copy the contents of @~/.ssh/id_rsa.pub@ onto the clipboard (this is your public key).  Proceed to "adding your key to the Arvados Workbench":#workbench .
+You may now proceed to "adding your key to the Arvados Workbench.":#workbench
 
 h2(#windows). Windows: Using PuTTY
 
@@ -137,7 +149,7 @@ Paste the public key that you copied to the clipboard in the previous section in
 
 h1(#login). Using ssh to log into an Arvados VM
 
-To determine the name and login information of the VM instance that you will connect to, go to the Arvados workbench and click on "Virtual machines" under *Configuration* or use the menu item _Access %(rarr)→% VMs_ to see a list of virtual machines that you have access to.  Make a note of the values in the *hostname* and *logins* columns.  In this guide the hostname will be _shell_ and the login will be _you_.  Replace these with your hostname and login as appropriate.
+To determine the name and login information of the VM instance that you will connect to, go to the Arvados workbench and click on "Virtual machines" under *Configuration* or use the menu item _Access %(rarr)→% VMs_ to see a list of virtual machines that you have access to.  The *hostname* columns lists the name of each available VM.  The *logins* column will have a value in the form of @["you"]@.  Ignore the square brackets and quotes to get your login name.  In this guide the hostname will be _shell_ and the login will be _you_.  Replace these with your hostname and login as appropriate.
 
 This section consists of two sets of instructions, depending on whether you will be logging in using a "Unix":#unixvm (Linux, OS X, Cygwin) or "Windows":#windowsvm client.
 
@@ -145,7 +157,7 @@ h2(#unixvm). Logging in using command line ssh (Unix)
 
 h3. Connecting to the VM
 
-Use the following command to connect to the "shell" VM instance as "you":
+Use the following command to connect to the "shell" VM instance as "you".  Replace <code>you at shell</code> at the end of the following command with your login and hostname:
 
 notextile. <pre><code>$ <span class="userinput">ssh -o "ProxyCommand ssh -a -x -p2222 turnout at switchyard.{{ site.arvados_api_host }} shell" -A -x you at shell</span></code></pre>
 

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


hooks/post-receive
--