merge

1 files changed, 48 insertions, 35 deletions

diff --git a/src/IO/about.c b/src/IO/about.c
index 508bfd11..77af318f 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -61,7 +61,7 @@ const char *const AboutSplash=
 "    <table border='0' cellspacing='0' cellpadding='2'><tr>\n"
 "    <td>\n"
 "    <td>\n"
-"     <a href='http://www.dillo.org/dillo2-help.html'>\n"
+"     <a href='http://www.dillo.org/dillo3-help.html'>\n"
 "     Help</a>\n"
 "    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
@@ -153,12 +153,6 @@ const char *const AboutSplash=
 "    <table border='0' cellspacing='0' cellpadding='5'><tr><td>\n"
 "    <table border='0' cellpadding='2'><tr>\n"
 "    <td>&nbsp;&nbsp;\n"
-"    <td><a href='http://www.google.com/'>Google</a>\n"
-"    <tr>\n"
-"    <td>&nbsp;&nbsp;\n"
-"    <td><a href='http://www.wikipedia.org/'>Wikipedia</a>\n"
-"    <tr>\n"
-"    <td>&nbsp;&nbsp;\n"
 "    <td><a href='http://www.gutenberg.org/'>P.&nbsp;Gutenberg</a>\n"
 "    <tr>\n"
 "    <td>&nbsp;&nbsp;\n"
@@ -240,20 +234,27 @@ const char *const AboutSplash=
 "<tr>\n"
 " <td bgcolor='#CCCCCC'>\n"
 "  <h4>Release overview</h4>\n"
-"  February 11, 2010\n"
+"  September 06, 2011\n"
 "<tr>\n"
 " <td bgcolor='#FFFFFF'>\n"
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
 "  <tr>\n"
 "   <td>\n"
 "<p>\n"
-"This release features a major overhaul of the cookies subsystem,\n"
-"a reimplementation of the DPI API, a configurable connection limit,\n"
-"and various CSS improvements.\n"
+"Dillo-3.0 is a port to FLTK-1.3, which is big news because FLTK-1.3.0 was\n"
+"<a href='http://fltk.org/articles.php?L1086'>released</a>\n"
+"in June, clearing the way for Dillo to return to those distributions\n"
+"which had excluded Dillo2 due to FLTK2 never being officially released.\n"
+"<p>\n"
+"Dillo-3.0 also has plenty of improvements and bugfixes.\n"
+"<p>\n"
+"After this release, the core team will focus on implementing the CSS\n"
+"feature of floating elements. This will <em>greatly</em> improve dillo's\n"
+"web page rendering since many sites have adopted floats instead of tables.\n"
+"<p>\n"
+"The new dillo3 has shown excellent stability in our experience.\n"
+"The core team welcomes developers willing to join our workforce.\n"
 "<p>\n"
-"Remember that the dillo project uses a release model where every new\n"
-"version shall be better than the last.\n"
-"<EM>Keep up with the latest one!</EM>\n"
 "  </table>\n"
 "</table>\n"
 "</table>\n"
@@ -274,27 +275,39 @@ const char *const AboutSplash=
 "  <tr>\n"
 "   <td>\n"
 "<ul>\n"
-"<li>Added keybindings for scrolling.\n"
-"<li>Help button and local help file.\n"
-"<li>Add support for multiple class names in CSS.\n"
-"<li>Fix X11 coordinate overflows.\n"
-"<li>Improve CSS font parsing.\n"
-"<li>Enable font face setting via &lt;font&gt; element.\n"
-"<li>Ignore XML comment markers in CSS.\n"
-"<li>Fix user agent style for nested &lt;ul&gt;.\n"
-"<li>Handle signed chars. Added dIsspace() and dIsalnum() to dlib.\n"
-"<li>Changed the CCCs to build in one step (for both HTTP and DPI).\n"
-"<li>Remove the empty cache entry lingering after connection abort.\n"
-"<li>Fixed URL unescaping in the datauri DPI.\n"
-"<li>Changed and reimplemented the DPI API.\n"
-"<li>Allow linebreaks around Chinese/Japanese characters.\n"
-"<li>Fix scrolling for text search.\n"
-"<li>Tooltips.\n"
-"<li>Enable popup menu below bottom of page content.\n"
-"<li>Handle JPEGs with CMYK color space.\n"
-"<li>General cookies overhaul.\n"
-"<li>Fixed a bug in w3c_mode.\n"
-"<li>Limit number of simultaneous connections.\n"
+"<li>Ported Dillo to FLTK-1.3.\n"
+"<li>Native build on OSX.\n"
+"<li>Default binding for close-all changed from Alt-q to Ctrl-q.\n"
+"<li>Default binding for close-tab changed from Ctrl-q to Ctrl-w.\n"
+"<li>Default binding for left-tab changed to Shift-Ctrl-Tab.\n"
+"<li>Rewrote the User Interface: much simpler design and event handling.\n"
+"<li>Added on-the-fly panel resize (tiny/small/medium and normal/small icons).\n"
+"<li>'hide-panels' key action now hides the findbar if present,\n"
+"     and toggles display of the control panels otherwise.\n"
+"<li>Allow multiple search engines to be set in dillorc, with a menu\n"
+"    in the web search dialog to select between them.\n"
+"<li>Added an optional label to dillorc's search_url.\n"
+"    Format: \"[&lt;label&gt; ]&lt;url&gt;\"\n"
+"<li>Add right_click_closes_tab preference (default is middle click).\n"
+"<li>Allow binding to non-ASCII keys and multimedia keys.\n"
+"<li>Avoid a certificate dialog storm on some HTTPS sites (BUG#868).\n"
+"<li>Enable line wrapping for &lt;textarea&gt;. (BUG#903)\n"
+"<li>Avoid double render after going Back or Forward\n"
+"    (it takes half the time now!)\n"
+"<li>Implemented a custom tabs handler (to allow fine control of it).\n"
+"<li>Rewrote dw's crossing-events dispatcher (avoids redundant events).\n"
+"<li>Fixed a years old bug: stamped tooltips when scrolling with keyboard.\n"
+"<li>Fixed a border case in URL resolver: empty path + {query|fragment}\n"
+"     (BUG#948)\n"
+"<li>Cancel the expected URL after offering a download (BUG#982)\n"
+"<li>Eliminated a pack of 22 compiler warnings (gcc-4.6.1 amd64)\n"
+"<li>Removed 'large' option of panel_size preference.\n"
+"<li>Removed --enable-ansi configure option.\n"
+"<li>Limit saved cookie size.\n"
+"<li>Wrap image alt text.\n"
+"<li>Added support for CSS adjacent sibling selectors.\n"
+"<li>Fix redraw loops and reenabled limit_text_width dillorc option.\n"
+"<li>Collapse parent's and first child's top margin.\n"
 "</ul>\n"
 "  </table>\n"
 "</table>\n"