summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-01-19 19:33:40 (GMT)
committerSteven Knight <knight@baldmt.com>2010-01-19 19:33:40 (GMT)
commita795a02888f1cec6db6841a96e94767eb6c14701 (patch)
treef47a496755385f07282cbfe4b719a529c260868f
parent9b0d6bc69aa1ce77f67227c8b2ae9691ce6e77e6 (diff)
downloadSCons-a795a02888f1cec6db6841a96e94767eb6c14701.zip
SCons-a795a02888f1cec6db6841a96e94767eb6c14701.tar.gz
SCons-a795a02888f1cec6db6841a96e94767eb6c14701.tar.bz2
Issue 2537: fix typos in the man page. (Luca Faravigna)
-rw-r--r--src/CHANGES.txt8
-rw-r--r--src/engine/SCons/Tool/applelink.xml2
-rw-r--r--src/engine/SCons/Tool/fortran.xml4
-rw-r--r--src/engine/SCons/Tool/latex.xml2
-rw-r--r--src/engine/SCons/Tool/link.xml2
-rw-r--r--src/engine/SCons/Tool/msvc.xml14
-rw-r--r--src/engine/SCons/Tool/qt.xml2
7 files changed, 24 insertions, 10 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index bafee58..c4f50dc 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,6 +10,14 @@
RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800
+ From Luca Falavigna:
+
+ - Fix typos in the man page.
+
+
+
+RELEASE X.X.X - XXX
+
From Jim Randall:
- Fixed temp filename race condition on Windows with long cmd lines.
diff --git a/src/engine/SCons/Tool/applelink.xml b/src/engine/SCons/Tool/applelink.xml
index 10b4559..a36536b 100644
--- a/src/engine/SCons/Tool/applelink.xml
+++ b/src/engine/SCons/Tool/applelink.xml
@@ -32,7 +32,7 @@ On Mac OS X with gcc,
general user-supplied frameworks options to be added at
the end of a command
line building a loadable module.
-(This has been largely superceded by
+(This has been largely superseded by
the &cv-link-FRAMEWORKPATH;, &cv-link-FRAMEWORKPATHPREFIX;,
&cv-link-FRAMEWORKPREFIX; and &cv-link-FRAMEWORKS; variables
described above.)
diff --git a/src/engine/SCons/Tool/fortran.xml b/src/engine/SCons/Tool/fortran.xml
index fa8133e..8d7e700 100644
--- a/src/engine/SCons/Tool/fortran.xml
+++ b/src/engine/SCons/Tool/fortran.xml
@@ -230,7 +230,7 @@ construction variables are included on this command line.
<summary>
The string displayed when a Fortran source file
is compiled to an object file
-after first running the file throught the C preprocessor.
+after first running the file through the C preprocessor.
If this is not set, then &cv-link-FORTRANPPCOM;
(the command line) is displayed.
</summary>
@@ -295,7 +295,7 @@ are included on this command line.
<summary>
The string displayed when a Fortran source file
is compiled to a shared-library object file
-after first running the file throught the C preprocessor.
+after first running the file through the C preprocessor.
If this is not set, then &cv-link-SHFORTRANPPCOM;
(the command line) is displayed.
</summary>
diff --git a/src/engine/SCons/Tool/latex.xml b/src/engine/SCons/Tool/latex.xml
index 1584e0f..56d7db5 100644
--- a/src/engine/SCons/Tool/latex.xml
+++ b/src/engine/SCons/Tool/latex.xml
@@ -62,7 +62,7 @@ by re-running LaTeX up to three times.
<cvar name="TEXINPUTS">
<summary>
-List of directories that the LaTeX programm will search
+List of directories that the LaTeX program will search
for include directories.
The LaTeX implicit dependency scanner will search these
directories for \include and \import files.
diff --git a/src/engine/SCons/Tool/link.xml b/src/engine/SCons/Tool/link.xml
index 8737bea..e8ca1db 100644
--- a/src/engine/SCons/Tool/link.xml
+++ b/src/engine/SCons/Tool/link.xml
@@ -136,7 +136,7 @@ The linker for programs that use shared libraries.
<cvar name="SHLINKCOM">
<summary>
-The command line used to link programs using shared libaries.
+The command line used to link programs using shared libraries.
</summary>
</cvar>
diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml
index 9e3e863..f4be770 100644
--- a/src/engine/SCons/Tool/msvc.xml
+++ b/src/engine/SCons/Tool/msvc.xml
@@ -314,10 +314,16 @@ constructor; setting it later has no effect.
This is currently only used on Windows, but in the future it will be
used on other OSes as well.
-Valid values for Windows are 'x86', 'i386' (for 32 bits);
-'amd64', 'emt64', 'x86_64' (64 bits);
-and 'ia64' (Itanium).
+Valid values for Windows are
+<literal>x86</literal>,
+<literal>i386</literal>
+(for 32 bits);
+<literal>amd64</literal>,
+<literal>emt64</literal>,
+<literal>x86_64</literal>
+(for 64 bits);
+and <literal>ia64</literal> (Itanium).
For example, if you want to compile 64-bit binaries, you would set
-TARGET_ARCH='x86_64' in your SCons environment.
+<literal>TARGET_ARCH='x86_64'</literal> in your SCons environment.
</summary>
</cvar>
diff --git a/src/engine/SCons/Tool/qt.xml b/src/engine/SCons/Tool/qt.xml
index ea73698..fcab437 100644
--- a/src/engine/SCons/Tool/qt.xml
+++ b/src/engine/SCons/Tool/qt.xml
@@ -132,7 +132,7 @@ builder method.
<cvar name="QT_AUTOSCAN">
<summary>
-Turn off scanning for mocable files. Use the Moc Builder to explicitely
+Turn off scanning for mocable files. Use the Moc Builder to explicitly
specify files to run moc on.
</summary>
</cvar>