summaryrefslogtreecommitdiff
path: root/doc/user/command-line.xml
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-06-15 14:28:28 +0000
committerLuca Falavigna <dktrkranz@debian.org>2010-06-15 14:28:28 +0000
commit0ed55e71a9f4b9cda836c6a4a5408cece60db0c6 (patch)
treeb1e82f6e428ac15ed9b4de93e48d8079420d537d /doc/user/command-line.xml
parentfe00e4f75ba00298c30d6854b245c2a42c6542b8 (diff)
parent738149c9bfb9965d013d01ef99f9bb1c2819e7e8 (diff)
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'doc/user/command-line.xml')
-rw-r--r--doc/user/command-line.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml
index 21b52dd..8bc72bb 100644
--- a/doc/user/command-line.xml
+++ b/doc/user/command-line.xml
@@ -926,8 +926,8 @@
These older names still work,
and you may encounter them in older
&SConscript; fles,
- but their use is discouraged
- and will be officially deprecated some day.
+ but they have been officially deprecated
+ as of &SCons; version 2.0.
</para>
@@ -1208,7 +1208,7 @@
choices to a specific set of allowed colors.
This can be set up quite easily
using the &EnumVariable;,
- which takes a list of &allowed_values
+ which takes a list of &allowed_values;
in addition to the variable name,
default value,
and help text arguments:
@@ -2064,7 +2064,7 @@
&SCons; supports a &DEFAULT_TARGETS; variable
that lets you get at the current list of default targets.
- The &DEFAULT_TARGETS variable has
+ The &DEFAULT_TARGETS; variable has
two important differences from the &COMMAND_LINE_TARGETS; variable.
First, the &DEFAULT_TARGETS; variable is a list of
internal &SCons; nodes,