Author: mcbrown
Date: 2008-11-03 12:06:13 +0100 (Mon, 03 Nov 2008)
New Revision: 12256
Log:
Moving gguides to simpler Arby format
Removing bad character from styleguide source file
Updating dependencies
Modified:
trunk/mysqldoc-guide/Makefile.depends
trunk/mysqldoc-guide/mysqldoc-formatting-guide-aspec.xml
trunk/mysqldoc-guide/mysqldoc-formatting-guide-base.xml
trunk/mysqldoc-guide/mysqldoc-style-guide-aspec.xml
trunk/mysqldoc-guide/mysqldoc-style-guide-base.xml
trunk/mysqldoc-guide/styleguide.xml
Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends 2008-11-02 22:31:36 UTC (rev 12255)
+++ trunk/mysqldoc-guide/Makefile.depends 2008-11-03 11:06:13 UTC (rev 12256)
Changed blocks: 1, Lines Added: 229, Lines Deleted: 0; 12520 bytes
@@ -0,0 +1,229 @@
+entities_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent
+entities_IMAGES =
+entities_SOURCES = entities.xml $(entities_INCLUDES)
+entities_IDMAPS =
+entities.validpure: $(entities_SOURCES)
+entities.titles: $(entities_SOURCES)
+entities.useless: $(entities_SOURCES)
+entities.valid: $(entities_SOURCES) $(entities_IDMAPS)
+entities.validwarn: $(entities_SOURCES) $(entities_IDMAPS)
+entities-prepped.xml: $(entities_SOURCES) $(entities_IDMAPS)
+entities-manprepped.xml: $(entities_SOURCES) $(entities_IDMAPS)
+entities-remprepped.xml: $(entities_SOURCES) $(entities_IDMAPS)
+
+formats_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent
+formats_IMAGES =
+formats_SOURCES = formats.xml $(formats_INCLUDES)
+formats_IDMAPS = \
+ ../mysqldoc-guide/metadata/formats.idmap \
+ ../mysqldoc-guide/metadata/tools.idmap
+formats.validpure: $(formats_SOURCES)
+formats.titles: $(formats_SOURCES)
+formats.useless: $(formats_SOURCES)
+formats.valid: $(formats_SOURCES) $(formats_IDMAPS)
+formats.validwarn: $(formats_SOURCES) $(formats_IDMAPS)
+formats-prepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
+formats-manprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
+formats-remprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
+
+formatting_guide_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ entities.xml \
+ mysqldoc-guide.ent \
+ special-markup.xml
+formatting_guide_IMAGES =
+formatting_guide_SOURCES = formatting-guide.xml $(formatting_guide_INCLUDES)
+formatting_guide_IDMAPS = \
+ ../mysqldoc-guide/metadata/entities.idmap \
+ ../mysqldoc-guide/metadata/formatting-guide.idmap \
+ ../mysqldoc-guide/metadata/styleguide.idmap
+formatting-guide.validpure: $(formatting_guide_SOURCES)
+formatting-guide.titles: $(formatting_guide_SOURCES)
+formatting-guide.useless: $(formatting_guide_SOURCES)
+formatting-guide.valid: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide.validwarn: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-prepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-manprepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-remprepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+
+legalnotice_en_INCLUDES =
+legalnotice_en_IMAGES =
+legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
+legalnotice_en_IDMAPS =
+legalnotice.en.validpure: $(legalnotice_en_SOURCES)
+legalnotice.en.titles: $(legalnotice_en_SOURCES)
+legalnotice.en.useless: $(legalnotice_en_SOURCES)
+legalnotice.en.valid: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en.validwarn: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-prepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+
+mysqldoc_formatting_guide_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../mysqldoc-guide/formatting-guide.xml \
+ ../refman-5.1/legalnotice.en.xml \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-formatting-guide-aspec.xml.fg-elements.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg-graphics.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg-ids.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg-introduction.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg-quotes.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg-structure-links.none.chapter.xml \
+ mysqldoc-formatting-guide-aspec.xml.fg.all.preface.xml \
+ mysqldoc-guide.ent
+mysqldoc_formatting_guide_IMAGES =
+mysqldoc_formatting_guide_SOURCES = mysqldoc-formatting-guide.xml
$(mysqldoc_formatting_guide_INCLUDES)
+mysqldoc_formatting_guide_IDMAPS = \
+ ../mysqldoc-guide/metadata/styleguide.idmap
+mysqldoc-formatting-guide.validpure: $(mysqldoc_formatting_guide_SOURCES)
+mysqldoc-formatting-guide.titles: $(mysqldoc_formatting_guide_SOURCES)
+mysqldoc-formatting-guide.useless: $(mysqldoc_formatting_guide_SOURCES)
+mysqldoc-formatting-guide.valid: $(mysqldoc_formatting_guide_SOURCES)
$(mysqldoc_formatting_guide_IDMAPS)
+mysqldoc-formatting-guide.validwarn: $(mysqldoc_formatting_guide_SOURCES)
$(mysqldoc_formatting_guide_IDMAPS)
+mysqldoc-formatting-guide-prepped.xml: $(mysqldoc_formatting_guide_SOURCES)
$(mysqldoc_formatting_guide_IDMAPS)
+mysqldoc-formatting-guide-manprepped.xml: $(mysqldoc_formatting_guide_SOURCES)
$(mysqldoc_formatting_guide_IDMAPS)
+mysqldoc-formatting-guide-remprepped.xml: $(mysqldoc_formatting_guide_SOURCES)
$(mysqldoc_formatting_guide_IDMAPS)
+
+mysqldoc_guide_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ entities.xml \
+ formats.xml \
+ formatting-guide.xml \
+ legalnotice.en.xml \
+ mysqldoc-guide.ent \
+ overview.xml \
+ special-markup.xml \
+ styleguide.xml \
+ tools.xml
+mysqldoc_guide_IMAGES =
+mysqldoc_guide_SOURCES = mysqldoc-guide.xml $(mysqldoc_guide_INCLUDES)
+mysqldoc_guide_IDMAPS = \
+ ../mysqldoc-guide/metadata/entities.idmap \
+ ../mysqldoc-guide/metadata/formats.idmap \
+ ../mysqldoc-guide/metadata/formatting-guide.idmap \
+ ../mysqldoc-guide/metadata/styleguide.idmap \
+ ../mysqldoc-guide/metadata/tools.idmap
+mysqldoc-guide.validpure: $(mysqldoc_guide_SOURCES)
+mysqldoc-guide.titles: $(mysqldoc_guide_SOURCES)
+mysqldoc-guide.useless: $(mysqldoc_guide_SOURCES)
+mysqldoc-guide.valid: $(mysqldoc_guide_SOURCES) $(mysqldoc_guide_IDMAPS)
+mysqldoc-guide.validwarn: $(mysqldoc_guide_SOURCES) $(mysqldoc_guide_IDMAPS)
+mysqldoc-guide-prepped.xml: $(mysqldoc_guide_SOURCES) $(mysqldoc_guide_IDMAPS)
+mysqldoc-guide-manprepped.xml: $(mysqldoc_guide_SOURCES) $(mysqldoc_guide_IDMAPS)
+mysqldoc-guide-remprepped.xml: $(mysqldoc_guide_SOURCES) $(mysqldoc_guide_IDMAPS)
+
+mysqldoc_style_guide_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../mysqldoc-guide/styleguide.xml \
+ ../refman-5.1/legalnotice.en.xml \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent \
+ mysqldoc-style-guide-aspec.xml.sg-capitalization.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-grammar.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-gui.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-names.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-numbering.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-principles.none.chapter.xml \
+ mysqldoc-style-guide-aspec.xml.sg-spelling.none.chapter.xml
+mysqldoc_style_guide_IMAGES =
+mysqldoc_style_guide_SOURCES = mysqldoc-style-guide.xml $(mysqldoc_style_guide_INCLUDES)
+mysqldoc_style_guide_IDMAPS = \
+ ../mysqldoc-guide/metadata/formatting-guide.idmap
+mysqldoc-style-guide.validpure: $(mysqldoc_style_guide_SOURCES)
+mysqldoc-style-guide.titles: $(mysqldoc_style_guide_SOURCES)
+mysqldoc-style-guide.useless: $(mysqldoc_style_guide_SOURCES)
+mysqldoc-style-guide.valid: $(mysqldoc_style_guide_SOURCES)
$(mysqldoc_style_guide_IDMAPS)
+mysqldoc-style-guide.validwarn: $(mysqldoc_style_guide_SOURCES)
$(mysqldoc_style_guide_IDMAPS)
+mysqldoc-style-guide-prepped.xml: $(mysqldoc_style_guide_SOURCES)
$(mysqldoc_style_guide_IDMAPS)
+mysqldoc-style-guide-manprepped.xml: $(mysqldoc_style_guide_SOURCES)
$(mysqldoc_style_guide_IDMAPS)
+mysqldoc-style-guide-remprepped.xml: $(mysqldoc_style_guide_SOURCES)
$(mysqldoc_style_guide_IDMAPS)
+
+overview_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent
+overview_IMAGES =
+overview_SOURCES = overview.xml $(overview_INCLUDES)
+overview_IDMAPS =
+overview.validpure: $(overview_SOURCES)
+overview.titles: $(overview_SOURCES)
+overview.useless: $(overview_SOURCES)
+overview.valid: $(overview_SOURCES) $(overview_IDMAPS)
+overview.validwarn: $(overview_SOURCES) $(overview_IDMAPS)
+overview-prepped.xml: $(overview_SOURCES) $(overview_IDMAPS)
+overview-manprepped.xml: $(overview_SOURCES) $(overview_IDMAPS)
+overview-remprepped.xml: $(overview_SOURCES) $(overview_IDMAPS)
+
+special_markup_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent
+special_markup_IMAGES =
+special_markup_SOURCES = special-markup.xml $(special_markup_INCLUDES)
+special_markup_IDMAPS =
+special-markup.validpure: $(special_markup_SOURCES)
+special-markup.titles: $(special_markup_SOURCES)
+special-markup.useless: $(special_markup_SOURCES)
+special-markup.valid: $(special_markup_SOURCES) $(special_markup_IDMAPS)
+special-markup.validwarn: $(special_markup_SOURCES) $(special_markup_IDMAPS)
+special-markup-prepped.xml: $(special_markup_SOURCES) $(special_markup_IDMAPS)
+special-markup-manprepped.xml: $(special_markup_SOURCES) $(special_markup_IDMAPS)
+special-markup-remprepped.xml: $(special_markup_SOURCES) $(special_markup_IDMAPS)
+
+styleguide_INCLUDES =
+styleguide_IMAGES =
+styleguide_SOURCES = styleguide.xml $(styleguide_INCLUDES)
+styleguide_IDMAPS = \
+ ../mysqldoc-guide/metadata/formatting-guide.idmap
+styleguide.validpure: $(styleguide_SOURCES)
+styleguide.titles: $(styleguide_SOURCES)
+styleguide.useless: $(styleguide_SOURCES)
+styleguide.valid: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide.validwarn: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-prepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-manprepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-remprepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+
+tools_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mysqldoc-guide.ent
+tools_IMAGES =
+tools_SOURCES = tools.xml $(tools_INCLUDES)
+tools_IDMAPS = \
+ ../mysqldoc-guide/metadata/tools.idmap
+tools.validpure: $(tools_SOURCES)
+tools.titles: $(tools_SOURCES)
+tools.useless: $(tools_SOURCES)
+tools.valid: $(tools_SOURCES) $(tools_IDMAPS)
+tools.validwarn: $(tools_SOURCES) $(tools_IDMAPS)
+tools-prepped.xml: $(tools_SOURCES) $(tools_IDMAPS)
+tools-manprepped.xml: $(tools_SOURCES) $(tools_IDMAPS)
+tools-remprepped.xml: $(tools_SOURCES) $(tools_IDMAPS)
+
+mysqldoc-formatting-guide-aspec.xml.fg-elements.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg-graphics.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg-ids.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg-introduction.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg-quotes.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg-structure-links.none.chapter.xml
mysqldoc-formatting-guide-aspec.xml.fg.all.preface.xml: ../common/fixedchars.ent
../mysqldoc-guide/formatting-guide.xml ../refman-common/urls.ent all-entities.ent
mysqldoc-guide.ent ../common/fixedchars.ent ../mysqldoc-guide/formatting-guide.xml
../refman-common/urls.ent all-entities.ent mysqldoc-guide.ent ../common/fixedchars.ent
../mysqldoc-guide/formatting-guide.xml ../refman-common/urls.ent all-entities.ent
mysqldoc-guide.ent ../common/fixedchars.ent ../mysqldoc-guide/formatting-guide.xml
../refman-common/urls.ent all-entities.ent mysqldoc-guide.ent ../common/fixedchars.ent
../mysqld!
oc-guide/formatting-guide.xml ../refman-common/urls.ent all-entities.ent
mysqldoc-guide.ent ../common/fixedchars.ent ../mysqldoc-guide/formatting-guide.xml
../refman-common/urls.ent all-entities.ent mysqldoc-guide.ent ../common/fixedchars.ent
../mysqldoc-guide/formatting-guide.xml ../refman-common/urls.ent all-entities.ent
mysqldoc-guide.ent
+ $(RM) mysqldoc-formatting-guide.xml mysqldoc-formatting-guide-arbitrary.xml
+ $(MAKE) mysqldoc-formatting-guide.xml
+
+mysqldoc-style-guide-aspec.xml.sg-capitalization.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-grammar.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-gui.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-names.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-numbering.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-principles.none.chapter.xml
mysqldoc-style-guide-aspec.xml.sg-spelling.none.chapter.xml:
../mysqldoc-guide/styleguide.xml ../mysqldoc-guide/styleguide.xml
../mysqldoc-guide/styleguide.xml ../mysqldoc-guide/styleguide.xml
../mysqldoc-guide/styleguide.xml ../mysqldoc-guide/styleguide.xml
../mysqldoc-guide/styleguide.xml
+ $(RM) mysqldoc-style-guide.xml mysqldoc-style-guide-arbitrary.xml
+ $(MAKE) mysqldoc-style-guide.xml
+
Modified: trunk/mysqldoc-guide/mysqldoc-formatting-guide-aspec.xml
===================================================================
--- trunk/mysqldoc-guide/mysqldoc-formatting-guide-aspec.xml 2008-11-02 22:31:36 UTC (rev
12255)
+++ trunk/mysqldoc-guide/mysqldoc-formatting-guide-aspec.xml 2008-11-03 11:06:13 UTC (rev
12256)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 25; 1173 bytes
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<book>
- <fragment id="arb-fg">
+ <fragment id="formatting-guide-fragment">
<include src="fg" markas="preface" filter="all">
@@ -9,40 +9,16 @@
</include>
- </fragment>
-
- <fragment id="arb-fg-introduction">
-
<include src="fg-introduction" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-fg-ids">
-
<include src="fg-ids" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-fg-structure-links">
-
<include src="fg-structure-links" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-fg-quotes">
-
<include src="fg-quotes" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-fg-elements">
-
<include src="fg-elements" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-fg-graphics">
-
<include src="fg-graphics" markas="chapter"/>
</fragment>
Modified: trunk/mysqldoc-guide/mysqldoc-formatting-guide-base.xml
===================================================================
--- trunk/mysqldoc-guide/mysqldoc-formatting-guide-base.xml 2008-11-02 22:31:36 UTC (rev
12255)
+++ trunk/mysqldoc-guide/mysqldoc-formatting-guide-base.xml 2008-11-03 11:06:13 UTC (rev
12256)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 13; 624 bytes
@@ -33,18 +33,6 @@
</bookinfo>
-<!--SRCFILE arb-fg-->
+<!--SRCFILE formatting-guide-fragment-->
-<!--SRCFILE arb-fg-introduction-->
-
-<!--SRCFILE arb-fg-ids-->
-
-<!--SRCFILE arb-fg-structure-links-->
-
-<!--SRCFILE arb-fg-quotes-->
-
-<!--SRCFILE arb-fg-elements-->
-
-<!--SRCFILE arb-fg-graphics-->
-
</book>
Modified: trunk/mysqldoc-guide/mysqldoc-style-guide-aspec.xml
===================================================================
--- trunk/mysqldoc-guide/mysqldoc-style-guide-aspec.xml 2008-11-02 22:31:36 UTC (rev
12255)
+++ trunk/mysqldoc-guide/mysqldoc-style-guide-aspec.xml 2008-11-03 11:06:13 UTC (rev
12256)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 25; 1119 bytes
@@ -1,44 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<book>
- <fragment id="arb-sg-principles">
+ <fragment id="style-guide-fragment">
<include src="sg-principles" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-numbering">
-
<include src="sg-numbering" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-capitalization">
-
<include src="sg-capitalization" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-names">
-
<include src="sg-names" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-grammar">
-
<include src="sg-grammar" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-spelling">
-
<include src="sg-spelling" markas="chapter"/>
- </fragment>
-
- <fragment id="arb-sg-gui">
-
<include src="sg-gui" markas="chapter"/>
</fragment>
Modified: trunk/mysqldoc-guide/mysqldoc-style-guide-base.xml
===================================================================
--- trunk/mysqldoc-guide/mysqldoc-style-guide-base.xml 2008-11-02 22:31:36 UTC (rev 12255)
+++ trunk/mysqldoc-guide/mysqldoc-style-guide-base.xml 2008-11-03 11:06:13 UTC (rev 12256)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 13; 609 bytes
@@ -32,18 +32,6 @@
</bookinfo>
-<!--SRCFILE arb-sg-principles-->
+<!--SRCFILE style-guide-fragment-->
-<!--SRCFILE arb-sg-numbering-->
-
-<!--SRCFILE arb-sg-capitalization-->
-
-<!--SRCFILE arb-sg-names-->
-
-<!--SRCFILE arb-sg-grammar-->
-
-<!--SRCFILE arb-sg-spelling-->
-
-<!--SRCFILE arb-sg-gui-->
-
</book>
Modified: trunk/mysqldoc-guide/styleguide.xml
===================================================================
--- trunk/mysqldoc-guide/styleguide.xml 2008-11-02 22:31:36 UTC (rev 12255)
+++ trunk/mysqldoc-guide/styleguide.xml 2008-11-03 11:06:13 UTC (rev 12256)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 496 bytes
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<chapter id="sg">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12256 - trunk/mysqldoc-guide | martin.brown | 3 Nov |