From: Thomas Ackermann <th.acker@arcor.de>
Date: Tue, 02 Apr 2013 09:26:57 GMT
Subject: [PATCH 1/3] Remove outdated/missleading/irrelevant entries from glossary-content.txt
Message-ID: <1051288663.727673.1364894817858.JavaMail.ngmail@webmail14.arcor-online.net>
In-Reply-To: <1481339149.727628.1364894663266.JavaMail.ngmail@webmail14.arcor-online.net>


Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
---
 Documentation/glossary-content.txt | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index eb7ba84..ab02238 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -5,7 +5,7 @@
 
 [[def_bare_repository]]bare repository::
 	A bare repository is normally an appropriately
-	named <<def_directory,directory>> with a `.git` suffix that does not
+	named directory with a `.git` suffix that does not
 	have a locally checked-out copy of any of the files under
 	revision control. That is, all of the Git
 	administrative and control files that would normally be present in the
@@ -79,7 +79,7 @@ to point at the new commit.
 	An <<def_object,object>> which contains the information about a
 	particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer,
 	author, date and the <<def_tree_object,tree object>> which corresponds
-	to the top <<def_directory,directory>> of the stored
+	to the top directory of the stored
 	revision.
 
 [[def_core_git]]core Git::
@@ -104,26 +104,11 @@ to point at the new commit.
 	an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any
 	particular branch.  In this case HEAD is said to be "detached".
 
-[[def_dircache]]dircache::
-	You are *waaaaay* behind. See <<def_index,index>>.
-
-[[def_directory]]directory::
-	The list you get with "ls" :-)
-
 [[def_dirty]]dirty::
 	A <<def_working_tree,working tree>> is said to be "dirty" if
 	it contains modifications which have not been <<def_commit,committed>> to the current
 	<<def_branch,branch>>.
 
-[[def_ent]]ent::
-	Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
-	http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
-	explanation. Avoid this term, not to confuse people.
-
-[[def_evil_merge]]evil merge::
-	An evil merge is a <<def_merge,merge>> that introduces changes that
-	do not appear in any <<def_parent,parent>>.
-
 [[def_fast_forward]]fast-forward::
 	A fast-forward is a special type of <<def_merge,merge>> where you have a
 	<<def_revision,revision>> and you are "merging" another
@@ -257,8 +242,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 	<<def_object,object>>.
 
 [[def_octopus]]octopus::
-	To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an
-	intelligent predator.
+	To <<def_merge,merge>> more than two <<def_branch,branches>>.
 
 [[def_origin]]origin::
 	The default upstream <<def_repository,repository>>. Most projects have
@@ -468,9 +452,7 @@ should not be combined with other pathspec.
 	object of an arbitrary type (typically a tag points to either a
 	<<def_tag_object,tag>> or a <<def_commit_object,commit object>>).
 	In contrast to a <<def_head,head>>, a tag is not updated by
-	the `commit` command. A Git tag has nothing to do with a Lisp
-	tag (which would be called an <<def_object_type,object type>>
-	in Git's context). A tag is most typically used to mark a particular
+	the `commit` command. A tag is most typically used to mark a particular
 	point in the commit ancestry <<def_chain,chain>>.
 
 [[def_tag_object]]tag object::
@@ -494,7 +476,7 @@ should not be combined with other pathspec.
 [[def_tree_object]]tree object::
 	An <<def_object,object>> containing a list of file names and modes along
 	with refs to the associated blob and/or tree objects. A
-	<<def_tree,tree>> is equivalent to a <<def_directory,directory>>.
+	<<def_tree,tree>> is equivalent to a directory.
 
 [[def_tree-ish]]tree-ish::
 	A <<def_ref,ref>> pointing to either a <<def_commit_object,commit
-- 
1.8.1.msysgit.1


---
Thomas