git-tar-tree: no more void pointer arithmetic

[git.git] / Documentation / tutorial-2.txt

diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index a3d45ee..894ca5e 100644 (file)
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -49,7 +49,7 @@ tree
 
 A tree can refer to one or more "blob" objects, each corresponding to
 a file.  In addition, a tree can also refer to other tree objects,
-thus creating a directory heirarchy.  You can examine the contents of
+thus creating a directory hierarchy.  You can examine the contents of
 any tree using ls-tree (remember that a long enough initial portion
 of the SHA1 will also work):
 
@@ -136,7 +136,7 @@ The "tree" object here refers to the new state of the tree:
 ------------------------------------------------
 $ git ls-tree d0492b36
 100644 blob a0423896973644771497bdc03eb99d5281615b51    file.txt
-$ git cat-file commit a0423896
+$ git cat-file blob a0423896
 hello world!
 ------------------------------------------------
 
@@ -214,7 +214,7 @@ $ git diff
 +++ b/file.txt
 @@ -1 +1,2 @@
  hello world!
- +hello world, again
++hello world, again
 $ git update-index file.txt
 $ git diff
 ------------------------------------------------
@@ -230,7 +230,7 @@ index a042389..513feba 100644
 +++ b/file.txt
 @@ -1 +1,2 @@
  hello world!
- +hello world, again
++hello world, again
 ------------------------------------------------
 
 So "git diff" is comparing against something other than the head.
@@ -375,9 +375,9 @@ What next?
 
 At this point you should know everything necessary to read the man
 pages for any of the git commands; one good place to start would be
-with the commands mentioned in link:everday.html[Everyday git].  You
+with the commands mentioned in link:everyday.html[Everyday git].  You
 should be able to find any unknown jargon in the
-link:glossary.html[Glosssay].
+link:glossary.html[Glossary].
 
 The link:cvs-migration.html[CVS migration] document explains how to
 import a CVS repository into git, and shows how to use git in a