From 882ffed9babb9ddc20bfb0979b14bb52d64c96c4 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@mit.edu>
Date: Wed, 15 Sep 2010 02:52:57 -0400
Subject: [PATCH] Release 4.2.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, 17 insertions(+), 14 deletions(-)
 rewrite WHATSNEW (100%)

diff --git a/Doxyfile b/Doxyfile
index 4e873a5c..e5f46907 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         = 4.1.1
+PROJECT_NUMBER         = 4.2.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 e13b9aa0..590c186f 100644
--- a/FOCUS
+++ b/FOCUS
@@ -1,4 +1,4 @@
-9 - Major security fixes
+4 - Minor feature enhancements
 
 [ Appendix A: Release focus IDs ]
 0 - N/A
diff --git a/NEWS b/NEWS
index 769d786d..c2e8abd5 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-4.2.0, unknown release date
+4.2.0, released 2010-09-15
 ! Added %Core.RemoveProcessingInstructions, which lets you remove
   <? ... ?> statements.
 ! Added %URI.DisableResources functionality; the directive originally
diff --git a/VERSION b/VERSION
index 2582dddf..ef8d7569 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.1
\ No newline at end of file
+4.2.0
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
dissimilarity index 100%
index 2fbcbc1e..9fecbe97 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,5 +1,8 @@
-HTML Purifier 4.1.1 is a major security and bugfix release that
-improves on 4.1's fix for an XSS vulnerability exploitable on Internet
-Explorer.  It also contains a number of important bugfixes, including
-the removal of improper logic that could result in infinite loops and
-fixed parsing for single-attributes with entities with DirectLex.
+HTML Purifier 4.2.0 is a minor release that implements a number of
+feature requests accumulated over half a year.  New configuration
+options include %Core.RemoveProcessingInstructions,
+%CSS.ForbiddenProperties, %HTML.FlashAllowFullScreen and
+%Core.NormalizeNewlines.  Additionally,%URI.DisableResources is
+now functional and file: is an optionally supported URI scheme.
+There are also some minor bugfixes, usability improvements and
+documentation updates.
diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php
index 260d82d8..0c9a78ee 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 4.1.1
+ * @version 4.2.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 ba2c7b30..11b217b0 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 4.1.1 - Standards Compliant HTML Filtering
+    HTML Purifier 4.2.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 = '4.1.1';
+    public $version = '4.2.0';
 
     /** Constant with version of HTML Purifier */
-    const VERSION = '4.1.1';
+    const VERSION = '4.2.0';
 
     /** Global configuration object */
     public $config;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 2a334b0d..54d40853 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    public $version = '4.1.1';
+    public $version = '4.2.0';
 
     /**
      * Bool indicator whether or not to automatically finalize
-- 
2.11.4.GIT