consolidate 4.2 items for 4.2 final

diff --git a/HISTORY b/HISTORY
index c2025338fe5947e9b2b98194ea7435ad9c2e17b3..c5d43b5a9d948042c86f1ba46d0379a31eb96847 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,29 +1,7 @@
 phpPgAdmin History
 ------------------
 
-Version 4.2-Beta-2
------------
-Bugs
-* Remove shared credentials when logging out of single server, to prevent automatic re-login
-* Improved SSL connection handling, fix problems with connections from older php builds 
-* Bring Full-Text-Search support up to par with 8.3 release, add help links
-* Fix bug with long role name truncation 
-* Fix bug with DELETE FROM when dropping a row (spq)
-* Fix problems when deleteing PUBLIC schema 
-* Fix several bugs in aggregate support
-* Improve autocompletion support
-* Tighten up use of global scope variables
-
-
-Translations
-* Catalan (Bernat Pegueroles)
-* French (ioguix)
-* German (Albe Laurenz, spq)
-* Japanese (Tadashi Jokagi)
-* Hungarian (Sulyok Peti) 
-
-
-Version 4.2-Beta-1
+Version 4.2
 -----------
 
 Features
@@ -55,11 +33,24 @@ Bugs
 * Fix bytea doesn't display as NULL when NULL
 * Schema qualifing every object to avoid non wanted behaviour about users' rights
   and schema_path
+* Remove shared credentials when logging out of single server, to prevent automatic re-login
+* Improved SSL connection handling, fix problems with connections from older php builds 
+* Fix bug with long role name truncation 
+* Fix bug with DELETE FROM when dropping a row (spq)
+* Fix problems when deleteing PUBLIC schema 
+* Fix several bugs in aggregate support
+* Improve autocompletion support
+* Tighten up use of global scope variables
 
 Translations
 * utf traditional chinese (Kuo Chaoyi)
 * utf simplified chinese (Kuo Chaoyi)
 * Italian (Nicola Soranzo)
+* Catalan (Bernat Pegueroles)
+* French (ioguix)
+* German (Albe Laurenz, spq)
+* Japanese (Tadashi Jokagi)
+* Hungarian (Sulyok Peti) 
 
 Version 4.1.3
 -------------