--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0d.  Last change: 2006 Apr 14
+*syntax.txt*	For Vim version 7.0d.  Last change: 2006 Apr 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -856,6 +856,53 @@ is used by default.  You may select the 
 If this variable is undefined or zero, btm syntax is selected.
 
 
+DOXYGEN						*doxygen.vim* *doxygen-syntax*
+
+Doxygen generates code documentation using a special documentation format
+(similar to Javadoc).  This syntax script adds doxygen highlighting to c, cpp
+and idl files, and should also work with java.
+
+There are a few of ways to turn on doxygen formatting. It can be done explicity
+or in a modeline by appending '.doxygen' to the syntax of the file. Example: >
+	:set syntax=c.doxygen
+or >
+	// vim:syntax=c.doxygen
+
+To use doxygen formatting on top of any filetype, add the following to your
+.vimrc for each filetype, replacing {filetype} with the relevent value. >
+	:let g:syntax_extra_{filetype}='doxygen'
+
+It can also be done automaticly for c, cpp and idl files by setting the global
+or buffer-local variable load_doxygen_syntax.  This is done by adding the
+following to your .vimrc. >
+	:let g:load_doxygen_syntax=1
+
+There are a couple of variables that have an affect on syntax highlighting, and
+are to do with non-standard highlighting options.
+
+Variable			Default	Effect ~
+g:doxygen_enhanced_color
+g:doxygen_enhanced_colour	0	Use non-standard highlighting for
+					doxygen comments.
+
+doxygen_my_rendering		0	Disable rendering of HTML bold, italic
+					and html_my_rendering underline.
+
+doxygen_javadoc_autobrief	1	Set to 0 to disable javadoc autobrief
+					colour highlighting.
+
+doxygen_end_punctuation		'[.]'	Set to regexp match for the ending
+					punctuation of brief 
+
+There are also some hilight groups worth mentioning as they can be useful in
+configuration.
+
+Highlight			Effect ~
+doxygenErrorComment		The colour of an end-comment when missing
+				punctuation in a code, verbatim or dot section
+doxygenLinkError		The colour of an end-comment when missing the
+				\endlink from a \link section.
+
 
 DTD						*dtd.vim* *ft-dtd-syntax*
 

--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0d.  Last change: 2006 Apr 14
+*todo.txt*      For Vim version 7.0d.  Last change: 2006 Apr 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,8 +30,6 @@ be worked on, but only if you sponsor Vi
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Do some of the 'cindent' bugs below.
-
 Add more tests for all new functionality in Vim 7.  Especially new functions.
 
 Win32: Describe how to do debugging. (George Reilly)
@@ -61,11 +59,8 @@ 7   Completion of network shares, patch 
 -   Patch for 'breakindent' option: repeat indent for wrapped line. (Vaclav
     Smilauer, 2004 Sep 13, fix Oct 31)
     Asked for improvements 2004 Dec 20.
-7   Make "5dd" on last-but-one-line not delete anything (Vi compatible).
-    Add flag in 'cpoptions' for this.  When not present, "2dd" in the last
-    line should delete the last line.  Patch from greenx 2002 Apr 11.
 8   Add a few more command names to the menus.  Patch from Jiri Brezina
-    (28 feb 2002).
+    (28 feb 2002).  Will mess the translations...
 7   ATTENTION dialog choices are more logical when "Delete it' appears
     before "Quit".  Patch by Robert Webb, 2004 May 3.
 -   Include flipcase patch: ~/vim/patches/wall.flipcase2 ?  Make it work
@@ -90,7 +85,7 @@ 8   Add functions:
 			Update 2004 Sep 10
 			Another patch from Edward L. Fox (2005 Nov 24)
 			Search in 'runtimepath'?
-			More docs about how to use this.
+			More docs needed about how to use this.
 			How to get the messages into the .po files?
     confirm()		add "flags" argument, with 'v' for vertical
 			    layout and 'c' for console dialog. (Haegg)
@@ -105,8 +100,8 @@ 7   Add patch from Benoit Cerrina to int
     quickfix window (2004 dec 2)
 7   When 'rightleft' is set, the search pattern should be displayed right
     to left as well?  See patch of Dec 26. (Nadim Shaikli)
-8   Lock all used memory so that it doesn't get swapped to disk (uncrypted).
-    Patch by Jason Holt, 2003 May 23.  Uses mlock.
+8   Option to lock all used memory so that it doesn't get swapped to disk
+    (uncrypted).  Patch by Jason Holt, 2003 May 23.  Uses mlock.
 7   Support a stronger encryption.  Jason Holt implemented AES (May 6 2003).
 7   Add ! register, for shell commands. (patch from Grenie)
 8   In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc.  Like it's
@@ -191,9 +186,6 @@ 6   Vi compatibility (optional): make "i
 
 
 GTK+ 1 (OK in GTK 2):
-8   When menus are disabled, 'm' removed from 'guioptions', Alt-F still pops
-    up the File menu.  Cannot reproduce this: gives a warning for a NULL
-    pointer if the menu was never displayed.
 8   When using "gvim -geom 40x30" or setting 'columns' in .gvimrc or with a
     GUIEnter autocommand, the width is still set to fit the toolbar.  Also
     happens when changing the font.  How to avoid that the toolbar specifies
@@ -1841,10 +1833,6 @@ 7   Better support for jumping to where 
     ":idselect", which uses an "ID" database (made by "mkid") like "tselect".
 
 
-Security:
--   nothing at the moment
-
-
 Win32 GUI:
 8   Make debug mode work while starting up (vim -D).  Open console window for
     the message and input?
@@ -2239,6 +2227,7 @@ 7   Use 'matchpairs' for 'showmatch': Wh
 'cindent', 'smartindent':
 8   Java: Inside an anonymous class, after an "else" or "try" the indent is
     too small. (Vincent Bergbauer)
+    Problem of using {} inside (), 'cindent' doesn't work then.
 8   In C++ it's possible to have {} inside (): (Kirshna)
 		func(
 			new String[] {

--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0d.  Last change: 2006 Apr 14
+*version7.txt*  For Vim version 7.0d.  Last change: 2006 Apr 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -900,6 +900,7 @@ dictconf and dictdconf syntax, indent an
 diff ftplugin file. (Bram Moolenaar)
 dircolors ftplugin file. (Nikolai Weibull)
 django and htmldjango syntax file. (Dave Hodder)
+doxygen syntax file. (Michael Geddes)
 elinks ftplugin file. (Nikolai Weibull)
 eterm ftplugin file. (Nikolai Weibull)
 eviews syntax file. (Vaidotas Zemlys)
@@ -964,6 +965,7 @@ SQL indent file.
 SQL-Informix syntax file. (Dean L Hill)
 SQL: Handling of various variants. (David Fishburn)
 sshconfig ftplugin file. (Nikolai Weibull)
+Stata and SMCL syntax files. (Jeff Pitblado)
 sudoers ftplugin file. (Nikolai Weibull)
 sysctl syntax and ftplugin file. (Nikolai Weibull)
 terminfo ftplugin file. (Nikolai Weibull)
@@ -2488,4 +2490,10 @@ Added the 'm' flag to 'cinoptions'.
 Win32: Make the "gvim --help" window appear in the middle of the screen
 instead of at an arbitrary position. (Randall W. Morris)
 
+Added gettabwinvar() and settabwinvar().
+
+Command line completion: pressing <Tab> after ":e /usr/*" expands the whole
+tree, because it becomes ":e /usr/**".  Don't add a star if there already is
+one.
+
  vim:tw=78:ts=8:ft=help:norl: