Merge branch 'kh/doc-markup-fixes' into next

Doc markup fixes.

* kh/doc-markup-fixes:
  doc: remove extra backtick for inline-verbatim
  doc: add missing backtick for inline-verbatim

diff --cc Documentation/fetch-options.adoc
index d3ac31f4e2a1a718f7704f985831ab0bca94ffea,65f7d1e7c7b435ac3334c85ac32aa5fa7bd1e749..ad1e1f49be181dad9aec102d14e1c7df732bf3ba
--- 1/Documentation/fetch-options.adoc
--- 2/Documentation/fetch-options.adoc
+++ b/Documentation/fetch-options.adoc
@@@ -1,8 -1,7 +1,8 @@@
 ---[no-]all::
 +--all::
 +--no-all::
        Fetch all remotes, except for the ones that has the
        `remote.<name>.skipFetchAll` configuration variable set.
-       This overrides the configuration variable fetch.all`.
+       This overrides the configuration variable `fetch.all`.
  
  -a::
  --append::

diff --cc Documentation/git-fast-import.adoc
Simple merge

diff --cc Documentation/git-multi-pack-index.adoc
index e8073bc272327cdad9f5637764f5eba3e90dc1f8,15b333041764be668c5f9fdb6c0445e698bd51c4..2f642697e9e106c3c4c96f7c22d66aec6c7a27f4
--- 1/Documentation/git-multi-pack-index.adoc
--- 2/Documentation/git-multi-pack-index.adoc
+++ b/Documentation/git-multi-pack-index.adoc
@@@ -25,11 -25,10 +25,11 @@@ OPTION
  +
  `<dir>` must be an alternate of the current repository.
  
 ---[no-]progress::
 +--progress::
 +--no-progress::
        Turn progress on/off explicitly. If neither is specified, progress is
        shown if standard error is connected to a terminal. Supported by
-       sub-commands `write`, `verify`, `expire`, and `repack.
+       sub-commands `write`, `verify`, `expire`, and `repack`.
  
  The following subcommands are available: