X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=07df6b48be0aab9c711905a3109d90c7567cca3e;hb=2c4ed386e8861e730037abe4f4d9e032c5c46242;hp=a069b7bb0cfbdacfc0ac2dd2183981b806792805;hpb=d8ddb0a41610fffdf9ef1a256d19d5a27face9d7;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index a069b7bb..07df6b48 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -1,5 +1,5 @@
 object::
-	The unit of storage in GIT. It is uniquely identified by
+	The unit of storage in git. It is uniquely identified by
 	the SHA1 of its contents. Consequently, an object can not
 	be changed.
 
@@ -43,14 +43,14 @@ DAG::
 
 index::
 	A collection of files with stat information, whose contents are
-	stored as objects. The cache is a stored version of your working
+	stored as objects. The index is a stored version of your working
 	tree. Truth be told, it can also contain a second, and even a third
 	version of a working tree, which are used when merging.
 
 index entry::
 	The information regarding a particular file, stored in the index.
 	An index entry can be unmerged, if a merge was started, but not
-	yet finished (i.e. if the cache contains multiple versions of
+	yet finished (i.e. if the index contains multiple versions of
 	that file).
 
 unmerged index:
@@ -75,7 +75,7 @@ checkout::
 	stored in the object database.
 
 commit::
-	As a verb: The action of storing the current state of the cache in the
+	As a verb: The action of storing the current state of the index in the
 	object database. The result is a revision.
 	As a noun: Short hand for commit object.