summaryrefslogtreecommitdiffstats
path: root/doc/user/mergeflags.xml
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2013-05-03 22:12:43 (GMT)
committerDirk Baechle <dl9obn@darc.de>2013-05-03 22:12:43 (GMT)
commite70f1133e2725460290ec719351a33dd28c1df3e (patch)
treeb37d71196a6afd7eeb3271c651e86bf3d810dbcd /doc/user/mergeflags.xml
parent9e7cf970a730549348fd22a0921ea0ed2e894a69 (diff)
downloadSCons-e70f1133e2725460290ec719351a33dd28c1df3e.zip
SCons-e70f1133e2725460290ec719351a33dd28c1df3e.tar.gz
SCons-e70f1133e2725460290ec719351a33dd28c1df3e.tar.bz2
- added first version of the SCons XSD
- rewrote User Guide XML files, such that they are valid against it
Diffstat (limited to 'doc/user/mergeflags.xml')
-rw-r--r--doc/user/mergeflags.xml23
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml
index a148409..0979d94 100644
--- a/doc/user/mergeflags.xml
+++ b/doc/user/mergeflags.xml
@@ -1,3 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+ <!ENTITY % scons SYSTEM "../scons.mod">
+ %scons;
+
+ <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+ %builders-mod;
+ <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+ %functions-mod;
+ <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+ %tools-mod;
+ <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+ %variables-mod;
+]>
+
+<section id="sect-mergeflags"
+ xmlns="http://www.scons.org/dbxsd/v1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd">
+<title>Merging Options into the Environment: the &MergeFlags; Function</title>
+
<!--
__COPYRIGHT__
@@ -135,3 +156,5 @@
in the specified construction environment.
</para>
+
+</section>