diff --git a/VERSION b/VERSION index 1c2cb51b..0924ac63 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.15.17.33.13 +Version 2.4.1-alpha.2+timestamp.2013.02.16.09.14.43 diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index cbdcec47..74bccf08 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -609,7 +609,7 @@ def protolinks_simple(proto, url): #elif proto == 'embed': # NOTE: embed is a synonym to iframe now # return '%s>'%(url,class_prefix,url) elif proto == 'qr': - return 'qr code'%url + return 'QR Code'%url return proto+':'+url def render(text, @@ -740,7 +740,7 @@ def render(text, '

auto-image: ()

' >>> render("qr: (qr:http://example.com/image.jpeg)") - '

qr: (qr code)

' + '

qr: (QR Code)

' >>> render("embed: (embed:http://example.com/page)") '

embed: ()

'