merge

Docs/Support/docbook-fixup.pl

@@ -29,8 +29,8 @@ print STDERR "Adding PARA inside ENTRY...\n";
 $data =~ s{<entry>(.+?)</entry>}
           {<entry><para>$1</para></entry>}gs;
 
-@apx = ("Users", "MySQL-customer-usage", "Credits", "News",
-        "Porting", "GPL-license", "LGPL-license", "Placeholder");
+@apx = ("Users", "MySQL-customer-usage", "News",
+        "GPL-license", "LGPL-license");
 
 foreach $apx (@apx) {
   print STDERR "Removing appendix $apx...\n";

Docs/manual.texi

@@ -48608,6 +48608,12 @@ Added boolean fulltext search code. It should be considered early alpha.
 
 @itemize @bullet
 @item
+Added boolean fulltext search code.
+It should be considered early alpha.
+@item
+Added variables @code{ft_min_word_len}, @code{ft_max_word_len}, and
+@code{ft_max_word_len_for_sort}.
+@item
 Added documentation for @code{libmysqld}, the embedded MySQL server
 library.  Also added example programs (a @code{mysql} client and
 @code{mysqltest} test program) which use @code{libmysqld}.
@@ -49101,9 +49107,6 @@ Fixed a bug when using @code{HEAP} tables with @code{LIKE}.
 @item
 Added @code{--mysql-version} to @code{safe_mysqld}
 @item
-Added variables @code{ft_min_word_len}, @code{ft_max_word_len}, and
-@code{ft_max_word_len_for_sort}.
-@item
 Changed @code{INNOBASE} to @code{InnoDB} (because the @code{INNOBASE}
 name was already used). All @code{configure} options and @code{mysqld}
 start options are now using @code{innodb} instead of @code{innobase}. This