diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5b3e74f..afb43a4 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 11
+*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2977,6 +2977,7 @@
 multi_lang		Compiled with support for multiple languages.
 mzscheme		Compiled with MzScheme interface |mzscheme|.
 netbeans_intg		Compiled with support for |netbeans|.
+netbeans_enabled	Compiled with support for |netbeans| and it's used.
 ole			Compiled with OLE automation support for Win32.
 os2			OS/2 version of Vim.
 osfiletype		Compiled with support for osfiletypes |+osfiletype|
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 00f5474..6644439 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Jun 14
+*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -190,11 +190,11 @@
 3. if a marker with a lower fold level is found, all folds up to and including
    this level end and a fold with the specified level starts.
 
-The number indicates the fold level.  A zero cannot be used.
-You can use "}}}" with a digit to indicate the level of the fold that
-ends.  The fold level of the following line will be one less than the
-indicated level.  Note that Vim doesn't look back to the level of the matching
-marker (that would take too much time).  Example: >
+The number indicates the fold level.  A zero cannot be used (a marker with
+level zero is ignored).  You can use "}}}" with a digit to indicate the level
+of the fold that ends.  The fold level of the following line will be one less
+than the indicated level.  Note that Vim doesn't look back to the level of the
+matching marker (that would take too much time).  Example: >
 
 	{{{1
 	fold level here is 1
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 7754f20..102a115 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2004 Jul 23
+*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2004 Oct 21
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -245,8 +245,9 @@
 '-' implies previous results clearance, '0' or command absence - don't use
 quickfix. Search is performed from start until first command occurrence.
 The default value is "" (don't use quickfix anyway). The following value
-seems to be useful: "s-,c-,d-,i-,t-,e-".
-
+seems to be useful: >
+	:set cscopequickfix=s-,c-,d-,i-,t-,e-
+<
 							*cscopetag* *cst*
 If 'cscopetag' set, the commands ":tag" and CTRL-] as well as "vim -t" will
 always use |:cstag| instead of the default :tag behavior.  Effectively, by
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index ee6adea..e7a9aa0 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -417,6 +417,12 @@
 initDone	Mark the buffer as ready for use.  Implicitly makes the buffer
 		the current buffer.  Fires the BufReadPost autocommand event.
 
+insertDone
+		Sent by NetBeans to tell vim an initial file insert is done.
+		This triggers a read message being printed. Prior to version
+		2.3, no read messages were displayed after opening a file.
+		New in version 2.3.
+
 moveAnnoToFront serNum
 		Not implemented.
 
@@ -450,6 +456,12 @@
 		- 'buftype' disallows writing
 		New in version 2.2.
 
+saveDone
+		Sent by NetBeans to tell vim a save is done. This triggers
+		a save message being printed. Prior to version 2.3, no save
+		messages were displayed after a save.
+		New in version 2.3.
+
 setAsUser	Not implemented.
 
 setBufferNumber pathname
@@ -473,6 +485,7 @@
 		This delay is used to give the IDE a chance to handle things
 		before really exiting.  The default delay is two seconds.
 		New in version 2.1.
+		Obsolete in version 2.3.
 
 setFullName pathname
 		Set the file name to be used for a buffer to "pathname", a
@@ -490,7 +503,14 @@
 		When the boolean argument "modified" is "T" mark the buffer as
 		modified, when it is "F" mark it as unmodified.
 
-setReadOnly	Not implemented.
+setModtime time
+		Update a buffers modification time after NetBeans saves the
+		file.
+		New in version 2.3.
+
+setReadOnly
+		Passed by NetBeans to tell vim a file is readonly.
+		Implemented in verion 2.3.
 
 setStyle	Not implemented.
 
@@ -508,7 +528,11 @@
 		disappear when the mouse is moved more than a few pixels.
 		New in version 2.1.
 
-specialKeys	Not implemented.
+specialKeys
+		Map a set of keys (mostly function keys) to be passed back
+		to NetBeans for processing. This lets NetBeans hotkeys be
+		used from vim.
+		Implemented in version 2.3.
 
 startAtomic	Begin an atomic operation.  The screen will not be updated
 		until "endAtomic" is given.
@@ -620,6 +644,11 @@
 		in the sign area.
 		New in version 2.2.
 
+disconnect
+		Tell NetBeans that vim is exiting and not to try and read or
+		write more commands.
+		New in version 2.3.
+
 fileClosed	Not implemented.
 
 fileModified	Not implemented.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6001909..769a45c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2004 Oct 08
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -918,7 +918,7 @@
 	  impossible!).  Writing may fail because of this.
 	- A directory "." means to put the backup file in the same directory
 	  as the edited file.
-	- A directory starting with "./" (or ".\" for MS-DOS et.al.) means to
+	- A directory starting with "./" (or ".\" for MS-DOS et al.) means to
 	  put the backup file relative to where the edited file is.  The
 	  leading "." is replaced with the path name of the edited file.
 	  ("." inside a directory name has no special meaning).
@@ -2046,7 +2046,7 @@
 	  the edited file.  On Unix, a dot is prepended to the file name, so
 	  it doesn't show in a directory listing.  On MS-Windows the "hidden"
 	  attribute is set and a dot prepended if possible.
-	- A directory starting with "./" (or ".\" for MS-DOS et.al.) means to
+	- A directory starting with "./" (or ".\" for MS-DOS et al.) means to
 	  put the swap file relative to where the edited file is.  The leading
 	  "." is replaced with the path name of the edited file.
 	- For Unix and Win32, if a directory ends in two path separators, the
@@ -2187,10 +2187,11 @@
 			global
 			{not in Vi}
 	When on, all the windows are automatically made the same size after
-	splitting or closing a window.  When off, splitting a window will
-	reduce the size of the current window and leave the other windows the
-	same.  When closing a window the extra lines are given to the window
-	next to it (depending on 'splitbelow' and 'splitright').
+	splitting or closing a window.  This also happens the moment the
+	option is switched on.  When off, splitting a window will reduce the
+	size of the current window and leave the other windows the same.  When
+	closing a window the extra lines are given to the window next to it
+	(depending on 'splitbelow' and 'splitright').
 	When mixing vertically and horizontally split windows, a minimal size
 	is computed and some windows may be larger if there is room.  The
 	'eadirection' option tells in which direction the size is affected.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index b6c30f3..b3ea0e8 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5223,6 +5223,7 @@
 keymap-hebrew	mbyte.txt	/*keymap-hebrew*
 keypad-0	intro.txt	/*keypad-0*
 keypad-9	intro.txt	/*keypad-9*
+keypad-comma	term.txt	/*keypad-comma*
 keypad-divide	intro.txt	/*keypad-divide*
 keypad-end	intro.txt	/*keypad-end*
 keypad-enter	intro.txt	/*keypad-enter*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 4ddd63e..b418e4c 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2004 Jan 09
+*term.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -372,9 +372,13 @@
 different modes.  If your terminal supports only one of the modes, both will
 look the same.
 
+							*keypad-comma*
 The keypad keys, when they are not mapped, behave like the equivalent normal
-key.
-							*xterm-codes*
+key.  There is one exception: if you have a comma on the keypad instead of a
+decimal point, Vim will use a dot anyway.  Use these mappings to fix that: >
+	:noremap <kPoint> ,
+	:noremap! <kPoint> ,
+<							*xterm-codes*
 There is a special trick to obtain the key codes which currently only works
 for xterm.  When |t_RV| is defined and a response is received which indicates
 an xterm with patchlevel 141 or higher, Vim uses special escape sequences to
diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1
index d1fa54a..d58943d 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/vim.1
@@ -392,7 +392,7 @@
 Like -w, but an existing file is overwritten.
 .TP
 -x
-Use encryption when writing files.   Will prompt for a crypt key.
+Use encryption when writing files.  Will prompt for a crypt key.
 .TP
 -X
 Don't connect to the X server.  Shortens startup time in a terminal, but the
@@ -415,14 +415,14 @@
 This can be used to edit a filename that starts with a '-'.
 .TP
 --echo-wid
-GTK GUI only: Echo the Window ID on stdout
+GTK GUI only: Echo the Window ID on stdout.
 .TP
 --help
 Give a help message and exit, just like "-h".
 .TP
 --literal
-Take file name arguments literally, do not expand wildcards.  Not needed on
-Unix, the shell expand wildcards.
+Take file name arguments literally, do not expand wildcards.  This has no
+effect on Unix where the shell expands wildcards.
 .TP
 --noplugin
 Skip loading plugins.  Implied by -u NONE.