winmerge-svn Mailing List for WinMerge (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7544
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7544&view=rev
Author:   gerundt
Date:     2011-06-12 12:39:14 +0000 (Sun, 12 Jun 2011)

Log Message:
-----------
Manual: Backport some R2_14 changes back to Trunk

Modified Paths:
--------------
    trunk/Docs/Users/Manual/Compare_files.xml
    trunk/Docs/Users/Manual/Configuration.xml
    trunk/Docs/Users/Manual/Faq.xml
    trunk/Docs/Users/Manual/Install.xml
    trunk/Docs/Users/Manual/Locales.xml
    trunk/Docs/Users/Manual/replaceables.xml

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================

--- trunk/Docs/Users/Manual/Compare_files.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -6,7 +6,7 @@
       <primary>comparing files</primary>
     </indexterm></title>
 
-  <para id="">This topic describes how to use the WinMerge File Compare window to
+  <para>This topic describes how to use the WinMerge File Compare window to
   compare and merge text files. To understand the basic concepts about
   differences discussed here, we suggest you read <xref linkend="Intro_diffs" />
   first. See <xref linkend="Intro_diffs" /> for related information about hex

Modified: trunk/Docs/Users/Manual/Configuration.xml
===================================================================
--- trunk/Docs/Users/Manual/Configuration.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/Configuration.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -1398,24 +1398,24 @@
         <secondary>options</secondary>
       </indexterm></title>
 
-    <para>This page allows you to specify the codepage that the ANSI version of
-    WinMerge uses for ANSI files. , and whether the codepage of certain file
-    formats should be detected from the contents of the files.</para>
+    <para>WinMerge detects handles file encoding transparently, and in most
+      cases you should not need to change the default settings.This page allows
+      you to specify the codepages of certain file formats, should you need to.  </para>
 
-    <important>
+<!--    <important>
       <para>The ANSI version of WinMerge (<filename>WinMerge.exe</filename>) is
       normally installed only on Windows 9X and WME. On all other, newer Windows
       systems, the Unicode version (<filename>WinMergeU.exe</filename>) is
       installed. The Unicode version of WinMerge handles encoding transparently.
       You should not need to change any settings in this page unless you are
       running the ANSI version.</para>
-    </important>
+    </important> -->
 
     <note>
       <para>A full explanation of text encoding and Windows codepages is beyond
-      the scope of WinMerge documentation. Fortunately, there is lots of
-      information about them on the Internet. For example, here are some places
-      to start:</para>
+        the scope of WinMerge documentation. Fortunately, there is lots of
+        information about them on the Internet. For example, here are some
+        places to start:</para>
 
       <itemizedlist>
         <listitem>
@@ -1434,7 +1434,7 @@
     </note>
 
     <section>
-      <title>Default codepage for ANSI files</title>
+      <title>Default codepage for non-Unicode files</title>
 
       <para>Choose one of these radio buttons to set the default codepage that
       WinMerge uses when handling ANSI files:</para>

Modified: trunk/Docs/Users/Manual/Faq.xml
===================================================================
--- trunk/Docs/Users/Manual/Faq.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/Faq.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -8,53 +8,43 @@
     <qandaset>
       <qandaentry>
         <question>
-          <para>Why are there two executable files,
-          <filename>WinMerge.exe</filename> and
-          <filename>WinMergeU.exe</filename>?<indexterm>
+          <para>Does WinMerge run on older Windows versions?</para>
+        </question>
+        <answer>
+          <para><indexterm>
               <primary>WinMerge executables, Unicode and ANSI</primary>
             </indexterm><indexterm>
               <primary>Unicode</primary>
-
               <secondary>WinMerge support</secondary>
             </indexterm><indexterm>
               <primary>ANSI</primary>
-
               <secondary>WinMerge support</secondary>
-            </indexterm></para>
-        </question>
-
-        <answer>
-          <para>They support the different character encoding capabilities of
-          older and newer versions of Windows.</para>
-
-          <itemizedlist>
-            <listitem>
-              <para><filename>WinMerge.exe</filename> is an ANSI (8-bit)
-              executable that works in all 32-bit Windows systems. It does not
-              have Unicode support.</para>
-
-              <para>Internally, it stores only ANSI characters (256
-              possibilities). If you open a Unicode file, the characters must be
-              converted to the ANSI codepage. Because there are over 100,000
-              Unicode characters, and only 256 can be represented in the ANSI
-              codepage, data loss can occur. Conversion might be approximate
-              (for example, accents are lost) or impossible: characters are
-              replaced by question marks ( <literal>?</literal> ).</para>
-
-              <para><filename>WinMerge.exe</filename> also cannot open files
-              with names outside the current ANSI codepage. For example,
-              WinMerge.exe running on an English system cannot open a file with
-              a Hebrew name.</para>
-            </listitem>
-
-            <listitem>
-              <para><filename>WinMergeU.exe</filename> is a Unicode-enabled
-              executable that works on Windows NT4, Windows 2000, and newer
-              systems. Because it supports Unicode, it has none of the
-              limitations listed above for
-              <filename>WinMerge.exe</filename>.</para>
-            </listitem>
-          </itemizedlist>
+            </indexterm>Beginning with Version 2.14, WinMerge ended support for
+            older 32-bit Windows systems, including Windows 9x, ME, and NT4. </para>
+          <para>Previously, WinMerge provided an ANSI (8-bit) executable,
+              <filename>WinMerge.exe</filename>, that was designed around the
+            old Windows codepages. <filename>WinMerge.exe</filename> internally
+            stored only the ANSI characters supported by the Windows codepage.
+            This executable had severe limitations for working with Unicode: if
+            you opened a Unicode file, the characters were converted to the
+            Windows ANSI codepage. Because there are over 100,000 Unicode
+            characters, and only 256 can be represented in the ANSI character
+            set, data loss could occur. Conversion might be approximate (for
+            example, accents are lost) or impossible: characters were replaced
+            by question marks ( <literal>?</literal> ).</para>
+          <para><filename>WinMerge.exe</filename> also could not open files with
+            names outside the current ANSI codepage. For example, on an English
+            system, <filename>WinMerge.exe</filename> could not open a file with
+            a Hebrew name.</para>
+          <para>WinMerge developed the Unicode-enabled
+              <filename>WinMergeU.exe</filename> executable to work with newer,
+            Unicode-based Windows systems. <filename>WinMergeU.exe</filename>
+            has none of the limitations of the ANSI executable.</para>
+          <para><filename>WinMergeU.exe</filename> has been installed by default
+            for some time, and since few ANSI-based Windows systems remain, the
+            value of maintaining <filename>WinMerge.exe</filename> is miminal.
+            As of Version 2.14, WinMerge no longer includes
+              <filename>WinMerge.exe</filename> in the installer.  </para>
         </answer>
       </qandaentry>
 
@@ -327,10 +317,8 @@
         <answer>
           <para>This is what we call a <glossterm>lossy
           conversion</glossterm>.</para>
+          <!--<para>For Unicode files (UCS-2, UTF-8), use <filename>WinMergeU.exe</filename>.</para>-->
 
-          <para>For Unicode files (UCS-2, UTF-8), use
-          <filename>WinMergeU.exe</filename>.</para>
-
           <para>For ANSI files, this is probably due to code-page problems. To
           troubleshoot, click <menuchoice>
               <guimenu>Edit</guimenu>

Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/Install.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -264,7 +264,7 @@
     <title>Installing from an archive<indexterm>
         <primary>archive, installing WinMerge from</primary>
       </indexterm><indexterm>
-        <primary>mfc71[u].dll runtime file</primary>
+        <primary>mfc71u.dll runtime file</primary>
       </indexterm><indexterm>
         <primary>msvcr71.dll runtime file</primary>
       </indexterm><indexterm>
@@ -274,10 +274,10 @@
     <para>WinMerge is pretty much independent of other system components. It is
     not tightly integrated with Windows, and does not use many DLLs.</para>
 
-    <para><filename>WinMerge[U].exe</filename> itself depends on
-    <filename>MFC71[U].dll</filename> , <filename>MSVCR71.dll and
+    <para><filename>WinMergeU.exe</filename> itself depends on
+    <filename>MFC71U.dll</filename> , <filename>MSVCR71.dll and
     MSVCP71.dll</filename>, in addition to some system DLLs. So if these DLLs
-    are already installed on a system, only <filename>WinMerge[U].exe</filename>
+    are already installed on a system, only <filename>WinMergeU.exe</filename>
     is needed to run WinMerge. The DLL files listed above are also available as
     a downloadable runtime package.</para>
 

Modified: trunk/Docs/Users/Manual/Locales.xml
===================================================================
--- trunk/Docs/Users/Manual/Locales.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/Locales.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -52,11 +52,10 @@
 
         <orderedlist>
           <listitem>
-            <simpara>Create a folder named <filename
-            class="directory">Languages</filename> under the WinMerge
-            installation directory (where <filename>WinMerge.exe</filename> or
-            <filename>WinMergeU.exe</filename> is located), if it does not
-            already exist.</simpara>
+            <simpara>Create a folder named <filename class="directory"
+                >Languages</filename> under the WinMerge installation directory
+              (where <filename>WinMergeU.exe</filename> is located), if it does
+              not already exist.</simpara>
           </listitem>
 
           <listitem>

Modified: trunk/Docs/Users/Manual/replaceables.xml
===================================================================
--- trunk/Docs/Users/Manual/replaceables.xml	2011-06-05 23:28:04 UTC (rev 7543)
+++ trunk/Docs/Users/Manual/replaceables.xml	2011-06-12 12:39:14 UTC (rev 7544)
@@ -16,13 +16,13 @@
         <row>
           <entry>Current version (minor)</entry>
 
-          <entry><phrase id="version-full">2.12.4</phrase></entry>
+          <entry><phrase id="version-full">2.16.0</phrase></entry>
         </row>
 
         <row>
           <entry>Current version (major)</entry>
 
-          <entry><phrase id="version">2.12</phrase></entry>
+          <entry><phrase id="version">2.16</phrase></entry>
         </row>
       </tbody>
     </tgroup>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (148)	Oct (84)	Nov (130)	Dec (121)
2007	Jan (89)	Feb (50)	Mar (81)	Apr (45)	May (42)	Jun (46)	Jul (40)	Aug (98)	Sep (80)	Oct (101)	Nov (128)	Dec (46)
2008	Jan (132)	Feb (117)	Mar (118)	Apr (112)	May (69)	Jun (140)	Jul (164)	Aug (159)	Sep (115)	Oct (65)	Nov (80)	Dec (128)
2009	Jan (145)	Feb (97)	Mar (118)	Apr (87)	May (96)	Jun (83)	Jul (50)	Aug (42)	Sep (18)	Oct (32)	Nov (12)	Dec (35)
2010	Jan (38)	Feb (8)	Mar (5)	Apr (19)	May (23)	Jun (39)	Jul (16)	Aug (4)	Sep (60)	Oct (100)	Nov (57)	Dec (43)
2011	Jan (25)	Feb (1)	Mar (3)	Apr	May (13)	Jun (19)	Jul	Aug (6)	Sep (5)	Oct (6)	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2013	Jan	Feb	Mar (19)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

winmerge-svn Mailing List for WinMerge (Page 3)

Windows visual diff and merge for files and directories

winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion