diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/build-install.in | 26 | ||||
-rw-r--r-- | doc/user/build-install.xml | 26 | ||||
-rw-r--r-- | doc/user/preface.in | 2 | ||||
-rw-r--r-- | doc/user/preface.xml | 2 | ||||
-rw-r--r-- | doc/user/simple.in | 2 | ||||
-rw-r--r-- | doc/user/simple.xml | 2 |
6 files changed, 42 insertions, 18 deletions
diff --git a/doc/user/build-install.in b/doc/user/build-install.in index 547154c..e473e37 100644 --- a/doc/user/build-install.in +++ b/doc/user/build-install.in @@ -136,7 +136,7 @@ If you need to install Python and have a choice, we recommend using the most recent Python 2.5 version available. Python 2.5 has significant improvements - the help speed up the performance of &SCons;'. + the help speed up the performance of &SCons;. </para> @@ -150,7 +150,7 @@ &SCons; comes pre-packaged for installation on a number of systems, including Linux and Windows systems. You do not need to read this entire section, - you should only need to read the section + you should need to read only the section appropriate to the type of system you're running on. </para> @@ -162,11 +162,11 @@ &SCons; comes in RPM (Red Hat Package Manager) format, pre-built and ready to install on Red Hat Linux, - Fedora Core, + Fedora, or any other Linux distribution that uses RPM. Your distribution may already have an &SCons; RPM built specifically for it; - many do, including SuSe, Mandrake and Fedora. + many do, including SUSE, Mandrake and Fedora. You can check for the availability of an &SCons; RPM on your distribution's download servers, or by consulting an RPM search site like @@ -177,6 +177,18 @@ <para> + If your distribution supports installation via + <application>yum</application>, + you should be able to install &SCons; by running: + + </para> + + <screen> + # <userinput>yum install scons</userinput> + </screen> + + <para> + If your Linux distribution does not already have a specific &SCons; RPM file, you can download and install from the @@ -197,7 +209,7 @@ </para> <screen> - # <userinput>rpm -Uvh scons-0.96-1.noarch.rpm</userinput> + # <userinput>rpm -Uvh scons-__VERSION__-1.noarch.rpm</userinput> </screen> <para> @@ -260,9 +272,9 @@ &SCons; provides a Windows installer that makes installation extremely easy. - Download the <filename>scons-0.95.win32.exe</filename> + Download the <filename>scons-__VERSION__.win32.exe</filename> file from the &SCons; download page at - <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>. + <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. Then all you need to do is execute the file (usually by clicking on its icon in Windows Explorer). These will take you through a small diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index 547154c..e473e37 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -136,7 +136,7 @@ If you need to install Python and have a choice, we recommend using the most recent Python 2.5 version available. Python 2.5 has significant improvements - the help speed up the performance of &SCons;'. + the help speed up the performance of &SCons;. </para> @@ -150,7 +150,7 @@ &SCons; comes pre-packaged for installation on a number of systems, including Linux and Windows systems. You do not need to read this entire section, - you should only need to read the section + you should need to read only the section appropriate to the type of system you're running on. </para> @@ -162,11 +162,11 @@ &SCons; comes in RPM (Red Hat Package Manager) format, pre-built and ready to install on Red Hat Linux, - Fedora Core, + Fedora, or any other Linux distribution that uses RPM. Your distribution may already have an &SCons; RPM built specifically for it; - many do, including SuSe, Mandrake and Fedora. + many do, including SUSE, Mandrake and Fedora. You can check for the availability of an &SCons; RPM on your distribution's download servers, or by consulting an RPM search site like @@ -177,6 +177,18 @@ <para> + If your distribution supports installation via + <application>yum</application>, + you should be able to install &SCons; by running: + + </para> + + <screen> + # <userinput>yum install scons</userinput> + </screen> + + <para> + If your Linux distribution does not already have a specific &SCons; RPM file, you can download and install from the @@ -197,7 +209,7 @@ </para> <screen> - # <userinput>rpm -Uvh scons-0.96-1.noarch.rpm</userinput> + # <userinput>rpm -Uvh scons-__VERSION__-1.noarch.rpm</userinput> </screen> <para> @@ -260,9 +272,9 @@ &SCons; provides a Windows installer that makes installation extremely easy. - Download the <filename>scons-0.95.win32.exe</filename> + Download the <filename>scons-__VERSION__.win32.exe</filename> file from the &SCons; download page at - <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>. + <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. Then all you need to do is execute the file (usually by clicking on its icon in Windows Explorer). These will take you through a small diff --git a/doc/user/preface.in b/doc/user/preface.in index 8fed593..a76fa1c 100644 --- a/doc/user/preface.in +++ b/doc/user/preface.in @@ -62,7 +62,7 @@ than the cryptic languages of other build tools, which are usually invented by programmers for other programmers. This is in no small part due to the - consistency and readability that are built in to Python. + consistency and readability that are hallmarks of Python. It just so happens that making a real, live scripting language the basis for the configuration files diff --git a/doc/user/preface.xml b/doc/user/preface.xml index f93ec5e..6f3140b 100644 --- a/doc/user/preface.xml +++ b/doc/user/preface.xml @@ -62,7 +62,7 @@ than the cryptic languages of other build tools, which are usually invented by programmers for other programmers. This is in no small part due to the - consistency and readability that are built in to Python. + consistency and readability that are hallmarks of Python. It just so happens that making a real, live scripting language the basis for the configuration files diff --git a/doc/user/simple.in b/doc/user/simple.in index 3382f86..9594501 100644 --- a/doc/user/simple.in +++ b/doc/user/simple.in @@ -396,7 +396,7 @@ <para> &SCons; reflects this distinction between - <emphasis>calling a builder method like</emphasis> &b-Program;> + <emphasis>calling a builder method like</emphasis> &b-Program; and <emphasis>actually building the program</emphasis> by printing the status messages that indicate when it's "just reading" the &SConstruct; file, diff --git a/doc/user/simple.xml b/doc/user/simple.xml index 8245237..6bd70b0 100644 --- a/doc/user/simple.xml +++ b/doc/user/simple.xml @@ -419,7 +419,7 @@ <para> &SCons; reflects this distinction between - <emphasis>calling a builder method like</emphasis> &b-Program;> + <emphasis>calling a builder method like</emphasis> &b-Program; and <emphasis>actually building the program</emphasis> by printing the status messages that indicate when it's "just reading" the &SConstruct; file, |