summaryrefslogtreecommitdiff
path: root/doc/user/command-line.in
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2011-09-10 11:25:54 +0200
committerLuca Falavigna <dktrkranz@debian.org>2011-09-10 11:25:54 +0200
commitf920539cfcaf32813d390bfa501a08ea8bf8ec89 (patch)
tree1b8d1d57e9b38d43d01c28521c2e34aff743adb5 /doc/user/command-line.in
parentf9b265b27769aff6cff204cea5402d69ead3dda0 (diff)
parentba4425ab5227fd9597fccd368bffff6bf1032149 (diff)
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'doc/user/command-line.in')
-rw-r--r--doc/user/command-line.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/command-line.in b/doc/user/command-line.in
index cd5ead6..52a61ac 100644
--- a/doc/user/command-line.in
+++ b/doc/user/command-line.in
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -221,7 +221,7 @@
</para>
- <sconstruct)
+ <sconstruct>
if not GetOption('help'):
SConscript('src/SConscript', export='env')
</sconstruct>
@@ -2195,7 +2195,7 @@
Second,
the contents of the &DEFAULT_TARGETS; list change
- in response to calls to the &Default: function,
+ in response to calls to the &Default; function,
as you can see from the following &SConstruct; file:
</para>