From c01da1f56a11906fcedfb1db62df6808a7003c0e Mon Sep 17 00:00:00 2001
From: Perry Rapp <elsapo@users.sourceforge.net>
Date: Mon, 19 Dec 2005 17:50:34 +0000
Subject: [PATCH]  BUG: [ 1384830 ] FAQ suggests non-proportional fonts
 available in 2.4+   removed version numbers ("WinMerge does not support
 non-proportional fonts")   Manual Faq.xml

---
 Docs/Users/Manual/Changes.txt | 5 +++++
 Docs/Users/Manual/Faq.xml     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Docs/Users/Manual/Changes.txt b/Docs/Users/Manual/Changes.txt
index e473a8ae4..7820b647f 100644
--- a/Docs/Users/Manual/Changes.txt
+++ b/Docs/Users/Manual/Changes.txt
@@ -1,3 +1,8 @@
+2005-12-19 Perry
+ BUG: [ 1384830 ] FAQ suggests non-proportional fonts available in 2.4+
+  removed version numbers ("WinMerge does not support non-proportional fonts")
+  Manual Faq.xml
+
 2005-12-08 Kimmo
  PATCH: [ 1375564 ] New encoding FAQ (UTF-8)
   Submitted by Perry
diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml
index d6a85e475..430bba6c2 100644
--- a/Docs/Users/Manual/Faq.xml
+++ b/Docs/Users/Manual/Faq.xml
@@ -254,7 +254,7 @@
         </question>
 
         <answer>
-          <para>Unfortunately WinMerge 2.0 and 2.2 supports only
+          <para>Unfortunately WinMerge supports only
           non-proportional fonts.</para>
         </answer>
       </qandaentry>
-- 
2.11.0