Sync with 1.8.0.2

* maint:
Git 1.8.0.2
Documentation/git-stash.txt: add a missing verb
git(1): remove a defunct link to "list of authors"

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 0aa4e20eaed524ee01ae4bee11873efaedf44124..711ffe17a7574511de6c20cb85b6cdd5a4fff5a5 100644 (file)
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -144,7 +144,7 @@ drop [-q|--quiet] [<stash>]::
 
        Remove a single stashed state from the stash list. When no `<stash>`
        is given, it removes the latest one. i.e. `stash@{0}`, otherwise
-       `<stash>` must a valid stash log reference of the form
+       `<stash>` must be a valid stash log reference of the form
        `stash@{<revision>}`.
 
 create::

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbe0883534438a8908e7f811f978e25972c18111..e643683b3aa3e8772083bd7ee0add76fd628b74d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.8.0.1/git.html[documentation for release 1.8.0.1]
+* link:v1.8.0.2/git.html[documentation for release 1.8.0.2]
 
 * release notes for
+  link:RelNotes/1.8.0.2.txt[1.8.0.2],
   link:RelNotes/1.8.0.1.txt[1.8.0.1],
   link:RelNotes/1.8.0.txt[1.8.0].
 
@@ -868,8 +869,7 @@ Authors
 -------
 Git was started by Linus Torvalds, and is currently maintained by Junio
 C Hamano. Numerous contributions have come from the git mailing list
-<git@vger.kernel.org>. For a more complete list of contributors, see
-http://git-scm.com/about. If you have a clone of git.git itself, the
+<git@vger.kernel.org>.  If you have a clone of git.git itself, the
 output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
 the authors for specific parts of the project.