Thread (4 messages) 4 messages, 1 author, 2016-06-15

[PATCH 2/3] Improve description of SHA1 related topics in glossary-content.txt

flat view
DORMANTno replies SUPERSEDED

From: Thomas Ackermann <hidden>
Date: 2016-06-15 22:56:36
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

Revision v1 of 3 in this series.

Revisions (3)
  1. v1 current
  2. v2 [diff vs current]
  3. v3 [diff vs current]
Signed-off-by: Thomas Ackermann <redacted>
---
 Documentation/glossary-content.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index ab02238..05bfebc 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -146,7 +146,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
@@ -230,10 +230,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 <<def_SHA1,SHA1>> hash
+	of the object's contents. The object name is usually represented by the 
+	40 character hexadecimal encoding of the hash value.
 
 [[def_object_type]]object type::
 	One of the identifiers "<<def_commit_object,commit>>",
@@ -426,7 +425,8 @@ should not be combined with other pathspec.
 	Source code management (tool).
 
 [[def_SHA1]]SHA1::
-	Synonym for <<def_object_name,object name>>.
+	"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
-- 
1.8.1.msysgit.1


---
Thomas
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help