bk commit into 5.0 tree (kent:1.2555)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 13:16:23+01:00, kent@stripped +2 -0
  Makefile.am:
    Removed place holder for 'manual.chm'
  .del-manual.chm:
    Delete: Docs/manual.chm

  BitKeeper/deleted/.del-manual.chm@stripped, 2007-11-02 13:07:52+01:00, kent@stripped +0 -0
    Delete: Docs/manual.chm

  Docs/Makefile.am@stripped, 2007-11-02 13:15:42+01:00, kent@stripped +1 -1
    Removed place holder for 'manual.chm'

diff -Nrup a/Docs/Makefile.am b/Docs/Makefile.am
--- a/Docs/Makefile.am	2007-11-02 13:14:41 +01:00
+++ b/Docs/Makefile.am	2007-11-02 13:15:42 +01:00
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-EXTRA_DIST =		manual.chm mysql.info INSTALL-BINARY
+EXTRA_DIST =		mysql.info INSTALL-BINARY
 
 # make sure that "make install" installs the info page, too
 # automake only seems to take care of this automatically,
diff -Nrup a/Docs/manual.chm b/Docs/manual.chm
--- a/Docs/manual.chm	2006-09-21 17:37:19 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,14 +0,0 @@
-
-*********************************************************
-
-This is a dummy placeholder file for "manual.chm" in the
-MySQL source trees.
-
-Note, that the documentation has been moved into a separate
-BitKeeper source tree named "mysqldoc" - do not attempt to edit this
-file! All changes to it should be done in the mysqldoc tree.
-
-This dummy file is being replaced with the actual file from the
-mysqldoc tree when building the official source distribution.
-
-*********************************************************