PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file

diff --git a/Docs/Users/Manual/Changes.txt b/Docs/Users/Manual/Changes.txt
index 8895d72..4c06d56 100644 (file)
--- a/Docs/Users/Manual/Changes.txt
+++ b/Docs/Users/Manual/Changes.txt
@@ -1,3 +1,7 @@
+2006-11-26 Kimmo
+ PATCH: [ 1602658 ] Manual: note about some 7-zip MSI installers missing file
+  Manual: Install.xml
+
 2006-11-26 Tim
  PATCH: [ 1602517 ] Manual: Remove "10.3.2. Apply to unrecognized side"
   Manual: Configuration.xml

diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml
index 91e7477..8897f29 100644 (file)
--- a/Docs/Users/Manual/Install.xml
+++ b/Docs/Users/Manual/Install.xml
@@ -9,8 +9,8 @@
     <para>Currently WinMerge installer works natively only for 32-bit Windows.
     There is no separate version of WinMerge for 64-bit Windows
     (WinXP/2003/Vista). 64-bit Windows versions can run the installer and
-    WinMerge as 32-bit application. For the Shell Integration there is 64-bit
-    version of included in the installer.</para>
+    WinMerge as 32-bit application. For the Shell Integration there is the
+    64-bit version of extension included in the installer.</para>
   </note>
 
   <sect2>
@@ -231,7 +231,9 @@
   </sect2>
 
   <sect2>
-    <title>7-Zip and Archive Support</title>
+    <title><indexterm>
+        <primary>Installing Archive Support</primary>
+      </indexterm>7-Zip and Archive Support</title>
 
     <para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
     archive support, but WinMerge installer does not install 7-Zip or archive
@@ -239,6 +241,13 @@
     archive support. 7-Zip installer can be downloaded from <ulink
     url="http://www.7-zip.org/">7-Zip.org</ulink>.</para>
 
+    <important>
+      <para>There are 7-Zip MSI installers that do not install all the
+      files WinMerge needs (namely <filename>7zip_pad.xml</filename> in 7-Zip
+      program folder). If there are problems with archive support enabling,
+      try running the EXE version of the 7-Zip installer.</para>
+    </important>
+
     <para>To install archive support, download and install 7-Zip plugin
     (Merge7zInstaller, see below) from <ulink
     url="http://www.winmerge.org/">WinMerge.org</ulink>.</para>