List:Internals« Previous MessageNext Message »
From:paul Date:September 27 2005 7:14pm
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3635)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3635 05/09/27 12:14:39 paul@stripped +20 -0
  Document language settings.

  userguide/Makefile
    1.5 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  sample-data/world/Makefile
    1.4 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  refman/Makefile
    1.27 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  refman-common/Makefile
    1.3 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  refman-5.1/Makefile
    1.17 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  refman-5.0/Makefile
    1.17 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  refman-4.1/Makefile
    1.23 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  query-browser/Makefile
    1.5 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  migration-toolkit/Makefile
    1.4 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  make.d/xml-xhtml-dir
    1.5 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-texi
    1.9 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-pdf
    1.6 05/09/27 12:14:38 paul@stripped +6 -0
    Set default-language parameter.

  make.d/xml-man
    1.4 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-html-web
    1.4 05/09/27 12:14:38 paul@stripped +8 -0
    Set default-language parameter.

  make.d/xml-html-section
    1.4 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-html-help
    1.6 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-html-dir
    1.5 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  make.d/xml-html-chapter
    1.5 05/09/27 12:14:38 paul@stripped +5 -0
    Set default-language parameter.

  internals/Makefile
    1.6 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

  administrator/Makefile
    1.5 05/09/27 12:14:38 paul@stripped +2 -0
    Set document language.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.2/refman-common/Makefile	2005-08-15 15:03:07 -05:00
