PATCH: [ 1344219 ] Manual: New FAQ items about archive files detection

diff --git a/Docs/Users/Manual/Changes.txt b/Docs/Users/Manual/Changes.txt
index 812de61..8b52385 100644 (file)
--- a/Docs/Users/Manual/Changes.txt
+++ b/Docs/Users/Manual/Changes.txt
@@ -1,6 +1,8 @@
 2005-11-01 Kimmo
  PATCH: [ 1344213 ] Manual: typo fixes for Configuration part
   Manual: Configuration.xml
+ PATCH: [ 1344219 ] Manual: New FAQ items about archive files detection
+  Manual: Faq.xml
 
 2005-10-29 Kimmo
  PATCH: [ 1341076 ] Manual: Mention maximum linefilter length

diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml
index 43ef571..c35cbfc 100644 (file)
--- a/Docs/Users/Manual/Faq.xml
+++ b/Docs/Users/Manual/Faq.xml
@@ -123,6 +123,18 @@
           files/paths per side.</para>
         </answer>
       </qandaentry>
+
+      <qandaentry>
+        <question>
+          <para>Can WinMerge open Open Office files?</para>
+        </question>
+
+        <answer>
+          <para>Yes, enable <guilabel>Detect archive type from file
+          signature</guilabel> option in <guilabel>Archive
+          Options</guilabel>.</para>
+        </answer>
+      </qandaentry>
     </qandaset>
   </sect2>
 
@@ -360,6 +372,19 @@
           <para>Unfortunately WinMerge can only use 7-zip.</para>
         </answer>
       </qandaentry>
+
+      <qandaentry>
+        <question>
+          <para>Can WinMerge open archive files with non-standard
+          file-extensions? (For example .jar files as zip-files)</para>
+        </question>
+
+        <answer>
+          <para>Yes, enable <guilabel>Detect archive type from file
+          signature</guilabel> option in <guilabel>Archive
+          Options</guilabel>.</para>
+        </answer>
+      </qandaentry>
     </qandaset>
   </sect2>
 
@@ -453,4 +478,4 @@
 
     <para></para>
   </sect2>
-</sect1>
\ No newline at end of file
+</sect1>