From 587d6428265563afbc6b0e3eaf76d6fc1a19a560 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Sun, 18 May 2008 05:46:06 +0000
Subject: [PATCH] Release 3.1.0.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1728 48356398-32a2-884e-a903-53898d9a118a
---
 Doxyfile                          |  2 +-
 NEWS                              |  2 +-
 VERSION                           |  2 +-
 WHATSNEW                          | 18 ++++++++++--------
 library/HTMLPurifier.includes.php |  2 +-
 library/HTMLPurifier.php          |  6 +++---
 library/HTMLPurifier/Config.php   |  2 +-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index da12f467..417ed045 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.1.0-dev
+PROJECT_NUMBER         = 3.1.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/NEWS b/NEWS
index ca2777a2..81b17a70 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-3.1.0, unknown release date
+3.1.0, released 2008-05-18
 # Unnecessary references to objects (vestiges of PHP4) removed from method
   signatures.  The following methods do not need references when assigning from
   them and will result in E_STRICT errors if you try:
diff --git a/VERSION b/VERSION
index fee2d3e4..a0cd9f0c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0-dev
\ No newline at end of file
+3.1.0
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
index b56960ea..0fa8562c 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,8 +1,10 @@
-Release 3.1.0rc1 is a release candidate aimed primarily at ironing out bugs
-in HTML Purifier's shiny new __autoload system.  There are lots of new features,
-however; some notable ones include support for the !important CSS modifier,
-display and visibility CSS properties with %CSS.AllowTricky, marquee
-with %HTML.Proprietary (had you scared for a moment, hmm?), a kses() wrapper,
-%CSS.AllowedProperties, %HTML.ForbiddenAttributes and %HTML.ForbiddenElements
-and a totally revamped ConfigDoc system. And of course, the usual slew of
-bugfixes.
+HTML Purifier 3.1.0 is the second release series for HTML Purifier on PHP 5
+as well as a security update related to URIs. It shifts over to using
+autoload, and also includes support for the !important CSS modifier,
+display and visibility CSS properties with %CSS.AllowTricky, marquee with
+%HTML.Proprietary (had you scared for a moment, hmm?), a kses() wrapper,
+%CSS.AllowedProperties, %HTML.ForbiddenAttributes and
+%HTML.ForbiddenElements and a totally revamped ConfigDoc system. Since the
+release candidate, there have also been a number of stability fixes such as
+improved URI escaping, a change in serializer ID format, and a relaxed
+format for %HTML.Allowed. And as always, numerous bugfixes.
diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php
index 5b73fc5e..8060b49f 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.1.0-dev
+ * @version 3.1.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 8e962be1..03709f12 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 3.1.0-dev - Standards Compliant HTML Filtering
+    HTML Purifier 3.1.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.1.0-dev';
+    public $version = '3.1.0';
     
     /** Constant with version of HTML Purifier */
-    const VERSION = '3.1.0-dev';
+    const VERSION = '3.1.0';
     
     /** Global configuration object */
     public $config;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 616ca06f..be264a62 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.1.0-dev';
+    public $version = '3.1.0';
     
     /**
      * Bool indicator whether or not to automatically finalize