"init-db" can really be just "init"

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7e560b0eea83ae7b32e17095f766d84c0b67671f..7c1a6592c112a76c23c2833537a13f40337c261c 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -188,11 +188,12 @@ octopus::
        predator.
 
 origin::
-       The default upstream tracking branch. Most projects have at
+       The default upstream repository. Most projects have at
        least one upstream project which they track. By default
        'origin' is used for that purpose.  New upstream updates
-       will be fetched into this branch; you should never commit
-       to it yourself.
+       will be fetched into remote tracking branches named
+       origin/name-of-upstream-branch, which you can see using
+       "git branch -r".
 
 pack::
        A set of objects which have been compressed into one file (to save
@@ -282,6 +283,13 @@ SCM::
 SHA1::
        Synonym for object name.
 
+symref::
+       Symbolic reference: instead of containing the SHA1 id itself, it
+       is of the format 'ref: refs/some/thing' and when referenced, it
+       recursively dereferences to this reference. 'HEAD' is a prime
+       example of a symref. Symbolic references are manipulated with
+       the gitlink:git-symbolic-ref[1] command.
+
 topic branch::
        A regular git branch that is used by a developer to
        identify a conceptual line of development.  Since branches