Manual: Small tweaks for "Install" page (Compatibility and Shell Integration)

--HG--
branch : stable

diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml
index 925890b..4212211 100644 (file)
--- a/Docs/Users/Manual/Install.xml
+++ b/Docs/Users/Manual/Install.xml
@@ -25,16 +25,16 @@
        \r
        <itemizedlist>\r
          <listitem>\r
-           <para><ulink url="http://sourceforge.net/projects/winmerge/files/stable/2.16.0/">WinMerge version 2.16.0</ulink> \r
-               supports Windows XP/2003/Vista/2008/7/8/2012/2014/10/2016 and later. It runs on both 32 bit and 64 bit Windows.</para>\r
+           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.16.0/">WinMerge 2.16.0</ulink> \r
+               supports Windows XP and later. It runs on both 32 bit and 64 bit Windows.</para>\r
          </listitem>\r
          <listitem>\r
-           <para><ulink url="http://sourceforge.net/projects/winmerge/files/stable/2.14.0/">WinMerge version 2.14.0</ulink> \r
-               supports Windows XP/2003/Vista/2008/7/8/2012 and later. It runs 32 bit on both 32 bit and 64 bit Windows.</para>\r
+           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.14.0/">WinMerge 2.14.0</ulink> \r
+               was the last version to support Windows 2000.</para>\r
          </listitem>\r
          <listitem>\r
-           <para><ulink url="http://sourceforge.net/projects/winmerge/files/stable/2.12.4/">WinMerge version 2.12.4</ulink> \r
-               was the last version to support Windows 9x, NT, 2000, and ME.</para>\r
+           <para><ulink url="https://sourceforge.net/projects/winmerge/files/stable/2.12.4/">WinMerge 2.12.4</ulink> \r
+               was the last version to support Windows 95, 98, ME and NT.</para>\r
          </listitem>\r
          <listitem>\r
            <para>WinMerge is not supported on Windows RT.</para>\r
@@ -341,31 +341,9 @@
       privileges.</para>\r
     </note>\r
 \r
-    <para>First, uninstall the current shell integration version by running\r
-    <filename>unregister.bat</filename> from the WinMerge directory. Then\r
-    restart the computer so that Windows completes the uninstall.</para>\r
-\r
-    <para>To register the shell integration DLL\r
-    (<filename>ShellExtension*.dll</filename>), run\r
-    <filename>register.bat</filename> from the WinMerge directory. We recommend\r
-    that you restart the computer after installing shell integration, so that\r
-    Windows updates all its references.</para>\r
-\r
-    <section>\r
-      <title>64-bit Windows Explorer shell integration<indexterm>\r
-          <primary>Windows 64-bit versions, WinMerge support</primary>\r
-        </indexterm></title>\r
-\r
-      <para>Starting with Version 2.6, WinMerge supports Windows Explorer shell\r
-      integration for 64-bit Windows versions. The WinMerge installer recognizes\r
-      the 64-bit versions of Windows and can install the correct shell\r
-      integration.</para>\r
-\r
-      <para>When you install shell integration manually from an archive file,\r
-      the shell integration DLL is named\r
-      <filename>ShellExtensionX64.dll</filename>. You can register and\r
-      unregister this file by using <filename>register.bat</filename> and\r
-      <filename>unregister.bat</filename>, as with 32-bit versions.</para>\r
-    </section>\r
+    <para>Open WinMerge and using the <xref\r
+    linkend="Configuration_shell-integ" /> in the Options window. In the\r
+    Options window use the <guibutton>Register shell extension</guibutton>\r
+    or <guibutton>Unregister shell extension</guibutton> buttons.</para>\r
   </section>\r
 </article>\r