Merge branch 'maint'

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 99f3c1ea6c41b1cda7069f82bd8e38bbbe27a711..b09bd9761faa42f2bc87306ee5c1890647dce769 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -243,7 +243,7 @@ where <name> is the name of the SVN repository as specified by the -R option to
 
 --username;;
        Specify the SVN username to perform the commit as.  This option overrides
-       configuration property 'username'.
+       the 'username' configuration property.
 
 --commit-url;;
        Use the specified URL to connect to the destination Subversion