Import Upstream version 2.48

5 files changed, 38 insertions, 3 deletions

diff --git a/Docs/src/SConscript b/Docs/src/SConscript
index ffec082..0a9a211 100755
--- a/Docs/src/SConscript
+++ b/Docs/src/SConscript
@@ -95,6 +95,11 @@ if build_chm:
 	# fix hhc.exe reverse return value - UGLY
 	old_spawn = env['SPAWN']
 	def new_spawn(*args, **kw):
+		if 'hhc' in args[3]:
+			if len(args) == 5:
+				args = (args[0], args[1], args[2], args[3], {'PATH': args[4]['PATH']})
+			else:
+				kw['env'] = {}
 		result = old_spawn(*args, **kw)
 		if 'hhc' in args[3]:
 			return not result
diff --git a/Docs/src/chm_config.but b/Docs/src/chm_config.but
index 6bf5139..87a8f6e 100755
--- a/Docs/src/chm_config.but
+++ b/Docs/src/chm_config.but
@@ -20,5 +20,5 @@
 
 \preamble Quick links:\\<br\\>\W{http://nsis.sourceforge.net/support/faq/}{FAQ} - A list of frequently asked questions\\<br\\>\W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\<br\\>\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features
 
-\copyright Copyright (C) 1999-2009 Contributors
+\copyright Copyright (C) 1999-2015 Contributors
 
diff --git a/Docs/src/config.but b/Docs/src/config.but
index d57f1b9..c8d4532 100755
--- a/Docs/src/config.but
+++ b/Docs/src/config.but
@@ -16,4 +16,4 @@
 
 \preamble Quick links:\\<br\\>\W{http://nsis.sourceforge.net/support/faq/}{FAQ} - A list of frequently asked questions\\<br\\>\W{http://nsis.sourceforge.net/wiki/}{NSIS Wiki} - Examples, functions, tutorials, plug-ins, software and more\\<br\\>\W{http://forums.winamp.com/forumdisplay.php?forumid=65}{Forum} - Post questions or discuss NSIS features
 
-\copyright Copyright (C) 1999-2009 Contributors
\ No newline at end of file
+\copyright Copyright (C) 1999-2015 Contributors
\ No newline at end of file
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 88f29b7..22e4543 100755
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1,5 +1,35 @@
 \A{history} Changelog and Release Notes
 
+\H{v2.48} 2.48
+
+Released on December 10th, 2015
+
+\S1{v2.48-cl} Changelog
+
+\b Fixed CHM (\W{http://sf.net/p/nsis/bugs/1129/}{bug #1129})
+
+\H{v2.47} 2.47
+
+Released on December 8th, 2015
+
+\S1{v2.47-rl} Release Notes
+
+\b This is a maintenance and security release
+
+\S1{v2.47-cl} Changelog
+
+\S2{} Major Changes
+
+\b LoadLibrary security hardening to prevent dll hijacking (\W{http://sf.net/p/nsis/bugs/1125}{bug #1125})
+
+\b \c{InitiateShutdown()} is used to reboot the machine if available (\W{http://sf.net/p/nsis/patches/247}{patch #247})
+
+\S2{} Minor Changes
+
+\b Fixed 4+ TiB freespace calculation bug (\W{http://sf.net/p/nsis/bugs/1115/}{bug #1115})
+
+\b Windows 8 & 2012 support in WinVer.nsh
+
 \H{v2.46} 2.46
 
 Released on December 6th, 2009
diff --git a/Docs/src/license.but b/Docs/src/license.but
index a5a1ff8..4fd0ccb 100755
--- a/Docs/src/license.but
+++ b/Docs/src/license.but
@@ -2,7 +2,7 @@
 
 \H{copyright} Copyright
 
-Copyright (C) 1995-2009 Contributors
+Copyright (C) 1995-2015 Contributors
 
 More detailed copyright information can be found in the individual source code files.