diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 66e6d30..5b9a541 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
+*repeat.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -290,7 +290,7 @@
 the first line ends in a <CR>, but following ones don't, you will get an error
 message, because the <CR> from the first lines will be lost.
 
-Macintosh: Files that are read with ":source" normally have <CR> <EOL>s.
+Mac Classic: Files that are read with ":source" normally have <CR> <EOL>s.
 These always work.  If you are using a file with <NL> <EOL>s (for example, a
 file made on Unix), this will be recognized if 'fileformats' is not empty and
 the first line does not end in a <CR>.  Be careful not to use a file with <NL>
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 8e86ec7..4f238c0 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 14
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -25,9 +25,9 @@
 This switches on the 'spell' option and specifies to check for US English.
 
 The words that are not recognized are highlighted with one of these:
-	SpellBad	word not recognized
-	SpellRare	rare word
-	SpellLocal	wrong spelling for selected region
+	SpellBad	word not recognized			|hl-SpellBad|
+	SpellRare	rare word				|hl-SpellRare|
+	SpellLocal	wrong spelling for selected region	|hl-SpellLocal|
 
 Vim only checks words for spelling, there is no grammar check.
 
@@ -63,9 +63,10 @@
 			'spellfile'.  In Visual mode the selected characters
 			are added as a word (including white space!).
 
-							*:spellg* *:spellgood*
-:spellg[ood] {word}	Add [word} as a good word to 'spellfile'.
+							*:spe* *:spellgood*
+:spe[llgood] {word}	Add [word} as a good word to 'spellfile'.
 
+							*:spellw* *:spellwrong*
 :spellw[rong] {word}	Add [word} as a wrong (bad) word to 'spellfile'.
 
 After adding a word to 'spellfile' its associated ".spl" file will
@@ -117,7 +118,7 @@
 	en_us		USA
 
 Words that are not used in one region but are used in another region are
-highlighted with |SpellLocal|.
+highlighted with SpellLocal |hl-SpellLocal|.
 
 Always use lowercase letters for the language and region names.
 
@@ -223,7 +224,7 @@
 	http://lingucomponent.openoffice.org/spell_dic.html
 You can also use a plain word list.
 
-:mksp[ell] [-ascii] {outname} {inname} ...		*:mksp* *:mkspell*
+:mksp[ell][!] [-ascii] {outname} {inname} ...		*:mksp* *:mkspell*
 			Generate a Vim spell file word lists.  Example: >
 		:mkspell nl nl_NL.words
 <
@@ -233,6 +234,9 @@
 			{outname}.{encoding}.spl.  {encoding} is the value of
 			the 'encoding' option.
 
+			When the output file already exists [!] must be added
+			to overwrite it.
+
 			When the [-ascii] argument is present, words with
 			non-ascii characters are skipped.  The resulting file
 			ends in "ascii.spl".
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e26fa90..c1d4b7e 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 14
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,8 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+synID() no longer works.
+
 Range(0) should return an empty list (Servatius Brandt).
 
 :let @= 'asdf' gives confusing error message.  Make @= writable?
@@ -77,6 +79,9 @@
 Include new PHP indent script from John Wellesz?
     http://www.vim.org/scripts/download_script.php?src_id=4330
 
+In Vim indenting use synID() to avoid recognizing "|en" in a string as
+"|endif".
+
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
   script names and a help file and produces a script that can be sourced to
@@ -88,6 +93,9 @@
     helpfile doc/myscript.txt
   For the "helpfile" item ":helptags" is run.
 
+For List comparing, consider [4] and ['4'] different? (Servatius Brandt)
+Also allows strict comparing for ordinary variables.
+
 Patch to alternate fold highlighting.  (Anthony Iano-Fletcher, 2005 May 12)
 More levels?
 
@@ -105,9 +113,18 @@
 	- Code for making suggestions:
 	  - Aspell has the "special" character, useful?
 	  - The score is a bit wrong for substituting multi-byte characters.
+	    At the head byte remember how may bytes are still to follow, do
+	    the scoring at the tail byte.  But don't even try when the score
+	    plus the minimal penalty (similar char) goes over maximum.
 	  - similar_chars() is too slow.
-	  - Swapping works with bytes instead of characters.
-	  - The sound-folding doesn't work for multi-byte characters.
+		use a lookuptable for single-byte
+		use a hashtable for multi-byte
+		support letter appearing in several lists?
+	  - 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 "."?
+	  - The sound-folding doesn't work for multi-byte characters.  It's
+	    very slow too.  Prepare the table (remove alternatives)?
 	- 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.
@@ -182,6 +199,7 @@
     - Put the list of choices right under the place where they would be
       inserted.
     - Pre-expand abbreviations, show which abbrevs would match?
+    - Completion in .NET framework SharpDevelop: http://www.icsharpcode.net
 -   UNDO TREE: keep all states of the text, don't delete undo info.
     When making a change, instead of clearing any future undo (thus redo)
     info, make a new branch.
@@ -288,7 +306,7 @@
 
 Win32: Patch for Korean IME. (Yusung, 2005 March 21)
 
-When "= evaluation results in a list, use it as a sequence of lines.
+When "= evaluation results in a List, use it as a sequence of lines.
 
 Support ":set syntax=cpp.doxygen"?  Suggested patch by Michael Geddes (9 Aug
 2004).  Should also work for 'filetype'.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 322137f..127c93a 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 13
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -657,6 +657,10 @@
 Added ":scriptnames" to bugreport.vim, so that we can see what plugins were
 used.
 
+Win32: If the user changes the setting for the number of lines a scroll wheel
+click scrolls it is now used immediately.  Previously Vim would need to be
+restarted.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*