From 7593717736274e12e2e5157e522d3bf54d4e9978 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 22 Apr 2014 14:30:44 +0200
Subject: [PATCH] remove RC1 references

---
 CHANGELOG.md                       | 12 ++++++------
 core/lib/Thelia/Core/Thelia.php    |  2 +-
 core/lib/Thelia/Install/Update.php |  1 +
 setup/insert.sql                   |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8160c7c3..e3937050a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,25 @@
 #2.0.0
-- coupons effect are recalculated after each product's cart modification
+- Coupons values are re-evaluated when a product quantity is changed in the shopping cart
 - You can declare new compilerPass in modules. See Thelia\Module\BaseModule::getCompilers phpDoc
 - Add ability to load assets from another template. See https://gist.github.com/lunika/9365180
 - allow possibility to use Dependency Injection compiler in Thelia modules
 - Add Deactivate Module Command Line
-- add indexes on database for improving performance
-- Change order and customer ref
+- Add indexes to  database to improve performance
+- Order and customer references are more human readable than before
 - Refactor intl process. A domain is created for each templates and modules :
     - core => for thelia core translations
     - bo.template_name (eg : bo.default) => for each backoffice template
     - fo.template_name (eg : fo.default) => for each frontoffice template
     - pdf.template_name (eg : pdf.default) => for each pdf template
-    - email.template_name (eg : emai.default) => for each email template
+    - email.template_name (eg : email.default) => for each email template
     - modules :
         - module_code (eg : paypal) => fore module core translations
         - module_code.ai (eg : paypal.ai) => used in AdminIncludes templates
         - bo.module_code.template_name (eg : bo.paypal.default) => used in back office template
         - fo.module_code.template_name (eg : fo.paypal.default) => used in front office template
 - new parameter for smarty ```intl``` function. The parameter ```d``` allow you to specify the translation domain (as explain before). This parameter is optional
-- the ```d``` can be omitted if you use ```{default_translation_domain domain='bo.default'}``` in your layout. If you use this smarty function, the ```d``` parameter is automatically to the domain specify in ```default_translation_domain``` function
-- We changed Thelia's license. Now Thelia use LGPL 3.0+ License
+- the ```d``` can be omitted if you use ```{default_translation_domain domain='bo.default'}``` in your layout. If you use this smarty function, the ```d``` parameter is automatically set with the domain specify in ```default_translation_domain``` function
+- We changed Thelia's license. Thelia is published  under the LGPL 3.0+ License
 
 
 #2.0.0-RC1
diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 902818250..22d58eb9a 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -49,7 +49,7 @@ use Thelia\Model\Module;
 class Thelia extends Kernel
 {
 
-    const THELIA_VERSION = '2.0.0-RC1';
+    const THELIA_VERSION = '2.0.0';
 
     public function init()
     {
diff --git a/core/lib/Thelia/Install/Update.php b/core/lib/Thelia/Install/Update.php
index 24528ad6d..d2630bb47 100644
--- a/core/lib/Thelia/Install/Update.php
+++ b/core/lib/Thelia/Install/Update.php
@@ -31,6 +31,7 @@ class Update
         '2' => '2.0.0-beta3',
         '3' => '2.0.0-beta4',
         '4' => '2.0.0-RC1',
+        '5' => '2.0.0',
     );
 
     protected function isLatestVersion($version)
diff --git a/setup/insert.sql b/setup/insert.sql
index 5e0b7b81d..acc7bba7d 100644
--- a/setup/insert.sql
+++ b/setup/insert.sql
@@ -39,11 +39,11 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
 ('store_name','', 0, 1, NOW(), NOW()),
 ('store_email','', 0, 1, NOW(), NOW()),
 ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()),
-('thelia_version','2.0.0-RC1', 1, 1, NOW(), NOW()),
+('thelia_version','2.0.0', 1, 1, NOW(), NOW()),
 ('thelia_major_version','2', 1, 1, NOW(), NOW()),
 ('thelia_minus_version','0', 1, 1, NOW(), NOW()),
 ('thelia_release_version','0', 1, 1, NOW(), NOW()),
-('thelia_extra_version','RC1', 1, 1, NOW(), NOW());
+('thelia_extra_version','', 1, 1, NOW(), NOW());
 
 
 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES