summaryrefslogtreecommitdiffstats
path: root/SCons
diff options
context:
space:
mode:
authorAlex Thiessen <alex.thiessen.de+github@gmail.com>2024-11-15 12:02:59 (GMT)
committerAlex Thiessen <alex.thiessen.de+github@gmail.com>2024-11-15 14:55:41 (GMT)
commit8aa16624a5dd789043fe0e1e99825d6711ad52b9 (patch)
treed150431a438742f25de4586a045ea2fb736ce3a6 /SCons
parentc1ddbc7fa5e34ae6aba45104e6dfb39ebb08d3eb (diff)
downloadSCons-8aa16624a5dd789043fe0e1e99825d6711ad52b9.zip
SCons-8aa16624a5dd789043fe0e1e99825d6711ad52b9.tar.gz
SCons-8aa16624a5dd789043fe0e1e99825d6711ad52b9.tar.bz2
*.xml: Fix obvious typos etc.
Diffstat (limited to 'SCons')
-rw-r--r--SCons/Action.xml2
-rw-r--r--SCons/Defaults.xml10
-rw-r--r--SCons/Environment.xml34
-rw-r--r--SCons/Script/Main.xml4
-rw-r--r--SCons/Script/SConscript.xml2
-rw-r--r--SCons/Subst.xml2
-rw-r--r--SCons/Tool/DCommon.xml2
-rw-r--r--SCons/Tool/Tool.xml2
-rw-r--r--SCons/Tool/c++.xml8
-rw-r--r--SCons/Tool/docbook/docbook.xml8
-rw-r--r--SCons/Tool/javac.xml2
-rw-r--r--SCons/Tool/link.xml4
-rw-r--r--SCons/Tool/msvc.xml4
-rw-r--r--SCons/Tool/msvs.xml2
-rw-r--r--SCons/Tool/ninja/ninja.xml2
-rw-r--r--SCons/Tool/packaging/packaging.xml6
-rw-r--r--SCons/Tool/textfile.xml6
-rw-r--r--SCons/Tool/tlib.xml2
-rw-r--r--SCons/Tool/xgettext.xml2
19 files changed, 52 insertions, 52 deletions
diff --git a/SCons/Action.xml b/SCons/Action.xml
index c71c305..738df78 100644
--- a/SCons/Action.xml
+++ b/SCons/Action.xml
@@ -59,7 +59,7 @@ greater than one, as that has a different meaning).
<para>
Action strings can be segmented by the
use of an AND operator, <literal>&amp;&amp;</literal>.
-In a segemented string, each segment is a separate
+In a segmented string, each segment is a separate
<quote>command line</quote>, these are run
sequentially until one fails or the entire
sequence has been executed. If an
diff --git a/SCons/Defaults.xml b/SCons/Defaults.xml
index 933fe9d..80ec4cd 100644
--- a/SCons/Defaults.xml
+++ b/SCons/Defaults.xml
@@ -147,7 +147,7 @@ and the second is the macro definition.
If the definition is not omitted or <literal>None</literal>,
the name and definition are combined into a single
<literal>name=definition</literal> item
-before the preending/appending.
+before the prepending/appending.
</para>
<example_commands>
@@ -618,7 +618,7 @@ If &cv-link-LIBLITERALPREFIX; is set to a non-empty string,
then a string-valued &cv-LIBS; entry
that starts with &cv-link-LIBLITERALPREFIX;
will cause the rest of the entry
-to be searched for for unmodified,
+to be searched for unmodified,
but respecting normal library search paths
(this is an exception to the guideline above
about leaving off the prefix/suffix from the library name).
@@ -649,12 +649,12 @@ env.Append(LIBS=File('/tmp/mylib.so'))
<!-- is this actually true? -->
For each &Builder; call that causes linking with libraries,
&SCons; will add the libraries in the setting of &cv-LIBS;
-in effect at that moment to the dependecy graph
+in effect at that moment to the dependency graph
as dependencies of the target being generated.
</para>
<para>
-The library list will transformed to command line
+The library list will be transformed to command line
arguments through the automatically-generated
&cv-link-_LIBFLAGS; &consvar;
which is constructed by
@@ -764,7 +764,7 @@ build phase begins, if has not already been done.
However, calling it explicitly provides the opportunity to
affect and examine its contents.
Instantiation occurs even if nothing in the build system
-appars to use it, due to internal uses.
+appears to use it, due to internal uses.
</para>
<para>
diff --git a/SCons/Environment.xml b/SCons/Environment.xml
index bc4c3b7..87d1e7c 100644
--- a/SCons/Environment.xml
+++ b/SCons/Environment.xml
@@ -572,14 +572,14 @@ named <parameter>key</parameter>,
then <parameter>key</parameter> is simply
stored with a value of <parameter>val</parameter>.
Otherwise, <parameter>val</parameter> is
-combinined with the existing value,
+combined with the existing value,
possibly converting into an appropriate type
which can hold the expanded contents.
There are a few special cases to be aware of.
Normally, when two strings are combined,
the result is a new string containing their concatenation
(and you are responsible for supplying any needed separation);
-however, the contents of &cv-link-CPPDEFINES; will
+however, the contents of &cv-link-CPPDEFINES;
will be postprocessed by adding a prefix and/or suffix
to each entry when the command line is produced,
so &SCons; keeps them separate -
@@ -696,7 +696,7 @@ scons: `.' is up to date.
<para>
<emphasis>Changed in version 4.5</emphasis>:
-clarifined the use of tuples vs. other types,
+clarified the use of tuples vs. other types,
handling is now consistent across the four functions.
</para>
@@ -723,7 +723,7 @@ See &cv-link-CPPDEFINES; for more details.
<para>
Appending a string <parameter>val</parameter>
-to a dictonary-typed &consvar; enters
+to a dictionary-typed &consvar; enters
<parameter>val</parameter> as the key in the dictionary,
and <literal>None</literal> as its value.
Using a tuple type to supply a key-value pair
@@ -1146,7 +1146,7 @@ This is useful for "one-off" builds
where a full Builder is not needed.
Since the anonymous Builder is never hooked
into the standard Builder framework,
-an Action must always be specfied.
+an Action must always be specified.
See the &f-link-Command; function description
for the calling syntax and details.
</para>
@@ -1458,7 +1458,7 @@ The Node (file) which
should cause the
<parameter>target</parameter>
to be rebuilt
-if it has "changed" since the last tme
+if it has "changed" since the last time
<parameter>target</parameter>
was built.
</para>
@@ -1533,7 +1533,7 @@ otherwise
<emphasis>not</emphasis>
be rebuilt).
Note that the decision can be made
-using whatever criteria are appopriate.
+using whatever criteria are appropriate.
Ignoring some or all of the function arguments
is perfectly normal.
</para>
@@ -2117,8 +2117,8 @@ or (most commonly) relative to the directory of the current
&f-Glob; matches both files stored on disk and Nodes
which &SCons; already knows about, even if any corresponding
file is not currently stored on disk.
-The evironment method form (&f-env-Glob;)
-performs string substition on
+The environment method form (&f-env-Glob;)
+performs string substitution on
<parameter>pattern</parameter>
and returns whatever matches the resulting expanded pattern.
The results are sorted, unlike for the similar &Python;
@@ -2209,7 +2209,7 @@ If the optional
<parameter>source</parameter>
argument evaluates true,
and the local directory is a variant directory,
-then &f-Glob; returnes Nodes from
+then &f-Glob; returns Nodes from
the corresponding source directory,
rather than the local directory.
<!-- XXX what about generated files that don't exist in src but will be sources? -->
@@ -2243,7 +2243,7 @@ directory.)
The optional
<parameter>exclude</parameter>
argument may be set to a pattern or a list of patterns
-descibing files or directories
+describing files or directories
to filter out of the match list.
Elements matching a least one specified pattern will be excluded.
These patterns use the same syntax as for
@@ -2448,7 +2448,7 @@ In case of duplication,
any &consvar; names that end in
<literal>PATH</literal>
keep the left-most value so the
-path searcb order is not altered.
+path search order is not altered.
All other &consvars; keep
the right-most value.
If <literal>unique</literal> is false,
@@ -2620,11 +2620,11 @@ the output produced by <parameter>command</parameter>
in order to distribute it to appropriate &consvars;.
&f-env-MergeFlags; uses a separate function to
do that processing -
-see &f-link-env-ParseFlags; for the details, including a
+see &f-link-env-ParseFlags; for the details, including
a table of options and corresponding &consvars;.
To provide alternative processing of the output of
<parameter>command</parameter>,
-you can suppply a custom
+you can supply a custom
<parameter>function</parameter>,
which must accept three arguments:
the &consenv; to modify,
@@ -2846,7 +2846,7 @@ See the manpage section "Construction Environments" for more details.
<summary>
<para>
Prepend values to &consvars; in the current &consenv;,
-Works like &f-link-env-Append; (see for details),
+works like &f-link-env-Append; (see for details),
except that values are added to the front,
rather than the end, of any existing value of the &consvar;
</para>
@@ -3225,7 +3225,7 @@ in a separate
<filename>.sconsign</filename>
file in each directory,
not in a single combined database file.
-This is a backwards-compatibility meaure to support
+This is a backwards-compatibility measure to support
what was the default behavior
prior to &SCons; 0.97 (i.e. before 2008).
Use of this mode is discouraged and may be
@@ -3602,7 +3602,7 @@ Returns a Node object representing the specified &Python;
Value Nodes can be used as dependencies of targets.
If the string representation of the Value Node
changes between &SCons; runs, it is considered
-out of date and any targets depending it will be rebuilt.
+out of date and any targets depending on it will be rebuilt.
Since Value Nodes have no filesystem representation,
timestamps are not used; the timestamp deciders
perform the same content-based up to date check.
diff --git a/SCons/Script/Main.xml b/SCons/Script/Main.xml
index 9dd9609..01a3b90 100644
--- a/SCons/Script/Main.xml
+++ b/SCons/Script/Main.xml
@@ -43,7 +43,7 @@ but with a few additional capabilities noted below.
See the
<ulink url="https://docs.python.org/3/library/optparse.html">
optparse documentation</ulink>
-for a thorough discussion of its option-processing capabities.
+for a thorough discussion of its option-processing capabilities.
All options added through &f-AddOption; are placed
in a special "Local Options" option group.
</para>
@@ -700,7 +700,7 @@ If the string contains the verbatim substring
it will be replaced with the Node.
Note that, for performance reasons, this is
<emphasis>not</emphasis>
-a regular SCons variable substition,
+a regular SCons variable substitution,
so you can not use other variables
or use curly braces.
The following example will print the name of
diff --git a/SCons/Script/SConscript.xml b/SCons/Script/SConscript.xml
index b64d9c3..7ae0159 100644
--- a/SCons/Script/SConscript.xml
+++ b/SCons/Script/SConscript.xml
@@ -364,7 +364,7 @@ Import("*")
Return to the calling SConscript, optionally
returning the values of variables named in
<varname>vars</varname>.
-Multiple strings contaning variable names may be passed to
+Multiple strings containing variable names may be passed to
&f-Return;. A string containing white space
is split into individual variable names.
Returns the value if one variable is specified,
diff --git a/SCons/Subst.xml b/SCons/Subst.xml
index 4ac4f7d..71aab2f 100644
--- a/SCons/Subst.xml
+++ b/SCons/Subst.xml
@@ -66,7 +66,7 @@ Example:
AllowSubstExceptions()
# Also allow a string containing a zero-division expansion
-# like '${1 / 0}' to evalute to ''.
+# like '${1 / 0}' to evaluate to ''.
AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
</example_commands>
</summary>
diff --git a/SCons/Tool/DCommon.xml b/SCons/Tool/DCommon.xml
index c46ed43..03a7096 100644
--- a/SCons/Tool/DCommon.xml
+++ b/SCons/Tool/DCommon.xml
@@ -286,7 +286,7 @@ DVERSUFFIX.
<summary>
<para>
The name of the compiler to use when compiling D source
-destined to be in a shared objects.
+destined to be in a shared object.
See also &cv-link-DC; for compiling to static objects.
</para>
</summary>
diff --git a/SCons/Tool/Tool.xml b/SCons/Tool/Tool.xml
index 5e996c7..ba8b9af 100644
--- a/SCons/Tool/Tool.xml
+++ b/SCons/Tool/Tool.xml
@@ -482,7 +482,7 @@ and
as C++ files,
and files with
<filename>.mm</filename>
-suffixes as Objective C++ files.
+suffixes as Objective-C++ files.
On case-sensitive systems (Linux, UNIX, and other POSIX-alikes),
SCons also treats
<filename>.C</filename>
diff --git a/SCons/Tool/c++.xml b/SCons/Tool/c++.xml
index af1e9e1..4e08a3b 100644
--- a/SCons/Tool/c++.xml
+++ b/SCons/Tool/c++.xml
@@ -56,7 +56,7 @@ Sets construction variables for generic POSIX C++ compilers.
<summary>
<para>
The C++ compiler.
-See also &cv-link-SHCXX; for compiling to shared objects..
+See also &cv-link-SHCXX; for compiling to shared objects.
</para>
</summary>
</cvar>
@@ -68,7 +68,7 @@ The command line used to compile a C++ source file to an object file.
Any options specified in the &cv-link-CXXFLAGS; and
&cv-link-CPPFLAGS; construction variables
are included on this command line.
-See also &cv-link-SHCXXCOM; for compiling to shared objects..
+See also &cv-link-SHCXXCOM; for compiling to shared objects.
</para>
</summary>
</cvar>
@@ -79,7 +79,7 @@ See also &cv-link-SHCXXCOM; for compiling to shared objects..
If set, the string displayed when a C++ source file
is compiled to a (static) object file.
If not set, then &cv-link-CXXCOM; (the command line) is displayed.
-See also &cv-link-SHCXXCOMSTR; for compiling to shared objects..
+See also &cv-link-SHCXXCOMSTR; for compiling to shared objects.
</para>
<example_commands>
@@ -96,7 +96,7 @@ By default, this includes the value of &cv-link-CCFLAGS;,
so that setting &cv-CCFLAGS; affects both C and C++ compilation.
If you want to add C++-specific flags,
you must set or override the value of &cv-link-CXXFLAGS;.
-See also &cv-link-SHCXXFLAGS; for compiling to shared objects..
+See also &cv-link-SHCXXFLAGS; for compiling to shared objects.
</para>
</summary>
</cvar>
diff --git a/SCons/Tool/docbook/docbook.xml b/SCons/Tool/docbook/docbook.xml
index 79d2aea..464c1b2 100644
--- a/SCons/Tool/docbook/docbook.xml
+++ b/SCons/Tool/docbook/docbook.xml
@@ -286,7 +286,7 @@ if one of them is installed (<literal>fop</literal> gets checked first).
<cvar name="DOCBOOK_XSLTPROCFLAGS">
<summary>
<para>
-Additonal command-line flags for the external executable
+Additional command-line flags for the external executable
<literal>xsltproc</literal> (or <literal>saxon</literal>,
<literal>xalan</literal>).
</para>
@@ -296,7 +296,7 @@ Additonal command-line flags for the external executable
<cvar name="DOCBOOK_XMLLINTFLAGS">
<summary>
<para>
-Additonal command-line flags for the external executable
+Additional command-line flags for the external executable
<literal>xmllint</literal>.
</para>
</summary>
@@ -305,7 +305,7 @@ Additonal command-line flags for the external executable
<cvar name="DOCBOOK_FOPFLAGS">
<summary>
<para>
-Additonal command-line flags for the
+Additional command-line flags for the
PDF renderer <literal>fop</literal> or <literal>xep</literal>.
</para>
</summary>
@@ -314,7 +314,7 @@ PDF renderer <literal>fop</literal> or <literal>xep</literal>.
<cvar name="DOCBOOK_XSLTPROCPARAMS">
<summary>
<para>
-Additonal parameters that are not intended for the XSLT processor executable, but
+Additional parameters that are not intended for the XSLT processor executable, but
the XSL processing itself. By default, they get appended at the end of the command line
for <literal>saxon</literal> and <literal>saxon-xslt</literal>, respectively.
</para>
diff --git a/SCons/Tool/javac.xml b/SCons/Tool/javac.xml
index d3be4f8..ccda885 100644
--- a/SCons/Tool/javac.xml
+++ b/SCons/Tool/javac.xml
@@ -109,7 +109,7 @@ env.Java(target='classes', source=['File1.java', 'File2.java'])
In this case, the user must specify the
<literal>LANG</literal>
environment variable to tell the compiler what encoding is used.
- For portibility, it's best if the encoding is hard-coded
+ For portability, it's best if the encoding is hard-coded
so that the compile will work if it is done on a system
with a different encoding.
</para>
diff --git a/SCons/Tool/link.xml b/SCons/Tool/link.xml
index 4bf7969..0b10768 100644
--- a/SCons/Tool/link.xml
+++ b/SCons/Tool/link.xml
@@ -66,7 +66,7 @@ based on the types of source files.
<summary>
<para>
This construction variable automatically introduces &cv-link-_LDMODULEVERSIONFLAGS;
-if &cv-link-LDMODULEVERSION; is set. Othervise it evaluates to an empty string.
+if &cv-link-LDMODULEVERSION; is set. Otherwise it evaluates to an empty string.
</para>
</summary>
</cvar>
@@ -75,7 +75,7 @@ if &cv-link-LDMODULEVERSION; is set. Othervise it evaluates to an empty string.
<summary>
<para>
This construction variable automatically introduces &cv-link-_SHLIBVERSIONFLAGS;
-if &cv-link-SHLIBVERSION; is set. Othervise it evaluates to an empty string.
+if &cv-link-SHLIBVERSION; is set. Otherwise it evaluates to an empty string.
</para>
</summary>
</cvar>
diff --git a/SCons/Tool/msvc.xml b/SCons/Tool/msvc.xml
index 97edb2c..acf9c5b 100644
--- a/SCons/Tool/msvc.xml
+++ b/SCons/Tool/msvc.xml
@@ -298,7 +298,7 @@ only if the &cv-link-PDB; &consvar; is set.
<para>
This variable specifies how much of a source file is precompiled. This
variable is ignored by tools other than &MSVC;, or when
-the PCH variable is not being used. When this variable is define it
+the PCH variable is not being used. When this variable is defined it
must be a string that is the name of the header that
is included at the end of the precompiled portion of the source files, or
the empty string if the "#pragma hrdstop" construct is being used:
@@ -621,7 +621,7 @@ Visual Studio </literallayout></entry>
It is only necessary to specify the <literal>Exp</literal>
suffix to select the express edition when both express and
non-express editions of the same product are installed
- simulaneously. The <literal>Exp</literal> suffix is unnecessary,
+ simultaneously. The <literal>Exp</literal> suffix is unnecessary,
but accepted, when only the express edition is installed.
</para></listitem>
</itemizedlist>
diff --git a/SCons/Tool/msvs.xml b/SCons/Tool/msvs.xml
index ad3a756..dba3257 100644
--- a/SCons/Tool/msvs.xml
+++ b/SCons/Tool/msvs.xml
@@ -803,7 +803,7 @@ env.MSVSSolution(
and &cv-MSVC_VERSION; is not,
&cv-MSVC_VERSION; will be initialized to the value
of &cv-MSVS_VERSION;.
- An error is raised if If both are set and have different values,
+ An error is raised if both are set and have different values.
</para>
</summary>
</cvar>
diff --git a/SCons/Tool/ninja/ninja.xml b/SCons/Tool/ninja/ninja.xml
index 3919194..65945d3 100644
--- a/SCons/Tool/ninja/ninja.xml
+++ b/SCons/Tool/ninja/ninja.xml
@@ -358,7 +358,7 @@ python -m pip install ninja
<cvar name="NINJA_SCONS_DAEMON_KEEP_ALIVE">
<summary>
<para>
- The number of seconds for the SCons deamon launched by ninja to stay alive.
+ The number of seconds for the SCons daemon launched by ninja to stay alive.
(Default: 180000)
</para>
</summary>
diff --git a/SCons/Tool/packaging/packaging.xml b/SCons/Tool/packaging/packaging.xml
index 62ba558..0c42462 100644
--- a/SCons/Tool/packaging/packaging.xml
+++ b/SCons/Tool/packaging/packaging.xml
@@ -55,7 +55,7 @@ env = Environment(tools=['default', 'packaging'])
<para>
&SCons; can build packages in a number of well known packaging formats.
The target package type may be selected with the
-the &cv-link-PACKAGETYPE; construction variable
+&cv-link-PACKAGETYPE; construction variable
or the <option>--package-type</option> command line option.
The package type may be a list, in which case &SCons; will attempt
to build packages for each type in the list. Example:
@@ -73,7 +73,7 @@ The currently supported packagers are:
<tgroup cols="2">
<tbody>
<row><entry><literal>msi</literal></entry><entry>Microsoft Installer package</entry></row>
-<row><entry><literal>rpm</literal></entry><entry>RPM Package Manger package</entry></row>
+<row><entry><literal>rpm</literal></entry><entry>RPM Package Manager package</entry></row>
<row><entry><literal>ipkg</literal></entry><entry>Itsy Package Management package</entry></row>
<row><entry><literal>tarbz2</literal></entry><entry>bzip2-compressed tar file</entry></row>
<row><entry><literal>targz</literal></entry><entry>gzip-compressed tar file</entry></row>
@@ -541,7 +541,7 @@ field in the RPM
<cvar name="X_RPM_EXTRADEFS">
<summary>
<para>
-A list used to supply extra defintions or flags
+A list used to supply extra definitions or flags
to be added to the RPM <filename>.spec</filename> file.
Each item is added as-is with a carriage return appended.
This is useful if some specific RPM feature not otherwise
diff --git a/SCons/Tool/textfile.xml b/SCons/Tool/textfile.xml
index 895fbef..2539f5a 100644
--- a/SCons/Tool/textfile.xml
+++ b/SCons/Tool/textfile.xml
@@ -82,7 +82,7 @@ env.Textfile(target='bar', source=['lalala', 'tanteratei'], LINESEPARATOR='|*')
# nested lists are flattened automatically
env.Textfile(target='blob', source=['lalala', ['Goethe', 42, 'Schiller'], 'tanteratei'])
-# files may be used as input by wraping them in File()
+# files may be used as input by wrapping them in File()
env.Textfile(
target='concat', # concatenate files with a marker between
source=[File('concat1'), File('concat2')],
@@ -154,7 +154,7 @@ it may be either a Python dictionary or a sequence of
If it is a dictionary it is converted into a list of tuples
with unspecified order,
so if one key is a prefix of another key
-or if one substitution could be further expanded by another subsitition,
+or if one substitution could be further expanded by another substitution,
it is unpredictable whether the expansion will occur.
</para>
@@ -185,7 +185,7 @@ env.Substfile('foo.in', SUBST_DICT=bad_foo)
good_foo = [('$foobar', '$foobar'), ('$foo', '$foo')]
env.Substfile('foo.in', SUBST_DICT=good_foo)
-# UNPREDICTABLE - one substitution could be futher expanded
+# UNPREDICTABLE - one substitution could be further expanded
bad_bar = {'@bar@': '@soap@', '@soap@': 'lye'}
env.Substfile('bar.in', SUBST_DICT=bad_bar)
diff --git a/SCons/Tool/tlib.xml b/SCons/Tool/tlib.xml
index 7274890..f186a17 100644
--- a/SCons/Tool/tlib.xml
+++ b/SCons/Tool/tlib.xml
@@ -27,7 +27,7 @@ This file is processed by the bin/SConsDoc.py module.
<tool name="tlib">
<summary>
<para>
-Sets construction variables for the Borlan
+Sets construction variables for the Borland
<application>tib</application> library archiver.
</para>
</summary>
diff --git a/SCons/Tool/xgettext.xml b/SCons/Tool/xgettext.xml
index 10bec3a..fb9c6a3 100644
--- a/SCons/Tool/xgettext.xml
+++ b/SCons/Tool/xgettext.xml
@@ -355,7 +355,7 @@ form source and target (default: <literal>'${TARGET.filebase}'</literal>).
<cvar name="_XGETTEXTFROMFLAGS">
<summary>
<para>
-Internal "macro". Genrates list of <literal>-D&lt;dir&gt;</literal> flags
+Internal "macro". Generates list of <literal>-D&lt;dir&gt;</literal> flags
from the &cv-link-XGETTEXTPATH; list.
</para>
</summary>