diff options
author | Chenbo Li <lichenbo1949@gmail.com> | 2013-08-02 23:44:26 +0800 |
---|---|---|
committer | Chenbo Li <lichenbo1949@gmail.com> | 2013-08-02 23:44:26 +0800 |
commit | 90fa867a66323c9936b9b6f833f1c6b9eb7a16ad (patch) | |
tree | d236da21d945b9d6f9370b2d770aad19d59280ca /zh-cn | |
parent | 1a52aefcba5c31bb05b58290380509d6da81045c (diff) | |
parent | 3baf491ea66ddc77fb949c7aa5e988c318e372c0 (diff) |
Merge branch 'master' of https://github.com/adambard/learnxinyminutes-docs into master-cn
Diffstat (limited to 'zh-cn')
-rwxr-xr-x | zh-cn/c-cn.html.markdown | 5 | ||||
-rwxr-xr-x | zh-cn/elisp-cn.html.markdown | 10 | ||||
-rwxr-xr-x | zh-cn/java-cn.html.markdown | 9 | ||||
-rwxr-xr-x | zh-cn/javascript-cn.html.markdown | 11 | ||||
-rwxr-xr-x | zh-cn/php-cn.html.markdown | 3 |
5 files changed, 24 insertions, 14 deletions
diff --git a/zh-cn/c-cn.html.markdown b/zh-cn/c-cn.html.markdown index ed55203c..f8a8e0bd 100755 --- a/zh-cn/c-cn.html.markdown +++ b/zh-cn/c-cn.html.markdown @@ -2,9 +2,10 @@ language: c filename: learnc.c contributors: - - ["Adam Bard", "http://adambard.com/"]
+ - ["Adam Bard", "http://adambard.com/"] translators: - - ["Chenbo Li", "http://binarythink.net/"] + - ["Chenbo Li", "http://binarythink.net/"] +lang: zh-cn --- C语言在今天仍然是高性能计算的主要选择。 diff --git a/zh-cn/elisp-cn.html.markdown b/zh-cn/elisp-cn.html.markdown index d9a8ce35..c3a2f927 100755 --- a/zh-cn/elisp-cn.html.markdown +++ b/zh-cn/elisp-cn.html.markdown @@ -3,12 +3,15 @@ language: elisp contributors:
- ["Bastien Guerry", "http://bzg.fr"]
translators:
- - ["Chenbo Li", "http://binarythink.net"]
+ - ["Chenbo Li", "http://binarythink.net"]
filename: learn-emacs-lisp.el
+lang: zh-cn
---
```scheme
-;; 15分钟学会Emacs Lisp (v0.2a) (作者:bzg,https://github.com/bzg 译者:lichenbo,http://douban.com/people/lichenbo)
+;; 15分钟学会Emacs Lisp (v0.2a)
+;;(作者:bzg,https://github.com/bzg
+;; 译者:lichenbo,http://douban.com/people/lichenbo)
;;
;; 请先阅读Peter Norvig的一篇好文:
;; http://norvig.com/21-days.html
@@ -301,7 +304,8 @@ filename: learn-emacs-lisp.el (list 'face 'bold)))
(other-window 1))
-;; 这个函数使用了 `re-search-forward': 和查找一个字符串不同,你用这个命令可以查找一个模式,即正则表达式
+;; 这个函数使用了 `re-search-forward':
+;; 和查找一个字符串不同,你用这个命令可以查找一个模式,即正则表达式
;; 正则表达式 "Bonjour \\(.+\\)!" 的意思是:
;; 字符串 "Bonjour ", 之后跟着
diff --git a/zh-cn/java-cn.html.markdown b/zh-cn/java-cn.html.markdown index 4db4e91e..b9ccf61a 100755 --- a/zh-cn/java-cn.html.markdown +++ b/zh-cn/java-cn.html.markdown @@ -1,12 +1,13 @@ --- - +name: java +category: language language: java +lang: zh-cn +filename: LearnJava.java contributors: - ["Jake Prather", "http://github.com/JakeHP"] translators: - - ["Chenbo Li", "http://binarythink.net"] -filename: LearnJava.java - + - ["Chenbo Li", "http://binarythink.net"] --- Java是一个通用的程序语言, 包含并发, 基于类的面向对象等特性 diff --git a/zh-cn/javascript-cn.html.markdown b/zh-cn/javascript-cn.html.markdown index dd04c8a5..3b5cfa94 100755 --- a/zh-cn/javascript-cn.html.markdown +++ b/zh-cn/javascript-cn.html.markdown @@ -1,9 +1,12 @@ --- language: javascript -author: Adam Brenecki -author_url: http://adam.brenecki.id.au -translator: Chenbo Li -translator_url: http://binarythink.net +category: language +name: javascript +contributors: + - ["Adam Brenecki", "http://adam.brenecki.id.au"] +translators: + - ["Chenbo Li", "http://binarythink.net"] +lang: zh-cn --- Javascript于1995年由网景公司的Brendan Eich发明。 diff --git a/zh-cn/php-cn.html.markdown b/zh-cn/php-cn.html.markdown index e3dfe419..3b242ce1 100755 --- a/zh-cn/php-cn.html.markdown +++ b/zh-cn/php-cn.html.markdown @@ -4,8 +4,9 @@ contributors: - ["Malcolm Fell", "http://emarref.net/"] - ["Trismegiste", "https://github.com/Trismegiste"] translators: - - ["Chenbo Li", "http://binarythink.net"] + - ["Chenbo Li", "http://binarythink.net"] filename: learnphp.php +lang: zh-cn --- 这份教程所使用的版本是 PHP 5+. |