summaryrefslogtreecommitdiff
path: root/doc/man/scons.xml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-26 16:31:31 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-26 16:31:31 +0200
commitdf608fa858819f84924451b6a97559671303e8b0 (patch)
tree931f0ae1302ff7d45e41a1aa4b6dbc96be174744 /doc/man/scons.xml
parent9d8eae9f5bf53a4a80e29d7a3a1d2c7d7197688a (diff)
parent78989ebb445af2c6462ae2bf05ffd588d76610e4 (diff)
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'doc/man/scons.xml')
-rw-r--r--doc/man/scons.xml74
1 files changed, 38 insertions, 36 deletions
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index d9bd74d..af73173 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -1,4 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2001 - 2014 The SCons Foundation
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-->
<!DOCTYPE reference [
<!ENTITY % version SYSTEM "../version.xml">
@@ -17,29 +41,7 @@
<!-- lifted from troff+man by doclifter -->
<reference 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 scons.xsd">
-<!-- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation -->
-
-<!-- Permission is hereby granted, free of charge, to any person obtaining -->
-<!-- a copy of this software and associated documentation files (the -->
-<!-- "Software"), to deal in the Software without restriction, including -->
-<!-- without limitation the rights to use, copy, modify, merge, publish, -->
-<!-- distribute, sublicense, and/or sell copies of the Software, and to -->
-<!-- permit persons to whom the Software is furnished to do so, subject to -->
-<!-- the following conditions: -->
-
-<!-- The above copyright notice and this permission notice shall be included -->
-<!-- in all copies or substantial portions of the Software. -->
-
-<!-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -->
-<!-- KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -->
-<!-- WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -->
-<!-- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -->
-<!-- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -->
-<!-- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -->
-<!-- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -->
-
-<!-- doc/man/scons.xml 2014/03/02 14:18:15 garyo -->
+ xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
<referenceinfo>
<title>SCons &buildversion;</title>
@@ -50,19 +52,19 @@
<surname>Knight</surname>
</author>
- <corpauthor>Steven Knight</corpauthor>
+ <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
- <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010</pubdate>
+ <pubdate>2004 - 2014</pubdate>
<copyright>
- <year>2004, 2005, 2006, 2007, 2008, 2009, 2010</year>
- <holder>Steven Knight</holder>
+ <year>2004 - 2014</year>
+ <holder>The SCons Foundation</holder>
</copyright>
<releaseinfo>version &buildversion;</releaseinfo>
-
+
<mediaobject role="cover"><imageobject><imagedata fileref="cover.jpg" format="JPG"/></imageobject></mediaobject>
-
+
</referenceinfo>
<title>SCons &buildversion;</title>
@@ -73,7 +75,7 @@
<refmeta>
<refentrytitle>SCONS</refentrytitle>
<manvolnum>1</manvolnum>
-<refmiscinfo class='source'>March 2014</refmiscinfo>
+<refmiscinfo class='source'>July 2014</refmiscinfo>
</refmeta>
<refnamediv id='name'>
<refname>scons</refname>
@@ -4934,7 +4936,7 @@ multi-stage builder.</para>
<term>single_source</term>
<listitem>
<para>Specifies that this builder expects exactly one source file per call. Giving
-more than one source file without target files results in implicitely calling
+more than one source file without target files results in implicitly calling
the builder multiple times (once for each source given). Giving multiple
source files together with target files results in a UserError exception.</para>
@@ -5116,7 +5118,7 @@ function will turn its
<emphasis role="bold">action</emphasis>
keyword argument into an appropriate
internal Action object.
-You can also explicity create Action objects
+You can also explicitly create Action objects
using the
<emphasis role="bold">Action</emphasis>()
global function,
@@ -6123,7 +6125,7 @@ So in the following case:</para>
<literallayout class="monospaced">
env['COND'] = 0
env.Command('foo.out', 'foo.in',
-<!-- '''echo ${COND==1 and 'FOO' or 'BAR'} &gt; $TARGET''') -->
+ '''echo ${COND==1 and 'FOO' or 'BAR'} &gt; $TARGET''')
</literallayout>
<para>the command executed will be either</para>
<literallayout class="monospaced">
@@ -7093,9 +7095,9 @@ source code.</para>
</refsect1>
<refsect1 id='authors'><title>AUTHORS</title>
-<para>Steven Knight &lt;knight@baldmt.com&gt;
-<!-- .br -->
-Anthony Roach &lt;aroach@electriceyeball.com&gt;</para>
+<para>Originally: Steven Knight &lt;knight@baldmt.com&gt; and Anthony Roach &lt;aroach@electriceyeball.com&gt;
+Since 2010: The SCons Development Team &lt;scons-dev@scons.org&gt;
+</para>
</refsect1>
</refentry>
</reference>