+++ 1.3/refman-common/Makefile	2005-09-27 12:14:38 -05:00
@@ -6,6 +6,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.4/userguide/Makefile	2005-08-20 21:36:40 -05:00
+++ 1.5/userguide/Makefile	2005-09-27 12:14:38 -05:00
@@ -16,6 +16,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.16/refman-5.0/Makefile	2005-09-06 14:11:59 -05:00
+++ 1.17/refman-5.0/Makefile	2005-09-27 12:14:38 -05:00
@@ -19,6 +19,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.16/refman-5.1/Makefile	2005-09-06 14:12:01 -05:00
+++ 1.17/refman-5.1/Makefile	2005-09-27 12:14:38 -05:00
@@ -19,6 +19,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.4/administrator/Makefile	2005-08-20 21:36:39 -05:00
+++ 1.5/administrator/Makefile	2005-09-27 12:14:38 -05:00
@@ -16,6 +16,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.5/internals/Makefile	2005-08-20 21:36:40 -05:00
+++ 1.6/internals/Makefile	2005-09-27 12:14:38 -05:00
@@ -18,6 +18,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.4/make.d/xml-html-chapter	2005-09-26 22:18:47 -05:00
+++ 1.5/make.d/xml-html-chapter	2005-09-27 12:14:38 -05:00
@@ -7,6 +7,10 @@
 MYSQL_HTML_CHAPTER_XSL = $(XSL_DIR)/mysql-html-section.xsl
 MYSQL_HTML_CHAPTER_XSL_DEPS = $(MYSQL_HTML_CHAPTER_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.html-chapter: %.html-chapter.d
 	touch $@
 
@@ -16,6 +20,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--param chunk.section.depth 0 \
 		--output $@/ \
 		$(MYSQL_HTML_CHAPTER_XSL) \

--- 1.5/make.d/xml-html-help	2005-09-26 22:18:47 -05:00
+++ 1.6/make.d/xml-html-help	2005-09-27 12:14:38 -05:00
@@ -9,6 +9,10 @@
 MYSQL_HTML_HELP_XSL = $(XSL_DIR)/mysql-html-help.xsl
 MYSQL_HTML_HELP_XSL_DEPS = $(MYSQL_HTML_HELP_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.html-help: %.html-help.d
 	touch $@
 
@@ -18,6 +22,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--param chunk.section.depth 0 \
 		--output $@/ \
 		$(MYSQL_HTML_HELP_XSL) \

--- 1.3/make.d/xml-html-section	2005-09-26 22:18:47 -05:00
+++ 1.4/make.d/xml-html-section	2005-09-27 12:14:38 -05:00
@@ -4,6 +4,10 @@
 MYSQL_HTML_SECTION_XSL = $(XSL_DIR)/mysql-html-section.xsl
 MYSQL_HTML_SECTION_XSL_DEPS = $(MYSQL_HTML_SECTION_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.html-section: %.html-section.d
 	touch $@
 
@@ -13,6 +17,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--output $@/ \
 		$(MYSQL_HTML_SECTION_XSL) \
 		$<

--- 1.3/make.d/xml-html-web	2005-09-26 22:18:47 -05:00
+++ 1.4/make.d/xml-html-web	2005-09-27 12:14:38 -05:00
@@ -2,9 +2,16 @@
 # The output files contain TOC stuff suitable for use on mysql.com
 # (Language sensitive)
 
+# The l10n.gentext.default.language parameter MUST be set because
+# mysqlweb-chunk.xsl includes its value in each output page.
+
 MYSQL_HTML_WEB_XSL = $(XSL_DIR)/mysqlweb-chunk.xsl
 MYSQL_HTML_WEB_XSL_DEPS = $(MYSQL_HTML_WEB_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.html-web: %.html-web.d
 	touch $@
 
@@ -14,6 +21,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--stringparam document.name.stem $* \
 		--output $@/ \
 		$(MYSQL_HTML_WEB_XSL) \

--- 1.3/make.d/xml-man	2005-09-26 22:18:47 -05:00
+++ 1.4/make.d/xml-man	2005-09-27 12:14:38 -05:00
@@ -4,8 +4,13 @@
 MYSQL_MAN_XSL = $(XSL_DIR)/mysql-man.xsl
 MYSQL_MAN_XSL_DEPS = $(MYSQL_MAN_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.man: %-manprepped.xml $(MYSQL_MAN_XSL_DEPS)
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--output $*.html \
 		$(MYSQL_MAN_XSL) \
 		$<

--- 1.8/make.d/xml-texi	2005-09-26 22:18:48 -05:00
+++ 1.9/make.d/xml-texi	2005-09-27 12:14:38 -05:00
@@ -3,6 +3,10 @@
 DBK_TEXI_XSL = $(XSL_DIR)/dbk-texi.xsl
 DBK_TEXI_XSL_DEPS = $(DBK_TEXI_XSL) $(XSL_DIR)/map-spchars-texi.xsl
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 # This line causes files with the named extension not to be deleted when
 # they are generated as intermediates for producing a final target.  They
 # are removed by "make clean".
@@ -11,6 +15,7 @@
 
 %.texi: %-texiprepped.xml $(DBK_TEXI_XSL_DEPS) $(FIXUP_TEXI)
 	$(XSLTPROC)  \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		$(DBK_TEXI_XSL) $< | $(FIXUP_TEXI) > $@
 
 clean::

--- 1.3/migration-toolkit/Makefile	2005-08-20 21:36:40 -05:00
+++ 1.4/migration-toolkit/Makefile	2005-09-27 12:14:38 -05:00
@@ -16,6 +16,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.4/query-browser/Makefile	2005-08-20 21:36:40 -05:00
+++ 1.5/query-browser/Makefile	2005-09-27 12:14:38 -05:00
@@ -16,6 +16,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.26/refman/Makefile	2005-09-06 14:10:40 -05:00
+++ 1.27/refman/Makefile	2005-09-27 12:14:38 -05:00
@@ -19,6 +19,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.5/make.d/xml-pdf	2005-09-26 22:18:48 -05:00
+++ 1.6/make.d/xml-pdf	2005-09-27 12:14:38 -05:00
@@ -4,6 +4,10 @@
 MYSQL_FO_XSL = $(XSL_DIR)/mysql-fo.xsl
 MYSQL_FO_XSL_DEPS = $(MYSQL_FO_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 # This line causes files with the named extension not to be deleted when
 # they are generated as intermediates for producing a final target.  They
 # are removed by "make clean".
@@ -15,10 +19,12 @@
 
 %.fo: %-prepped.xml $(MYSQL_FO_XSL_DEPS)
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--output $@ $(MYSQL_FO_XSL) $<
 
 %.a4.fo: %-prepped.xml $(MYSQL_FO_XSL_DEPS)
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--stringparam paper.type A4 \
 		--output $@ $(MYSQL_FO_XSL) $<
 

--- 1.22/refman-4.1/Makefile	2005-09-06 14:11:57 -05:00
+++ 1.23/refman-4.1/Makefile	2005-09-27 12:14:38 -05:00
@@ -19,6 +19,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.3/sample-data/world/Makefile	2005-08-20 21:36:40 -05:00
+++ 1.4/sample-data/world/Makefile	2005-09-27 12:14:38 -05:00
@@ -6,6 +6,8 @@
 # Location of directory containing Makefile components
 MAKE_DIR = $(REPO_ROOT)/make.d
 
+DOC_LANG = en
+
 all::
 	@echo "You must say what you want to do."
 	@echo "Some commands supported by this Makefile:"

--- 1.4/make.d/xml-html-dir	2005-09-26 22:18:47 -05:00
+++ 1.5/make.d/xml-html-dir	2005-09-27 12:14:38 -05:00
@@ -8,6 +8,10 @@
 MYSQL_HTML_XSL = $(XSL_DIR)/mysql-html.xsl
 MYSQL_HTML_XSL_DEPS = $(MYSQL_HTML_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.html-dir: %.html-dir.d
 	touch $@
 
@@ -17,6 +21,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--output $@/$*.html \
 		$(MYSQL_HTML_XSL) \
 		$<

--- 1.4/make.d/xml-xhtml-dir	2005-09-26 22:18:48 -05:00
+++ 1.5/make.d/xml-xhtml-dir	2005-09-27 12:14:38 -05:00
@@ -8,6 +8,10 @@
 MYSQL_XHTML_XSL = $(XSL_DIR)/mysql-xhtml.xsl
 MYSQL_XHTML_XSL_DEPS = $(MYSQL_XHTML_XSL)
 
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
 %.xhtml-dir: %.xhtml-dir.d
 	touch $@
 
@@ -17,6 +21,7 @@
 	-$(RM) -r $@/
 	mkdir $@/
 	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(DOC_LANG) \
 		--output $@/$*.xhtml \
 		$(MYSQL_XHTML_XSL) \
 		$<
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3635)paul27 Sep