Use capitalized names where appropriate

The Linux kernel and Emacs are both spelled capitalized

Signed-off-by: Henrik Austad <henrik@austad.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 7892244ef19d507379489de0cc81ad18b936c6af..458fafdb2cc7e54c5e2f49ca5854e6ec9fe581ee 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -590,7 +590,7 @@ list.  When the history has lines of development that diverged and
 then merged back together, the order in which 'git-log' presents
 those commits is meaningless.
 
 then merged back together, the order in which 'git-log' presents
 those commits is meaningless.
 

-Most projects with multiple contributors (such as the linux kernel,
+Most projects with multiple contributors (such as the Linux kernel,

 or git itself) have frequent merges, and 'gitk' does a better job of
 visualizing their history.  For example,
 
 or git itself) have frequent merges, and 'gitk' does a better job of
 visualizing their history.  For example,
 


@@ -642,7 +642,7 @@ digressions that may be interesting at this point are:
 
   * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
     series of git commits into emailed patches, and vice versa,
 
   * linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
     series of git commits into emailed patches, and vice versa,

-    useful for projects such as the linux kernel which rely heavily
+    useful for projects such as the Linux kernel which rely heavily

     on emailed patches.
 
   * linkgit:git-bisect[1]: When there is a regression in your
     on emailed patches.
 
   * linkgit:git-bisect[1]: When there is a regression in your

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d4b1e90f941e0d2481c5414799af55db0b7948b6..5242a7e97b994b4a8d62b7cff2f4045166b797e6 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -59,7 +59,7 @@ project in mind, here are some interesting examples:
 ------------------------------------------------
        # git itself (approx. 10MB download):
 $ git clone git://git.kernel.org/pub/scm/git/git.git
 ------------------------------------------------
        # git itself (approx. 10MB download):
 $ git clone git://git.kernel.org/pub/scm/git/git.git

-       # the linux kernel (approx. 150MB download):
+       # the Linux kernel (approx. 150MB download):

 $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 ------------------------------------------------
 
 $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 ------------------------------------------------
 


@@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on
 MERGE_HEAD, and which touch an unmerged file.
 
 You may also use linkgit:git-mergetool[1], which lets you merge the
 MERGE_HEAD, and which touch an unmerged file.
 
 You may also use linkgit:git-mergetool[1], which lets you merge the

-unmerged files using external tools such as emacs or kdiff3.
+unmerged files using external tools such as Emacs or kdiff3.

 
 Each time you resolve the conflicts in a file and update the index:
 
 
 Each time you resolve the conflicts in a file and update the index: