Merge branch 'is-6' into compiler-update

Examples/CodeAutomation.iss

@@ -5,6 +5,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=no
 CreateAppDir=no
 DisableProgramGroupPage=yes
 DefaultGroupName=My Program
@@ -160,7 +161,7 @@ end;
 {--- MSXML ---}
 
 const
-  XMLURL = 'http://jrsoftware.github.io/issrc/ishelp/isxfunc.xml';
+  XMLURL = 'http://jrsoftware.github.io/issrc/ISHelp/isxfunc.xml';
   XMLFileName = 'isxfunc.xml';
   XMLFileName2 = 'isxfuncmodified.xml';
 
@@ -305,6 +306,4 @@ begin
   CreateButton(Left, Top, '&MSXML...', @MSXMLButtonOnClick);
   Top := Top + TopInc;
   CreateButton(Left, Top, '&Word...', @WordButtonOnClick);
-end;
-
-
+end;

Examples/CodeAutomation2.iss

@@ -12,6 +12,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=no
 CreateAppDir=no
 DisableProgramGroupPage=yes
 DefaultGroupName=My Program

Examples/CodeClasses.iss

@@ -5,6 +5,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=yes
 CreateAppDir=no
 DisableProgramGroupPage=yes
 DefaultGroupName=My Program

Examples/CodeDlg.iss

@@ -8,6 +8,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=no
 DefaultDirName={autopf}\My Program
 DisableProgramGroupPage=yes
 UninstallDisplayIcon={app}\MyProg.exe

Examples/CodeDll.iss

@@ -5,6 +5,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=no
 DefaultDirName={autopf}\My Program
 DisableProgramGroupPage=yes
 UninstallDisplayIcon={app}\MyProg.exe

Examples/CodeExample1.iss

@@ -5,6 +5,7 @@
 [Setup]
 AppName=My Program
 AppVersion=1.5
+DisableWelcomePage=no
 DefaultDirName={code:MyConst}\My Program
 DefaultGroupName=My Program
 UninstallDisplayIcon={app}\MyProg.exe

whatsnew.htm

@@ -27,16 +27,10 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 </p>
 
 <p><a name="6.0.0"></a><span class="ver">6.0.0-dev </span><span class="date">(?)</span></p>
+<p><span class="head2">Administrative vs. non administrative install mode</span></p>
 <p>A number of changes have been made to the administrative vs. non administrative install mode functionality:</p>
 <ul>
   <li>Added a <a href="http://www.jrsoftware.org/is6help/index.php?topic=admininstallmode">Non Administrative Install Mode</a> topic to the help file.</li>
-  <li>Added a <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">Side-by-side installation</a> topic to the help file.</li>
-</ul>
-<ul>
-  <li>Two separate installation runs that do not share the same administrative or non administrative install mode no longer count as the <a href="http://www.jrsoftware.org/is6help/index.php?topic=sameappnotes">same application</a>. This means you can now install these modes <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">side-by-side</a> even if the installers share the same <tt>AppId</tt> setting (or if <tt>AppId</tt> is not set, the same <tt>AppName</tt> setting.)</li>
-  <li><b>Change in default behavior:</b> To avoid entries with identical names in the <i>Add/Remove Programs</i> Control Panel applet Setup will now automatically mark the new entry with a text like &quot;Current user&quot; or &quot;64-bit&quot; when necessary during a <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">side-by-side</a> installation.</a>
-  <li>The Compiler IDE's New Script Wizard now offers an option to select administrative or non administrative install mode and outputs scripts which work in both modes.</li>
-  <li>Pascal Scripting changes: Added new <tt>IsAdminInstallMode</tt> support function.</li>
 </ul>
 <ul>
   <li>Added new &quot;auto&quot; constants which automatically map to their &quot;common&quot; form unless the installation is running in non administrative install mode, in which case they map to their &quot;user&quot; form. It is recommended to update your scripts to use these "auto" constants as much as possible to avoid mistakes. The list of added &quot;auto&quot; constants is: <tt>{autoappdata}</tt>, <tt>{autocf}</tt>, <tt>{autocf32}</tt>, <tt>{autocf64}</tt>, <tt>{autodesktop}</tt>, <tt>{autodocs}</tt>, <tt>{autopf}</tt>, <tt>{autopf32}</tt>, <tt>{autopf64}</tt>, <tt>{autoprograms}</tt>, <tt>{autostartmenu}</tt><tt>, {autostartup}</tt>, and <tt>{autotemplates}</tt>.</li>
