From 53ff3e2744b20c579f52ca92d2a6a4922252a28c Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@mit.edu>
Date: Tue, 7 Jul 2009 22:41:01 -0400
Subject: [PATCH] Release 4.0.0.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
---
 Doxyfile                          |  2 +-
 FOCUS                             |  2 +-
 NEWS                              |  2 +-
 VERSION                           |  2 +-
 WHATSNEW                          | 13 +++++++------
 library/HTMLPurifier.includes.php |  2 +-
 library/HTMLPurifier.php          |  6 +++---
 library/HTMLPurifier/Config.php   |  2 +-
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index e90477d2..34c36c14 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = HTMLPurifier
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 3.3.0
+PROJECT_NUMBER         = 4.0.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/FOCUS b/FOCUS
index 6b30af4c..f288597a 100644
--- a/FOCUS
+++ b/FOCUS
@@ -1,4 +1,4 @@
-7 - Major bugfixes
+5 - Major feature enhancements
 
 [ Appendix A: Release focus IDs ]
 0 - N/A
diff --git a/NEWS b/NEWS
index 5535ed99..49832ff6 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-4.0.0, unknown release date
+4.0.0, released 2009-07-07
 # APIs for ConfigSchema subsystem have substantially changed. See
   docs/dev-config-bcbreaks.txt for details; in essence, anything that
   had both namespace and directive now have a single unified key.
diff --git a/VERSION b/VERSION
index 0fa4ae48..0c89fc92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0
\ No newline at end of file
+4.0.0
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
index f6408a9e..3fd6c8ef 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,7 @@
-HTML Purifier 3.3.0 is fixes a number of obscure bugs reported and fixed
-over a four month period.  It is probably the last release in the 3.x
-series.  Notable new features include support for the overflow CSS
-property; notable bugfixes include fixed YouTube rendering in certain
-versions of Firefox, CSSDefinition Printer, improved early PHP support
-and bugs in iconv.
+HTML Purifier 4.0 is a major feature release focused on configuration
+It deprecates the $config->set('Ns', 'Directive', $value) syntax for
+$config->set('Ns.Directive', $value); both syntaxes work but the
+former will throw errors.  There are also some new features:  robust
+support for name/id, configuration inheritance, remove nbsp in
+the RemoveEmpty autoformatter, userland configuration directives
+and configuration serialization.
diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php
index 662e1184..7cfb9706 100644
--- a/library/HTMLPurifier.includes.php
+++ b/library/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  *
- * @version 3.3.0
+ * @version 4.0.0
  *
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index 27d0e726..e3fce9c2 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 3.3.0 - Standards Compliant HTML Filtering
+    HTML Purifier 4.0.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -55,10 +55,10 @@ class HTMLPurifier
 {
 
     /** Version of HTML Purifier */
-    public $version = '3.3.0';
+    public $version = '4.0.0';
 
     /** Constant with version of HTML Purifier */
-    const VERSION = '3.3.0';
+    const VERSION = '4.0.0';
 
     /** Global configuration object */
     public $config;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 91a3cbcb..a0170604 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    public $version = '3.3.0';
+    public $version = '4.0.0';
 
     /**
      * Bool indicator whether or not to automatically finalize