summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-04-26 16:43:54 -0400
committerGary Oberbrunner <garyo@oberbrunner.com>2014-04-26 16:43:54 -0400
commit3af3b7b1656e73b3ea8ec00038aedef502fc3107 (patch)
tree3ecbff5ffb2a1e650191fbb1cb778e555342187d
parenta33c9fa0cd97107072a17f6cf6a2e49202893b74 (diff)
downloadscons-3af3b7b1656e73b3ea8ec00038aedef502fc3107.tar.gz
Updated author and copyright info.
Also cleaned up a couple of doc typos.
-rw-r--r--README.rst9
-rw-r--r--doc/man/scons.xml24
-rw-r--r--doc/python10/main.xml8
-rw-r--r--doc/user/main.xml2
-rw-r--r--rpm/scons.spec.in4
5 files changed, 25 insertions, 22 deletions
diff --git a/README.rst b/README.rst
index a1025ca1..b9e7d3b7 100644
--- a/README.rst
+++ b/README.rst
@@ -731,9 +731,10 @@ Check the SCons web site at:
Author Info
===========
-Steven Knight, knight at baldmt dot com, http://www.baldmt.com/~knight/
-
-With plenty of help from the SCons Development team:
+SCons was originally written by Steven Knight, knight at baldmt dot com.
+Since around 2010 it has been maintained by the SCons
+development team, co-managed by Bill Deegan and Gary Oberbrunner, with
+many contributors, including but not at all limited to:
- Chad Austin
- Dirk Baechle
@@ -745,6 +746,8 @@ With plenty of help from the SCons Development team:
- Gary Oberbrunner
- Anthony Roach
- Greg Spencer
+- Tom Tanner
+- Anatoly Techtonik
- Christoph Wiedemann
- Russel Winder
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index d726796e..10d25097 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -52,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>
@@ -4936,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>
@@ -5118,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,
@@ -6125,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">
@@ -7095,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;<br/>
+Since 2010: The SCons Development Team &lt;scons-dev@scons.org&gt;
+</para>
</refsect1>
</refentry>
</reference>
diff --git a/doc/python10/main.xml b/doc/python10/main.xml
index 60938527..a7732dab 100644
--- a/doc/python10/main.xml
+++ b/doc/python10/main.xml
@@ -10,7 +10,7 @@
<article 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 http://www.scons.org/dbxsd/v1.0/scons.xsd">
-
+
<!--
__COPYRIGHT__
@@ -35,7 +35,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
-
+
<articleinfo>
<title>SCons Design and Implementation</title>
@@ -46,8 +46,8 @@
<copyright>
<year>2001</year>
- <year>2002</year>
- <holder>Steven Knight</holder>
+ <year>2014</year>
+ <holder>The SCons Foundation</holder>
</copyright>
<pubdate>2002</pubdate>
diff --git a/doc/user/main.xml b/doc/user/main.xml
index ae515fa3..a1657776 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -72,7 +72,7 @@
<surname>Knight</surname>
</author>
- <corpauthor>Steven Knight</corpauthor>
+ <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
<pubdate>2004 - 2014</pubdate>
diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in
index 312eb44c..9b97a07d 100644
--- a/rpm/scons.spec.in
+++ b/rpm/scons.spec.in
@@ -14,8 +14,8 @@ Group: Development/Tools
BuildRoot: %{_tmppath}/%{name}-buildroot
Prefix: %{_prefix}
BuildArchitectures: noarch
-Vendor: Steven Knight <knight@scons.org>
-Packager: Steven Knight <knight@scons.org>
+Vendor: The SCons Development Team <scons-dev@scons.org>
+Packager: The SCons Development Team <scons-dev@scons.org>
Requires: python >= 2.4
Url: http://www.scons.org/