diff options
| author | kent@kent-amd64.(none) <> | 2007-11-02 13:17:07 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2007-11-02 13:17:07 +0100 |
| commit | 741c9b4f705f7349174786449d0157f340c4355f (patch) | |
| tree | 9cfd641b0186f0e2aed7de85454b4cf2513279f7 /Docs | |
| parent | d3894dad60c388ea4c5c32004178fbd99a2641b6 (diff) | |
| parent | 01903380d549e5b338f43dab8b413ef741524393 (diff) | |
| download | mariadb-git-741c9b4f705f7349174786449d0157f340c4355f.tar.gz | |
Merge mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
into mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 2 | ||||
| -rw-r--r-- | Docs/manual.chm | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index d161836aaca..dac256f8fd6 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -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 --git a/Docs/manual.chm b/Docs/manual.chm deleted file mode 100644 index 28c3e1b5a86..00000000000 --- a/Docs/manual.chm +++ /dev/null @@ -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. - -********************************************************* |