Make help entries alphabetical

[git.git] / Documentation / glossary-content.txt

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index f981fee4e541324049976dafd6a42955d0eca75d..9afca755ed309b5bdf3cd293d6120f676f1053cd 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -87,11 +87,10 @@ to point at the new commit.
        source code management tools.
 
 [[def_DAG]]DAG::
-       Directed acyclic graph. The <<def_commit,commit>> objects form a
+       Directed acyclic graph. The <<def_commit_object,commit objects>> form a
        directed acyclic graph, because they have parents (directed), and the
-       graph of commit objects is acyclic (there is no
-       <<def_chain,chain>> which begins and ends with the same
-       <<def_object,object>>).
+       graph of commit objects is acyclic (there is no <<def_chain,chain>>
+       which begins and ends with the same <<def_object,object>>).
 
 [[def_dangling_object]]dangling object::
        An <<def_unreachable_object,unreachable object>> which is not
@@ -184,7 +183,8 @@ to point at the new commit.
        and potentially aborted, and allow for a post-notification after the
        operation is done. The hook scripts are found in the
        `$GIT_DIR/hooks/` directory, and are enabled by simply
-       making them executable.
+       removing the `.sample` suffix from the filename. In earlier versions
+       of git you had to make them executable.
 
 [[def_index]]index::
        A collection of files with stat information, whose contents are stored
@@ -247,9 +247,10 @@ This commit is referred to as a "merge commit", or sometimes just a
        the <<def_hash,hash>> of the object.
 
 [[def_object_type]]object type::
-       One of the identifiers
-       "<<def_commit,commit>>","<<def_tree,tree>>","<<def_tag,tag>>" or "<<def_blob_object,blob>>"
-       describing the type of an <<def_object,object>>.
+       One of the identifiers "<<def_commit_object,commit>>",
+       "<<def_tree_object,tree>>", "<<def_tag_object,tag>>" or
+       "<<def_blob_object,blob>>" describing the type of an
+       <<def_object,object>>.
 
 [[def_octopus]]octopus::
        To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an