doc: git-pull.txt use US spelling, fix minor typo

Signed-off-by: René Genz <liebundartig@freenet.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 4470e4b5747f2474868fc0322823fff6aa25b841..942af8e0f7166b49ca581eb099b59714f0a1c327 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you
 in a state that may be hard to back out of in the case of a conflict.
 
 If any of the remote changes overlap with local uncommitted changes,
 in a state that may be hard to back out of in the case of a conflict.
 
 If any of the remote changes overlap with local uncommitted changes,

-the merge will be automatically cancelled and the work tree untouched.
+the merge will be automatically canceled and the work tree untouched.

 It is generally best to get any local changes in working order before
 pulling or stash them away with linkgit:git-stash[1].
 
 It is generally best to get any local changes in working order before
 pulling or stash them away with linkgit:git-stash[1].
 


@@ -210,7 +210,8 @@ EXAMPLES
   current branch:
 +
 ------------------------------------------------
   current branch:
 +
 ------------------------------------------------

-$ git pull, git pull origin
+$ git pull
+$ git pull origin

 ------------------------------------------------
 +
 Normally the branch merged in is the HEAD of the remote repository,
 ------------------------------------------------
 +
 Normally the branch merged in is the HEAD of the remote repository,