summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-03-13 23:31:16 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-03-13 23:31:16 (GMT)
commit99aee445f9f7d8277d70480a3b3781cc3e1da095 (patch)
tree2e0a305ec2896410a3aaa91bd5c2fdcbe076c7eb
parent511d400e8ae1b55682fadd0e279f639e02733628 (diff)
parent2ca0cf5091d8f69d2e2551664f7f945310aa4709 (diff)
downloadSCons-99aee445f9f7d8277d70480a3b3781cc3e1da095.zip
SCons-99aee445f9f7d8277d70480a3b3781cc3e1da095.tar.gz
SCons-99aee445f9f7d8277d70480a3b3781cc3e1da095.tar.bz2
Merge branch 'master' of github.com:SCons/scons
-rw-r--r--src/engine/SCons/Action.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Action.xml b/src/engine/SCons/Action.xml
index d85af3b..350082d 100644
--- a/src/engine/SCons/Action.xml
+++ b/src/engine/SCons/Action.xml
@@ -65,9 +65,9 @@ is set to <literal>2</literal> or higher,
then that number of entries in the command
string will be scanned for relative or absolute
paths. The count will reset after any
-<literal>&&</literal> entries are found.
+<literal>&amp;&amp;</literal> entries are found.
The first command in the action string and
-the first after any <literal>&&</literal>
+the first after any <literal>&amp;&amp;</literal>
entries will be found by searching the
<varname>PATH</varname> variable in the
<varname>ENV</varname> environment used to
@@ -88,7 +88,7 @@ with that construction environment.
not be added to the targets built with that
construction environment. The first command
in the action string and the first after any
-<literal>&&</literal> entries will be found
+<literal>&amp;&amp;</literal> entries will be found
by searching the <varname>PATH</varname>
variable in the <varname>ENV</varname>
environment used to execute the command.