updated for version 7.0116

3 files changed, 41 insertions, 6 deletions

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index fedaba5ed0..5f75a0c749 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2005 May 21
+*editing.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -354,14 +354,32 @@ file1 file2") embedded spaces must be escaped with a backslash.
 							*wildcard*
 Wildcards in {file} are expanded.  Which wildcards are supported depends on
 the system.  These are the common ones:
-	*	matches anything, including nothing
 	?	matches one character
+	*	matches anything, including nothing
+	**	matches anything, including nothing, recurses into directories
 	[abc]	match 'a', 'b' or 'c'
+
 To avoid the special meaning of the wildcards prepend a backslash.  However,
 on MS-Windows the backslash is a path separator and "path\[abc]" is still seen
 as a wildcard when "[" is in the 'isfname' option.  A simple way to avoid this
 is to use "path\[[]abc]".  Then the file "path[abc]" literally.
 
+					*starstar-wildcard*
+Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.
+This allows searching a directory tree.  This goes up to 100 directories deep.
+Example: >
+	:n **/*.txt
+Finds files:
+	ttt.txt
+	subdir/ttt.txt
+	a/b/c/d/ttt.txt
+When non-wildcard characters are used these are only matched in the first
+directory.  Example: >
+	:n /usr/inc**/*.h
+Finds files:
+	/usr/include/types.h
+	/usr/include/sys/types.h
+	/usr/inc_old/types.h
 					*backtick-expansion* *`-expansion*
 On Unix and a few other systems you can also use backticks in the file name,
 for example: >
@@ -1406,7 +1424,7 @@ problem goes away the next day.
 The file searching is currently used for the 'path', 'cdpath' and 'tags'
 options.  There are three different types of searching:
 
-1) Downward search:
+1) Downward search:					*starstar*
    Downward search uses the wildcards '*', '**' and possibly others
    supported by your operating system.  '*' and '**' are handled inside Vim, so
    they work on all operating systems.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a37fa54c04..0030e3f5ea 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 Jul 22
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2221,8 +2221,11 @@ expand({expr} [, {flag}])				*expand()*
 		expanded like a file name is expanded on the command line.
 		'suffixes' and 'wildignore' are used, unless the optional
 		{flag} argument is given and it is non-zero.  Names for
-		non-existing files are included.
-
+		non-existing files are included.  The "**" item can be used to
+		search in a directory tree.  For example, to find all "README"
+		files in the current directory and below: >
+			:echo expand("**/README")
+<
 		Expand() can also be used to expand variables and environment
 		variables that are only known in a shell.  But this can be
 		slow, because a shell must be started.  See |expr-env-expand|.
@@ -2708,6 +2711,11 @@ globpath({path}, {expr})				*globpath()*
 		The 'wildignore' option applies: Names matching one of the
 		patterns in 'wildignore' will be skipped.
 
+		The "**" item can be used to search in a directory tree.
+		For example, to find all "README.txt" files in the directories
+		in 'runtimepath' and below: >
+			:echo globpath(&rtp, "**/README.txt")
+<
 							*has()*
 has({feature})	The result is a Number, which is 1 if the feature {feature} is
 		supported, zero otherwise.  The {feature} argument is a
@@ -3528,8 +3536,14 @@ search({pattern} [, {flags}])				*search()*
 		'n'	do Not move the cursor
 		'w'	wrap around the end of the file
 		'W'	don't wrap around the end of the file
+		's'	set the ' mark at the previous location of the
+			cursor.
 		If neither 'w' or 'W' is given, the 'wrapscan' option applies.
 
+		If the 's' flag is supplied, the ' mark is set, only if the
+		cursor is moved. The 's' flag cannot be combined with the 'n'
+		flag.
+
 		When a match has been found its line number is returned.
 		The cursor will be positioned at the match, unless the 'n'
 		flag is used).
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 6c61c24a84..fffaa339dd 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5154,6 +5154,7 @@ hebrew	hebrew.txt	/*hebrew*
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
+help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -6328,6 +6329,8 @@ standard-plugin	usr_05.txt	/*standard-plugin*
 standard-plugin-list	help.txt	/*standard-plugin-list*
 standout	syntax.txt	/*standout*
 star	pattern.txt	/*star*
+starstar	editing.txt	/*starstar*
+starstar-wildcard	editing.txt	/*starstar-wildcard*
 start-of-file	pattern.txt	/*start-of-file*
 starting	starting.txt	/*starting*
 starting-amiga	starting.txt	/*starting-amiga*