Merge branch 'maint'

* maint:
User's Manual: remove duplicated url at the end of Appendix B

diff --combined Documentation/user-manual.txt
index da9c6b2999c28501511b8d31e705176ddc9cc3c1,b6533fa206a37aaccbb9f78712839e31ac94856e..9f527d3b2e75df15d3114404f9590f2ba47f41ea
--- 1/Documentation/user-manual.txt
--- 2/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -18,22 -18,12 +18,22 @@@ People needing to do actual developmen
  Further chapters cover more specialized topics.
  
  Comprehensive reference documentation is available through the man
 -pages.  For a command such as "git clone <repo>", just use
 +pages, or linkgit:git-help[1] command.  For example, for the command
 +"git clone <repo>", you can either use:
  
  ------------------------------------------------
  $ man git-clone
  ------------------------------------------------
  
 +or:
 +
 +------------------------------------------------
 +$ git help clone
 +------------------------------------------------
 +
 +With the latter, you can use the manual viewer of your choice; see
 +linkgit:git-help[1] for more information.
 +
  See also <<git-quick-start>> for a brief overview of git commands,
  without any explanation.
  
@@@ -4366,9 -4356,7 +4366,9 @@@ $ git remote show example       # get detail
  * remote example
    URL: git://example.com/project.git
    Tracked remote branches
 -    master next ...
 +    master
 +    next
 +    ...
  $ git fetch example           # update branches from example
  $ git branch -r                       # list all remote branches
  -----------------------------------------------
@@@ -4572,4 -4560,3 +4572,3 @@@ Alternates, clone -reference, etc
  More on recovery from repository corruption.  See:
        http://marc.theaimsgroup.com/?l=git&m=117263864820799&w=2
        http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2
-       http://marc.theaimsgroup.com/?l=git&m=117147855503798&w=2