Index: branches/2.8.x/INSTALL
===================================================================
--- branches/2.8.x/INSTALL	(revision 1615)
+++ branches/2.8.x/INSTALL	(revision 1616)
@@ -1,34 +1,26 @@
-WebsiteBaker 2.8.2 SP2 Installation Instructions
+WebsiteBaker 2.8.3 Installation Instructions
 =================================================
 
-Step 1 - Preparing your existing webspace:
+Step 1 - Preparing your webspace
 - Login to your webspace account and create a database.
 
-Step 2 - Download WebsiteBaker from http://www.websitebaker2.org/en/download/latest-version.php
-- Download "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
-- Unzip the package to your lokal machine
-- Download "Hotfix 2011/11/29"
-- Unzip the package to your lokal machine and overwrite "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
-- rename config.php.new to config.php
-- change favicon to your own
-- upload all files to your Webspace.
+Step 2 - Download WebsiteBaker
+- Download "WebsiteBaker 2.8.3" from http://www.websitebaker2.org/en/download/latest-version.php
+- Unzip the package to your local machine
 
-Step 3 - Installation:
-- call in your Browser www.yourdomainname.com
-- follow the Installation Instructions
+Step 3 - Preparing the Installation-Package
+- Rename "config.php.new" to "config.php"
+- Delete File "upgrade-script.php"
 
-Step 4 - Installation folder:
-- Delete folder install
+Step 4 - Uploading
+- Upload all files to your Webspace
 
-Step 5 - Upgrade-script:
-- Delete File upgrade-script.php
+Step 5 - Installation
+- Call in your Browser www.yourdomainname.com
+- Follow the Installation Instructions
 
-Step 6 Fill in Admintool Droplets if empty after install
-- After login to the backend, check droplet by menu admin-tools
-- if droplet is empty go to Menu Add-ons advanced
-- in Execute module files manually File: "upgrade.php" or File: "install.php"
-- select droplets and click Execute
+Step 6 - Cleaning
+- Delete folder "/install"
 
-Have fun with WB 2.8.2 SP2
+Have fun with WB 2.8.3
 
-
Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1615)
+++ branches/2.8.x/CHANGELOG	(revision 1616)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+18 Feb-2012 Build 1616 Dietmar Woellbrink (Luisehahne)
+! update INSTALL and UPGRADE instruction to 2.8.3 (Tks to Ruebenwurzel)
 18 Feb-2012 Build 1615 Dietmar Woellbrink (Luisehahne)
 + Validationfix, add qx_rawlang.php in quickSkin_alpha to solve
   <a> escaping malformed URI reference messages in javascript
Index: branches/2.8.x/UPGRADE
===================================================================
--- branches/2.8.x/UPGRADE	(revision 1615)
+++ branches/2.8.x/UPGRADE	(revision 1616)
@@ -1,51 +1,110 @@
-WebsiteBaker 2.8.2 SP2 UPGRADE Instructions
+WebsiteBaker 2.8.3 UPGRADE Instructions
 =================================================
 
-Upgrade from WB 2.8.0 to WB 2.8.2 SP2
-Upgrade from WB 2.8.1 to WB 2.8.2 SP2
-- need full package "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
+This file describes the upgrade from all Versions
+since WB 2.7 directly to WB 2.8.3.
 
-Upgrade from WB 2.8.2 to WB 2.8.2 SP2
-- download "ServicePack 2 for WebsiteBaker 2.8.2 all fixes"
+Step 1 is different, depending from the WB-Version
+you start.
 
-Download WebsiteBaker from http://www.websitebaker2.org/en/download/latest-version.php
+Step 2 - Step 9 are the same, no matter from which
+WB-Version you upgrade.
 
-Step 1 - Preparing your existing system:
-- Login to your backend and set "Settings" - "Backend-Theme" to "wb_theme" and don't forget to store.
-- Backup your changed Files in modules and templates folder like .css, .js, wb_config.js for the Editor
 
-Step 2 - Download Instructions
-- Download "WebsiteBaker 2.8.2 [R1528] including ServicePack 2"
-- If you already installed WB 2.8.2
-  Download "ServicePack 2 for WebsiteBaker 2.8.2 all fixes"
+****************************************
+* Upgrade from WB 2.8.2SP2 to WB 2.8.3 *
+* Upgrade from WB 2.8.2SP1 to WB 2.8.3 *
+* Upgrade from WB 2.8.2    to WB 2.8.3 *
+****************************************
 
-Step 3 - upgrading
-- Unzip the packages to your lokal machine
-- upload all files to your Webspace.
-- Be shure that existing files are overwritten.
+Step 1 - Preparing your existing system
+- Backup your changed Files in modules and templates folder like .css, .js and .htt
+- Backup your Droplets
+- Delete Folder "/templates/argos_theme"
+- Delete Folder "/templates/wb_theme"
 
