MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul.dubois Date:November 18 2008 4:48am
Subject:svn commit - mysqldoc@docsrva: r12514 - in trunk: . topic-guides/topics-common
View as plain text  
Author: paul
Date: 2008-11-18 05:48:33 +0100 (Tue, 18 Nov 2008)
New Revision: 12514

Log:
 r34524@arctic:  paul | 2008-11-17 22:49:48 -0600
 Undo broken dependency auto-update


Modified:
   trunk/topic-guides/topics-common/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35793
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34512
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35793
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34524


Modified: trunk/topic-guides/topics-common/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-common/Makefile.depends	2008-11-18 04:47:52 UTC (rev 12513)
+++ trunk/topic-guides/topics-common/Makefile.depends	2008-11-18 04:48:33 UTC (rev 12514)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 4; 5020 bytes

@@ -446,6 +446,7 @@
 mysql_ha_drbd_INCLUDES = \
 	../../common/fixedchars.ent \
 	../../common/phrases.ent \
+	../../refman-5.0/../refman-common/images/published/active-master-mysql-server.png \
 	../../refman-5.0/faqs.xml \
 	../../refman-5.1/legalnotice.en.xml \
 	../../refman-5.1/versions.ent \

@@ -455,7 +456,6 @@
 	../../refman-common/images/published/drbd-sepinterface.png \
 	../../refman-common/images/published/ha-heartbeat-overview.png \
 	../../refman-common/urls.ent \
-	/../refman-common/images/published/active-master-mysql-server.png \
 	all-entities.ent \
 	mysql-ha-drbd-aspec.xml.faqs-mysql-drbd-heartbeat.none.chapter.xml \
 	mysql-ha-drbd-aspec.xml.ha-drbd-install-mysql.none.chapter.xml \

@@ -464,10 +464,10 @@
 	mysql-ha-drbd-aspec.xml.ha-drbd.all.preface.xml \
 	mysql-ha-drbd-aspec.xml.ha-heartbeat.none.chapter.xml
 mysql_ha_drbd_IMAGES = \
+	../../refman-5.0/../refman-common/images/published/active-master-mysql-server.png \
 	../../refman-common/images/published/drbd-main.png \
 	../../refman-common/images/published/drbd-sepinterface.png \
-	../../refman-common/images/published/ha-heartbeat-overview.png \
-	/../refman-common/images/published/active-master-mysql-server.png
+	../../refman-common/images/published/ha-heartbeat-overview.png
 mysql_ha_drbd_SOURCES = mysql-ha-drbd.xml $(mysql_ha_drbd_INCLUDES)
 mysql_ha_drbd_IDMAPS = \
 	../../refman-5.0/metadata/se-innodb-core.idmap \

@@ -704,7 +704,7 @@
 	$(RM) mysql-ha-scalability.xml mysql-ha-scalability-arbitrary.xml
 	$(MAKE) mysql-ha-scalability.xml
 
-mysql-ha-drbd-aspec.xml.faqs-mysql-drbd-heartbeat.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-install-mysql.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-install.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-performance.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd.all.preface.xml mysql-ha-drbd-aspec.xml.ha-heartbeat.none.chapter.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.0/faqs.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent /../refman-common/images/published/active-master-mysql-server.png all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refma!
 n-common/ha-drbd.xml ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/images/published/drbd-main.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-heartbeat.xml ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/urls.ent all-entities.ent
+mysql-ha-drbd-aspec.xml.faqs-mysql-drbd-heartbeat.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-install-mysql.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-install.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd-performance.none.chapter.xml mysql-ha-drbd-aspec.xml.ha-drbd.all.preface.xml mysql-ha-drbd-aspec.xml.ha-heartbeat.none.chapter.xml: ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.0/../refman-common/images/published/active-master-mysql-server.png ../../refman-5.0/faqs.xml ../../refman-5.1/versions.ent ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions!
 .ent ../../refman-common/ha-drbd.xml ../../refman-common/images/published/drbd-sepinterface.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-drbd.xml ../../refman-common/images/published/drbd-main.png ../../refman-common/urls.ent all-entities.ent ../../common/fixedchars.ent ../../common/phrases.ent ../../refman-5.1/versions.ent ../../refman-common/ha-heartbeat.xml ../../refman-common/images/published/ha-heartbeat-overview.png ../../refman-common/urls.ent all-entities.ent
 	$(RM) mysql-ha-drbd.xml mysql-ha-drbd-arbitrary.xml
 	$(MAKE) mysql-ha-drbd.xml
 


Thread
svn commit - mysqldoc@docsrva: r12514 - in trunk: . topic-guides/topics-commonpaul.dubois18 Nov