From b219978c84d3a08f2331e4c8bd52cb639762cf6e Mon Sep 17 00:00:00 2001
From: corvid <corvid@lavabit.com>
Date: Wed, 1 Jul 2009 18:27:07 +0000
Subject: update for 2.1.1

---
 ChangeLog      |  3 ++-
 README         |  8 ++++++--
 configure.in   |  2 +-
 src/IO/about.c | 25 +++++++++++++------------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c48390a..ca3d0cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 Dillo project
 =============================================================================
 
-dillo-2.2 [??, 2009]
+dillo-2.1.1 [Jul 3, 2009]
 
 +- Add additional size checks for images.
    Patch: Jorge Arellano Cid, Johannes Hofmann, corvid
@@ -12,6 +12,7 @@ dillo-2.2 [??, 2009]
    Patches: Johannes Hofmann
 +- Removed redundant system includes.
  - Added the "nop" keybinding (nop = NO_OPERATION; cancels a default hook).
+ - Added 'stop' key action (not bound by default).
  - Fixed segfault when URL is NULL and dpis can't be found.
    Patches: place (AKA corvid)
 +- Reduced 'warning: ignoring return value of ...'
diff --git a/README b/README
index 0fe12c07..f4cfd4fd 100644
--- a/README
+++ b/README
@@ -2,14 +2,18 @@
  Dillo
 =======
 
-  This  is  the second release of the dillo-2.x generation of the
+  Release 2.1.1 is part of of the dillo-2.x generation of the
 Dillo  web  browser.  In this new series significant parts of the
 codebase  were  ported  to C++, and the rendering engine now uses
 the FLTK2 library instead of GTK1.
 
+dillo-2.1.1:
+
+  This release improves image size checking.
+
 dillo-2.1:
 
-  This  release  comes with substantial improvements, among which
+  This  release  came with substantial improvements, among which
 the  most important is a basic CSS infrastructure! There are also
 configurable  keybindings  among  other  goodies. Please read the
 Changelog highlights in the splash page of the browser itself.
diff --git a/configure.in b/configure.in
index 758a41fe..15e8fc06 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_INIT(src/dillo.cc)
 dnl Detect the canonical host and target build environment
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(dillo, 2.1)
+AM_INIT_AUTOMAKE(dillo, 2.1.1)
 AM_CONFIG_HEADER(config.h)
 sysconfdir=${sysconfdir}/${PACKAGE}
 
diff --git a/src/IO/about.c b/src/IO/about.c
index 8fd42580..3cca7ef3 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -240,20 +240,16 @@ const char *const AboutSplash=
 "<tr>\n"
 " <td bgcolor='#CCCCCC'>\n"
 "  <h4>Release overview</h4>\n"
-"  June 15, 2009\n"
+"  July 3, 2009\n"
 "<tr>\n"
 " <td bgcolor='#FFFFFF'>\n"
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
 "  <tr>\n"
 "   <td>\n"
 "<p>\n"
-"This is the second release of the dillo2 series. It comes with\n"
-"substantial improvements, among which the most important is a basic\n"
-"CSS infrastructure!\n"
-"<p>\n"
-"There are also configurable keybindings among other goodies. Please read\n"
-"the Changelog highlights below. This time they were sorted into two groups\n"
-"by relevance and user visibility.\n"
+"This release of Dillo improves image size checking. It builds upon version\n"
+"2.1, which brought significant improvements such as basic CSS support and\n"
+"configurable keybindings.\n"
 "<p>\n"
 "Remember that the dillo project uses a release model where every new\n"
 "version shall be better than the last.\n"
@@ -277,7 +273,15 @@ const char *const AboutSplash=
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
 "  <tr>\n"
 "   <td>\n"
-"Dillo:<br>\n"
+"2.1.1:<br>\n"
+"<ul>\n"
+"<li>Add additional size checks for images.\n"
+"<li>Added support for css colors of the form rgb(255, 255, 255).\n"
+"<li>Added the 'nop' keybinding (nop = NO_OPERATION; cancels a default hook).\n"
+"<li>Added 'stop' key action (not bound by default).\n"
+"<li>Reduced 'warning: ignoring return value of ...'\n"
+"</ul>\n"
+"2.1:<br>\n"
 "<ul>\n"
 "<li>Implemented basic CSS infrastructure!\n"
 "<li>Read user style from ~/.dillo/style.css.\n"
@@ -291,9 +295,6 @@ const char *const AboutSplash=
 "<li>Added dillo(1) man page.\n"
 "<li>Added \"font_max_size\", \"font_min_size\" dillorc options.\n"
 "<li>Added instant client-side redirects (aka. zero-delay META refresh).\n"
-"</ul>\n"
-"<small>&nbsp;</small>\n"
-"<ul>\n"
 "<li>Proxy support for HTTPS.\n"
 "<li>Updated the URL resolver to comply with RFC-3986.\n"
 "<li>Fixed Bookmarks modify's HTML so it wraps nicely on handhelds.\n"
-- 
cgit v1.2.3