diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index aba12a1..83f81ad 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 17
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1603,6 +1603,8 @@
 setwinvar( {nr}, {varname}, {val})	set {varname} in window {nr} to {val}
 simplify( {filename})		String	simplify filename as much as possible
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
+spellbadword()			String	badly spelled word at cursor
+spellsuggest({word} [, {max}])	List	spelling suggestions
 split( {expr} [, {pat} [, {keepempty}]])
 				List	make List from {pat} separated {expr}
 strftime( {format}[, {time}])	String	time in specified format
@@ -3757,6 +3759,27 @@
 			   return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
 			endfunc
 			let sortedlist = sort(mylist, "MyCompare")
+<
+
+							*spellbadword()*
+spellbadword()	Return the badly spelled word under or after the cursor.
+		The cursor is advanced to the start of the bad word.
+		When no bad word is found in the cursor line an empty String
+		is returned and the cursor doesn't move.
+
+							*spellsuggest()*
+spellsuggest({word} [, {max}])
+		Return a List with spelling suggestions to replace {word}.
+		When {max} is given up to this number of suggestions are
+		returned.  Otherwise up to 25 suggestions are returned.
+
+		{word} can be a badly spelled word followed by other text.
+		This allows for joining two words that were split.  The
+		suggestions then also include the following text.
+
+		The spelling information for the current window is used.  The
+		'spell' option must be set and 'spelllang' is relevant.
+
 
 split({expr} [, {pattern} [, {keepempty}]])			*split()*
 		Make a List out of {expr}.  When {pattern} is omitted or empty
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 94bd9f4..a2c05f9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 17
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5662,6 +5662,25 @@
 	idea to set 'spelllang' after setting 'encoding'.
 	More info at |spell|.
 
+						*'spellsuggest'* *'sps'*
+'spellsuggest' 'sps'	string	(default "best")
+			global
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Method used for spelling suggestions |z?|.  Can be one of these
+	values:
+
+	best		Method that works best for English.  Finds small
+			changes and uses some sound-a-like scoring.
+	double		Uses two methods and mixes the results.  The first
+			method is finding small changes, the other method
+			computes how much the suggestion sounds like the bad
+			word.  Can be slow and doesn't always give better
+			results.
+	fast		Only check for small changes.
+
+
 			*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
 'splitbelow' 'sb'	boolean	(default off)
 			global
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 4c7a1a8..7013e6d 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 19
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -92,6 +92,12 @@
 			higher the score the more different).
 			The score may be slightly wrong for words with
 			multi-byte characters.
+			When a word was replaced the redo command "." will
+			repeat the word replacement.  This works like "ciw",
+			the good word and <Esc>.
+
+The 'spellsuggest' option influences how the list of suggestions is generated
+and sorted.  See |'spellsuggest'|.
 
 
 PERFORMANCE
@@ -337,7 +343,7 @@
 	/regions=uscagb				regions "us", "ca" and "gb"
 	example					word for all regions
 	/1blah					word for region 1 "us"
-	/!Vim					bad word
+	/!vim					bad word
 	/?3Campbell				rare word in region 3 "gb"
 	/='s mornings				keep-case word
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 7ec2e28..ce4807a 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5130,6 +5130,7 @@
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
+help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -6274,6 +6275,8 @@
 spell-syntax	spell.txt	/*spell-syntax*
 spell-wordlist-format	spell.txt	/*spell-wordlist-format*
 spell.txt	spell.txt	/*spell.txt*
+spellbadword()	eval.txt	/*spellbadword()*
+spellsuggest()	eval.txt	/*spellsuggest()*
 split()	eval.txt	/*split()*
 splitfind	windows.txt	/*splitfind*
 splitview	windows.txt	/*splitview*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 06a8fbc..6159b8f 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 19
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,9 +30,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Can define a function with illegal name (Servatius Brandt):
-    function F{-1}()
-
 Add extra list of file locations.  Can be used with:
     :ltag	      list of matching tags, like :tselect
 
@@ -56,6 +53,8 @@
     Patch from Sergey Khorev, 2005 Apr 11
     Add has("balloon_multiline")
 
+Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June 20)
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
@@ -100,14 +99,22 @@
 -   Add SPELLCHECKER, with support for many languages.
     - Spell checking code todo's:
 	- Code for making suggestions:
-	  - Hebrew: also use prefixes for suggestions.
+	  - ":mkspell" runs out of memory for Polish with utf-8.
 	  - When 'spellfile' directory doesn't exist, ask user to create it?
+	  - When 'spelllang' has more than one language only .add file of
+	    first is used?
 	  - Aspell has the "special" character, useful?
+	  - Can "the the" be added as a bad word?
+		Add BAD item in .aff file, set WF_BANNED flag.
+	  - Simple and fast sound-a-like: mapping list for first char and rest
+		    vowel as first char: *
+		    remove other vowels
+	  - How about words that are split over two lines?  E.g., "et al.".
 	  - When putting map string in .spl file check for duplicate chars.
-	  - GUI: Selecting text doesn't work at the prompt.
-	  - Should "z?" replacement be redo-able with "."?
+	  - Hebrew: also use prefixes for suggestions.  See message from
+	    Kaminsky (June 20) for ideas.
 	  - The sound-folding doesn't work for multi-byte characters.  It's
-	    very slow too.  Prepare the table (remove alternatives)?
+	    very slow too.
 	- Also put list of word characters in word list file.  Otherwise the
 	  one for Italian may differ from the one used for English.
 	- Make "en-rare" spell file.
@@ -121,8 +128,8 @@
 	http://spellchecker.mozdev.org/source.html
 	http://whiteboard.openoffice.org/source/browse/whiteboard/lingucomponent/source/spellcheck/myspell/
       author: Kevin Hendricks <kevin.hendricks@sympatico.ca>
-    - Update option window for 'verbosefile', 'spell', 'spellfile' and
-      'spelllang'.
+    - Update option window for 'verbosefile', 'spell', 'spellfile',
+      'spellsuggest' and 'spelllang'.
     - Distribution: Need wordlists for many languages; "language pack"
       Put them on the ftp site, ready to download.  Include README for
       copyrights.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index fa89204..40002dd 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 17
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1137,5 +1137,8 @@
 setbufvar() and setwinvar() did not give error messages.
 
 It was possible to set a variable with an illegal name, e.g. with setbufvar().
+It was possible to define a function with illegal name, e.t. ":func F{-1}()"
+
+CTRL-W F and "gf" didn't use the same method to get the file name.
 
  vim:tw=78:ts=8:ft=help:norl: