--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2010 Nov 16
+*options.txt*	For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1439,7 +1439,7 @@ A jump table for the options with a shor
 			all operations except yank.  Yank shall copy the text
 			into register '+' and also into '*' when "unnamed" is
 			included.
-			Only available with the |+x11| feature.
+			Only available with the |+X11| feature.
 			Availability can be checked with: >
 				if has('unnamedplus')
 <
@@ -2861,6 +2861,9 @@ A jump table for the options with a shor
 	  file only, the option is not changed.
 	When 'binary' is set, the value of 'fileformats' is not used.
 
+	Note that when Vim starts up with an empty buffer this option is not
+	use.  Set 'fileformat' in your .vimrc instead.
+
 	For systems with a Dos-like <EOL> (<CR><NL>), when reading files that
 	are ":source"ed and for vimrc files, automatic <EOL> detection may be
 	done:
@@ -3218,7 +3221,8 @@ A jump table for the options with a shor
 	the internal format mechanism.
 
 	The expression may be evaluated in the |sandbox|, see
-	|sandbox-option|.
+	|sandbox-option|.  That stops the option from working, since changing
+	the buffer text is not allowed.
 
 						*'fsync'* *'fs'*
 'fsync' 'fs'		boolean	(default on)
@@ -6241,7 +6245,7 @@ A jump table for the options with a shor
 	Do smart autoindenting when starting a new line.  Works for C-like
 	programs, but can also be used for other languages.  'cindent' does
 	something like this, works better in most cases, but is more strict,
-	see |C-indenting|.  When 'cindent' is on or 'smartindent' is set,
+	see |C-indenting|.  When 'cindent' is on or 'indentexpr' is set,
 	setting 'si' has no effect.  'indentexpr' is a more advanced
 	alternative.
 	Normally 'autoindent' should also be on when using 'smartindent'.
@@ -7762,7 +7766,7 @@ A jump table for the options with a shor
 	uses another default.
 
 
-			*'wildignorecase* *'wic'* *'nowildignorecase* *'nowic'*
+			*'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'*
 'wildignorecase' 'wic'	boolean	(default off)
 			global
 			{not in Vi}