diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b4f71d2..9ee13e3 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 28
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -3781,8 +3781,8 @@
 soundfold({word})
 		Return the sound-folded equivalent of {word}.  Uses the first
 		language in 'spellang' for the current window that supports
-		soundfolding.  When no sound folding is possible the {word}
-		is returned unmodified.
+		soundfolding.  'spell' must be set.  When no sound folding is
+		possible the {word} is returned unmodified.
 		This can be used for making spelling suggestions.  Note that
 		the method can be quite slow.
 
@@ -3808,8 +3808,8 @@
 		first entry, thus this can be used to check spelling.
 
 		The spelling information for the current window is used.  The
-		'spell' option must be set and the value of 'spelllang' is
-		used.
+		'spell' option must be set and the values of 'spelllang' and
+		'spellsuggest' are used.
 
 
 split({expr} [, {pattern} [, {keepempty}]])			*split()*
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 6accc11..606a030 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 28
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -706,7 +706,8 @@
 	SAL C                    K ~
 	SAL K                    K ~
 
-TODO: explain how it works.
+An explantion how it works can be found in the Aspell manual:
+http://aspell.net/man-html/Phonetic-Code.html.
 
 There are a few special items:
 
@@ -716,4 +717,32 @@
 
 "1" has the same meaning as "true".  Any other value means "false".
 
+
+SIMPLE SOUNDFOLDING		*spell-affix-SOFOFROM* *spell-affix-SOFOTO*
+
+The SAL mechanism is complex and slow.  A simpler mechanism is mapping all
+characters to another character, mapping similar sounding characters to the
+same character.  At the same time this does case folding.  You can not have
+SAL items at the same time.
+
+There are two items required: one to speficy the characters that are mapped
+and one that specifies the characters they are mapped to.  They must have
+exactly the same number of characters.  Example:
+
+    SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ~
+    SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkes ~
+
+In the example all vowels are mapped to the same character 'e'.  Another
+method is to leave out all vowels.  Some characters that sound nearly the same
+and are often mixed up, such as 'm' and 'n', are mapped to the same character.
+Don't do this too much, all words will start looking alike.
+
+Characters that do not appear in SOFOFROM will be left out, except that all
+white space is replaced by one space.  Sequences of the same character in
+SOFOFROM are replaced by one.
+
+You can use the |soundfold()| function to try out the results.  Or set the
+'verbose' option to see the score in the output of the |z?| command.
+
+
  vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 8d9d152..67930a2 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2415,6 +2415,8 @@
 :spelld	spell.txt	/*:spelld*
 :spelldump	spell.txt	/*:spelldump*
 :spellgood	spell.txt	/*:spellgood*
+:spellr	spell.txt	/*:spellr*
+:spellrepall	spell.txt	/*:spellrepall*
 :spellw	spell.txt	/*:spellw*
 :spellwrong	spell.txt	/*:spellwrong*
 :split	windows.txt	/*:split*
@@ -3710,6 +3712,8 @@
 E75	vi_diff.txt	/*E75*
 E750	repeat.txt	/*E750*
 E751	spell.txt	/*E751*
+E752	spell.txt	/*E752*
+E753	spell.txt	/*E753*
 E754	spell.txt	/*E754*
 E756	spell.txt	/*E756*
 E758	spell.txt	/*E758*
@@ -5141,6 +5145,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*
@@ -6253,6 +6258,7 @@
 sniff-intro	if_sniff.txt	/*sniff-intro*
 sort()	eval.txt	/*sort()*
 sorting	change.txt	/*sorting*
+soundfold()	eval.txt	/*soundfold()*
 space	intro.txt	/*space*
 spec-customizing	pi_spec.txt	/*spec-customizing*
 spec-how-to-use-it	pi_spec.txt	/*spec-how-to-use-it*
@@ -6275,6 +6281,8 @@
 spell-affix-REP	spell.txt	/*spell-affix-REP*
 spell-affix-SAL	spell.txt	/*spell-affix-SAL*
 spell-affix-SFX	spell.txt	/*spell-affix-SFX*
+spell-affix-SOFOFROM	spell.txt	/*spell-affix-SOFOFROM*
+spell-affix-SOFOTO	spell.txt	/*spell-affix-SOFOTO*
 spell-affix-UPP	spell.txt	/*spell-affix-UPP*
 spell-affix-chars	spell.txt	/*spell-affix-chars*
 spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5973375..11b1c04 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 28
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,8 +30,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-send fixes for ccmalloc port to FreeBSD.
-
 Add extra list of file locations.  Can be used with:
     :ltag	      list of matching tags, like :tselect
 
@@ -99,13 +97,9 @@
 PLANNED FOR VERSION 7.0:
 
 -   Add SPELLCHECKER, with support for many languages.
-    - Spell checking code todo's:
-	- Code for making suggestions:
-	  - Hebrew: also use prefixes for suggestions.  See message from
-	    Kaminsky (June 20) for ideas.
-	  - Simple and fast sound-a-like: mapping list for first char and rest
-		    vowel as first char: *
-		    remove other vowels
+  - Spell checking code todo's:
+    - Dutch: badword "voorjaarsconferentie"; "najaarsconferentie" gets zero
+      soundfold score.
     - Proofread and cleanup spell help.
     - Use "engspchk" from Charles Campbell for ideas (commands, rare words).
     - Make "en-rare" spell file?  Ask Charles Campbell.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index f9a634c..00209a1 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 25
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -305,6 +305,7 @@
 			(idea by Hugo Haas)
 'spell'			switch spell checking on/off
 'spelllang'		languages to check spelling for
+'spellsuggest'		methods for spell suggestions
 'verbosefile'		Log messages in a file.
 
 
@@ -377,7 +378,10 @@
 |reverse()|		reverse the order of a List
 |setqflist()|		create a quickfix list (Yegappan Lakshmanan)
 |sort()|		sort a List
+|soundfold()|		get the sound-a-like equivalent of a word
 |split()|		split a String into a List
+|spellbadword()|	get a badly spelled word
+|spellsuggest()|	get suggestions for correct spelling
 |string()|		String representation of a List or Dictionary
 |system()|		Filters {input} through a shell command.
 |taglist()|		Get list of matching tags. (Yegappan Lakshmanan)
@@ -435,6 +439,8 @@
 
 Pascal indent file. (Neil Carter)
 
+Many filetype plugins and others from Nikolai Weibull.
+
 Moved all the indent settings from the filetype plugin to the indent file.
 Implemented b:undo_indent to undo indent settings when setting 'filetype' to a
 different value.
@@ -1146,4 +1152,11 @@
 
 CTRL-W F and "gf" didn't use the same method to get the file name.
 
+When reporting a conversion error the line number of the last error could be
+given.  Now report the first encountered error.
+
+When using ":e ++enc=name file" and iconv() was used for conversion an error
+caused a fallback to no conversion.  Now replace a character with '?' and
+continue.
+
  vim:tw=78:ts=8:ft=help:norl: