From beb81fd53ec0dfc66aa9fe5f91741d3ee06ddd50 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Fri, 9 Dec 2011 10:15:49 -0600
Subject: [PATCH] fixed CHANGELOG and restored caching

---
 CHANGELOG                                    | 14 +++++++-------
 VERSION                                      |  2 +-
 applications/examples/controllers/default.py |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dd49d6af..14614ab2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,22 +1,22 @@
 ## 1.99.3
-This is a major recision in peparation for 2.0
+This is a major revision in peparation for web2py 2.0
 - moved to GitHub and abandoned Lanchpad 
 - new web site layout, thanks Anthony
 - new welcome app using skeleton, thanks Anthony
 - jQuery 1.7.1
 - modernizr 2.0.6 (customized)
 - ``define_table('thing', singluar='thing',plural='things')``
-- CAS 1.0 and 2.0 compliant
+- CAS 1.0 and 2.0 compliant, thanks Olivier
 - fixed validate_and_insert and validate_and_update, thanks Anthony
-- request.user_agent().is_mobile etc., thanks Ross and Angelo
+- ``request.user_agent().is_mobile`` etc., thanks Ross and Angelo
 - better router, thanks Jonathan
 - app on/off buttons
 - support for dropbox_login
 - improved markmin recognizes qr code, supports auto audio/video/embed
-- response.optimize_css = 'concat,minify,inline', thanks Ross
-- response.optimize_js = 'concat,minify,inline' thanks Ross
-- db.define_table(...,common_filter=query), thanks Yair
-- db(...,ignore_common_filter=True)
+- ``response.optimize_css = 'concat,minify,inline'``, thanks Ross
+- ``response.optimize_js = 'concat,minify,inline'`` thanks Ross
+- ``db.define_table(...,common_filter=query)``, thanks Yair
+- ``db(...,ignore_common_filter=True)``
 - support for stripe payments
 - support for DowCommerce payments, thanks Dave
 - experimental PyPy support
diff --git a/VERSION b/VERSION
index 24deff12..ada4f38d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.3 (2011-12-09 09:56:59) stable
+Version 1.99.3 (2011-12-09 10:15:45) stable
diff --git a/applications/examples/controllers/default.py b/applications/examples/controllers/default.py
index f2649de1..496f24a0 100644
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -8,7 +8,7 @@ response.description = T('web2py Web Framework')
 
 session.forget()
 
-#@cache('index')
+@cache('index')
 def index():
     return response.render()