From bbbedc60fea8b4c0cac6905aea2737d40a3988f0 Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Fri, 23 Aug 2019 07:56:49 -0600
Subject: [PR #3425] further tweak "default" tool wording [ci skip]

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 doc/generated/tools.gen           | 26 +++++++++++++-------------
 src/engine/SCons/Tool/default.xml | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index bb2b71f..f542118 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -140,22 +140,22 @@ Set construction variables for cygwin linker/loader.
     <listitem>
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 Sets <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variables</literal> for a default list of Tool modules.
-Include <emphasis role="bold">default</emphasis>
-in the tools list to retain
-the tools that would have been available if no
-<parameter>tools</parameter> parameter were supplied
-to an <emphasis role="bold">Environment</emphasis>
-or <emphasis role="bold">Clone</emphasis> call.
+Use <emphasis role="bold">default</emphasis>
+in the tools list to retain the original defaults,
+since the <parameter>tools</parameter> parameter
+is treated as a literal statement of the tools
+to be made available in that <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>, not an addition.
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
-The list of available tools from default is dependent both on
-the platform and what software is installed on the platform.
+The list of tools selected by default is not static,
+but is dependent both on
+the platform and on the software installed on the platform.
 Some tools will not initialize if an underlying command is
 not found, and some tools are selected from a list of choices
 on a first-found basis. The finished tool list can be
 examined by inspecting the <envar>TOOLS</envar> <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variable</literal>
-variable in the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>.
+in the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>.
 </para>
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -168,7 +168,7 @@ tex, latex, pdflatex, pdftex, tar, zip, textfile.
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Linux systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 gcc, intelc, icc, cc;
 a C++ compiler from
 g++, intelc, icc, cxx;
@@ -185,7 +185,7 @@ m4, rpm.
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 On Windows systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 msvc, mingw, gcc, intelc, icl, icc, cc, bcc32;
 a C++ compiler from
 msvc, intelc, icc, g++, cxx, bcc32;
@@ -203,7 +203,7 @@ msvs, midl.
 
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 On MacOS systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 gcc, cc;
 a C++ compiler from
 g++, cxx;
@@ -212,7 +212,7 @@ a linker from
 applelink, gnulink;
 a Fortran compiler from
 gfortran, f95, f90, g77;
-and a static archiver 'ar'.
+and a static archiver ar.
 It also selects all found from the list
 m4, rpm.
 </para>
diff --git a/src/engine/SCons/Tool/default.xml b/src/engine/SCons/Tool/default.xml
index 84c9bd8..4b862fb 100644
--- a/src/engine/SCons/Tool/default.xml
+++ b/src/engine/SCons/Tool/default.xml
@@ -27,22 +27,22 @@ See its __doc__ string for a discussion of the format.
 <summary>
 <para>
 Sets &consvars; for a default list of Tool modules.
-Include <emphasis role="bold">default</emphasis>
-in the tools list to retain
-the tools that would have been available if no
-<parameter>tools</parameter> parameter were supplied
-to an <emphasis role="bold">Environment</emphasis>
-or <emphasis role="bold">Clone</emphasis> call.
+Use <emphasis role="bold">default</emphasis>
+in the tools list to retain the original defaults,
+since the <parameter>tools</parameter> parameter
+is treated as a literal statement of the tools
+to be made available in that &consenv;, not an addition.
 </para>
 
 <para>
-The list of available tools from default is dependent both on
-the platform and what software is installed on the platform.
+The list of tools selected by default is not static,
+but is dependent both on
+the platform and on the software installed on the platform.
 Some tools will not initialize if an underlying command is
 not found, and some tools are selected from a list of choices
 on a first-found basis. The finished tool list can be
 examined by inspecting the <envar>TOOLS</envar> &consvar;
-variable in the &consenv;.
+in the &consenv;.
 </para>
 
 <para>
@@ -55,7 +55,7 @@ tex, latex, pdflatex, pdftex, tar, zip, textfile.
 
 <para>
 On Linux systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 gcc, intelc, icc, cc;
 a C++ compiler from
 g++, intelc, icc, cxx;
@@ -72,7 +72,7 @@ m4, rpm.
 
 <para>
 On Windows systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 msvc, mingw, gcc, intelc, icl, icc, cc, bcc32;
 a C++ compiler from
 msvc, intelc, icc, g++, cxx, bcc32;
@@ -90,7 +90,7 @@ msvs, midl.
 
 <para>
 On MacOS systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
 gcc, cc;
 a C++ compiler from
 g++, cxx;
@@ -99,7 +99,7 @@ a linker from
 applelink, gnulink;
 a Fortran compiler from
 gfortran, f95, f90, g77;
-and a static archiver 'ar'.
+and a static archiver ar.
 It also selects all found from the list
 m4, rpm.
 </para>
-- 
cgit v0.12