Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 6 insertions, 6 deletions

diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index afabddb7f9..0a0cbc8ec6 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -11,9 +11,9 @@ Differences between Vim and Vi				*vi-differences*
 ==============================================================================
 1. Limits						*limits*
 
-Vim has only a few limits for the files that can be edited {Vi: can not handle
+Vim has only a few limits for the files that can be edited. Vi cannot handle
 <Nul> characters and characters above 128, has limited line length, many other
-limits}.
+limits.
 
 Maximum line length	   2147483647 characters
 Maximum number of lines	   2147483647 lines
@@ -44,7 +44,7 @@ kept in memory:  Command-line history, error messages for Quickfix mode, etc.
 
 Support for different systems.
 	Vim can be used on:
-	- Modern Unix systems (*BSD, Linux, etc.)
+	- Modern Unix systems (BSD, Linux, etc.)
 	- Windows (XP SP 2 or greater)
 	- OS X
 
@@ -180,12 +180,12 @@ Command-line editing and history.			|cmdline-editing|
 	forward/backward one character.  The shifted right/left cursor keys
 	can be used to move forward/backward one word.  CTRL-B/CTRL-E can be
 	used to go to the begin/end of the command-line.
-	{Vi: can only alter the last character in the line}
-	{Vi: when hitting <Esc> the command-line is executed.  This is
+	(Vi: can only alter the last character in the line)
+	(Vi: when hitting <Esc> the command-line is executed.  This is
 	unexpected for most people; therefore it was changed in Vim.  But when
 	the <Esc> is part of a mapping, the command-line is executed.  If you
 	want the Vi behaviour also when typing <Esc>, use ":cmap ^V<Esc>
-	^V^M"}
+	^V^M")
 							|cmdline-history|
 	The command-lines are remembered.  The up/down cursor keys can be used
 	to recall previous command-lines.  The 'history' option can be set to