-Step 4 - Cleanup Files and Folders (if exist) on your Webspace:
-- Delete File admin/preferences/details.php
-- Delete File admin/preferences/email.php
-- Delete File admin/preferences/password.php
-- Delete Folder modules/backup
-- Delete Folder modules/droplets/js
-- Delete Folder templates/classic_theme
 
-Step 5 - Upgrade the database:
-- call in your Browser www.yourdomainname. com/upgrade-script.php
+****************************************
+* Upgrade from WB 2.8.1    to WB 2.8.3 *
+* Upgrade from WB 2.8.0    to WB 2.8.3 *
+****************************************
 
-Step 6 - Delete the upgrade-script:
+Step 1 - Preparing your existing system
+- Backup your changed Files in modules and templates folder like .css, .js and .htt
+- Backup your Droplets
+- Delete File "/admin/preferences/details.php"
+- Delete File "/admin/preferences/email.php"
+- Delete File "/admin/preferences/password.php"
+- Delete Folder "/modules/backup"
+- Delete Folder "/modules/droplets/js"
+- Delete Folder "/templates/argos_theme"
+- Delete Folder "/templates/classic_theme"
+- Delete Folder "/templates/wb_theme"
+
+
+****************************************
+* Upgrade from WB 2.7      to WB 2.8.3 *
+****************************************
+
+Step 1 - Preparing your existing system
+- Backup your changed Files in modules and templates folder like .css, .js and .htt
+- Backup your Droplets
+- Delete File "/account/stylesheet.css"
+- Delete Folder "/admin"
+- Delete Folder "/include/captcha"
+- Delete Folder "/include/codepress"
+- Delete Folder "/modules/code"
+- Delete Folder "/modules/fckeditor"
+- Delete Folder "/modules/reload"
+- Delete Folder "/modules/show_menu2"
+- Delete Folder "/modules/wrapper"
+- Delete Folder "/templates/allcss"
+- Delete Folder "/templates/round"
+- Delete Folder "/templates/simple"
+
+
+****************************************
+* Upgrade from WB 2.8.2SP2 to WB 2.8.3 *
+* Upgrade from WB 2.8.2SP1 to WB 2.8.3 *
+* Upgrade from WB 2.8.2    to WB 2.8.3 *
+* Upgrade from WB 2.8.1    to WB 2.8.3 *
+* Upgrade from WB 2.8.0    to WB 2.8.3 *
+* Upgrade from WB 2.7      to WB 2.8.3 *
+****************************************
+
+Step 2 - Download WebsiteBaker 
+- Download "WebsiteBaker 2.8.3" from http://www.websitebaker2.org/en/download/latest-version.php
+- Unzip the package to your local machine
+
+Step 3 - Preparing the Upgrade-Package
+- Delete File "config.php.new"
+- Delete Folder "/install"
+- Change favicon to your own
+
+Step 4 - Upgrade the Files
+- Upload all files to your Webspace
+- Be shure that existing files are overwritten
+
+Step 5 - Upgrade the Database
+- if you upgrade from WB 2.8.x:
+   Login as superadmin to your backend, upgrade-script starts automatically
+- if the script not starts automatically and if you upgrade from WB 2.7:
+   Call in your Browser www.yourdomainname.com/upgrade-script.php
+- Follow the Upgrade-Instructions  
+
+Step 6 - Cleaning
 - Delete File upgrade-script.php
 
-Step 7 - Delete the config.php.new:
-- to solve the problem with overwritten config.php by upgrade to 2.8.2  we upload a config.php.new.
+Step 7 - Actualize Addons Table (just to be shure)
+- Go to "Add-ons" - "Advanced"
+- Reload "Modules", "Templates" and "Languages"
 
-Step 8 Upgrade Admintool Droplets
-- do a backup from your droplets
-- unzip your backup local and upload your own droplets to /modules/droplets/example
-- go to Menu Add-ons advanced
-- in Execute module files manually File: File: "install.php"
-- select droplets and click Execute
+Step 8 - Activate changed Droplets
+- Go to "Add-ons" - "Modules" - "Advanced"
+- Execute "install.php" from Modul "Droplets"
 
-Have fun with WB 2.8.2 SP2
+Step 9 - Upgrade all WYSIWYG-sections to new URL-Handling
+- Go to "Add-ons" - "Modules" - "Advanced"
+- Execute "upgrade.php" from Modul "WYSIWYG"
+
+Have fun with WB 2.8.3
\ No newline at end of file
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1615)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1616)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1615');
+if(!defined('REVISION')) define('REVISION', '1616');
 if(!defined('SP')) define('SP', '');
