Merge branch 'jc/spht'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 9ff4659d8c021465758332270aeaa2c88a593b14..1574ecd77eccc586c62b745465bffb80baf67ce7 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -101,9 +101,9 @@ OPTIONS
 
 --help::
        Prints the synopsis and a list of the most commonly used
-       commands.  If a git command is named this option will bring up
-       the man-page for that command. If the option '--all' or '-a' is
-       given then all available commands are printed.
+       commands. If the option '--all' or '-a' is given then all
+       available commands are printed. If a git command is named this
+       option will bring up the manual page for that command.
 
 --exec-path::
        Path to wherever your core git programs are installed.
@@ -536,7 +536,7 @@ Authors
 -------
 * git's founding father is Linus Torvalds <torvalds@osdl.org>.
 * The current git nurse is Junio C Hamano <gitster@pobox.com>.
-* The git potty was written by Andres Ericsson <ae@op5.se>.
+* The git potty was written by Andreas Ericsson <ae@op5.se>.
 * General upbringing is handled by the git-list <git@vger.kernel.org>.
 
 Documentation