diff --git a/VERSION b/VERSION index 2111adef..fd161d06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-06 13:39:52) dev +Version 2.00.0 (2012-08-06 17:36:46) dev diff --git a/applications/welcome/models/menu.py b/applications/welcome/models/menu.py index b4d9df24..784f4a4a 100644 --- a/applications/welcome/models/menu.py +++ b/applications/welcome/models/menu.py @@ -13,7 +13,6 @@ response.meta.author = 'Your Name ' response.meta.description = 'a cool new app' response.meta.keywords = 'web2py, python, framework' response.meta.generator = 'Web2py Web Framework' -response.meta.copyright = 'Copyright 2012' ## your http://google.com/analytics id response.google_analytics_id = None diff --git a/applications/welcome/views/default/index.html b/applications/welcome/views/default/index.html index 1f541731..50e64114 100644 --- a/applications/welcome/views/default/index.html +++ b/applications/welcome/views/default/index.html @@ -4,7 +4,7 @@ {{if 'message' in globals():}}

{{=message}}

-

{{=T('How did you get here?')}}

+

{{=T('How did you get here?')}}

  1. {{=T('You are successfully running web2py')}}
  2. {{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}
  3. @@ -16,7 +16,6 @@ A('web2py/applications/%(application)s/views/%(controller)s/index.html'%request, _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}
  4. {{=T('You can modify this application and adapt it to your needs')}}
  5. -
{{else:}} {{=BEAUTIFY(response._vars)}} diff --git a/gluon/globals.py b/gluon/globals.py index c1bb716a..d7d68feb 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -220,9 +220,9 @@ class Response(Storage): return page def include_meta(self): - s = '' + s = '\n' for key,value in (self.meta or {}).items(): - s += '' % (key,xmlescape(value)) + s += '\n' % (key,xmlescape(value)) self.write(s,escape=False) def include_files(self):