Merge branch 'sn/doc-opt-notation' into next

* sn/doc-opt-notation:
  Fix {update,checkout}-index usage strings
  Put a space between `<' and argument in pack-objects usage string
  Remove stray quotes in --pretty and --format documentation
  Use parentheses and `...' where appropriate
  Fix odd markup in --diff-filter documentation
  Use angles for placeholders consistently

Conflicts:
	Documentation/git-repack.txt
	Documentation/merge-strategies.txt

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc Documentation/git-daemon.txt
index 685aa58cec823e69acc8f247e019ebdb8e9415ce,2f0ddf6fe817ab7b59fb5f5276ba688447661ee3..5054f790a140b43640d1e4d68a032d95da3daaca
--- 1/Documentation/git-daemon.txt
--- 2/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@@ -85,13 -85,12 +85,13 @@@ OPTION
        be either an IPv4 address or an IPv6 address if supported.  If IPv6
        is not supported, then --listen=hostname is also not supported and
        --listen must be given an IPv4 address.
 +      Can be given more than once.
        Incompatible with '--inetd' option.
  
- --port=n::
+ --port=<n>::
        Listen on an alternative port.  Incompatible with '--inetd' option.
  
- --init-timeout=n::
+ --init-timeout=<n>::
        Timeout between the moment the connection is established and the
        client request is received (typically a rather low value, since
        that should be basically immediate).

diff --cc Documentation/git-repack.txt
index 9566727f7ad6c1690571f7321f79da951c8c6b50,af79b86516764617163b020ec3c4d9bbeda9fe9b..27f7865b061cc96398f7aa052d162723e1f9255e
--- 1/Documentation/git-repack.txt
--- 2/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
 -'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------

diff --cc Documentation/git-show-branch.txt
Simple merge

diff --cc Documentation/git-update-index.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge

diff --cc Documentation/merge-strategies.txt
index 77f26061d66fa24c57e169e75cff542e1223e12e,8676e26ca20311196d069ab28c08c913271c7631..595a3cf1a7118ba29a1d57d7fc17d233d89cd3d0
--- 1/Documentation/merge-strategies.txt
--- 2/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@@ -74,11 -52,7 +74,11 @@@ no-renormalize;
        Disables the `renormalize` option.  This overrides the
        `merge.renormalize` configuration variable.
  
- subtree[=path];;
 +rename-threshold=<n>;;
 +      Controls the similarity threshold used for rename detection.
 +      See also linkgit:git-diff[1] `-M`.
 +
+ subtree[=<path>];;
        This option is a more advanced form of 'subtree' strategy, where
        the strategy makes a guess on how two trees must be shifted to
        match with each other when merging.  Instead, the specified path

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc builtin/commit-tree.c
Simple merge

diff --cc daemon.c
Simple merge

diff --cc fast-import.c
Simple merge

diff --cc git-am.sh
Simple merge

diff --cc git-relink.perl
Simple merge