From d92c79edf54df96d259d3c99eb2a5461b4111340 Mon Sep 17 00:00:00 2001 From: radhika Date: Tue, 8 Jul 2014 11:24:12 -0400 Subject: [PATCH] 2380: ssh doc references are updated to point to the right env. --- doc/_includes/_tutorial_expectations.liquid | 1 + doc/user/getting_started/check-environment.html.textile.liquid | 2 +- doc/user/reference/api-tokens.html.textile.liquid | 2 +- doc/user/reference/sdk-cli.html.textile.liquid | 2 +- .../topics/tutorial-gatk-variantfiltration.html.textile.liquid | 2 +- doc/user/topics/tutorial-job-debug.html.textile.liquid | 2 +- doc/user/topics/tutorial-job1.html.textile.liquid | 2 +- doc/user/topics/tutorial-trait-search.html.textile.liquid | 2 +- .../tutorials/running-external-program.html.textile.liquid | 2 +- doc/user/tutorials/tutorial-firstscript.html.textile.liquid | 2 +- doc/user/tutorials/tutorial-keep.html.textile.liquid | 3 +-- doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 doc/_includes/_tutorial_expectations.liquid diff --git a/doc/_includes/_tutorial_expectations.liquid b/doc/_includes/_tutorial_expectations.liquid new file mode 100644 index 0000000000..86ac64c90d --- /dev/null +++ b/doc/_includes/_tutorial_expectations.liquid @@ -0,0 +1 @@ +*This tutorial assumes that you are logged into an Arvados VM instance ("Unix":{{site.baseurl}}/user/getting_started/ssh-access-unix.html#login or "Windows":{{site.baseurl}}/user/getting_started/ssh-access-windows.html#login), and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* diff --git a/doc/user/getting_started/check-environment.html.textile.liquid b/doc/user/getting_started/check-environment.html.textile.liquid index 2908e6e742..c9d4778c7e 100644 --- a/doc/user/getting_started/check-environment.html.textile.liquid +++ b/doc/user/getting_started/check-environment.html.textile.liquid @@ -4,7 +4,7 @@ navsection: userguide title: "Checking your environment" ... -First you should "log into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login if you have not already done so. +First you should log into an Arvados VM instance ("Unix":{{site.baseurl}}/user/getting_started/ssh-access-unix.html#login or "Windows":{{site.baseurl}}/user/getting_started/ssh-access-windows.html#login) if you have not already done so. If @arv user current@ is able to access the API server, it will print out information about your account. Check that you are able to access the Arvados API server using the following command: diff --git a/doc/user/reference/api-tokens.html.textile.liquid b/doc/user/reference/api-tokens.html.textile.liquid index 317e7a026d..8a333ffffb 100644 --- a/doc/user/reference/api-tokens.html.textile.liquid +++ b/doc/user/reference/api-tokens.html.textile.liquid @@ -8,7 +8,7 @@ The Arvados API token is a secret key that enables the @arv@ command line client Access the Arvados Workbench using this link: "https://{{ site.arvados_workbench_host }}/":https://{{ site.arvados_workbench_host }}/ (Replace @{{ site.arvados_api_host }}@ with the hostname of your local Arvados instance if necessary.) -Open a shell on the system where you want to use the Arvados client. This may be your local workstation, or "an Arvados virtual machine accessed with SSH":{{site.baseurl}}/user/getting_started/ssh-access.html. +Open a shell on the system where you want to use the Arvados client. This may be your local workstation, or an Arvados virtual machine accessed with SSH ("Unix":{{site.baseurl}}/user/getting_started/ssh-access-unix.html#login or "Windows":{{site.baseurl}}/user/getting_started/ssh-access-windows.html#login). Click on the user icon in the upper right corner to access the user settings menu. Click on the menu item *Manage API tokens* to go to the "Api client authorizations" page. diff --git a/doc/user/reference/sdk-cli.html.textile.liquid b/doc/user/reference/sdk-cli.html.textile.liquid index f44fef2bf4..3f62254d20 100644 --- a/doc/user/reference/sdk-cli.html.textile.liquid +++ b/doc/user/reference/sdk-cli.html.textile.liquid @@ -4,7 +4,7 @@ navsection: userguide title: "Command line interface" ... -*First, you should be "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +*First, you should be logged into an Arvados VM instance ("Unix":{{site.baseurl}}/user/getting_started/ssh-access-unix.html#login or "Windows":{{site.baseurl}}/user/getting_started/ssh-access-windows.html#login), and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* h3. Usage diff --git a/doc/user/topics/tutorial-gatk-variantfiltration.html.textile.liquid b/doc/user/topics/tutorial-gatk-variantfiltration.html.textile.liquid index ea608b4bc1..fa33f67669 100644 --- a/doc/user/topics/tutorial-gatk-variantfiltration.html.textile.liquid +++ b/doc/user/topics/tutorial-gatk-variantfiltration.html.textile.liquid @@ -6,7 +6,7 @@ title: "Using GATK with Arvados" This tutorial demonstrates how to use the Genome Analysis Toolkit (GATK) with Arvados. In this example we will install GATK and then create a VariantFiltration job to assign pass/fail scores to variants in a VCF file. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} h2. Installing GATK diff --git a/doc/user/topics/tutorial-job-debug.html.textile.liquid b/doc/user/topics/tutorial-job-debug.html.textile.liquid index bc1932e9b3..8b0df3693f 100644 --- a/doc/user/topics/tutorial-job-debug.html.textile.liquid +++ b/doc/user/topics/tutorial-job-debug.html.textile.liquid @@ -6,7 +6,7 @@ title: "Debugging a Crunch script" To test changes to a script by running a job, the change must be pushed to your hosted repository, and the job might have to wait in the queue before it runs. This cycle can be an inefficient way to develop and debug scripts. This tutorial demonstrates an alternative: using @arv-crunch-job@ to run your job in your local VM. This avoids the job queue and allows you to execute the script directly from your git working tree without committing or pushing. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} This tutorial uses *@you@* to denote your username. Replace *@you@* with your user name in all the following examples. diff --git a/doc/user/topics/tutorial-job1.html.textile.liquid b/doc/user/topics/tutorial-job1.html.textile.liquid index cf09804871..b687d714c3 100644 --- a/doc/user/topics/tutorial-job1.html.textile.liquid +++ b/doc/user/topics/tutorial-job1.html.textile.liquid @@ -6,7 +6,7 @@ title: "Running a Crunch job on the command line" This tutorial introduces how to run individual Crunch jobs using the @arv@ command line tool. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} You will create a job to run the "hash" Crunch script. The "hash" script computes the MD5 hash of each file in a collection. diff --git a/doc/user/topics/tutorial-trait-search.html.textile.liquid b/doc/user/topics/tutorial-trait-search.html.textile.liquid index 976f16e3a5..a95e30ddfd 100644 --- a/doc/user/topics/tutorial-trait-search.html.textile.liquid +++ b/doc/user/topics/tutorial-trait-search.html.textile.liquid @@ -6,7 +6,7 @@ title: "Querying the Metadata Database" This tutorial introduces the Arvados Metadata Database. The Metadata Database stores information about files in Keep. This example will use the Python SDK to find public WGS (Whole Genome Sequencing) data for people who have reported a certain medical condition. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} In the tutorial examples, three angle brackets (>>>) will be used to denote code to enter at the interactive Python prompt. diff --git a/doc/user/tutorials/running-external-program.html.textile.liquid b/doc/user/tutorials/running-external-program.html.textile.liquid index da6df59c4d..ab310152e9 100644 --- a/doc/user/tutorials/running-external-program.html.textile.liquid +++ b/doc/user/tutorials/running-external-program.html.textile.liquid @@ -6,7 +6,7 @@ title: "Using Crunch to run external programs" This tutorial demonstrates how to use Crunch to run an external program by writting a wrapper using the Python SDK. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} In this tutorial, you will use the external program @md5sum@ to compute hashes instead of the built-in Python library used in earlier tutorials. diff --git a/doc/user/tutorials/tutorial-firstscript.html.textile.liquid b/doc/user/tutorials/tutorial-firstscript.html.textile.liquid index 5365b5aed7..570f74c412 100644 --- a/doc/user/tutorials/tutorial-firstscript.html.textile.liquid +++ b/doc/user/tutorials/tutorial-firstscript.html.textile.liquid @@ -7,7 +7,7 @@ title: "Writing a pipeline" In this tutorial, we will write the "hash" script demonstrated in the first tutorial. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} This tutorial uses *@you@* to denote your username. Replace *@you@* with your user name in all the following examples. diff --git a/doc/user/tutorials/tutorial-keep.html.textile.liquid b/doc/user/tutorials/tutorial-keep.html.textile.liquid index fac3530373..3546c5c101 100644 --- a/doc/user/tutorials/tutorial-keep.html.textile.liquid +++ b/doc/user/tutorials/tutorial-keep.html.textile.liquid @@ -6,8 +6,7 @@ title: "Storing and Retrieving data using Keep" This tutorial introduces you to the Arvados file storage system. - -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} The Arvados distributed file system is called *Keep*. Keep is a content-addressable file system. This means that files are managed using special unique identifiers derived from the _contents_ of the file, rather than human-assigned file names (specifically, the MD5 hash). This has a number of advantages: * Files can be stored and replicated across a cluster of servers without requiring a central name server. diff --git a/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid b/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid index 045b8ec41e..efcc8757fd 100644 --- a/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid +++ b/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid @@ -6,7 +6,7 @@ title: "Writing a multi-step pipeline" A pipeline in Arvados is a collection of crunch scripts, in which the output from one script may be used as the input to another script. -*This tutorial assumes that you are "logged into an Arvados VM instance":{{site.baseurl}}/user/getting_started/ssh-access.html#login, and have a "working environment.":{{site.baseurl}}/user/getting_started/check-environment.html* +{% include 'tutorial_expectations' %} This tutorial uses *@you@* to denote your username. Replace *@you@* with your user name in all the following examples. -- 2.30.2