Preparing release 4.2.0. New storage: json.

git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@231 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23

diff --git a/Makefile b/Makefile
index 3076f94af3a6c40ee95b1ce3a8dc9237950c2273..808c17cc6598fd1c2d60cbda06e3158caba761bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-VERSION=4.1.2
+VERSION=4.2.0
+
 EXAMPLE_SHELL=ns-unescape mz-unescape bkmk2db koi2win.db \
        bkmk-koi bkmk-win bkmk-chk bkmk-publish bkmk-sort hotexplode.pl \
        check_title.py set-real_title.py set-title-list.py \

diff --git a/doc/ANNOUNCE b/doc/ANNOUNCE
index 29761da6499a3575a643c892498476a2dd707303..bb0b9d93408ac86482e3a282235f370a257c7269 100644 (file)
--- a/doc/ANNOUNCE
+++ b/doc/ANNOUNCE
@@ -3,48 +3,9 @@
 
 WHAT IS IT
    A set of classes, libraries, programs and plugins I use to manipulate my
-bookmarks.html. I like Mozilla, but I need more features. I want to extend
-Mozilla's "Check for updates" feature (Navigator4 called it "Update
-bookmarks").
+bookmarks.html.
 
-WHAT'S NEW in version 4.1.2
-
-   Process http error 307 as a temporary redirect.
-
-
-WHAT'S NEW in version 4.1.1 (2008-03-10)
-   Catch and report all errors.
-
-   Consider application/xhtml+xml as HTML.
-
-   Better handling of exceptions while looking up the icon.
-
-   Recode HTML entities.
-
-   Always use utf-8 as the default encoding.
-
-
-WHAT'S NEW in version 4.1.0 (2008-01-14)
-   Parser for HTML based on BeautifulSoup.
-
-   Changed User-agent header: I saw a number of sites that forbid
-   "Mozilla compatible" browsers. Added a number of fake headers to pretend
-   this is a real web-browser - there are still stupid sites
-   that are trying to protect themselves from robots by analyzing headers.
-
-   Handle redirects while looking for the icon.
-
-   Handle float timeouts in HTML redirects.
-
-   Minimal required version of Python is 2.5 now.
-
-
-WHAT'S NEW in version 4.0.0 (2007-10-20)
-   Extended support for Mozilla: charset and icon in bookmarks.
-   Use the charset to add Accept-Charset header.
-   Retrieve favicon.ico (or whatever <link> points to) and store it.
-
-   The project celebrates 10th anniversary!
+WHAT'S NEW in version 4.2.0
 
 
 WHERE TO GET
@@ -52,12 +13,11 @@ WHERE TO GET
    Mirrors:   http://phd.webhost.ru/Software/Python/#bookmarks_db
                    http://phd.by.ru/Software/Python/#bookmarks_db
 
-
 AUTHOR
    Oleg Broytman <phd@phd.pp.ru>
 
 COPYRIGHT
-   Copyright (C) 1997-2008 PhiloSoft Design
+   Copyright (C) 1997-2010 PhiloSoft Design
 
 LICENSE
    GPL

diff --git a/doc/TODO b/doc/TODO
index b4ff4c1da7a80c226a7c4c42a610bdcfb7d24f80..57a6c8dc39144934a282a8d7f9a80816ca00677b 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,9 +1,11 @@
+New storage: json.
+
+New storage: pyyaml.
+
 New robot based on PycURL.
 
 Use lxml to parse broken HTML.
 
-New database format: pyyaml.
-
 A program to publish bookmarks with icons.
 
 Fetch description from <META name="description" content="..."> and store it in