Merge tag 'upstream/2.5.1'

Upstream version 2.5.1

1 files changed, 16 insertions, 16 deletions

diff --git a/scons.1 b/scons.1
index 5b1964b..de8f1f0 100644
--- a/scons.1
+++ b/scons.1
@@ -3,11 +3,11 @@
 .\"    Author: Steven Knight
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: <pubdate>2004 - 2016</pubdate>
-.\"    Manual: SCons 2.5.0
-.\"    Source: SCons 2.5.0 version 2.5.0
+.\"    Manual: SCons 2.5.1
+.\"    Source: SCons 2.5.1 version 2.5.1
 .\"  Language: English
 .\"
-.TH "SCONS" "1" "<pubdate>2004 - 2016</pubdate>" "SCons 2\&.5\&.0 version 2.5.0" "SCons 2\&.5\&.0"
+.TH "SCONS" "1" "<pubdate>2004 - 2016</pubdate>" "SCons 2\&.5\&.1 version 2.5.1" "SCons 2\&.5\&.1"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -3185,6 +3185,11 @@ Uses:
 \fB$ASPPCOMSTR\fR\&.
 .RE
 .PP
+packaging
+.RS 4
+A framework for building binary and source packages\&.
+.RE
+.PP
 Packaging
 .RS 4
 Sets construction variables for the
@@ -3192,11 +3197,6 @@ Sets construction variables for the
 Builder\&.
 .RE
 .PP
-packaging
-.RS 4
-A framework for building binary and source packages\&.
-.RE
-.PP
 pdf
 .RS 4
 Sets construction variables for the Portable Document Format builder\&.
@@ -11172,14 +11172,14 @@ DFLAGPREFIX
 DFLAGPREFIX\&.
 .RE
 .PP
-_DFLAGS
+DFLAGS
 .RS 4
-_DFLAGS\&.
+DFLAGS\&.
 .RE
 .PP
-DFLAGS
+_DFLAGS
 .RS 4
-DFLAGS\&.
+_DFLAGS\&.
 .RE
 .PP
 DFLAGSUFFIX
@@ -12602,14 +12602,14 @@ General options passed to the Ghostscript program, when converting PostScript to
 .PP
 HOST_ARCH
 .RS 4
-The name of the host hardware architecture used to create the Environment\&. If a platform is specified when creating the Environment, then that Platform\*(Aqs logic will handle setting this value\&. This value is immutable, and should not be changed by the user after the Environment is initialized\&. Currently only set for Win32\&.
-.sp
 Sets the host architecture for Visual Studio compiler\&. If not set, default to the detected host architecture: note that this may depend on the python you are using\&. This variable must be passed as an argument to the Environment() constructor; setting it later has no effect\&.
 .sp
 Valid values are the same as for
 \fB$TARGET_ARCH\fR\&.
 .sp
 This is currently only used on Windows, but in the future it will be used on other OSes as well\&.
+.sp
+The name of the host hardware architecture used to create the Environment\&. If a platform is specified when creating the Environment, then that Platform\*(Aqs logic will handle setting this value\&. This value is immutable, and should not be changed by the user after the Environment is initialized\&. Currently only set for Win32\&.
 .RE
 .PP
 HOST_OS
@@ -15863,8 +15863,6 @@ A reserved variable name that may not be set or used in a construction environme
 .PP
 TARGET_ARCH
 .RS 4
-The name of the target hardware architecture for the compiled objects created by this Environment\&. This defaults to the value of HOST_ARCH, and the user can override it\&. Currently only set for Win32\&.
-.sp
 Sets the target architecture for Visual Studio compiler (i\&.e\&. the arch of the binaries generated by the compiler)\&. If not set, default to
 \fB$HOST_ARCH\fR, or, if that is unset, to the architecture of the running machine\*(Aqs OS (note that the python build or architecture has no effect)\&. This variable must be passed as an argument to the Environment() 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\&.
 .sp
@@ -15880,6 +15878,8 @@ ia64
 (Itanium)\&. For example, if you want to compile 64\-bit binaries, you would set
 TARGET_ARCH=\*(Aqx86_64\*(Aq
 in your SCons environment\&.
+.sp
+The name of the target hardware architecture for the compiled objects created by this Environment\&. This defaults to the value of HOST_ARCH, and the user can override it\&. Currently only set for Win32\&.
 .RE
 .PP
 TARGET_OS