diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
index d3b03d8..80773af 100644
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
+*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2005 Oct 03
 
 by Gustavo Niemeyer ~
 
@@ -26,13 +26,13 @@
 |spec_chglog_format| set, the plugin will ask you for an email address
 to use in this edit session.
 
-Everytime you run the plugin, it will check to see if the last entry
-in the changelog has been written today and by you.  If it's the entry
-mathes, it will just insert a new changelog item, otherwise it will
-create a new changelog entry.  If you are running with
-|spec_chglog_release_info| enabled, it will also check if the name, version
-and release matches.  The plugin is smart enough to ask you if it should
-update the package release, if you have not done so.
+Every time you run the plugin, it will check to see if the last entry in the
+changelog has been written today and by you.  If the entry matches, it will
+just insert a new changelog item, otherwise it will create a new changelog
+entry.  If you are running with |spec_chglog_release_info| enabled, it will
+also check if the name, version and release matches.  The plugin is smart
+enough to ask you if it should update the package release, if you have not
+done so.
 
 Setting a map					*spec-setting-a-map*
 -------------
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 8471698..0382490 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 Sep 30
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Oct 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,15 +30,13 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Support subdirectories in plugin directory?  (Nikolai Weibull)
+test32 hangs.  When 'complete' is ".,w" finding match in other window.
 
-When scrolling starts, remember what script/line caused this, so that we know
-what caused the hit-enter prompt?  (Charles Campbell)
-
+Undercurl doesn't work in HTML italic. (Michal Bozon)
 When 'foldcolumn' is 1 show more + to be able to open all folds? (Donohue)
 
 ccomplete:
-- How to use a popup menu?
+- When completing something that is a structure, add the "." or "->".
 - When a typedef or struct is local to a file only use it in that file?
 
 Mac unicode patch (Da Woon Jung):
@@ -79,10 +77,7 @@
     make it work for all completion methods.
 
     UI:
-    - Display the list of choices right under the place where they
-      would be inserted in a kind of meny (use scrollbar when there are many
-      alternatives).
-      At first in a terminal, then add GUI implementations.
+    - GUI implementation of the popup menu.
     - When using tags, show match in preview window (function prototype,
       struct member, etc.).
       Or use one window for matches, another for context/info (Doug Kearns,
@@ -3645,6 +3640,11 @@
 
 
 Far future and "big" extensions:
+-   Instead of using a Makefile and autoconf, use a simple shell script to
+    find the C compiler and do everything with C code.  Translate something
+    like an Aap recipe and configure.in to C.  Avoids depending on Python,
+    thus will work everywhere.  With batch file to find the C compiler it
+    would also work on MS-Windows.
 -   Make it easy to setup Vim for groups of users: novice vi users, novice
     Vim users, C programmers, xterm users, GUI users,...
 -   Change layout of blocks in swap file: Text at the start, with '\n' in
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 4659863..6d2d57e 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 08
+*usr_05.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -327,6 +327,9 @@
 That's all!  Now you can use the commands defined in this plugin to justify
 text.
 
+If your plugin directory is getting full: You can also put them subdirecties.
+For example, use "~/.vim/plugin/perl/*.vim" for all your Perl plugins.
+
 
 FILETYPE PLUGINS			*add-filetype-plugin* *ftplugins*
 
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 3b53a4d..cd7e7e6 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 Sep 30
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -194,7 +194,12 @@
 The 'omnifunc' option is set by filetype plugins to define the function that
 figures out the completion.
 
-Currently only C is supported. |ft-c-omni|
+Currently supported languages:
+	C	|ft-c-omni|
+	XHTML	|ft-html-omni|
+
+When the 'completeopt' option contains "menu" then matches for Insert mode
+completion are displayed in a popup menu.
 
 
 KDE support						*new-KDE*
@@ -366,6 +371,7 @@
 'completefunc'		The name of a function used for user-specified Insert
 			mode completion.  CTRL-X CTRL-U can be used in Insert
 			mode to do any kind of completion.  (Taro Muraoka)
+'completeopt'		Enable popup menu for Insert mode completion.
 'omnifunc'		The name of a function used for omni completion.
 'quoteescape'		Characters used to escape quotes inside a string.
 			Used for the a", a' and a` text objects. |a'|
@@ -603,6 +609,9 @@
 'scrolljump' can be set to a negative number to scroll a percentage of the
 window height.
 
+The |v:scrollstart| variable has been added to help finding the location in
+your script that causes the hit-enter prompt.
+
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
 
@@ -826,6 +835,9 @@
 When the 'include' option contains \zs the file name found is what is being
 matched from \zs to the end or \ze.  Useful to pass more to 'includeexpr'.
 
+Loading plugins on startup now supports subdirectories in the plugin
+directory. |load-plugins|
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*