Merge branch '7582-run-any-docker-container' refs #7582

[arvados.git] / doc / user / tutorials / git-arvados-guide.html.textile.liquid

diff --git a/doc/user/tutorials/git-arvados-guide.html.textile.liquid b/doc/user/tutorials/git-arvados-guide.html.textile.liquid
index 482d8d524468922b9f87dc2c111cda9f2c2538bb..a46a1d9318a5a06e28d0be15e60ced23b076415d 100644 (file)
--- 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,19 @@ 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
+
+Create a git branch named *tutorial_branch* in the *tutorial* Arvados git 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.
+First, create a file named *tutorial.txt* in the local repository. Although this tutorial shows how to add a text file to Arvados, the same steps can be used to add any of your custom bash, R, or python scripts to an Arvados repository.
 
 <notextile>
 <pre><code>~$ <span class="userinput">echo 'hello world' > tutorial.txt</span>
@@ -67,18 +74,16 @@ 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 that describes what this script does.
 
 <notextile>
 <pre><code>~$ <span class="userinput">git commit -a -m "Added tutorial.txt"</span>
 </code></pre>
 </notextile>
 
-Next, push the changes in the local repository to the remote repository.
+Finally, push the changes in the local repository to the remote repository.
 
 <notextile>
 <pre><code>~$ <span class="userinput">git push origin tutorial_branch</span>
 </code></pre>
 </notextile>
-
-Although this tutorial showed how to add a text file to Arvados, this tutorial should also show the necessary steps for adding your custom bash, R, or python scripts to an Arvados repository.