[ARVADOS] updated: 406b3de5426bf0d63564410cf6caf2834ba2b7bb

git at public.curoverse.com git at public.curoverse.com
Tue Aug 18 15:36:59 EDT 2015


Summary of changes:
 .../_tutorial_git_repo_expectations.liquid         |  2 +-
 .../add-new-repository.html.textile.liquid         |  2 +-
 .../git-arvados-guide.html.textile.liquid          | 21 +++++++-----
 .../tutorial-submit-job.html.textile.liquid        | 39 ++--------------------
 4 files changed, 17 insertions(+), 47 deletions(-)

       via  406b3de5426bf0d63564410cf6caf2834ba2b7bb (commit)
      from  39c9193f03471aa7826769b34d6b55890a2c98a3 (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 406b3de5426bf0d63564410cf6caf2834ba2b7bb
Author: Bryan Cosca <bcosc at curoverse.com>
Date:   Tue Aug 18 15:36:53 2015 -0400

    6862: Moved clone arvados repository from tutorial-submit-job to git-arvados-guide, fixed some headers to include Arvados repository

diff --git a/doc/_includes/_tutorial_git_repo_expectations.liquid b/doc/_includes/_tutorial_git_repo_expectations.liquid
index 57c5553..c6ff50d 100644
--- a/doc/_includes/_tutorial_git_repo_expectations.liquid
+++ b/doc/_includes/_tutorial_git_repo_expectations.liquid
@@ -1,3 +1,3 @@
 {% include 'notebox_begin' %}
-This tutorial assumes that you have a working Arvados repository. If you do not have a repository created, you can follow the "Adding a new repository":{{site.baseurl}}/user/tutorials/add-new-repository.html page. We will use the *$USER/tutorial* repository created in that page as the example.
+This tutorial assumes that you have a working Arvados repository. If you do not have a repository created, you can follow the instructions in the "Adding a new repository":{{site.baseurl}}/user/tutorials/add-new-repository.html page. We will use the *$USER/tutorial* repository created in that page as the example.
 {% include 'notebox_end' %}
diff --git a/doc/user/tutorials/add-new-repository.html.textile.liquid b/doc/user/tutorials/add-new-repository.html.textile.liquid
index d2a17a4..84de5ff 100644
--- a/doc/user/tutorials/add-new-repository.html.textile.liquid
+++ b/doc/user/tutorials/add-new-repository.html.textile.liquid
@@ -1,7 +1,7 @@
 ---
 layout: default
 navsection: userguide
-title: Adding a new Arvados repository
+title: Adding a new Arvados git repository
 ...
 
 Arvados repositories are managed through the Git revision control system. You can use these repositories to store your crunch scripts and run them in the arvados cluster.
diff --git a/doc/user/tutorials/git-arvados-guide.html.textile.liquid b/doc/user/tutorials/git-arvados-guide.html.textile.liquid
index 482d8d5..cabe43d 100644
--- a/doc/user/tutorials/git-arvados-guide.html.textile.liquid
+++ b/doc/user/tutorials/git-arvados-guide.html.textile.liquid
@@ -4,14 +4,19 @@ navsection: userguide
 title: Working with an Arvados git repository
 ...
 
-Working with an Arvados git repository is analogous to working with other public repositories. If you are already familiar with git, feel free to skip this part of the documentation.
-
-This tutorial describes how to work with a new Arvados git repository. It will show you how to upload custom scripts to a remote Arvados repository, so you can use it in Arvados pipelines.
+This tutorial describes how to work with a new Arvados git repository. Working with an Arvados git repository is analogous to working with other public git repositories. It will show you how to upload custom scripts to a remote Arvados repository, so you can use it in Arvados pipelines.
 
 {% include 'tutorial_expectations' %}
 
 {% include 'tutorial_git_repo_expectations' %}
 
+{% include 'notebox_begin' %}
+For more information about using Git, try
+<notextile>
+<pre><code>$ <span class="userinput">man gittutorial</span></code></pre>
+</notextile> or *"search Google for Git tutorials":http://google.com/#q=git+tutorial*.
+{% include 'notebox_end' %}
+
 h2. Cloning an Arvados repository
 
 Before you start using Git, you should do some basic configuration (you only need to do this the first time):
@@ -43,17 +48,17 @@ Ignore any warning that you are cloning an empty repository.
 </pre>
 </notextile>
 
-h2. Creating a git branch
+h2. Creating a git branch in an Arvados repository
 
 <notextile>
 <pre><code>~$ <span class="userinput">cd tutorial</span>
-<span class="userinput">git checkout -b tutorial_branch</span>
+~$ <span class="userinput">git checkout -b tutorial_branch</span>
 </code></pre>
 </notextile>
 
-h2. Adding a script to git
+h2. Adding files or scripts to an Arvados repository
 
-First, create a new file in the local repository.
+Create a file named *tutorial.txt* in the local repository.
 
 <notextile>
 <pre><code>~$ <span class="userinput">echo 'hello world' > tutorial.txt</span>
@@ -67,7 +72,7 @@ Next, add the new file to the git index.
 </code></pre>
 </notextile>
 
-Next, commit all the changes to the local repository, along with a message of what you've accomplished.
+Next, commit all the changes to the local repository, along with a commit message tht describes what this script does.
 
 <notextile>
 <pre><code>~$ <span class="userinput">git commit -a -m "Added tutorial.txt"</span>
diff --git a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
index dc1c849..fb04695 100644
--- a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid
@@ -13,44 +13,9 @@ This tutorial uses @$USER@ to denote your username.  Replace @$USER@ with your u
 
 Also, this tutorial uses the @tutorial@ arvados repository created in "Adding a new arvados repository":add-new-repository.html as the example repository.
 
-h2. Clone arvados repository
+h2. Clone Arvados repository
 
-All Crunch scripts are managed through the Git revision control system.  Before you start using Git, you should do some basic configuration (you only need to do this the first time):
-
-<notextile>
-<pre><code>~$ <span class="userinput">git config --global user.name "Your Name"</span>
-~$ <span class="userinput">git config --global user.email $USER at example.com</span></code></pre>
-</notextile>
-
-On the Arvados Workbench, click on the dropdown menu icon <span class="fa fa-lg fa-user"></span> <span class="caret"></span> in the upper right corner of the top navigation menu to access the user settings menu, and click on the menu item *Repositories*. In the *Repositories* page, you should see the @$USER/tutorial@ repository listed in the *name* column.  Next to *name* is the column *URL*. Copy the *URL* value associated with your repository.  This should look like <notextile><code>https://git.{{ site.arvados_api_host }}/$USER/tutorial.git</code></notextile>. Alternatively, you can use <notextile><code>git at git.{{ site.arvados_api_host }}:$USER/tutorial.git</code></notextile>
-
-Next, on the Arvados virtual machine, clone your Git repository:
-
-<notextile>
-<pre><code>~$ <span class="userinput">cd $HOME</span> # (or wherever you want to install)
-~$ <span class="userinput">git clone https://git.{{ site.arvados_api_host }}/$USER/tutorial.git</span>
-Cloning into 'tutorial'...</code></pre>
-</notextile>
-
-This will create a Git repository in the directory called @tutorial@ in your home directory. Say yes when prompted to continue with connection.
-Ignore any warning that you are cloning an empty repository.
-
-*Note:* If you are prompted for username and password when you try to git clone using this command, you may first need to update your git configuration. Execute the following commands to update your git configuration.
-
-<notextile>
-<pre>
-<code>~$ <span class="userinput">git config 'credential.https://git.{{ site.arvados_api_host }}/.username' none</span></code>
-<code>~$ <span class="userinput">git config 'credential.https://git.{{ site.arvados_api_host }}/.helper' '!cred(){ cat >/dev/null; if [ "$1" = get ]; then echo password=$ARVADOS_API_TOKEN; fi; };cred'</span></code>
-</pre>
-</notextile>
-
-{% include 'notebox_begin' %}
-For more information about using Git, try
-
-notextile. <pre><code>$ <span class="userinput">man gittutorial</span></code></pre>
-
-or go to our "Working with an Arvados Git Repository page":{{site.baseurl}}/user/tutorials/add-new-repository.html, or *"search Google for Git tutorials":http://google.com/#q=git+tutorial*.
-{% include 'notebox_end' %}
+Please clone the tutorial repository using the instructions from "Working with Arvados git repository":git-arvados-guide.html.
 
 h2. Creating a Crunch script
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list