diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 7a3bb25b7..4d0b46244 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -20,6 +20,14 @@
- bugfix [ 997916 ] Bug and solution in File.pm
- Added the page.isMyAncestor condition to the Navigation system. (Thanks to
Len Kranendonk)
+ - Added automatic URL extensions.
+ - Added a new global unique id generator to replace the old incrementer system.
+ - Fixed a bug in userImport.pl, where it was using the old Auth system.
+ - Added a UI Level of 9 to the WS Client.
+ - Added missing documentation to Page API and fixed pod errors in that package as well.
+ - Fixed a bug in the HTMLArea image picker where it would break if your gateway was not
+ in the root of your virtual host, or you had multiple gateways, but none was the
+ default page of your virtual host.
- passing form param disableWobjects=$call shortcircuits most of
WebGUI::Wobject::WSClient::www_view()
- Added write permission checks to WebGUI::Template.
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 2053d26d7..1549f60a0 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,15 @@ upgrading from one version to the next, or even between multiple
versions. Be sure to heed the warnings contained herein as they will
save you many hours of grief.
+6.2.0
+--------------------------------------------------------------------
+ * WebGUI now requires Time::HiRes to operate. Be sure to have it
+ installed prior to upgrading or the the upgrade will fail.
+
+ * Parts of the WebGUI API have changed once again, so be sure that
+ any third-party plug-ins you have installed have been updated
+ to work with 6.2 before upgrading.
+
6.1.0
--------------------------------------------------------------------
diff --git a/docs/install.txt b/docs/install.txt
index a31cca634..7e3256b27 100644
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -25,6 +25,7 @@ QnD INSTALL INSTRUCTIONS:
IO::Zlib
SOAP::Lite
Cache::Cache
+ Time::HiRes
Image::Magick (optional)
diff --git a/docs/migration.txt b/docs/migration.txt
index 6766be221..102aedd9b 100644
--- a/docs/migration.txt
+++ b/docs/migration.txt
@@ -17,9 +17,13 @@ CONTENTS
1. Wobject Migration
--------------------
-1.1 Nothing Yet
+1.1 Global Unique Wobject IDs
-There have currently been no changes to the Wobject API.
+In 6.2 we changed wobjects to use the new Global Unique ID system. See WebGUI::Id for
+details. This change means that wobject Ids are now 22 character text strings rather
+than integers. That means you'll need to update your database tables and code to account
+for the Ids being strings. Also, anything using the setCollateral method will start using
+GUIDs as well.
@@ -152,4 +156,12 @@ belong in WebGUI::Session. The main changes of interest are that you no longer
do HTTP redirects and set cookies via session. Take a look at WebGUI::HTTP for
details.
+5.9 Global Unique IDs
+
+In 6.2 we added global unique Ids to WebGUI. This means that a lot of the integer-
+based incrementer IDs will now be replaced with 22 character text IDs. You should
+update your code and database tables to take advantage of this. Some of the more
+important ID's that have been changed are User Ids, Group Ids, and Wobject Ids.
+See WebGUI::Id for more information.
+
diff --git a/docs/upgrades/upgrade_6.1.1-6.2.0.sql b/docs/upgrades/upgrade_6.1.1-6.2.0.sql
index f8440a47a..795ef13fc 100644
--- a/docs/upgrades/upgrade_6.1.1-6.2.0.sql
+++ b/docs/upgrades/upgrade_6.1.1-6.2.0.sql
@@ -57,6 +57,75 @@ alter table IndexedSearch add column (forceSearchRoots smallint(1) default 1);
alter table DataForm_field add column (vertical smallint(1) default 1);
alter table DataForm_field add column (extras varchar(128));
+insert into settings (name,value) VALUES ("urlExtension","");
+alter table users change userId userId char(22) not null;
+alter table DataForm_entry change userId userId char(22);
+alter table IndexedSearch_docInfo change ownerId ownerId char(22);
+alter table Poll_answer change userId userId char(22);
+alter table Survey_response change userId userId char(22);
+alter table USS_submission change userId userId char(22);
+alter table authentication change userId userId char(22);
+alter table collateral change userId userId char(22);
+alter table forumPost change userId userId char(22);
+alter table forumPostRating change userId userId char(22);
+alter table forumRead change userId userId char(22);
+alter table forumSubscription change userId userId char(22);
+alter table forumThreadSubscription change userId userId char(22);
+alter table groupings change userId userId char(22);
+alter table karmaLog change userId userId char(22);
+alter table messageLog change userId userId char(22);
+alter table page change ownerId ownerId char(22);
+alter table pageStatistics change userId userId char(22);
+alter table passiveProfileAOI change userId userId char(22);
+alter table passiveProfileLog change userId userId char(22);
+alter table userLoginLog change userId userId char(22);
+alter table userProfileData change userId userId char(22);
+alter table userSession change userId userId char(22);
+alter table wobject change ownerId ownerId char(22);
+alter table wobject change addedBy addedBy char(22);
+alter table wobject change editedBy editedBy char(22);
+alter table wobject change wobjectId wobjectId char(22);
+alter table wobject change forumId forumId char(22);
+alter table wobject change pageId pageId char(22);
+alter table wobject change groupIdView groupIdView char(22);
+alter table wobject change groupIdEdit groupIdEdit char(22);
+alter table wobject change bufferUserId bufferUserId char(22);
+alter table wobject change bufferPrevId bufferPrevId char(22);
+alter table wobject change templateId templateId char(22);
+alter table Article change wobjectId wobjectId char(22);
+alter table USS change wobjectId wobjectId char(22);
+alter table USS change groupToContribute groupToContribute char(22);
+alter table USS change groupToApprove groupToApprove char(22);
+alter table USS change submissionTemplateId submissionTemplateId char(22);
+alter table USS change submissionFormTemplateId submissionFormTemplateId char(22);
+alter table USS change submissionFormTemplateId submissionFormTemplateId char(22);
+alter table USS change USS_id USS_id char(22);
+alter table USS_submission change USS_submissionId USS_submissionId char(22);
+alter table USS_submission change forumId forumId char(22);
+alter table USS_submission change USS_id USS_id char(22);
+alter table DataForm change wobjectId wobjectId char(22);
+alter table DataForm change emailTemplateId emailTemplateId char(22);
+alter table DataForm change acknowlegementTemplateId acknowlegementTemplateId char(22);
+alter table DataForm change listTemplateId listTemplateId char(22);
+alter table DataForm_entry change wobjectId wobjectId char(22);
+alter table DataForm_entry change DataForm_entryId DataForm_entryId char(22);
+alter table DataForm_tab change wobjectId wobjectId char(22);
+alter table DataForm_tab change DataForm_tabId DataForm_tabId char(22);
+alter table EventsCalendar change wobjectId wobjectId char(22);
+alter table EventsCalendar_event change wobjectId wobjectId char(22);
+alter table FileManager change wobjectId wobjectId char(22);
+alter table FileManager_file change wobjectId wobjectId char(22);
+alter table FileManager_file change FileManager_fileId FileManager_fileId char(22);
+alter table EventsCalendar_event change EventsCalendar_eventId EventsCalendar_eventId char(22);
+alter table EventsCalendar change eventTemplateId eventTemplateId char(22);
+alter table EventsCalendar_event change EventsCalendar_recurringId EventsCalendar_recurringId char(22);
+alter table FileManager_file change groupToView groupToView char(22);
+
+delete from template where namespace='style' and templateId='10';
+INSERT INTO template VALUES (10,'htmlArea Image Manager','\n \n \n <tmpl_var session.page.title> - <tmpl_var session.setting.companyName>\n \n \r\n\n \n \r\n\r\n\r\n\r\n\r\n\r\n\n \n \r\n\n