--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2006 Feb 28
+*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4012,8 +4012,8 @@ A jump table for the options with a shor
 	specified with multi-byte characters (e.g., UTF-8), but only the lower
 	8 bits of each character will be used.
 
-	Example (for Greek):					*greek*  >
-	    :set langmap=�A,�B,�C,�D,�E,�F,�G,�H,�I,�J,�K,�L,�M,�N,�O,�P,QQ,�R,�S,�T,�U,�V,WW,�X,�Y,�Z,�a,�b,�c,�d,�e,�f,�g,�h,�i,�j,�k,�l,�m,�n,�o,�p,qq,�r,�s,�t,�u,�v,�w,�x,�y,�z
+	Example (for Greek, in UTF-8):				*greek*  >
+	    :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz
 <	Example (exchanges meaning of z and y for commands): >
 	    :set langmap=zy,yz,ZY,YZ
 <
@@ -5691,7 +5691,9 @@ A jump table for the options with a shor
 	The 'matchpairs' option can be used to specify the characters to show
 	matches for.  'rightleft' and 'revins' are used to look for opposite
 	matches.
-	Note: For the use of the short form parental guidance is advised.
+	Also see the matchparen plugin for highlighting the match when moving
+	around |pi_paren.txt|.
+	Note: Use of the short form is rated PG.
 
 				 *'showmode'* *'smd'* *'noshowmode'* *'nosmd'*
 'showmode' 'smd'	boolean	(Vim default: on, Vi default: off)
@@ -6291,7 +6293,7 @@ A jump table for the options with a shor
 	'S' flag in 'cpoptions'.
 	Only normal file name characters can be used, "/\*?[|<>" are illegal.
 
-					*'tabline'* *'tal'*
+						*'tabline'* *'tal'*
 'tabline' 'tal'		string	(default empty)
 			global
 			{not in Vi}
@@ -6315,7 +6317,17 @@ A jump table for the options with a shor
 	are invisible and you can't jump to their windows.
 
 
-					*'tabstop'* *'ts'*
+						*'tabpagemax'* *'tpm'*
+'tabpagemax' 'tpm'	number	(default 10)
+			global
+			{not in Vi}
+			{not available when compiled without the +windows
+			feature}
+	Maximum number of tab pages to be opened by the |-p| command line
+	argument or the ":tab all" command. |tabpage|
+
+
+						*'tabstop'* *'ts'*
 'tabstop' 'ts'		number	(default 8)
 			local to buffer
 	Number of spaces that a <Tab> in the file counts for.  Also see