Authored by xuqi

Merge branch 'master' of git.dev.yoho.cn:web/learning-documentation

Conflicts:
	前端开发相关/handlebars使用指南.md
@@ -58,7 +58,7 @@ Level1: @@ -58,7 +58,7 @@ Level1:
58 {{link 'http://www.baidu.com' '百度'}} 58 {{link 'http://www.baidu.com' '百度'}}
59 59
60 //helper 60 //helper
61 - Handlerbars.registerHelper('link', function(url, name) { 61 + Handlebars.registerHelper('link', function(url, name) {
62 return '<a href="' + url + '">' + name + '</a>'; 62 return '<a href="' + url + '">' + name + '</a>';
63 }); 63 });
64 64