From: stevenknight Date: Tue, 19 Jan 2010 19:33:40 +0000 (+0000) Subject: Issue 2537: fix typos in the man page. (Luca Faravigna) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63688dfd87de6ac1e9ed1adf901ac4353026bfef;p=scons.git Issue 2537: fix typos in the man page. (Luca Faravigna) git-svn-id: http://scons.tigris.org/svn/scons/trunk@4639 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- diff --git a/src/CHANGES.txt b/src/CHANGES.txt index bafee58c..c4f50dce 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 10b45598..a36536b0 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 fa8133e3..8d7e7000 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. 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. @@ -295,7 +295,7 @@ are included on this command line. 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. diff --git a/src/engine/SCons/Tool/latex.xml b/src/engine/SCons/Tool/latex.xml index 1584e0fe..56d7db50 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. -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 8737bea4..e8ca1dbb 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. -The command line used to link programs using shared libaries. +The command line used to link programs using shared libraries. diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index 9e3e863f..f4be7705 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 +x86, +i386 +(for 32 bits); +amd64, +emt64, +x86_64 +(for 64 bits); +and ia64 (Itanium). For example, if you want to compile 64-bit binaries, you would set -TARGET_ARCH='x86_64' in your SCons environment. +TARGET_ARCH='x86_64' in your SCons environment. diff --git a/src/engine/SCons/Tool/qt.xml b/src/engine/SCons/Tool/qt.xml index ea736982..fcab437f 100644 --- a/src/engine/SCons/Tool/qt.xml +++ b/src/engine/SCons/Tool/qt.xml @@ -132,7 +132,7 @@ builder method. -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.