From f83b3effc64b2a9c2584d1523918587792c8cc1c Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Fri, 31 Oct 2014 01:28:26 +0100
Subject: [PATCH] prepare 3.1

---
 README.md     | 13 +++++++++----
 composer.json | 10 +++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a41024af..5d1fc788 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-#Smarty 2 template engine
+#Smarty 3 template engine
 ##Distribution repository
-Starting with Smarty 2.6.23 Composer has been configured to load the packages from github.
+Starting with Smarty 3.1.21 Composer has been configured to load the packages from github.
  
 **NOTE: Because of this change you must clear your local composer cache with the "composer clearcache" command**
 
 To get the latest stable version use
 
 	"require": {
-	   "smarty/smarty": "~2.6"
+	   "smarty/smarty": "~3.1"
 	}
 
 in your composer.json file.
@@ -15,9 +15,14 @@ in your composer.json file.
  To get the trunk version use
 
 	"require": {
-	   "smarty/smarty": "~2.6@dev"
+	   "smarty/smarty": "~3.1@dev"
 	}
 
 The "smarty/smarty" package will start at libs/....   subfolder.
 
+To retrieve the development and documentation folders add
+
+     "require-dev": {
+         "smarty/smarty-dev": "~3.1@dev"
+     }
 
diff --git a/composer.json b/composer.json
index 106bb281..c84b5951 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,10 @@
         {
             "name": "Uwe Tews",
             "email": "uwe.tews@googlemail.com"
+        },
+        {
+            "name": "Rodney Rehm",
+            "email": "rodney.rehm@medialize.de"
         }
     ],
     "support": {
@@ -26,13 +30,13 @@
     "autoload": {
         "classmap": [
             "libs/Smarty.class.php",
-            "libs/Smarty_Compiler.class.php",
-            "libs/Config_File.class.php"
+            "libs/SmartyBC.class.php",
+            "libs/sysplugins/smarty_security.php"
         ]
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     }