Update.

	* iconv/gconv_int.h (gconv_module): Add new element from_regex_mem.
	* iconv/gconv_conf.c (module_compare): Make s1 and s2 const.
	(detect_conflict): New function.
	(add_alias): Call detect_conflict to see whether there is already
	a module for the new name.
	(add_module): Make sure there is no alias for the new name.
	(read_conf_file): Call add_alias with new argument.
	(__gconv_read_conf): Don't destroy module tree immediately after
	walking it.  We need it to test the internal conversions for
	conflicts.
	* iconv/gconv_db.c (find_derivation): Don't allocate memory for
	regular expression.  There is now room in the module descriptor.
	(free_mem): Don't free memory for regular expression.

1 files changed, 2 insertions, 2 deletions

diff --git a/manual/search.texi b/manual/search.texi
index 0bcbc9b4d3..b43153a44b 100644
--- a/manual/search.texi
+++ b/manual/search.texi
@@ -498,10 +498,10 @@ structure there is another function which allows to apply a function on
 all elements of the tree.  The function must have this type:
 
 @smallexample
-int __action_fn_t (const void *nodep, VISIT value, int level);
+void __action_fn_t (const void *nodep, VISIT value, int level);
 @end smallexample
 
-The @var{nodep} is the data value of the current node (nce given as the
+The @var{nodep} is the data value of the current node (once given as the
 @var{key} argument to @code{tsearch}).  @var{level} is a numeric value
 which corresponds to the depth of the current node in the tree.  The
 root node has the depth @math{0} and its children have a depth of