Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint

* gp/avoid-explicit-mention-of-dot-git-refs:
  Fix ".git/refs" stragglers

diff --cc Documentation/config.txt
index bbba728d09bbb578f86c1ef171d24b53c1178fa3,91f37be12740631324ba0eeaa7f3b351b24b2e20..b3023b817244d5b315f8e3227eaa87fd888ecf95
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -442,8 -422,8 +442,8 @@@ core.sharedRepository:
        See linkgit:git-init[1]. False by default.
  
  core.warnAmbiguousRefs::
 -      If true, git will warn you if the ref name you passed it is ambiguous
 +      If true, Git will warn you if the ref name you passed it is ambiguous
-       and might match multiple refs in the .git/refs/ tree. True by default.
+       and might match multiple refs in the repository. True by default.
  
  core.compression::
        An integer -1..9, indicating a default compression level.

diff --cc Documentation/gitcli.txt
Simple merge