From 78989ebb445af2c6462ae2bf05ffd588d76610e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Jul 2014 16:31:27 +0200 Subject: Imported Upstream version 2.3.2 --- doc/man/SConstruct | 2 +- doc/man/epub.xsl | 2 +- doc/man/html.xsl | 3 +- doc/man/pdf.xsl | 3 +- doc/man/scons-time.xml | 57 +++++++++++++++++-------------------- doc/man/scons.css | 4 +-- doc/man/scons.xml | 74 +++++++++++++++++++++++++------------------------ doc/man/scons_title.xsl | 2 +- doc/man/sconsign.xml | 56 ++++++++++++++++++------------------- 9 files changed, 100 insertions(+), 103 deletions(-) (limited to 'doc/man') diff --git a/doc/man/SConstruct b/doc/man/SConstruct index 7127ff2..51cdd44 100644 --- a/doc/man/SConstruct +++ b/doc/man/SConstruct @@ -3,7 +3,7 @@ # # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# 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 diff --git a/doc/man/epub.xsl b/doc/man/epub.xsl index 18da970..ebbd85a 100644 --- a/doc/man/epub.xsl +++ b/doc/man/epub.xsl @@ -1,7 +1,7 @@ - - + - - - - - - + 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. - - - - - - - +--> + + + SCONS-TIME 1 -March 2014 +July 2014 scons-time diff --git a/doc/man/scons.css b/doc/man/scons.css index 6941abb..ff9b5a1 100644 --- a/doc/man/scons.css +++ b/doc/man/scons.css @@ -6,11 +6,11 @@ body { } -a { +a:link { color: #80572a; } -a:hover { +a:link:hover { color: #d72816; text-decoration: none; } 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 @@ + @@ -17,29 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> SCons &buildversion; @@ -50,19 +52,19 @@ Knight - Steven Knight + Steven Knight and the SCons Development Team - 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2004 - 2014 - 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Steven Knight + 2004 - 2014 + The SCons Foundation version &buildversion; - + - + SCons &buildversion; @@ -73,7 +75,7 @@ SCONS 1 -March 2014 +July 2014 scons @@ -4934,7 +4936,7 @@ multi-stage builder. single_source 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. @@ -5116,7 +5118,7 @@ function will turn its action keyword argument into an appropriate internal Action object. -You can also explicity create Action objects +You can also explicitly create Action objects using the Action() global function, @@ -6123,7 +6125,7 @@ So in the following case: env['COND'] = 0 env.Command('foo.out', 'foo.in', - + '''echo ${COND==1 and 'FOO' or 'BAR'} > $TARGET''') the command executed will be either @@ -7093,9 +7095,9 @@ source code. AUTHORS -Steven Knight <knight@baldmt.com> - -Anthony Roach <aroach@electriceyeball.com> +Originally: Steven Knight <knight@baldmt.com> and Anthony Roach <aroach@electriceyeball.com> +Since 2010: The SCons Development Team <scons-dev@scons.org> + diff --git a/doc/man/scons_title.xsl b/doc/man/scons_title.xsl index 6093c20..54dd33c 100644 --- a/doc/man/scons_title.xsl +++ b/doc/man/scons_title.xsl @@ -1,7 +1,7 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> SCONSIGN 1 -March 2014 +July 2014 sconsign -- cgit v1.2.3