# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1339877640 14400
# Node ID aa95955970420e2869891b9f2b4e417226416fb5
# Parent  fa2312e930b186d4fef060f7e226e6aab41287d9
oxford it

diff -r fa2312e930b1 -r aa9595597042 chapters/35.markdown
--- a/chapters/35.markdown	Sat Jun 16 16:12:39 2012 -0400
+++ b/chapters/35.markdown	Sat Jun 16 16:14:00 2012 -0400
@@ -133,7 +133,7 @@
     :echo join(foo, '---')
     :echo join([1, 2, 3], '')
 
-Vim displays "a b", "a---b" and "123".  `join` will join the items in the given
+Vim displays "a b", "a---b", and "123".  `join` will join the items in the given
 list together into a string, separated by the given separator string (or a space
 if none is given), coercing each item to a string if necessary/possible.