From e2db35bf45309316f9d90e2e2c69ed9a8c86e50d Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 11 Dec 2015 20:25:17 +0000
Subject: [PATCH] Merge history and chm fix from 2.48

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6682 212acab6-be3b-0410-9dea-997c60f758d6
---
 Docs/src/SConscript  |  6 +++++-
 Docs/src/history.but | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Docs/src/SConscript b/Docs/src/SConscript
index bb9cdc20..f5764280 100644
--- a/Docs/src/SConscript
+++ b/Docs/src/SConscript
@@ -158,12 +158,16 @@ env.Append(BUILDERS = {'Halibut' : docs_builder})
 # 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)
 	for p in args[3]:
 		if 'hhc.exe' in p.lower():
 			return not result
 	return result
-
 env['SPAWN'] = new_spawn
 
 # BUILD!
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 513fa150..b2052abd 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -324,6 +324,36 @@ Released on May 19th, 2013
 
 \b Fixed Korean MUI_[UN]TEXT_FINISH_INFO_* (\W{http://sourceforge.net/support/tracker.php?aid=3541515}{bug #3541515})
 
+\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