@@ -52,6 +46,11 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
   <li>Using [Registry] section <tt>Root</tt> value <tt>HKCR</tt> is no longer recommended, use <tt>HKA</tt> with the <tt>Subkey</tt> parameter set to &quot;Software\Classes&quot; instead.</li>
   <li>Pascal Scripting change: Added <tt>HKA</tt> and <tt>HKEY_AUTO</tt> constants. <tt>HKA32</tt>, <tt>HKA64</tt>, <tt>HKEY_AUTO_32</tt>, and <tt>HKEY_AUTO_64</tt> are also supported.</li>
 </ul>
+<ul>
+  <li>The Compiler IDE's New Script Wizard now offers an option to select administrative or non administrative install mode and outputs scripts which work in both modes.</li>
+  <li>Pascal Scripting changes: Added new <tt>IsAdminInstallMode</tt> support function.</li>
+</ul>
+<p><span class="head2">Dynamic install mode</span></p>
 <p>Once your script is fully updated to support both administrative and non administrative mode (for example by using the new &quot;auto&quot; constants and the new [Registry] section <tt>Root</tt> value <tt>HKA</tt>) you can then use the following:</p>
 <ul>
   <li>Added new [Setup] section directive: <tt>PrivilegesRequiredOverridesAllowed</tt>, which can be set to one or more overrides which allow the end user to override the script's default <tt>PrivilegesRequired</tt> setting. The following overrides are supported: <tt>commandline</tt> and <tt>msgbox</tt>.</li>
@@ -61,7 +60,16 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
   </ul>
   <li>Inno Setup's own installer now supports both administrative and non administrative mode and allows the <tt>commandline</tt> override.</li>
 </ul>
-<p>Other changes:</p>
+<p><span class="head2">Side-by-side installations</span></p>
+<p>Support for <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">side-by-side</a> installations has been improved:</p>
+<ul>
+  <li>Added a <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">Side-by-side installation</a> topic to the help file.</li>
+</ul>
+<ul>
+  <li>Two separate installation runs that do not share the same administrative or non administrative install mode no longer count as the <a href="http://www.jrsoftware.org/is6help/index.php?topic=sameappnotes">same application</a>. This means you can now install these modes <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">side-by-side</a> even if the installers share the same <tt>AppId</tt> setting (or if <tt>AppId</tt> is not set, the same <tt>AppName</tt> setting.)</li>
+  <li><b>Change in default behavior:</b> To avoid entries with identical names in the <i>Add/Remove Programs</i> Control Panel applet Setup will now automatically mark the new entry with a text like &quot;Current user&quot; or &quot;64-bit&quot; when necessary during a <a href="http://www.jrsoftware.org/is6help/index.php?topic=sidebyside">side-by-side</a> installation.</a>
+</ul>
+<p><span class="head2">Other changes</span></p>
 <ul>
 <li><b>Change in default behavior:</b> Starting with Inno Setup 6 there's only one version available: Unicode Inno Setup. Unicode Inno Setup has been available for 9 years but in case you have not yet updated to it: please see the <a href="http://www.jrsoftware.org/is6help/index.php?topic=admininstallmode">Unicode Inno Setup</a> topic in the help file for more information. Basically, unless you're using [Code] to make DLL calls with string parameters you shouldn't have to make any changes to your script.</li>
 <li>Added new [Setup] section directive: <tt>VersionInfoOriginalFileName</tt>, which sets the original filename version value.</li>