Author: paul
Date: 2007-04-17 21:11:55 +0200 (Tue, 17 Apr 2007)
New Revision: 5930
Log:
r23573@polar: paul | 2007-04-17 14:11:07 -0500
Make further proto-doc -> proto-book changes.
Modified:
trunk/proto-doc/Makefile
trunk/proto-doc/README
trunk/proto-doc/proto-book.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23569
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19201
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:23573
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19201
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
===================================================================
--- trunk/proto-doc/Makefile 2007-04-17 19:06:42 UTC (rev 5929)
+++ trunk/proto-doc/Makefile 2007-04-17 19:11:55 UTC (rev 5930)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1620 bytes
@@ -9,7 +9,7 @@
# Set any variables here that should override imported standard variables
DOC_LANG = en
-MAIN_DOC_BASENAME = proto-doc
+MAIN_DOC_BASENAME = proto-book
# Set IDMAP and remap variables
@@ -19,7 +19,7 @@
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
IDMAP_REFS = .
-IDMAP_SRCS = $(PROTO_DOC_SRCS)
+IDMAP_SRCS = $(PROTO_BOOK_SRCS)
IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
# Import standard variables
@@ -36,21 +36,21 @@
# "make depend" updates the _SRCS variable
# Set _SRCS_EXTRA variable by hand to any entity files needed
-depend:: proto-doc.depend
+depend:: proto-book.depend
-PROTO_DOC_SRCS_EXTRA = ../common/fixedchars.ent
+PROTO_BOOK_SRCS_EXTRA = ../common/fixedchars.ent
-PROTO_DOC_SRCS = $(PROTO_DOC_SRCS_EXTRA) proto-doc.xml copyright.xml legalnotice.en.xml
+PROTO_BOOK_SRCS = $(PROTO_BOOK_SRCS_EXTRA) proto-book.xml copyright.xml legalnotice.en.xml
-proto-doc-prepped.xml: $(PROTO_DOC_SRCS) $(IDMAP_OBJS)
-proto-doc-remprepped.xml: $(PROTO_DOC_SRCS) $(IDMAP_OBJS)
+proto-book-prepped.xml: $(PROTO_BOOK_SRCS) $(IDMAP_OBJS)
+proto-book-remprepped.xml: $(PROTO_BOOK_SRCS) $(IDMAP_OBJS)
# ... put any special-case target rules here ...
# Include this clean target if you generate plain text output
# from the document
clean::
- $(RM) proto-doc.txt
+ $(RM) proto-book.txt
# Import standard target rules
# (comment out or remove any that you don't need)
Modified: trunk/proto-doc/README
===================================================================
--- trunk/proto-doc/README 2007-04-17 19:06:42 UTC (rev 5929)
+++ trunk/proto-doc/README 2007-04-17 19:11:55 UTC (rev 5930)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 944 bytes
@@ -4,14 +4,14 @@
1) Make a copy of this directory, named for the new document. In
the following instructions, suppose that this copy is named "my-doc".
-2) Rename proto-doc.xml to the name that you'll use for your document
+2) Rename proto-book.xml to the name that you'll use for your document
- Example: mv proto-doc.xml my-doc.xml
+ Example: mv proto-book.xml my-doc.xml
3) Look through my-doc.xml and edit as necessary. For example, change
the title to something meaningful.
-4) Edit Makefile to change "proto-doc" and "PROTO_DOC" to "my-doc"
+4) Edit Makefile to change "proto-book" and "PROTO_BOOK" to "my-doc"
and "MY_DOC". Also note other comments in the Makefile and make
any appropriate changes.
Modified: trunk/proto-doc/proto-book.xml
===================================================================
--- trunk/proto-doc/proto-book.xml 2007-04-17 19:06:42 UTC (rev 5929)
+++ trunk/proto-doc/proto-book.xml 2007-04-17 19:11:55 UTC (rev 5930)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 462 bytes
@@ -5,7 +5,7 @@
<!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent">
%fixedchars.entities;
]>
-<book id="proto-doc" lang="en">
+<book id="proto-book" lang="en">
<title>TITLE OF DOCUMENT HERE</title>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5930 - in trunk: . proto-doc | paul | 17 Apr |
