Author: paul
Date: 2010-11-23 01:06:23 +0100 (Tue, 23 Nov 2010)
New Revision: 23919
Log:
r44533@arctic: paul | 2010-11-22 18:05:38 -0600
Remove refs to twins project from topic guides; rebuild dependencies
Modified:
trunk/topic-guides/topics-5.0/Makefile.depends
trunk/topic-guides/topics-5.0/mysql-tutorial-excerpt-aspec.xml
trunk/topic-guides/topics-5.1/Makefile.depends
trunk/topic-guides/topics-5.1/mysql-tutorial-excerpt-aspec.xml
trunk/topic-guides/topics-5.5/Makefile.depends
trunk/topic-guides/topics-5.5/mysql-tutorial-excerpt-aspec.xml
trunk/topic-guides/topics-5.6/Makefile.depends
trunk/topic-guides/topics-5.6/mysql-tutorial-excerpt-aspec.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44521
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65877
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44533
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:65877
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.0/Makefile.depends 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 3436 bytes
@@ -1357,11 +1357,11 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml all-entities.ent ../../refman-5.0/tutorial.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.0/versions.ent ../../refman-5.0/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
+mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml all-entities.ent ../../refman-5.0/tutorial.xml ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.0/versions.ent ../../refman-5.0/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
$(MAKE) mysql-tutorial-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
+mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
$(MAKE) mysql-tutorial-excerpt.arbitrary
cp mysql-tutorial-excerpt.arbitrary mysql-tutorial-excerpt-arbitrary.xml
Modified: trunk/topic-guides/topics-5.0/mysql-tutorial-excerpt-aspec.xml
===================================================================
--- trunk/topic-guides/topics-5.0/mysql-tutorial-excerpt-aspec.xml 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.0/mysql-tutorial-excerpt-aspec.xml 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 615 bytes
@@ -18,8 +18,6 @@
<include prefix="refman-5.0" src="examples" filter="none" markas="chapter"/>
- <include prefix="refman-5.0" src="twin" filter="none" markas="chapter"/>
-
<include prefix="refman-5.0" src="apache" filter="none" markas="chapter"/>
</fragment>
Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.1/Makefile.depends 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 3520 bytes
@@ -1965,11 +1965,11 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent all-entities.ent ../../refman-5.1/versions.ent mysql-tutorial-excerpt-aspec.xml ../../refman-5.1/tutorial.xml ../../mysql-monitor-common/enterprise.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.1/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
+mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent all-entities.ent ../../refman-5.1/versions.ent mysql-tutorial-excerpt-aspec.xml ../../refman-5.1/tutorial.xml ../../mysql-monitor-common/enterprise.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.1/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
$(MAKE) mysql-tutorial-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
+mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
$(MAKE) mysql-tutorial-excerpt.arbitrary
cp mysql-tutorial-excerpt.arbitrary mysql-tutorial-excerpt-arbitrary.xml
Modified: trunk/topic-guides/topics-5.1/mysql-tutorial-excerpt-aspec.xml
===================================================================
--- trunk/topic-guides/topics-5.1/mysql-tutorial-excerpt-aspec.xml 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.1/mysql-tutorial-excerpt-aspec.xml 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 615 bytes
@@ -18,8 +18,6 @@
<include prefix="refman-5.1" src="examples" filter="none" markas="chapter"/>
- <include prefix="refman-5.1" src="twin" filter="none" markas="chapter"/>
-
<include prefix="refman-5.1" src="apache" filter="none" markas="chapter"/>
</fragment>
Modified: trunk/topic-guides/topics-5.5/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.5/Makefile.depends 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.5/Makefile.depends 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 3436 bytes
@@ -1979,11 +1979,11 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml ../../refman-5.5/tutorial.xml all-entities.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.5/versions.ent ../../refman-5.5/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
+mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml ../../refman-5.5/tutorial.xml all-entities.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.5/versions.ent ../../refman-5.5/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
$(MAKE) mysql-tutorial-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
+mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
$(MAKE) mysql-tutorial-excerpt.arbitrary
cp mysql-tutorial-excerpt.arbitrary mysql-tutorial-excerpt-arbitrary.xml
Modified: trunk/topic-guides/topics-5.5/mysql-tutorial-excerpt-aspec.xml
===================================================================
--- trunk/topic-guides/topics-5.5/mysql-tutorial-excerpt-aspec.xml 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.5/mysql-tutorial-excerpt-aspec.xml 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 615 bytes
@@ -18,8 +18,6 @@
<include prefix="refman-5.5" src="examples" filter="none" markas="chapter"/>
- <include prefix="refman-5.5" src="twin" filter="none" markas="chapter"/>
-
<include prefix="refman-5.5" src="apache" filter="none" markas="chapter"/>
</fragment>
Modified: trunk/topic-guides/topics-5.6/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.6/Makefile.depends 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.6/Makefile.depends 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 3436 bytes
@@ -1979,11 +1979,11 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-5.6/versions.ent ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml all-entities.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.6/tutorial.xml ../../refman-5.6/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
+mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml: ../../refman-5.6/versions.ent ../../refman-common/urls.ent mysql-tutorial-excerpt-aspec.xml all-entities.ent ../../common/phrases.ent ../../common/fixedchars.ent ../../refman-5.6/tutorial.xml ../../refman-5.6/metadata/tutorial.idmap mysql-tutorial-excerpt-base.xml
$(MAKE) mysql-tutorial-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.twin.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
+mysql-tutorial-excerpt-arbitrary.xml: mysql-tutorial-excerpt-aspec.xml.apache.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.entering-queries.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.batch-mode.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.database-use.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.examples.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.connecting-disconnecting.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.getting-information.none.chapter.xml mysql-tutorial-excerpt-aspec.xml.tutorial.all.preface.xml
$(MAKE) mysql-tutorial-excerpt.arbitrary
cp mysql-tutorial-excerpt.arbitrary mysql-tutorial-excerpt-arbitrary.xml
Modified: trunk/topic-guides/topics-5.6/mysql-tutorial-excerpt-aspec.xml
===================================================================
--- trunk/topic-guides/topics-5.6/mysql-tutorial-excerpt-aspec.xml 2010-11-22 23:36:25 UTC (rev 23918)
+++ trunk/topic-guides/topics-5.6/mysql-tutorial-excerpt-aspec.xml 2010-11-23 00:06:23 UTC (rev 23919)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 615 bytes
@@ -18,8 +18,6 @@
<include prefix="refman-5.6" src="examples" filter="none" markas="chapter"/>
- <include prefix="refman-5.6" src="twin" filter="none" markas="chapter"/>
-
<include prefix="refman-5.6" src="apache" filter="none" markas="chapter"/>
</fragment>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23919 - in trunk: . topic-guides/topics-5.0 topic-guides/topics-5.1 topic-guides/topics-5.5 topic-guides/topics-5.6 | paul.dubois | 23 Nov |
