X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ChangeLog;h=ff92401d5615fe4b75c90949c7e5fa12db5fd692;hp=e16c454bdb7f39a8e42ac98444553b1a7cc4ce46;hb=383bd999f52387cc8bb769702b5625c014205d30;hpb=97110184221edacdb7d4dfc29de0e38d63f4d831

diff --git a/ChangeLog b/ChangeLog
index e16c454b..ff92401d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 --------------------------------------------------------------------
-ChangeLog for Internet JunkBuster
+ChangeLog for Privoxy
 --------------------------------------------------------------------
+*** Version 2.9.14 Beta *** 
+- Fix Solaris compile problem (gateway.h and filters.h)
+- Makefile fixes for Solaris, FreeBSD (?)
+- Fix build failure where certain features were disabled.
+- New 'blocked-compact' template.
+- Various tweaks for actions file to get ready for stable 3.0
+- Various other minor fixes.
 
 *** Version 2.9.13 Beta *** 
 
@@ -11,6 +18,7 @@ default.filter.
 - http://i.j.b/ is now http://p.p/
 - The 'logo' option for replacing ad iamges is removed now. 'Pattern' 
 (checkerboard) is now the default.
+- RPM spec file make over.
 
 
 *** Version 2.9.12 Beta *** 
@@ -92,14 +100,14 @@ image).
 Thanks to Jörg Strohmayer (joergs at users.sourceforge.net) for these.
 - Temporary hack to get FORCE_LOAD to work with IE.  I just lowercased the
 FORCE_LOAD_PREFIX.  Needs fixing properly.
-- Most URLs hardcoded into JunkBuster were changed to go through a script
+- Most URLs hardcoded into Junkbuster were changed to go through a script
 e.g. http://ijbswa.sourceforge.net/redirect.php?v=2.9.3&to=faq
 The only other URLs left are the GNU GPL:
   http://www.fsf.org/copyleft/gpl.html
 and the home page:
   http://ijbswa.sourceforge.net/
-... and various URLs which will be intercepted by JunkBuster anyway.
-TODO: Still need to do something with the URLs in JunkBuster Corp's 
+... and various URLs which will be intercepted by Junkbuster anyway.
+TODO: Still need to do something with the URLs in Junkbuster Corp's 
 copyright/trademark notice on the bottom of the show-proxy-args page.
 - PCRE or GNU Regex is now a #define option.
 
@@ -140,7 +148,7 @@ To see command-line options, run "./configure --help".
 This is my first ever autoconf script, so it has some rough edges
 (how PCRE is handled is the roughest).
 -  Error logging code replaced with new module errlog.c, based on the
-one from JunkBusterMT (but with the threading code removed).
+one from JunkbusterMT (but with the threading code removed).
 -  Most of Rodney's 0.21 and 0.21A patches applied. (Marked *).  I did not
 apply all of these, since I had already independently done conditional
 popup file, conditional image file, and integration of popup code.