Merge branch 'cc/replace-edit'

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index fce585388c773f89bec19fdfb639f92651e62450..44c970ce18143e2a45c9f5364535e26508b50317 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -148,8 +148,8 @@ the same local time zone.
 [verse]
 config key: svn-remote.<name>.ignore-paths
 +
-If the ignore-paths config key is set and the command line option is
-also given, both regular expressions will be used.
+If the ignore-paths configuration key is set, and the command-line
+option is also given, both regular expressions will be used.
 +
 Examples:
 +