Merge branch 'ta/doc-config-adoc-fixes'

Various AsciiDoc markup fixes in 'git config' documentation and
related files to ensure lists and formatting are rendered correctly.

* ta/doc-config-adoc-fixes:
  doc: git-config: escape erroneous highlight markup
  doc: config/sideband: fix description list delimiter
  doc: config: terminate runaway lists

diff --cc Documentation/config.adoc
Simple merge

diff --cc Documentation/config/safe.adoc
index 5b1690aebe8f58e5af7e55cabe486e4a8219b689,5ae4476b24cbd7ffbcac8941eb7cce62ed5c7a44..99fbfc06188c523ffe4039c3c99a5b41cc374a0d
--- 1/Documentation/config/safe.adoc
--- 2/Documentation/config/safe.adoc
+++ b/Documentation/config/safe.adoc
@@@ -2,12 -2,12 +2,14 @@@ safe.bareRepository:
        Specifies which bare repositories Git will work with. The currently
        supported values are:
  +
 -* `all`: Git works with all bare repositories. This is the default.
+ --
 +* `all`: Git works with all bare repositories. This is the default in
 +  Git 2.x.
  * `explicit`: Git only works with bare repositories specified via
    the top-level `--git-dir` command-line option, or the `GIT_DIR`
 -  environment variable (see linkgit:git[1]).
 +  environment variable (see linkgit:git[1]). This will be the default
 +  in Git 3.0.
+ --
  +
  If you do not use bare repositories in your workflow, then it may be
  beneficial to set `safe.bareRepository` to `explicit` in your global

diff --cc Documentation/config/sideband.adoc
Simple merge