merging 5.8.0 and 6.1.1 changes

docs/changelog/5.x.x.txt

@@ -1,3 +1,7 @@
+5.5.8
+ - bugfix [ 991366 ] 5.5.7 typo in Macro/Synopsis.pm
+ - bugfix [ 992018 ] Synopsis(); macro generates error
+
 5.5.7
  - bugfix [ 935552 ] USS bug (w/ and w/o img mixed posts). 
  - bugfix [ 926610 ] WebGUI::Wobject::Article

docs/changelog/6.x.x.txt

@@ -1,14 +1,24 @@
 6.2.0
  - Added generateContent.pl script to generate content offline. This script is
-   not backwards compatible with previous WebGUI versions.
- - Added metadata functionality to wobjects.
- - Added a new passive profiling mechanism.
- - Added a passive profile summarizer.
+   not backwards compatible with previous WebGUI versions. (Thanks to
+   DonorWare for funding this feature.)
+ - Added metadata functionality to wobjects. (Thanks to DonorWare for funding
+   this feature.)
+ - Added a new passive profiling mechanism. (Thanks to DonorWare for funding
+   this feature.)
+ - Added a passive profile summarizer. (Thanks to DonorWare for funding this
+   feature.)
  - Added AOIRank and AOIHits macro's to retrieve user's Area's Of Interest
-   statistics.
+   statistics. (Thanks to DonorWare for funding this feature.)
  - Fixed a typo in Forum/UI.pm
 
 
+6.1.1
+ - bugfix [ 991313 ] Manage Translations doesn't work
+ - bugfix [ 991677 ] Preload erro my $i earlier declaration
+ - bugfix [ 991200 ] scriptUrl option in webgui.conf ignored
+
+
 6.1.0
  - Changed the output of upgrade.pl for better understanding.
  - Added a --history option to upgrade.pl that displays the upgrade history

docs/upgrades/upgrade_5.5.7-5.5.8.sql

@@ -0,0 +1,3 @@
+insert into webguiVersion values ('5.5.8','upgrade',unix_timestamp());
+
+

docs/upgrades/upgrade_6.1.0-6.1.1.sql

@@ -0,0 +1,5 @@
+insert into webguiVersion values ('6.1.1','upgrade',unix_timestamp());
+delete from groups where groupId=10;
+delete from groupings where groupId=10;
+delete from groupGroupings where groupId=10 or inGroup=10; 
+