Author: paul
Date: 2007-04-18 19:31:18 +0200 (Wed, 18 Apr 2007)
New Revision: 5963
Log:
r23658@polar: paul | 2007-04-18 12:29:04 -0500
Refactor entity-inclusion in proto-doc directory.
Added:
trunk/proto-doc/all-entities.ent
Modified:
trunk/proto-doc/Makefile.depends
trunk/proto-doc/proto-appendix.xml
trunk/proto-doc/proto-book.xml
trunk/proto-doc/proto-chapter.xml
trunk/proto-doc/proto-manpage.xml
trunk/proto-doc/proto-section.xml
trunk/proto-doc/proto-userguide-chapter.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23655
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19307
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23658
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19307
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/proto-doc/Makefile.depends
===================================================================
--- trunk/proto-doc/Makefile.depends 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/Makefile.depends 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 398 bytes
@@ -15,6 +15,7 @@
proto_book_INCLUDES = \
../common/fixedchars.ent \
+ all-entities.ent \
copyright.xml \
legalnotice.en.xml
proto_book_IMAGES =
Added: trunk/proto-doc/all-entities.ent
===================================================================
--- trunk/proto-doc/all-entities.ent (rev 0)
+++ trunk/proto-doc/all-entities.ent 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 580 bytes
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ This file names all the entity files needed by .xml files in the
+ current directory. All ENTITY declarations should be given
+ first, followed by references to the those entities.
+-->
+<!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
+%fixedchars.entities;
Modified: trunk/proto-doc/proto-appendix.xml
===================================================================
--- trunk/proto-doc/proto-appendix.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-appendix.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 578 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<appendix id="">
Modified: trunk/proto-doc/proto-book.xml
===================================================================
--- trunk/proto-doc/proto-book.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-book.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 577 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<book id="proto-book" lang="en">
Modified: trunk/proto-doc/proto-chapter.xml
===================================================================
--- trunk/proto-doc/proto-chapter.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-chapter.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 573 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<chapter id="">
Modified: trunk/proto-doc/proto-manpage.xml
===================================================================
--- trunk/proto-doc/proto-manpage.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-manpage.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 625 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<!--
In element id attributes, any underscores in the program name
Modified: trunk/proto-doc/proto-section.xml
===================================================================
--- trunk/proto-doc/proto-section.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-section.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 573 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<section id="">
Modified: trunk/proto-doc/proto-userguide-chapter.xml
===================================================================
--- trunk/proto-doc/proto-userguide-chapter.xml 2007-04-18 17:21:16 UTC (rev 5962)
+++ trunk/proto-doc/proto-userguide-chapter.xml 2007-04-18 17:31:18 UTC (rev 5963)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 677 bytes
@@ -2,8 +2,8 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
- %fixedchars.entities;
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
]>
<!-- Replace "-chapter" with a more descriptive term -->
<chapter id="user-guide-chapter">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5963 - in trunk: . proto-doc | paul | 18 Apr |
