summaryrefslogtreecommitdiff
path: root/contrib/svn-fe
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 12:00:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-08 12:00:28 -0700
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /contrib/svn-fe
parentMerge branch 'mh/update-ref-batch-create-fix' (diff)
parentcode and test: fix misuses of "nor" (diff)
downloadtgif-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'contrib/svn-fe')
-rw-r--r--contrib/svn-fe/svn-fe.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index 1128ab2ce4..a3425f4770 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -40,8 +40,8 @@ manual page.
NOTES
-----
Subversion dumps do not record a separate author and committer for
-each revision, nor a separate display name and email address for
-each author. Like git-svn(1), 'svn-fe' will use the name
+each revision, nor do they record a separate display name and email
+address for each author. Like git-svn(1), 'svn-fe' will use the name
---------
user <user@UUID>