PATCH: [ 1404317 ] Web: Known Limitations page

diff --git a/Web/2.4/images/statusbar.gif b/Web/2.4/images/statusbar.gif
new file mode 100644 (file)
index 0000000..c52d810
Binary files /dev/null and b/Web/2.4/images/statusbar.gif differ

diff --git a/Web/2.4/limitations.php b/Web/2.4/limitations.php
new file mode 100644 (file)
index 0000000..5756d67
--- /dev/null
+++ b/Web/2.4/limitations.php
@@ -0,0 +1,26 @@
+<?php
+  include('../page.inc');
+
+  $page = new Page;
+  $page->printHead('WinMerge 2.4: Known Limitations', WINMERGE_2_4);
+?>
+<h2>Known Limitations</h2>
+<ul>
+  <li>
+    <p><strong>Sometimes you cannot merge two files because the program says they are binary, even if they are mostly text files.</strong></p>
+    <p><i>Workaround</i>: Use the new <code>EditBinaryFiles.dll</code> plugin available in <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158">development version 2.5</a>.</p>
+  </li>
+  <li>
+    <p><strong>There is no way to specify the codepage for a particular file.</strong></p>
+    <p><i>Workaround</i>: Specify the default codepages for all files in Edit-&gt;Options-&gt;Codepage-&gt;Custom codepage.</p>
+  </li>
+  <li><p><strong>There is no 3-way merge.</strong></p></li>
+  <li>
+    <p><strong>There are no line numbers.</strong></p>
+    <p><i>Workaround</i>: Click on desired line and look in lower right corner status bar to see line number.</p>
+    <p><img src="images/statusbar.gif" alt="Status Bar"></p>
+  </li>
+</ul>
+<?php
+  $page->printFoot();
+?>
\ No newline at end of file

diff --git a/Web/page.inc b/Web/page.inc
index 406e783..ee74e64 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -214,6 +214,7 @@
           $temp .= "  <li><a href=\"/2.4/manual/index.html\">Manual</a></li>\n";
           $temp .= "  <li><a href=\"/2.4/screenshots.php\">Screenshots</a></li>\n";
           $temp .= "  <li><a href=\"/2.4/changes.php\">Change History</a></li>\n";
+          $temp .= "  <li><a href=\"/2.4/limitations.php\">Known Limitations</a></li>\n";
           $temp .= "</ul>\n";
           $temp .= "<ul>\n";
           $temp .= "  <li><a href=\"/downloads.php\">Downloads</a>\n";

diff --git a/Web/readme.txt b/Web/readme.txt
index 16b5a7a..fe9e181 100644 (file)
--- a/Web/readme.txt
+++ b/Web/readme.txt
@@ -1,3 +1,9 @@
+2006-01-13 Tim
+ PATCH: [ 1404317 ] Web: Known Limitations page
+  Web: page.inc
+  Web\2.4: new file limitations.php
+  Web\2.4\images: new file statusbar.gif
+
 2006-01-11 Tim
  PATCH: [ 1402858 ] Web: New background color for 'important' and 'note'
   Web\css: all.css