From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2012 20:27:10 +0000 (-0700)
Subject: Merge branch 'jc/doc-git-updates' (early part)
X-Git-Tag: v1.7.12~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/91e4bfe96f1e72a3ce743fe032bfadfc9509fc2a?ds=inline;hp=-c

Merge branch 'jc/doc-git-updates' (early part)

* 'jc/doc-git-updates' (early part):
Documentation: update URL for formatted pages
---

91e4bfe96f1e72a3ce743fe032bfadfc9509fc2a
diff --combined Documentation/git.txt
index 677eb95995,df1f7d221c..eb6b2c0117
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -33,7 -33,7 +33,7 @@@ as defined in the configuration file (s
  
  Formatted and hyperlinked version of the latest git
  documentation can be viewed at
- `http://www.kernel.org/pub/software/scm/git/docs/`.
+ `http://git-htmldocs.googlecode.com/git/git.html`.
  
  ifdef::stalenotes[]
  [NOTE]
@@@ -44,16 -44,6 +44,16 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.11.5/git.html[documentation for release 1.7.11.5]
 +
 +* release notes for
 +  link:RelNotes/1.7.11.5.txt[1.7.11.5],
 +  link:RelNotes/1.7.11.4.txt[1.7.11.4],
 +  link:RelNotes/1.7.11.3.txt[1.7.11.3],
 +  link:RelNotes/1.7.11.2.txt[1.7.11.2],
 +  link:RelNotes/1.7.11.1.txt[1.7.11.1],
 +  link:RelNotes/1.7.11.txt[1.7.11].
 +
  * link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
  
  * release notes for
@@@ -739,7 -729,7 +739,7 @@@ othe
  
  'GIT_EDITOR'::
  	This environment variable overrides `$EDITOR` and `$VISUAL`.
 -	It is used by several git comands when, on interactive mode,
 +	It is used by several git commands when, on interactive mode,
  	an editor is to be launched. See also linkgit:git-var[1]
  	and the `core.editor` option in linkgit:git-config[1].