v2, 3 partsSome small fixes to glossary-content.txt

> -[[def_dircache]]dircache::
> -	You are *waaaaay* behind. See <<def_index,index>>.
> -
> ...
> -[[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_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>>.

>  Documentation/glossary-content.txt | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 5a7a486..4dd0a52 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -153,7 +153,7 @@ to point at the new commit.
>  	created. Configured via the `.git/info/grafts` file.
>  
>  [[def_hash]]hash::
> -	In Git's context, synonym to <<def_object_name,object name>>.
> +	In Git's context, synonym for <<def_object_name,object name>>.
>  
>  [[def_head]]head::
>  	A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
> @@ -225,7 +225,7 @@ This commit is referred to as a "merge commit", or sometimes just a
>  
>  [[def_object]]object::
>  	The unit of storage in Git. It is uniquely identified by the
> -	<<def_SHA1,SHA1>> of its contents. Consequently, an
> +	<<def_SHA1,SHA-1>> of its contents. Consequently, an
>  	object can not be changed.
>  
>  [[def_object_database]]object database::
> @@ -237,10 +237,9 @@ This commit is referred to as a "merge commit", or sometimes just a
>  	Synonym for <<def_object_name,object name>>.
>  
>  [[def_object_name]]object name::
> -	The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
> -	of the object's contents using the Secure Hash Algorithm
> -	1 and usually represented by the 40 character hexadecimal encoding of
> -	the <<def_hash,hash>> of the object.
> +	The unique identifier of an <<def_object,object>>.  The
> +	object name is usually represented by a 40 character
> +	hexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>
>  
>  [[def_object_type]]object type::
>  	One of the identifiers "<<def_commit_object,commit>>",
> @@ -376,7 +375,7 @@ should not be combined with other pathspec.
>  	to the result.
>  
>  [[def_ref]]ref::
> -	A 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that
> +	A 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that
>  	denotes a particular <<def_object,object>>. They may be stored in
>  	a file under `$GIT_DIR/refs/` directory, or
>  	in the `$GIT_DIR/packed-refs` file.
> @@ -432,8 +431,9 @@ should not be combined with other pathspec.
>  [[def_SCM]]SCM::
>  	Source code management (tool).
>  
> -[[def_SHA1]]SHA1::
> -	Synonym for <<def_object_name,object name>>.
> +[[def_SHA1]]SHA-1::
> +	"Secure Hash Algorithm 1"; a cryptographic hash function. 
> +	In the context of Git used as a synonym for <<def_object_name,object name>>.
>  
>  [[def_shallow_repository]]shallow repository::
>  	A shallow <<def_repository,repository>> has an incomplete
> @@ -447,7 +447,7 @@ should not be combined with other pathspec.
>  	its history can be later deepened with linkgit:git-fetch[1].
>  
>  [[def_symref]]symref::
> -	Symbolic reference: instead of containing the <<def_SHA1,SHA1>>
> +	Symbolic reference: instead of containing the <<def_SHA1,SHA-1>>
>  	id itself, it is of the format 'ref: refs/some/thing' and when
>  	referenced, it recursively dereferences to this reference.
>  	'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic

> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
> ---
> [snip]
>
>  [[def_object_name]]object name::
> -	The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
> -	of the object's contents using the Secure Hash Algorithm
> -	1 and usually represented by the 40 character hexadecimal encoding of
> -	the <<def_hash,hash>> of the object.
> +	The unique identifier of an <<def_object,object>>.  The
> +	object name is usually represented by a 40 character
> +	hexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>

> ---
>  Documentation/glossary-content.txt | 64 ++------------------------------------
>  1 file changed, 2 insertions(+), 62 deletions(-)
>
> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> index 4dd0a52..f21678d 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -268,59 +268,7 @@ This commit is referred to as a "merge commit", or sometimes just a
>  	pack.
>  
>  [[def_pathspec]]pathspec::
> -       Pattern used to specify paths.
> -+
> -Pathspecs are used on the command line of "git ls-files", "git
> -ls-tree", "git add", "git grep", "git diff", "git checkout",
> -and many other commands to
> -limit the scope of operations to some subset of the tree or
> -worktree.  See the documentation of each command for whether
> -paths are relative to the current directory or toplevel.  The
> -pathspec syntax is as follows:
> -
> -* any path matches itself
> -* the pathspec up to the last slash represents a
> -  directory prefix.  The scope of that pathspec is
> -  limited to that subtree.
> -* the rest of the pathspec is a pattern for the remainder
> -  of the pathname.  Paths relative to the directory
> -  prefix will be matched against that pattern using fnmatch(3);
> -  in particular, '*' and '?' _can_ match directory separators.
> -+
> -For example, Documentation/*.jpg will match all .jpg files
> -in the Documentation subtree,
> -including Documentation/chapter_1/figure_1.jpg.
> -
> -+
> -A pathspec that begins with a colon `:` has special meaning.  In the
> -short form, the leading colon `:` is followed by zero or more "magic
> -signature" letters (which optionally is terminated by another colon `:`),
> -and the remainder is the pattern to match against the path. The optional
> -colon that terminates the "magic signature" can be omitted if the pattern
> -begins with a character that cannot be a "magic signature" and is not a
> -colon.
> -+
> -In the long form, the leading colon `:` is followed by a open
> -parenthesis `(`, a comma-separated list of zero or more "magic words",
> -and a close parentheses `)`, and the remainder is the pattern to match
> -against the path.
> -+
> -The "magic signature" consists of an ASCII symbol that is not
> -alphanumeric.
> -+
> ---
> -top `/`;;
> -	The magic word `top` (mnemonic: `/`) makes the pattern match
> -	from the root of the working tree, even when you are running
> -	the command from inside a subdirectory.
> ---
> -+
> -Currently only the slash `/` is recognized as the "magic signature",
> -but it is envisioned that we will support more types of magic in later
> -versions of Git.
> -+
> -A pathspec with only a colon means "there is no pathspec". This form
> -should not be combined with other pathspec.
> +       Pattern used to limit paths in Git commands.
>  
>  [[def_parent]]parent::
>  	A <<def_commit_object,commit object>> contains a (possibly empty) list
> @@ -389,15 +337,7 @@ should not be combined with other pathspec.
>  [[def_refspec]]refspec::
>  	A "refspec" is used by <<def_fetch,fetch>> and
>  	<<def_push,push>> to describe the mapping between remote
> -	<<def_ref,ref>> and local ref. They are combined with a colon in
> -	the format <src>:<dst>, preceded by an optional plus sign, +.
> -	For example: `git fetch $URL
> -	refs/heads/master:refs/heads/origin` means "grab the master
> -	<<def_branch,branch>> <<def_head,head>> from the $URL and store
> -	it as my origin branch head". And `git push
> -	$URL refs/heads/master:refs/heads/to-upstream` means "publish my
> -	master branch head as to-upstream branch at $URL". See also
> -	linkgit:git-push[1].
> +	<<def_ref,ref>> and local ref. 
>  
>  [[def_remote_tracking_branch]]remote-tracking branch::
>  	A regular Git <<def_branch,branch>> that is used to follow changes from