From 75fc9c74fdb1667d44635d5dfd0e165601232d32 Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Tue, 20 Jan 2015 15:49:39 +0800
Subject: [PATCH 01/24] =?UTF-8?q?Add=20Django=201.7=20=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cf228e3..7923a2d 100644
--- a/README.md
+++ b/README.md
@@ -341,7 +341,8 @@
 * [Python入门教程](http://liam0205.me/2013/11/02/Python-tutorial-zh_cn/) ([PDF](http://liam0205.me/attachment/Python/The_Python_Tutorial_zh-cn.pdf))
 * [Python的神奇方法指南](http://article.yeeyan.org/view/311527/287706)
 * [笨办法学 Python](http://sebug.net/paper/books/LearnPythonTheHardWay/) （[PDF](http://liam0205.me/attachment/Python/PyHardWay/Learn_Python_The_Hard_Way_zh-cn.pdf)版下载）
-* [Django 文档中文版](http://django-chinese-docs.readthedocs.org/en/latest/) 正在翻译中
+* [Django 1.5 文档中文版](http://django-chinese-docs.readthedocs.org/en/latest/) 正在翻译中
+* [Diango 1.7 文档中文版](http://django-1-7-doc.coding.io/)
 * [Django 最佳实践](https://github.com/brantyoung/zh-django-best-practices)
 * [Django搭建简易博客教程](http://andrew-liu.gitbooks.io/django-blog/)
 * [The Django Book 中文版](http://djangobook.py3k.cn/2.0/)

From 64477666786e07c60ee99ee2e11943a044fb3a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Tue, 20 Jan 2015 17:25:02 +0800
Subject: [PATCH 02/24] =?UTF-8?q?Diango=201.7=20=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7923a2d..db2c3d6 100644
--- a/README.md
+++ b/README.md
@@ -342,7 +342,7 @@
 * [Python的神奇方法指南](http://article.yeeyan.org/view/311527/287706)
 * [笨办法学 Python](http://sebug.net/paper/books/LearnPythonTheHardWay/) （[PDF](http://liam0205.me/attachment/Python/PyHardWay/Learn_Python_The_Hard_Way_zh-cn.pdf)版下载）
 * [Django 1.5 文档中文版](http://django-chinese-docs.readthedocs.org/en/latest/) 正在翻译中
-* [Diango 1.7 文档中文版](http://django-1-7-doc.coding.io/)
+* [Diango 1.7 文档中文版](http://django-1-7-doc.coding.io/)  正在翻译中，目前只翻译了目录
 * [Django 最佳实践](https://github.com/brantyoung/zh-django-best-practices)
 * [Django搭建简易博客教程](http://andrew-liu.gitbooks.io/django-blog/)
 * [The Django Book 中文版](http://djangobook.py3k.cn/2.0/)

From d39b5e028a739efef79d46640f959b0f857fd93b Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Wed, 21 Jan 2015 09:10:43 +0800
Subject: [PATCH 03/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Sketch=20=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E6=89=8B=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index db2c3d6..fca76cd 100644
--- a/README.md
+++ b/README.md
@@ -183,6 +183,7 @@
 
 * [OpenWrt智能、自动、透明翻墙路由器教程](http://softwaredownload.gitbooks.io/openwrt-fanqiang/)
 * [SAN 管理入门系列](https://community.emc.com/docs/DOC-16067)
+* [Sketch 中文手册](http://sketchcn.com/sketch-chinese-user-manual.html#introduce)
 
 ## 语言相关类
 

From 0194404ee9d25d3f2c22d079800d2ab00f70ef76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Wed, 21 Jan 2015 15:54:27 +0800
Subject: [PATCH 04/24] =?UTF-8?q?=E9=9D=A2=E5=90=91=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8C=96=E6=8E=98=E6=8C=87?=
 =?UTF-8?q?=E5=8D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fca76cd..ebba6f2 100644
--- a/README.md
+++ b/README.md
@@ -171,6 +171,7 @@
 ### 大数据
 
 * [大数据/数据挖掘/推荐系统/机器学习相关资源](https://github.com/Flowerowl/Big-Data-Resources)
+* [面向程序员的数据挖掘指南](https://github.com/jizhang/guidetodatamining)
 
 ## 编程艺术
 

From caaf23b5600312a212581cf096b19c62e1068a43 Mon Sep 17 00:00:00 2001
From: Jun Gu <2dxgujun@gmail.com>
Date: Sat, 24 Jan 2015 10:16:42 +0800
Subject: [PATCH 05/24] New three books

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index ebba6f2..8d3fc82 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,7 @@
 ### MySQL
 
 * [MySQL索引背后的数据结构及算法原理](http://www.cnblogs.com/leoo2sk/archive/2011/07/10/mysql-index.html)
+* [21分钟MySQL入门教程](http://www.cnblogs.com/mr-wid/archive/2013/05/09/3068229.html)
 
 ### 项目相关
 
@@ -145,6 +146,7 @@
 ### 设计模式
 
 * [图说设计模式](https://github.com/me115/design_patterns)
+* [史上最全设计模式导学目录](http://blog.csdn.net/lovelion/article/details/17517213)
 
 ### Web
 
@@ -329,6 +331,7 @@
 * Google Material Design 正體中文版 ([译本一](http://wcc723.gitbooks.io/google_design_translate/content/style-icons.html) [译本二](https://github.com/1sters/material_design_zh))
 * [Google Android官方培训课程中文版](http://hukai.me/android-training-course-in-chinese/index.html)
 * [Android学习之路](http://stormzhang.github.io/android/2014/07/07/learn-android-from-rookie/)
+* [Material Design 中文版](http://design.1sters.com/)
 
 ### Python
 

From c50fc64e341cd1643a6feda31542f14fbf17ed71 Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Sat, 24 Jan 2015 11:51:58 +0800
Subject: [PATCH 06/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Standard=20C=20?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=A0=87=E5=87=86=E5=87=BD=E6=95=B0=E5=BA=93?=
 =?UTF-8?q?=E9=80=9F=E6=9F=A5=20(Cheat=20Sheet)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ebba6f2..df24498 100644
--- a/README.md
+++ b/README.md
@@ -462,6 +462,7 @@
 * [精彩博客集合](https://github.com/hacke2/hacke2.github.io/issues/2)
 * [正则表达式简明参考](http://www.xiaoleilu.com/regex-guide/)
 * [中文文案排版指北](https://github.com/sparanoid/chinese-copywriting-guidelines)
+* [Standard C 语言标准函数库速查 (Cheat Sheet)](http://ganquan.info/standard-c/)
 
 ### 测试相关
 

From 399526d603894294db786610b3b140c7b602a4c6 Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Sat, 24 Jan 2015 11:53:19 +0800
Subject: [PATCH 07/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20git-flow=20=E5=A4=87?=
 =?UTF-8?q?=E5=BF=98=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index df24498..a395119 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,7 @@
 * [Git-Cheat-Sheet](https://github.com/flyhigher139/Git-Cheat-Sheet) （感谢 @flyhigher139 翻译了中文版）
 * [GitHub秘籍](http://snowdream86.gitbooks.io/github-cheat-sheet/content/zh/index.html)
 * [Github帮助文档](https://github.com/waylau/github-help)
+* [git-flow 备忘清单](http://danielkummer.github.io/git-flow-cheatsheet/index.zh_CN.html)
 
 ### 编辑器
 

From 031ed03febacf6350553521f33c997869ee54aa2 Mon Sep 17 00:00:00 2001
From: wwek <licoolgo@qq.com>
Date: Sat, 24 Jan 2015 03:31:56 -0500
Subject: [PATCH 08/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=A6=E7=B1=8D=20?=
 =?UTF-8?q?=E7=90=86=E8=A7=A3Linux=E8=BF=9B=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ebba6f2..58a7ed0 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,7 @@
 * [Linux 命令行(中文版)](http://billie66.github.io/TLCL/book/)
 * [Linux 构建指南](http://works.jinbuguo.com/lfs/lfs62/index.html)
 * [Linux工具快速教程](https://github.com/me115/linuxtools_rst)
+* [理解Linux进程](https://github.com/tobegit3hub/understand_linux_process)
 
 #### 智能系统
 * [一步步搭建物联网系统](https://github.com/gmszone/designiot)

From 3d469fa2aa47bb455029176daabfaae1a2fbdb93 Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Sat, 24 Jan 2015 23:03:45 +0800
Subject: [PATCH 09/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Twisted=20=E4=B8=8E?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E7=BC=96=E7=A8=8B=E5=85=A5=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a395119..afc9d2b 100644
--- a/README.md
+++ b/README.md
@@ -366,6 +366,7 @@
 * [Python 正则表达式操作指南](http://wiki.ubuntu.org.cn/Python正则表达式操作指南)
 * [python初级教程：入门详解](http://www.crifan.com/files/doc/docbook/python_beginner_tutorial/release/html/python_beginner_tutorial.html)
 * [Python Cookbook 第3版 中文版](http://python3-cookbook.readthedocs.org/zh_CN/latest/)
+* [Twisted 与异步编程入门](http://likebeta.gitbooks.io/twisted-intro-cn/)
 
 ### Ruby
 

From 4ea8f01c66d9bdc6ef615212c93e80e46e6e65af Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Mon, 26 Jan 2015 10:17:33 +0800
Subject: [PATCH 10/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Bash=20=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC15=E5=88=86=E9=92=9F=E8=BF=9B=E9=98=B6=E6=95=99?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index afc9d2b..4d54011 100644
--- a/README.md
+++ b/README.md
@@ -382,6 +382,7 @@
 ### Shell
 
 * [Shell脚本编程30分钟入门](https://github.com/qinjx/30min_guides/blob/master/shell.md)
+* [Bash脚本15分钟进阶教程](http://blog.sae.sina.com.cn/archives/3606)
 * [Linux工具快速教程](https://github.com/me115/linuxtools_rst)
 ### Go
 

From 8e0496e2147364dc05cd665b3c4b24b6aec9672d Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Mon, 26 Jan 2015 10:27:08 +0800
Subject: [PATCH 11/24] Git Cheatsheet Chs

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4d54011..1134527 100644
--- a/README.md
+++ b/README.md
@@ -466,6 +466,7 @@
 * [正则表达式简明参考](http://www.xiaoleilu.com/regex-guide/)
 * [中文文案排版指北](https://github.com/sparanoid/chinese-copywriting-guidelines)
 * [Standard C 语言标准函数库速查 (Cheat Sheet)](http://ganquan.info/standard-c/)
+* [Git Cheatsheet Chs](http://gh.amio.us/git-cheatsheet-chs/)
 
 ### 测试相关
 

From 713ffcc64515e655c5e36c286fde324d591f2cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=B7=E6=B8=A1?= <justjavac@gmail.com>
Date: Mon, 26 Jan 2015 13:38:51 +0800
Subject: [PATCH 12/24] =?UTF-8?q?Google=20Material=20Design=20=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86=EF=BC=8C=E5=88=A0=E9=99=A4=E5=85=B6=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=80=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 081b6b7..d4e2873 100644
--- a/README.md
+++ b/README.md
@@ -333,7 +333,6 @@
 * Google Material Design 正體中文版 ([译本一](http://wcc723.gitbooks.io/google_design_translate/content/style-icons.html) [译本二](https://github.com/1sters/material_design_zh))
 * [Google Android官方培训课程中文版](http://hukai.me/android-training-course-in-chinese/index.html)
 * [Android学习之路](http://stormzhang.github.io/android/2014/07/07/learn-android-from-rookie/)
-* [Material Design 中文版](http://design.1sters.com/)
 
 ### Python
 

From 519ee7f0d26d048eb2ef3e26519aed6f132f388e Mon Sep 17 00:00:00 2001
From: SDLyu <dragon90321@gmail.com>
Date: Tue, 27 Jan 2015 16:39:11 +0800
Subject: [PATCH 13/24] =?UTF-8?q?Yeoman=20=E4=B8=AD=E6=96=87=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d4e2873..2c8728a 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,7 @@
 * [Chrome 开发者工具中文手册](https://github.com/CN-Chrome-DevTools/CN-Chrome-DevTools)
 * [Chrome扩展开发文档](http://open.chrome.360.cn/extension_dev/overview.html)
 * [Grunt中文文档](http://www.gruntjs.org/)
+* [Yeoman中文文档](http://yeomanjs.org/)
 * [移动Web前端知识库](https://github.com/AlloyTeam/Mars)
 * [正则表达式30分钟入门教程](http://deerchao.net/tutorials/regex/regex.htm)
 * [前端开发体系建设日记](https://github.com/fouber/blog/issues/2)

From 37c6181b4485e22999cc43443567adc95c99f62a Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Wed, 28 Jan 2015 00:17:04 +0800
Subject: [PATCH 14/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=A4=A7=E5=9E=8B?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=E4=B8=8A=E7=9A=84=E5=BF=AB=E9=80=9F=E5=92=8C?=
 =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1134527..20947d9 100644
--- a/README.md
+++ b/README.md
@@ -173,6 +173,7 @@
 
 * [大数据/数据挖掘/推荐系统/机器学习相关资源](https://github.com/Flowerowl/Big-Data-Resources)
 * [面向程序员的数据挖掘指南](https://github.com/jizhang/guidetodatamining)
+* [大型集群上的快速和通用数据处理架构](https://code.csdn.net/CODE_Translation/spark_matei_phd)
 
 ## 编程艺术
 

From 448cc30346282147705b4a9de0e2708eb19ff18e Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Thu, 29 Jan 2015 22:51:09 +0800
Subject: [PATCH 15/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20TextGrocery=20?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=20API=20=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 20947d9..c0624c4 100644
--- a/README.md
+++ b/README.md
@@ -358,7 +358,7 @@
 * [Jinja2 文档中文版](http://docs.jinkan.org/docs/jinja2/)
 * [Werkzeug 文档中文版](http://werkzeug-docs-cn.readthedocs.org/zh_CN/latest/)
 * [Flask之旅](http://spacewander.github.io/explore-flask-zh)
-* [Introduction to Tornado 中文翻译](http://demo.pythoner.com/itt2zh/index.html)
+* [Introduction to Tornado 中文翻译](http://demo.pythoner.com/itt2zh/inde[[x.html)
 * [Python自然语言处理中文版](http://pan.baidu.com/s/1qW4pvnY) （感谢陈涛同学的翻译，也谢谢 [@shwley](https://github.com/shwley) 联系了作者）
 * [Python 绘图库 matplotlib 官方指南中文翻译](http://liam0205.me/2014/09/11/matplotlib-tutorial-zh-cn/)
 * [Scrapy 0.25 文档](http://scrapy-chs.readthedocs.org/zh_CN/latest/)
@@ -368,6 +368,7 @@
 * [python初级教程：入门详解](http://www.crifan.com/files/doc/docbook/python_beginner_tutorial/release/html/python_beginner_tutorial.html)
 * [Python Cookbook 第3版 中文版](http://python3-cookbook.readthedocs.org/zh_CN/latest/)
 * [Twisted 与异步编程入门](http://likebeta.gitbooks.io/twisted-intro-cn/)
+* [TextGrocery 中文 API](http://textgrocery.readthedocs.org/zh/latest/index.html) ( 基于svm算法的一个短文本分类 Python 库 )
 
 ### Ruby
 

From dec2e7dff26f21e98f0d4ad933047122b7fa75e0 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Fri, 30 Jan 2015 10:07:15 +0800
Subject: [PATCH 16/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=8ANginx=E6=95=99?=
 =?UTF-8?q?=E7=A8=8B=E4=BB=8E=E5=85=A5=E9=97=A8=E5=88=B0=E7=B2=BE=E9=80=9A?=
 =?UTF-8?q?=E3=80=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

这本跟淘宝团队的《Nginx开发从入门到精通》不是同一本。前者偏重如何使用，后者偏重背后原理。
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1796eae..7cbf751 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@
 ### WEB服务器
 
 * [Nginx开发从入门到精通](http://tengine.taobao.org/book/index.html) (淘宝团队出品)
+* [Nginx教程从入门到精通](http://www.ttlsa.com/nginx/nginx-stu-pdf/)(PDF版本，运维生存时间出品)
 * [Apache 中文手册](http://works.jinbuguo.com/apache/menu22/index.html)
 
 ### 版本控制

From e0a4cd2d960b1af24f210a0f4284821517af4ade Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Fri, 30 Jan 2015 11:34:27 +0800
Subject: [PATCH 17/24] =?UTF-8?q?Refine=20Introduction=20to=20Tornado=20?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c0624c4..6c4f7ec 100644
--- a/README.md
+++ b/README.md
@@ -358,7 +358,7 @@
 * [Jinja2 文档中文版](http://docs.jinkan.org/docs/jinja2/)
 * [Werkzeug 文档中文版](http://werkzeug-docs-cn.readthedocs.org/zh_CN/latest/)
 * [Flask之旅](http://spacewander.github.io/explore-flask-zh)
-* [Introduction to Tornado 中文翻译](http://demo.pythoner.com/itt2zh/inde[[x.html)
+* [Introduction to Tornado 中文翻译](http://demo.pythoner.com/itt2zh/index.html)
 * [Python自然语言处理中文版](http://pan.baidu.com/s/1qW4pvnY) （感谢陈涛同学的翻译，也谢谢 [@shwley](https://github.com/shwley) 联系了作者）
 * [Python 绘图库 matplotlib 官方指南中文翻译](http://liam0205.me/2014/09/11/matplotlib-tutorial-zh-cn/)
 * [Scrapy 0.25 文档](http://scrapy-chs.readthedocs.org/zh_CN/latest/)

From c0b83916672723ee7bcc42a967abd7186238f90e Mon Sep 17 00:00:00 2001
From: arcticlion <david.malan@aol.com>
Date: Mon, 2 Feb 2015 17:32:31 +0800
Subject: [PATCH 18/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=8F=AF=E7=88=B1?=
 =?UTF-8?q?=E7=9A=84=20Python?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7e58d4d..b38ea27 100644
--- a/README.md
+++ b/README.md
@@ -342,6 +342,7 @@
 * [小白的Python教程](http://www.liaoxuefeng.com/wiki/001374738125095c955c1e6d8bb493182103fac9270762a000)
 * [简明Python教程](http://woodpecker.org.cn/abyteofpython_cn/chinese/)
 * [零基础学Python](http://looly.gitbooks.io/python-basic)
+* [可爱的 Python ](http://lovelypython.readthedocs.org/en/latest/)
 * [Python 2.7 官方教程中文版](http://www.pythondoc.com/pythontutorial27/index.html)
 * [Python 3.3 官方教程中文版](http://www.pythondoc.com/pythontutorial3/index.html)
 * [深入 Python 3](http://sebug.net/paper/books/dive-into-python3/)

From 4e46b1de074bc3d18951124efef23ea2cb9a7f37 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 3 Feb 2015 23:05:06 +0800
Subject: [PATCH 19/24] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=AD=E7=BC=BA=E5=A4=B1=E7=9A=84=E6=9D=A1=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 7cbf751..bd2246b 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,10 @@
 
 * [语言无关类](#语言无关类)
   * [操作系统](#操作系统)
+  * [智能系统](#智能系统)
   * [WEB服务器](#web服务器)
   * [版本控制](#版本控制)
+  * [编辑器](#编辑器)
   * [NoSQL](#nosql)
   * [PostgreSQL](#postgresql)
   * [MySQL](#mysql)
@@ -31,6 +33,7 @@
   * [Web](#web)
   * [大数据](#大数据)
   * [编程艺术](#编程艺术)
+  * [其它](#其它)
 
 * [语言相关类](#语言相关类)
   * [AWK](#awk)
@@ -60,6 +63,7 @@
   * [Scheme](#scheme)
 
 * [读书笔记及其它](#读书笔记及其它)
+* [测试相关](#测试相关)
 
 ## 语言无关类
 

From f8b806001791ca1df0ab8980db49a81ee76f46ce Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 3 Feb 2015 23:11:40 +0800
Subject: [PATCH 20/24] =?UTF-8?q?=E5=B0=86Vimscript=E6=9D=A1=E7=9B=AE?=
 =?UTF-8?q?=E5=B9=B6=E5=85=A5=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E3=80=8A=E5=83=8FIDE=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7=E4=BD=BF=E7=94=A8Vim=E3=80=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

考虑到Vimscript基本上算是Vim知识体系中的一个子集，独立作为一门语言似乎有些不妥。所以就并入Vim的条目下。然后Vim又属于编辑器，最后还是觉得把整个Vimscript条目的内容都移入编辑器这一条中为好。
---
 README.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bd2246b..279cc27 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,6 @@
   * [R](#r)
   * [Scala](#scala)
   * [Swift](#swift)
-  * [Vimscript](#vimscript)
   * [Scheme](#scheme)
 
 * [读书笔记及其它](#读书笔记及其它)
@@ -117,6 +116,9 @@
 ### 编辑器
 
 * [exvim--vim 改良成IDE项目](http://exvim.github.io/docs-zh/intro/)
+* [笨方法学Vimscript 中译本](http://learnvimscriptthehardway.onefloweroneworld.com/)
+* [Vim中文文档](https://github.com/vimcn/vimcdoc)
+* [所需即所获：像 IDE 一样使用 vim](https://github.com/yangyangwithgnu/use_vim_as_ide)
 
 ### NoSQL
 
@@ -452,11 +454,6 @@
 
 * [笨办法学Prolog](http://fengdidi.github.io/blog/2011/11/15/qian-yan/)
 
-### Vimscript
-
-* [笨方法学Vimscript 中译本](http://learnvimscriptthehardway.onefloweroneworld.com/)
-* [Vim中文文档](https://github.com/vimcn/vimcdoc)
-
 ### Scheme
 * [Yet Another Scheme Tutorial Scheme入门教程](http://deathking.github.io/yast-cn/)
 

From 985056771cf1cc210d79df1e68275314bd448382 Mon Sep 17 00:00:00 2001
From: nibome <nibo.me.nb@gmail.com>
Date: Sat, 7 Feb 2015 17:14:07 +0800
Subject: [PATCH 21/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Google=20Java?=
 =?UTF-8?q?=E7=BC=96=E7=A8=8B=E9=A3=8E=E6=A0=BC=E6=8C=87=E5=8D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6ec0c4e..deb705a 100644
--- a/README.md
+++ b/README.md
@@ -249,6 +249,7 @@
 * [MyBatis中文文档](http://mybatis.github.io/mybatis-3/zh/index.html)
 * [用jersey构建REST服务](https://github.com/waylau/RestDemo)
 * [Activiti 5.x 用户指南](https://github.com/waylau/activiti-5.x-user-guide)
+* [Google Java编程风格指南](http://www.hawstein.com/posts/google-java-style.html)
 
 ### JavaScript
 

From 76df51ba1f372b7570ff03fd89570cb693a59db3 Mon Sep 17 00:00:00 2001
From: "Gao, Chao" <supergrubby@foxmail.com>
Date: Mon, 9 Feb 2015 15:31:06 +0800
Subject: [PATCH 22/24] =?UTF-8?q?Developing=20iOS=208=20Apps=20with=20Swif?=
 =?UTF-8?q?t=20=E5=AD=97=E5=B9=95=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index deb705a..302392b 100644
--- a/README.md
+++ b/README.md
@@ -448,6 +448,7 @@
 
 * [The Swift Programming Language 中文版](http://numbbbbb.github.io/the-swift-programming-language-in-chinese/)
 * [Swift 语言指南](http://dev.swiftguide.cn)
+* [Stanford 公开课，Developing iOS 8 Apps with Swift 字幕翻译文件](https://github.com/x140yu/Developing_iOS_8_Apps_With_Swift)
 
 ### Perl
 

From 74ec37565c126b0b22451a0cf8166f999841d973 Mon Sep 17 00:00:00 2001
From: SDLyu <dragon90321@gmail.com>
Date: Wed, 11 Feb 2015 17:15:45 +0800
Subject: [PATCH 23/24] Add Sass Guidelines.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 302392b..fddd660 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@
 * [Emmet 文档](http://yanxyz.github.io/emmet-docs/)
 * [前端代码规范](http://alloyteam.github.io/code-guide/) (腾讯alloyteam团队)
 * [HTML和CSS编码规范](http://codeguide.bootcss.com/)
+* [Sass Guidelines 中文](http://sass-guidelin.es/zh/)
 
 ### Dart
 

From 21689a809ea0d07f3d7e258dea2d110593db62b1 Mon Sep 17 00:00:00 2001
From: Way Lau <waylau521@gmail.com>
Date: Thu, 12 Feb 2015 15:36:52 +0800
Subject: [PATCH 24/24] =?UTF-8?q?add=20=20Netty=204.x=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8C=87=E5=8D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fddd660..2ae6b60 100644
--- a/README.md
+++ b/README.md
@@ -251,6 +251,7 @@
 * [用jersey构建REST服务](https://github.com/waylau/RestDemo)
 * [Activiti 5.x 用户指南](https://github.com/waylau/activiti-5.x-user-guide)
 * [Google Java编程风格指南](http://www.hawstein.com/posts/google-java-style.html)
+* [Netty 4.x 用户指南](https://github.com/waylau/netty-4-user-guide)
 
 ### JavaScript