Provide a separate post-install README for MSI.

The old README.txt instructed you to manually update PATH if you
wanted to run pscp from a command prompt. But the MSI installer can do
that automatically, so the wording needs tweaks. And now that we're
actually launching README (at least optionally) from the installer UI,
it's more important to not make it look silly.

diff --git a/windows/README-msi.txt b/windows/README-msi.txt
new file mode 100644 (file)
index 0000000..a6c2707
--- /dev/null
+++ b/windows/README-msi.txt
@@ -0,0 +1,45 @@
+PuTTY README\r
+============\r
+\r
+This is the README file for the PuTTY MSI installer distribution. If\r
+you're reading this, you've probably just run our installer and\r
+installed PuTTY on your system.\r
+\r
+What should I do next?\r
+----------------------\r
+\r
+If you want to use PuTTY to connect to other computers, or use PSFTP\r
+to transfer files, you should just be able to run them from the\r
+Start menu.\r
+\r
+If you want to use the command-line file transfer utility PSCP, you\r
+will need to run this from a Command Prompt or equivalent, because it\r
+will not do anything useful without command-line options telling it\r
+what files to copy to and from where. You can do this by just running\r
+the command 'pscp' from a Command Prompt, if you used the installer's\r
+option to put the PuTTY installation directory on your PATH.\r
+Alternatively, you can always run pscp.exe by its full pathname, e.g.\r
+"C:\Program Files\PuTTY\pscp.exe".\r
+\r
+(Note that a Command Prompt that was already open before you ran the\r
+installer will not have inherited the update of PATH.)\r
+\r
+Some versions of Windows will refuse to run HTML Help files (.CHM)\r
+if they are installed on a network drive. If you have installed\r
+PuTTY on a network drive, you might want to check that the help file\r
+works properly. If not, see http://support.microsoft.com/kb/896054\r
+for information on how to solve this problem.\r
+\r
+What do I do if it doesn't work?\r
+--------------------------------\r
+\r
+The PuTTY home web site is\r
+\r
+    http://www.chiark.greenend.org.uk/~sgtatham/putty/\r
+\r
+Here you will find our list of known bugs and pending feature\r
+requests. If your problem is not listed in there, or in the FAQ, or\r
+in the manuals, read the Feedback page to find out how to report\r
+bugs to us. PLEASE read the Feedback page carefully: it is there to\r
+save you time as well as us. Do not send us one-line bug reports\r
+telling us `it doesn't work'.\r

diff --git a/windows/installer.wxs b/windows/installer.wxs
index 22ea6e4ab23c6f7d0880a979f7038ca3bbee2481..52e7cb771effeb472a5c9d3b51bc81c600ac129c 100644 (file)
--- a/windows/installer.wxs
+++ b/windows/installer.wxs
@@ -162,7 +162,7 @@
           <Component Id="README_Component"
                      Guid="0AB63F2A-0FD9-4961-B8F7-AB85C22D9986">
             <File Id="README_File"
-                  Source="README.txt" KeyPath="yes" />
+                  Source="README-msi.txt" Name="README.txt" KeyPath="yes" />
           </Component>
 
           <!--