Clean up indentation in the WiX template

setup/installer/windows/wix-template.xml

@@ -2,8 +2,7 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
 >		
 
-<Product Name='{app}{x64}' Id='*' UpgradeCode='{upgrade_code}'
+<Product Name='{app}{x64}' Id='*' UpgradeCode='{upgrade_code}' Language='1033' Codepage='1252' Version='{version}' Manufacturer='Kovid Goyal'>
-				Language='1033' Codepage='1252' Version='{version}' Manufacturer='Kovid Goyal'>
 				
     <Package Id='*' Keywords='Installer' Description="{app} Installer"
         Comments='{app} is a registered trademark of Kovid Goyal' Manufacturer='Kovid Goyal'
@@ -12,15 +11,14 @@
 
     <Media Id="1" Cabinet="{app}.cab" CompressionLevel="{compression}" EmbedCab="yes" />
     <!-- The following line ensures that DLLs are replaced even if
-                     their version is the same as before or they dont have
+        their version is the same as before or they dont have versions.
-                     versions. Microsoft's brain dead installer will otherwise
+        Microsoft's brain dead installer will otherwise use file dates to
-                     use file dates to determine whether to install a file or
+        determine whether to install a file or not. Simply not robust. And
-                     not. Simply not robust. And since we dont install any
+        since we dont install any system files whatsoever, we can never replace
-                     system files whatsoever, we can never replace a system
+        a system file with an older version. This way the calibre install
-                     file with an older version. This way the calibre install
+        should always result in a consistent set of files being present in the
-                     should always result in a consistent set of files being
+        installation folder, though of course, with Microsoft there are no
-                     present in the installation folder, though of course, with
+        guarantees of anything. -->
-                     Microsoft there are no guarantees of anything. -->
     <Property Id='REINSTALLMODE' Value='amus'/>
 
     <Upgrade Id="{upgrade_code}">
@@ -46,10 +44,9 @@
     <Directory Id='TARGETDIR' Name='SourceDir'>
         <Directory Id='{ProgramFilesFolder}' Name='PFiles'>
             <!-- The name must be calibre on 32 bit to ensure
-                                 that the component guids dont change compared
+                that the component guids dont change compared to previous msis.
-                                 to previous msis. However, on 64 bit it must
+                However, on 64 bit it must be Calibre2 otherwise by default it
-                                 be Calibre2 otherwise by default it will
+                will install to C:\Program Files\calibre -->
-                                 install to C:\Program Files\calibre -->
             <Directory Id='APPLICATIONFOLDER' Name="{appfolder}" />
         </Directory>
         <Directory Id="ProgramMenuFolder">
@@ -110,7 +107,6 @@
     </DirectoryRef>
 
 
-
     <Feature Id="Complete" Title="{app}" Display="expand" Level="1"
         ConfigurableDirectory="APPLICATIONFOLDER">
 
@@ -195,11 +191,7 @@
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch {app}" />
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
     <Property Id="WixShellExecTarget" Value="[#{exe_map[calibre]}]" />
-                <CustomAction Id="LaunchApplication" BinaryKey="WixCA"
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes"/>
-                    DllEntry="WixShellExec" Impersonate="yes"/>
 
 </Product>
 </Wix>
-
-
-