From 3ab501209b46e83a377ac5a781a8f2fef7f4f30c Mon Sep 17 00:00:00 2001
From: Thomas Ackermann
Date: Mon, 15 Apr 2013 19:47:50 +0200
Subject: [PATCH] glossary: improve description of SHA-1 related topics
The name of the hash function is "SHA-1", not "SHA1".
Also to people who look up "object name" in the glossary,
the details of which hash function is applied on what to
compute "object name" is not important but the fact that the
name is meant to be an unique identifier for the contents
stored in the object is.
Signed-off-by: Thomas Ackermann
Signed-off-by: Junio C Hamano
---
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 5a7a486aab..7f87f560c8 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 <>.
+ In Git's context, synonym for <>.
[[def_head]]head::
A <> to the <> 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
- <> of its contents. Consequently, an
+ <> 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::
- The unique identifier of an <>. The <>
- of the object's contents using the Secure Hash Algorithm
- 1 and usually represented by the 40 character hexadecimal encoding of
- the <> of the object.
+ The unique identifier of an <>. The
+ object name is usually represented by a 40 character
+ hexadecimal string. Also colloquially called <>.
[[def_object_type]]object type::
One of the identifiers "<>",
@@ -376,7 +375,7 @@ should not be combined with other pathspec.
to the result.
[[def_ref]]ref::
- A 40-byte hex representation of a <> or a name that
+ A 40-byte hex representation of a <> or a name that
denotes a particular <>. 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_SHA1]]SHA-1::
+ "Secure Hash Algorithm 1"; a cryptographic hash function.
+ In the context of Git used as a synonym for <>.
[[def_shallow_repository]]shallow repository::
A shallow <> 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 <>
+ Symbolic reference: instead of containing the <>
id itself, it is of the format 'ref: refs/some/thing' and when
referenced, it recursively dereferences to this reference.
'<>' is a prime example of a symref. Symbolic
--
2.11.4.GIT