Merge branch 'kh/branch-ref-syntax-advice'

When git refuses to create a branch because the proposed branch
name is not a valid refname, an advice message is given to refer
the user to exact naming rules.

* kh/branch-ref-syntax-advice:
  branch: advise about ref syntax rules
  advice: use double quotes for regular quoting
  advice: use backticks for verbatim
  advice: make all entries stylistically consistent
  t3200: improve test style

diff --cc Documentation/config/advice.txt
index dde8e7840ef38225995549411fbcf9305b160c37,06c754899c553e2dcca7bec4c3083a9b1aa88e22..f83341165367baac4f02779eedf432822644e615
--- 1/Documentation/config/advice.txt
--- 2/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@@ -123,23 -126,20 +126,23 @@@ advice.*:
                by linkgit:git-switch[1] or
                linkgit:git-checkout[1] when switching branches.
        statusUoption::
-               Advise to consider using the `-u` option to linkgit:git-status[1]
-               when the command takes more than 2 seconds to enumerate untracked
-               files.
+               Shown when linkgit:git-status[1] takes more than 2
+               seconds to enumerate untracked files, to tell the user that
+               they can use the `-u` option.
        submoduleAlternateErrorStrategyDie::
-               Advice shown when a submodule.alternateErrorStrategy option
+               Shown when a submodule.alternateErrorStrategy option
                configured to "die" causes a fatal error.
 +      submoduleMergeConflict::
 +              Advice shown when a non-trivial submodule merge conflict is
 +              encountered.
        submodulesNotUpdated::
-               Advice shown when a user runs a submodule command that fails
+               Shown when a user runs a submodule command that fails
                because `git submodule update --init` was not run.
        suggestDetachingHead::
-               Advice shown when linkgit:git-switch[1] refuses to detach HEAD
+               Shown when linkgit:git-switch[1] refuses to detach HEAD
                without the explicit `--detach` option.
        updateSparsePath::
-               Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
+               Shown when either linkgit:git-add[1] or linkgit:git-rm[1]
                is asked to update index entries outside the current sparse
                checkout.
        waitingForEditor::

diff --cc advice.c
Simple merge

diff --cc advice.h
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc t/t3200-branch.sh
Simple merge