diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 06c8b5d..a1d2450 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 Jul 20
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,37 +30,6 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-About HTML tag pairing: http://www.w3.org/TR/html4/index/elements.html
-
-":e *.foo" completion with file name starting with "+" should be escaped.
-
-VMS patch for term.c also in Vim 6.3 (Zoltan Arpadffy)
-
-Make_cyg.mak files for Vim 6.3 from Tony Mechelynck?
-
-Add extra list of file locations.  Can be used with:
-    :ltag	      list of matching tags, like :tselect
-
-    :lnext	      next location
-    :lprevious :lNext previous location
-    :lnfile	      location in next file
-    :lNfile :lpfile   location in previous file
-    :lrewind :lfirst  first location
-    :llast	      last location
-    :ll [N]	      go to location N (current one if N omitted)
-    :lwindow	      open window with locations (separate from quickfix window)
-    :lopen	      open window with locations
-    :lclose	      close window with locations
-    :llist	      list locations
-    :lfile	      read locations from file using 'errorformat'
-    :lgetfile	      idem, don't jump to first one
-    :lbuffer	      idem, from current buffer.
-
-Win32: Balloon text can't contain line break.
-    Hints for multiline tooltips from Alexei Alexandrov (2005 Mar 26)
-    Patch from Sergey Khorev, 2005 Apr 11
-    Add has("balloon_multiline")
-
 Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June 20)
 
 Netrw plugin problems:
@@ -268,6 +237,25 @@
 
 Add gui_mch_browsedir() for Motif, KDE and Mac OS/X.
 
+Add extra list of file locations.  A bit like the quickfix list, but there is
+one per window.  Can be used with:
+    :ltag	      list of matching tags, like :tselect
+Commands to use the location list:
+    :lnext	      next location
+    :lprevious :lNext previous location
+    :lnfile	      location in next file
+    :lNfile :lpfile   location in previous file
+    :lrewind :lfirst  first location
+    :llast	      last location
+    :ll [N]	      go to location N (current one if N omitted)
+    :lwindow	      open window with locations (separate from quickfix window)
+    :lopen	      open window with locations
+    :lclose	      close window with locations
+    :llist	      list locations
+    :lfile	      read locations from file using 'errorformat'
+    :lgetfile	      idem, don't jump to first one
+    :lbuffer	      idem, from current buffer.
+
 7   Add a ":cstring" command.  Works like ":cfile" but reads from a string
     variable.  Also accept a list variable?  Patch from Yegappan Lakshmanan.
     2005 Feb 17  Now it's ":cexpr".
@@ -3137,6 +3125,8 @@
 Various improvements:
 7   [t to move to previous xml/html tag (like "vatov"), ]t to move to next
     ("vatv").
+7   [< to move to previous xml/html tag, e.g., previous <li>. ]< to move to
+    next <li>, ]< to next </li>, [< to previous </li>.
 8   Add ":rename" command: rename the file of the current buffer and rename
     the buffer.  Buffer may be modified.
 -   Perhaps ":cexpr" could read errors from a list?
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index cf7f036..0bd1e7d 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 Jul 20
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -367,7 +367,7 @@
 |foldtextresult()|  	the text displayed for a closed fold at line "lnum"
 |function()|		make a Funcref out of a function name
 |get()|			get an item from a List or Dictionary
-|getbufline()|		get a line or list of lines from a specified buffer
+|getbufline()|		get a list of lines from a specified buffer
 			(Yegappan Lakshmanan)
 |getfontname()| 	get actual font name being used
 |getfperm()|		get file permission string (Nikolai Weibull)
@@ -695,6 +695,9 @@
 user-defined completion function should return the completion candidates as a
 Vim List and the returned results are not filtered by Vim.
 
+Win32: Balloons can have multiple lines if common controls supports it.
+(Sergey Khorev)
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
@@ -1190,4 +1193,8 @@
 Win32: When using the "Edit with Vim" entry the file name was limited to about
 200 characters.
 
+When using command line completion for ":e *foo" and the file "+foo" exists
+the resulting command ":e +foo" doesn't work.  Now insert a backslash: ":e
+\+foo".
+
  vim:tw=78:ts=8:ft=help:norl: