Merge tag 'upstream/2.3.2'

Upstream version 2.3.2

18 files changed, 34 insertions, 31 deletions

diff --git a/doc/design/SConstruct b/doc/design/SConstruct
index 1cafcb1..5cee70e 100644
--- a/doc/design/SConstruct
+++ b/doc/design/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/design/acks.xml b/doc/design/acks.xml
index 94a249f..76aa968 100644
--- a/doc/design/acks.xml
+++ b/doc/design/acks.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-acks"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Acknowledgements</title>
 
 <!--
 
-  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/design/bground.xml b/doc/design/bground.xml
index 327d041..b711a37 100644
--- a/doc/design/bground.xml
+++ b/doc/design/bground.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-background"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Background</title>
 
 <!--
 
-  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/design/chtml.xsl b/doc/design/chtml.xsl
index 25fc37e..44b2551 100644
--- a/doc/design/chtml.xsl
+++ b/doc/design/chtml.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  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

@@ -33,6 +33,7 @@
 <xsl:param name="base.dir" select="'scons-design/'"/>

 <xsl:param name="l10n.gentext.default.language" select="'en'"/>

 <xsl:param name="section.autolabel" select="1"/>

+<xsl:param name="section.label.includes.component.label" select="1"/>

 <xsl:param name="html.stylesheet" select="'scons.css'"/>

 <xsl:param name="generate.toc">

 /appendix toc,title

diff --git a/doc/design/copyright.xml b/doc/design/copyright.xml
index df3d544..d91f7a7 100644
--- a/doc/design/copyright.xml
+++ b/doc/design/copyright.xml
@@ -6,11 +6,11 @@
 
 <legalnotice 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">
+             xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 
 <!--
 
-  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/design/engine.xml b/doc/design/engine.xml
index 4f56e61..065daf4 100644
--- a/doc/design/engine.xml
+++ b/doc/design/engine.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-engine"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Build Engine API</title>
 
 <!--
 
-  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/design/goals.xml b/doc/design/goals.xml
index f9dfc1c..e320be8 100644
--- a/doc/design/goals.xml
+++ b/doc/design/goals.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-goals"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Goals</title>
 
 <!--
 
-  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/design/html.xsl b/doc/design/html.xsl
index 2c94958..5b03fa1 100644
--- a/doc/design/html.xsl
+++ b/doc/design/html.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  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

@@ -32,6 +32,7 @@
 

 <xsl:param name="l10n.gentext.default.language" select="'en'"/>

 <xsl:param name="section.autolabel" select="1"/>

+<xsl:param name="section.label.includes.component.label" select="1"/>

 <xsl:param name="html.stylesheet" select="'scons.css'"/>

 <xsl:param name="generate.toc">

 /appendix toc,title

diff --git a/doc/design/install.xml b/doc/design/install.xml
index dc27b2c..1d3f38e 100644
--- a/doc/design/install.xml
+++ b/doc/design/install.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-install"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Installation</title>
 
 <!--
 
-  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/design/intro.xml b/doc/design/intro.xml
index 1d042ae..b716ca6 100644
--- a/doc/design/intro.xml
+++ b/doc/design/intro.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-intro"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Introduction</title>
 
 <!--
 
-  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/design/issues.xml b/doc/design/issues.xml
index a43b77f..a35149d 100644
--- a/doc/design/issues.xml
+++ b/doc/design/issues.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-issues"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Other Issues</title>
 
 <!--
 
-  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/design/main.xml b/doc/design/main.xml
index fb6469b..fda23ec 100644
--- a/doc/design/main.xml
+++ b/doc/design/main.xml
@@ -2,7 +2,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
@@ -37,7 +37,7 @@
 
 <book 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">
+      xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
   <bookinfo>
     <title>SCons &buildversion;</title>
     <subtitle>Design</subtitle>
diff --git a/doc/design/native.xml b/doc/design/native.xml
index 83227ab..6ba892b 100644
--- a/doc/design/native.xml
+++ b/doc/design/native.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-native"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Native Python Interface</title>
 
 <!--
 
-  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/design/overview.xml b/doc/design/overview.xml
index 66ef78d..cd50146 100644
--- a/doc/design/overview.xml
+++ b/doc/design/overview.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-overview"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Overview</title>
 
 <!--
 
-  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/design/pdf.xsl b/doc/design/pdf.xsl
index c8acf1b..57c246b 100644
--- a/doc/design/pdf.xsl
+++ b/doc/design/pdf.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  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

@@ -33,6 +33,7 @@
 	<xsl:include href="scons_title.xsl"/> 

 <xsl:param name="l10n.gentext.default.language" select="'en'"/>

 <xsl:param name="section.autolabel" select="1"></xsl:param>

+<xsl:param name="section.label.includes.component.label" select="1"/>

 <xsl:param name="paper.type" select="'letter'"></xsl:param>

 <xsl:param name="body.start.indent">0pt</xsl:param>

 <xsl:param name="shade.verbatim" select="1"></xsl:param>

diff --git a/doc/design/scons.css b/doc/design/scons.css
index 6941abb..ff9b5a1 100644
--- a/doc/design/scons.css
+++ b/doc/design/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/design/scons_title.xsl b/doc/design/scons_title.xsl
index 52ca405..7fc9589 100644
--- a/doc/design/scons_title.xsl
+++ b/doc/design/scons_title.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-  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/design/summary.xml b/doc/design/summary.xml
index 8b68654..1931bef 100644
--- a/doc/design/summary.xml
+++ b/doc/design/summary.xml
@@ -7,12 +7,12 @@
 <chapter id="chap-summary"
          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">
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 <title>Summary</title>
 
 <!--
 
-  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