Merge branch 'master' into next

* master:
  Documentation: git aliases
  git-cvsserver asciidoc formatting tweaks
  config.txt grammar, typo, and asciidoc fixes
  Documentation: git-ls-tree (typofix)
  Document git-ls-tree --fullname
  Document git aliases support
  make clean: remove dist-doc targets.
  Misc doc improvements
  Documentation: add missing docs make check-docs found.
  Some doc typo fixes
  Off-by-one error in get_path_prefix(), found by Valgrind
  gitk: Re-read the descendent/ancestor tag & head info on update

diff --combined Documentation/git-read-tree.txt
index 1c01d00,d894f53..11bd9c0
--- 1/Documentation/git-read-tree.txt
--- 2/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@@ -8,7 -8,7 +8,7 @@@ git-read-tree - Reads tree information 
  
  SYNOPSIS
  --------
 -'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
 +'git-read-tree' (<tree-ish> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]])
  
  
  DESCRIPTION
@@@ -63,15 -63,6 +63,15 @@@ OPTION
  * when both sides adds a path identically.  The resolution
    is to add that path.
  
 +--prefix=<prefix>/::
 +      Keep the current index contents, and read the contents
 +      of named tree-ish under directory at `<prefix>`.  The
 +      original index file cannot have anything at the path
 +      `<prefix>` itself, and have nothing in `<prefix>/`
 +      directory.  Note that the `<prefix>/` value must end
 +      with a slash.
 +
 +
  <tree-ish#>::
        The id of the tree object(s) to be read/merged.
  
@@@ -266,7 -257,7 +266,7 @@@ file that does not match stage 2
  This is done to prevent you from losing your work-in-progress
  changes, and mixing your random changes in an unrelated merge
  commit.  To illustrate, suppose you start from what has been
- commited last to your repository:
+ committed last to your repository:
  
  ----------------
  $ JC=`git-rev-parse --verify "HEAD^0"`