diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 21ccf2b..f09e2ef 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 11
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1278,7 +1278,7 @@
 			'diffexpr'	original file
 			'patchexpr'	original file
 			'printexpr'	file to be printed
-		And set to the swap file name for |SwapExits|.
+		And set to the swap file name for |SwapExists|.
 
 					*v:fname_out* *fname_out-variable*
 v:fname_out	The name of the output file.  Only valid while
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index ba8e423..dd95b6c 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Dec 09
+*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -57,6 +57,7 @@
 	|>|	>	shift right
 	|<|	<	shift left
 	|zf|	zf	define a fold
+	|g@|    g@      call function set with the 'operatorfunc' option
 
 If the motion includes a count and the operator also had a count before it,
 the two counts are multiplied.  For example: "2d3w" deletes six words.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f49e3ab..cea3588 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Dec 11
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4646,6 +4646,17 @@
 	For the use of the function see 'completefunc'.
 
 
+						*'operatorfunc'* *'opfunc'*
+'operatorfunc' 'opfunc'	string	(default: empty)
+			global
+			{not in Vi}
+	This option specifies a function to be called by the |g@| operator.
+	See |:map-operator| for more info and an example.
+
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
+
+
 					*'osfiletype'* *'oft'* *E366*
 'osfiletype' 'oft'	string (RISC-OS default: "Text",
 				others default: "")
@@ -5873,7 +5884,7 @@
 			{not in Vi}
 			{not available when compiled without the |+syntax|
 			feature}
-	Methods used for spelling suggestions.  Both for the |z?| command and
+	Methods used for spelling suggestions.  Both for the |z=| command and
 	the |spellsuggest()| function.  This is a comma-separated list of
 	items:
 
@@ -5892,7 +5903,7 @@
 			character inserts/deletes/swaps.  Works well for
 			simple typing mistakes.
 
-	{number}	The maximum number of suggestions listed for |z?|.
+	{number}	The maximum number of suggestions listed for |z=|.
 			Not used for |spellsuggest()|.  The number of
 			suggestions is never more than the value of 'lines'
 			minus two.
@@ -5914,7 +5925,7 @@
 			Lists, each with a suggestion and a score.
 			Example:
 				[['the', 33], ['that', 44]]
-			Set 'verbose' and use |z?| to see the scores that the
+			Set 'verbose' and use |z=| to see the scores that the
 			internal methods use.  A lower score is better.
 			This may invoke |spellsuggest()| if you temporarily
 			set 'spellsuggest' to exclude the "expr:" part.
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index ffd1509..d6efe64 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.0aa.  Last change: 2005 Feb 10
+*recover.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -126,6 +126,28 @@
 A Vim swap file can be recognized by the first six characters: "b0VIM ".
 After that comes the version number, e.g., "3.0".
 
+
+Links and symbolic links ~
+
+On Unix it is possible to have two names for the same file.  This can be done
+with hard links and with symbolic links (symlinks).
+
+For hard links Vim does not know the other name of the file.  Therefore, the
+name of the swapfile will be based on the name you used to edit the file.
+There is no check for editing the same file by the other name too, because Vim
+cannot find the other swapfile (except for searching all of your harddisk,
+which would be very slow).
+
+For symbolic links Vim resolves the links to find the name of the actual file.
+The swap file name is based on that name.  Thus it doesn't matter by what name
+you edit the file, the swap file name will normally be the same.  However,
+there are exceptions:
+- When the directory of the actual file is not writable the swapfile is put
+  elsewhere.
+- When the symbolic links somehow create a loop you get an *E773* error
+  message and the unmodified file name will be used.  You won't be able to
+  save your file normally.
+
 ==============================================================================
 2. Recovery					*recovery* *E308* *E311*
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 31949c2..157e164 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -614,6 +614,8 @@
 'omnifunc'	options.txt	/*'omnifunc'*
 'op'	vi_diff.txt	/*'op'*
 'open'	vi_diff.txt	/*'open'*
+'operatorfunc'	options.txt	/*'operatorfunc'*
+'opfunc'	options.txt	/*'opfunc'*
 'optimize'	vi_diff.txt	/*'optimize'*
 'option'	intro.txt	/*'option'*
 'osfiletype'	options.txt	/*'osfiletype'*
@@ -2144,9 +2146,14 @@
 :map-<silent>	map.txt	/*:map-<silent>*
 :map-<unique>	map.txt	/*:map-<unique>*
 :map-alt-keys	map.txt	/*:map-alt-keys*
+:map-arguments	map.txt	/*:map-arguments*
+:map-commands	map.txt	/*:map-commands*
 :map-local	map.txt	/*:map-local*
+:map-modes	map.txt	/*:map-modes*
+:map-operator	map.txt	/*:map-operator*
 :map-script	map.txt	/*:map-script*
 :map-silent	map.txt	/*:map-silent*
+:map-special-chars	map.txt	/*:map-special-chars*
 :map-special-keys	map.txt	/*:map-special-keys*
 :map-undo	map.txt	/*:map-undo*
 :map-verbose	map.txt	/*:map-verbose*
@@ -3777,6 +3784,7 @@
 E770	spell.txt	/*E770*
 E771	spell.txt	/*E771*
 E772	spell.txt	/*E772*
+E773	recover.txt	/*E773*
 E78	motion.txt	/*E78*
 E79	message.txt	/*E79*
 E80	message.txt	/*E80*
@@ -5158,6 +5166,7 @@
 g?	change.txt	/*g?*
 g??	change.txt	/*g??*
 g?g?	change.txt	/*g?g?*
+g@	map.txt	/*g@*
 gD	pattern.txt	/*gD*
 gE	motion.txt	/*gE*
 gH	visual.txt	/*gH*
@@ -5991,6 +6000,7 @@
 new-debug-itf	version6.txt	/*new-debug-itf*
 new-debug-mode	version6.txt	/*new-debug-mode*
 new-debug-support	version7.txt	/*new-debug-support*
+new-define-operator	version7.txt	/*new-define-operator*
 new-diff-mode	version6.txt	/*new-diff-mode*
 new-encryption	version5.txt	/*new-encryption*
 new-evim	version6.txt	/*new-evim*