svn commit - mysqldoc@docsrva: r3845 - in trunk: . make.d

[paul]

Author: paul
Date: 2006-11-04 17:27:03 +0100 (Sat, 04 Nov 2006)
New Revision: 3845

Log:
 r11625@frost:  paul | 2006-11-04 09:42:49 -0600
 Move lines around


Modified:
   trunk/make.d/vars-docbook

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:15175
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11592
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:11301
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:15175
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11625
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:11301


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2006-11-04 10:49:49 UTC (rev 3844)
+++ trunk/make.d/vars-docbook	2006-11-04 16:27:03 UTC (rev 3845)
Changed blocks: 3, Lines Added: 23, Lines Deleted: 23; 2277 bytes

@@ -1,4 +1,27 @@
 # ----------------------------------------------------------------------
+# These variables can be overridden by setting them in the Makefile
+# prior to including this file.
+
+# Assume document language is English unless it's set otherwise
+
+DOC_LANG ?= en
+
+# Set XML_CATLOG_FILES to the pathname of the catalog.xml file and
+# set that variable in the environment for xmllint so that it uses
+# the file.
+
+XML_CATALOG_FILES ?= $(REPO_ROOT)/catalog.xml
+
+# Map <remark> elements to <para> so they show up in final output?
+# (default: no)
+
+# DO NOT ENABLE THIS FOR PRODUCTION DOCUMENTS because the remarks
+# will show up in published documents.  Use only for documents
+# that are still in development.
+
+MAP_REMARK_TO_PARA ?= 0
+
+# ----------------------------------------------------------------------
 # Stylesheet variables
 
 # xmllint and xsltproc operations must be able to find the DocBook DTD

@@ -15,12 +38,6 @@
 #   import the DocBook stylesheets as necessary with:
 #   <xsl:import href="docbook-xsl/..."/>
 
-# Set XML_CATLOG_FILES to the pathname of the catalog.xml file and
-# set that variable in the environment for xmllint so that it uses
-# the file.
-
-XML_CATALOG_FILES = $(REPO_ROOT)/catalog.xml
-
 # XML validator
 
 XMLLINT = XML_CATALOG_FILES="$(XML_CATALOG_FILES)" xmllint

@@ -37,23 +54,6 @@
 XSLTPROC = xsltproc --xinclude --novalid $(XSLTPROC_EXTRA_FLAGS)
 
 # ----------------------------------------------------------------------
-# These variables can be overridden by setting them in the Makefile
-# prior to including this file.
-
-# Assume document language is English unless it's set otherwise
-
-DOC_LANG ?= en
-
-# Map <remark> elements to <para> so they show up in final output?
-# (default: no)
-
-# DO NOT ENABLE THIS FOR PRODUCTION DOCUMENTS because the remarks
-# will show up in published documents.  Use only for documents
-# that are still in development.
-
-MAP_REMARK_TO_PARA ?= 0
-
-# ----------------------------------------------------------------------
 # Other scripts
 
 # Script that rewrites XML documents into standard format