diff --git a/published/20151001 Powerline – Adds Powerful Statuslines and Prompts to Vim Editor and Bash Terminal.md b/published/20151001 Powerline – Adds Powerful Statuslines and Prompts to Vim Editor and Bash Terminal.md
new file mode 100644
index 0000000000..d826b716c6
--- /dev/null
+++ b/published/20151001 Powerline – Adds Powerful Statuslines and Prompts to Vim Editor and Bash Terminal.md	
@@ -0,0 +1,256 @@
+Powerline：给 Vim 和 Bash 提供更棒的状态行和提示信息
+=================================================
+
+Powerline 是一个极棒的 [Vim 编辑器][1]的状态行插件，这个插件是使用 Python 开发的，主要用于显示状态行和提示信息，适用于很多软件，比如 bash、zsh、tmux 等等。
+
+[
+ ![Install Powerline Statuslines in Linux](http://www.tecmint.com/wp-content/uploads/2015/10/Install-Powerline-Statuslines-in-Linux-620x297.png) 
+][2]
+
+*Powerline 使 Linux 终端更具威力*
+
+### 特色
+
+1. 使用 python 编写，使其更具扩展性且功能丰富
+2. 稳定易测的代码库，兼容 python 2.6+ 和 python 3
+3. 支持多种 Linux 功能及工具的提示和状态栏
+4. 通过 JSON 保存配置和颜色方案
+5. 快速、轻量级，具有后台守护进程支持，提供更佳的性能
+
+### Powerline 效果截图
+
+[
+ ![Powerline Vim Statuslines](http://www.tecmint.com/wp-content/uploads/2015/10/Powerline-Vim-Statuslines.png) 
+][3]
+
+*Vim 中 Powerline 状态行效果*
+
+在本文中，我会介绍如何安装 Powerline 及其字体，以及如何在 RedHat 和 Debian 类的系统中使 Bash 和 Vim 支持 Powerline。
+
+### 第一步：准备好安装 Powerline 所需的软件
+
+由于和其它无关项目之间存在命名冲突，因此 powerline 只能放在 PyPI（Python Package Index）中的 `powerline-status` 包下.
+
+为了从 PyPI 中安装该包，需要先准备好 `pip`（该工具专门用于 Python 包的管理）工具。所以首先要在 Linux 系统下安装好 `pip` 工具。
+
+#### 在 Debian、Ubuntu 和 Linux Mint 中安装 pip
+
+```
+# apt-get install python-pip
+```
+**示例输出：**
+
+```
+Reading package lists... Done
+Building dependency tree       
+Reading state information... Done
+Recommended packages:
+python-dev-all python-wheel
+The following NEW packages will be installed:
+python-pip
+0 upgraded, 1 newly installed, 0 to remove and 533 not upgraded.
+Need to get 97.2 kB of archives.
+After this operation, 477 kB of additional disk space will be used.
+Get:1 http://archive.ubuntu.com/ubuntu/ trusty-updates/universe python-pip all 1.5.4-1ubuntu3 [97.2 kB]
+Fetched 97.2 kB in 1s (73.0 kB/s)     
+Selecting previously unselected package python-pip.
+(Reading database ... 216258 files and directories currently installed.)
+Preparing to unpack .../python-pip_1.5.4-1ubuntu3_all.deb ...
+Unpacking python-pip (1.5.4-1ubuntu3) ...
+Processing triggers for man-db (2.6.7.1-1ubuntu1) ...
+Setting up python-pip (1.5.4-1ubuntu3) ...
+```
+
+#### 在 CentOS、RHEL 和 Fedora 中安装 pip
+
+在 Fedora 类系统中，需要先打开 [epel 仓库][4]，然后按照如下方法安装 pip 包。
+
+```
+# yum install python-pip          
+# dnf install python-pip                     [Fedora 22+ 以上]           
+```
+
+**示例输出：**
+
+```
+Installing:
+python-pip          noarch          7.1.0-1.el7             epel          1.5 M
+Transaction Summary
+=================================================================================
+Install  1 Package
+Total download size: 1.5 M
+Installed size: 6.6 M
+Is this ok [y/d/N]: y
+Downloading packages:
+python-pip-7.1.0-1.el7.noarch.rpm                         | 1.5 MB  00:00:01     
+Running transaction check
+Running transaction test
+Transaction test succeeded
+Running transaction
+Installing : python-pip-7.1.0-1.el7.noarch                                 1/1 
+Verifying  : python-pip-7.1.0-1.el7.noarch                                 1/1 
+Installed:
+python-pip.noarch 0:7.1.0-1.el7                                                
+Complete!
+```
+
+### 第二步：在 Linux 中安装 Powerline
+
+现在可以从 Git 仓库中安装 Powerline 的最新开发版。在此之前系统需要安装好 Git 工具以便可以从仓库拉下代码。
+
+```
+# apt-get install git
+# yum install git
+# dnf install git
+```
+
+然后你可以通过 `pip` 命令安装 Powerline。
+
+```
+# pip install git+git://github.com/Lokaltog/powerline
+```
+
+**示例输出：**
+
+```
+Cloning git://github.com/Lokaltog/powerline to /tmp/pip-WAlznH-build
+Running setup.py (path:/tmp/pip-WAlznH-build/setup.py) egg_info for package from git+git://github.com/Lokaltog/powerline
+warning: no previously-included files matching '*.pyc' found under directory 'powerline/bindings'
+warning: no previously-included files matching '*.pyo' found under directory 'powerline/bindings'
+Installing collected packages: powerline-status
+Found existing installation: powerline-status 2.2
+Uninstalling powerline-status:
+Successfully uninstalled powerline-status
+Running setup.py install for powerline-status
+warning: no previously-included files matching '*.pyc' found under directory 'powerline/bindings'
+warning: no previously-included files matching '*.pyo' found under directory 'powerline/bindings'
+changing mode of build/scripts-2.7/powerline-lint from 644 to 755
+changing mode of build/scripts-2.7/powerline-daemon from 644 to 755
+changing mode of build/scripts-2.7/powerline-render from 644 to 755
+changing mode of build/scripts-2.7/powerline-config from 644 to 755
+changing mode of /usr/local/bin/powerline-config to 755
+changing mode of /usr/local/bin/powerline-lint to 755
+changing mode of /usr/local/bin/powerline-render to 755
+changing mode of /usr/local/bin/powerline-daemon to 755
+Successfully installed powerline-status
+Cleaning up...
+```
+
+### 第三步：在 Linux 中安装 Powerline 的字体
+
+Powerline 使用特殊的符号来为开发者显示特殊的箭头效果和符号内容。因此你的系统中必须要有符号字体或者补丁过的字体。
+
+通过下面的 [wget][5] 命令下载最新的系统字体及字体配置文件。
+
+```
+# wget https://github.com/powerline/powerline/raw/develop/font/PowerlineSymbols.otf
+# wget https://github.com/powerline/powerline/raw/develop/font/10-powerline-symbols.conf
+```
+
+然后你将下载的字体放到字体目录下 `/usr/share/fonts` 或者 `/usr/local/share/fonts`，或者你可以通过 `xset q` 命令找到一个有效的字体目录。
+
+```
+# mv PowerlineSymbols.otf /usr/share/fonts/
+```
+
+接下来你需要通过如下命令更新你系统的字体缓存。
+
+```
+# fc-cache -vf /usr/share/fonts/
+```
+
+其次安装字体配置文件。
+
+```
+# mv 10-powerline-symbols.conf /etc/fonts/conf.d/
+```
+
+注意：如果相应的符号没有出现，可以尝试关闭终端会话并重启 X window，这样就会生效了。
+
+### 第四步：给 Bash Shell 和 Vim 状态行设置 Powerline
+
+在这一节将介绍 bash shell 和 vim 编辑器中关于 Powerline 的配置。首先通过在 `~/.bashrc` 中添加如下内容以便设置终端为 256 色。
+
+```
+export TERM="screen-256color"
+```
+
+#### 打开 Bash Shell 中的 Powerline
+
+如果希望在 bash shell 中默认打开 Powerline，可以在 `~/.bashrc` 中添加如下内容。
+
+首先通过如下命令获取 powerline 的安装位置。
+
+```
+# pip show powerline-status
+Name: powerline-status
+Version: 2.2.dev9999-git.aa33599e3fb363ab7f2744ce95b7c6465eef7f08
+Location: /usr/local/lib/python2.7/dist-packages
+Requires: 
+```
+
+一旦找到 powerline 的具体位置后，根据你系统的情况替换到下列行中的 `/usr/local/lib/python2.7/dist-packages` 对应的位置。
+
+```
+powerline-daemon -q
+POWERLINE_BASH_CONTINUATION=1
+POWERLINE_BASH_SELECT=1
+. /usr/local/lib/python2.7/dist-packages/powerline/bindings/bash/powerline.sh
+```
+
+然后退出后重新登录，现在 powerline 的状态行应该如下显示了。
+
+[
+ ![Bash Powerline Statuslines](http://www.tecmint.com/wp-content/uploads/2015/10/Bash-Powerline-Statuslines.gif) 
+][6]
+
+现在切换目录并注意显示你当前路径的面包屑导航提示的变化。
+
+如果远程 Linux 服务器上安装了 powerline，你能看到后台挂起的任务，当你用 ssh 登录上去时，会看到该提示增加了主机名。
+
+#### 在 Vim 中打开 Powerline
+
+如果你喜欢使用 vim，正好有一个 vim 的强力插件。可以在 `~/.vimrc` 中添加如下内容打开该插件（LCTT 译注：注意同样需要根据你的系统情况修改路径）。
+
+```
+set rtp+=/usr/local/lib/python2.7/dist-packages/powerline/bindings/vim/
+set laststatus=2
+set t_Co=256
+```
+
+然后你打开 vim 后会看到一个新的状态行:
+
+[
+ ![Vim Powerline Statuslines](http://www.tecmint.com/wp-content/uploads/2015/10/Vim-Powerline-Statuslines.gif) 
+][7]
+
+### 总结
+
+Powerline 可以在某些软件中提供颜色鲜艳、很优美的状态行及提示内容，这对编程环境有利。希望这篇指南对您有帮助，如果您需要帮助或者有任何好的想法，请留言给我。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/7badddbc53297b2e8ed7011cf45df0c0?s=128&d=blank&r=g)
+
+我是Ravi Saive，TecMint的作者。一个喜欢分享诀窍和想法的电脑极客及Linux专家。我的大部分服务都运行在开源平台Linux中。关注我的Twitter，Facebook和Google+。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/powerline-adds-powerful-statuslines-and-prompts-to-vim-and-bash/
+
+作者：[Ravi Saive][a]
+译者：[beyondworld](https://github.com/beyondworld)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/admin/
+[1]:http://www.tecmint.com/vi-editor-usage/
+[2]:http://www.tecmint.com/wp-content/uploads/2015/10/Install-Powerline-Statuslines-in-Linux.png
+[3]:http://www.tecmint.com/wp-content/uploads/2015/10/Powerline-Vim-Statuslines.png
+[4]:https://linux.cn/article-2324-1.html
+[5]:http://www.tecmint.com/10-wget-command-examples-in-linux/
+[6]:http://www.tecmint.com/wp-content/uploads/2015/10/Bash-Powerline-Statuslines.gif
+[7]:http://www.tecmint.com/wp-content/uploads/2015/10/Vim-Powerline-Statuslines.gif
diff --git a/published/20160823 Getting Started with HTTP2 - Part 1.md b/published/20160823 Getting Started with HTTP2 - Part 1.md
new file mode 100644
index 0000000000..62358240f2
--- /dev/null
+++ b/published/20160823 Getting Started with HTTP2 - Part 1.md	
@@ -0,0 +1,62 @@
+初识 HTTP/2（一）
+============================================================
+ ![](https://static.viget.com/_284x284_crop_center-center/http2-pizza.png?mtime=20160822160641)
+
+> 用披萨来说明当你订单数很大的时候 HTTP/2 是怎么打败 HTTP/1.1 的。
+
+在建立网站和应用的方式上 HTTP/2 有些令人惊叹的改变，在 HTTP/2 发布后的一年半，几乎 [10% 的网站使用了  HTTP/2][4]。它绝对值得采用，但是这篇文章应该首先推给使用 HTTP/2 的前端开发者。这个连载的文章是指导前端开发者怎么转换到 HTTP/2。
+
+本文涵盖了 HTTP/2 对 HTTP/1.1 来说有什么提高的内容，并且向前端开发者介绍了 HTTP/2。
+
+### 再次让我想起什么是 HTTP ...
+
+超文本传输协议，也就是 HTTP，这个协议决定了 web 内容怎么传输。HTTP/1.1 在 1999 年被标准化，那时候的 web 和现在有很大的不同，表格霸占了整个网络。样式通常被内联在元素中，如果网站管理员更加的细致，他们会在头部写个 `<style>`标签。 JavaScript 也被丢在文档里面，那时候完整的网站通常也不会超过几页。
+
+HTTP/1.1 预计这种情况会持续一段时间，所以它并没有太过关注在让一个站点可以加载大量的资源方面，因为那时候的开发者并不需要这个。因此它使用了一个非常简单的方式来处理资源，你访问一个资源然后服务器去寻找它，并且返回你访问的资源，或者告诉你这个资源不存在。这种被叫作"线头堵塞"方式非常高效，但是当你需要多个资源的时候，这个进程会依次寻找每个资源。这意味着在你访问第二个资源之前，服务器必须找到你访问的第一个资源并且载入它，或者告诉你没找到。
+
+### 大型站点的发展
+
+在 1999 年之后的几年里，随着 php 和其他像 Rails 这样的动态语言的崛起，站点变得越来越复杂。css 文件也随着向响应式开发的转变而变的越来越大，因此像 Sass 这样的可以创造一个简单的工作环境的 CSS 编译器就应运而生。 JavaScript 也在 web 上有了更大的作用，它允许开发者编写复杂的应用，这曾经只是 C++ 开发人员的工作。随着 Retina 和高清显示屏的兴起，也让图片变得更高清。随着这些改变，文件大小呈现指数式的增长，使得本来是等待几个字节的资源变成了加载几千字节，甚至在某些情况下有几兆。当你开始载入页面的其它东西前，必须先载入数百 K 的东西，你只能乐观的假设你的用户有很快的网络接入。
+
+想象 HTTP/1.1 是个过去的那种柜台购买式的街旁披萨店。你能自己过去并且预定一个雪碧和 2 片 Angry Hawaiian ，然后等待 3 分钟。他们可以很容易地处理这些，实际上这是一个蓬勃发展的商业模式-定单简单、处理迅速。
+
+![](https://static.viget.com/_300xAUTO_crop_center-center/http2-pizzaorder1.png?mtime=20160823122331)
+
+然而，一旦你决定在同样的披萨店主办一场小区域的季度颁奖典礼，事情就变的更复杂了。每个人都预定不同的东西，快速而杂乱无章让等待时间直线上升。
+
+![](https://static.viget.com/_300xAUTO_crop_center-center/http2-pizzaorder2.png?mtime=20160823130750)
+
+### 哪里是 HTTP/2 的舞台
+
+HTTP/2 对前端开发者主要的承诺就是复用。意思就是资源请求能发生在同一时间，并且服务器能马上响应这些资源。在请求之间没有等待，因为它们发生在同一时间。
+
+使用同样的比喻，HTTP/2 允许披萨店在餐馆他们自己区域举办派对。派一个服务员接受订单，并把所有已经准备好的订单交付。当其他人的比萨在制作的时候，你也不需要花 30 分钟去等待你的雪碧，它们在第一批交付的东西之中。这方式使得管理大量订单更加简单，并且防止人们等他们的订单时间太长。
+
+复用带给我们的 web 开发的大变化是改变了文件的加载方式。帮助绕过资源加载的 HTTP/1.1 瓶颈的方式是通过连接和压缩需要被加载的文件。所有任务运行器都默认采取这样的操作方式，或者需要作一点小设置就行。和过去一样，开发人员可以将图像放在精灵拼图（sprite sheets）中，这会减少了对服务器的请求数。
+
+### 改进 HTTP/1.1
+
+将文件连接起来是个处理 HTTP1.1 的请求限制问题的非常聪明的方式，但是连接文件的主要问题是它要求用户第一次访问整个网站时下载所有的资源。一旦它们载入后，浏览器就会缓存所有的资源。这能提高用户每次访问网页时的速度，但是前期负载很重，对[跳出率不利][5]。此外，他们可能为所不访问的页面加载资源。期望用户访问每个页面以查看每个样式，并与每个脚本进行交互是不现实的。此外，在加拿大和欧洲以及几乎每个美国移动提供商的地方，有每月的带宽上限。不是加载额外的 54 千字节的内容就会超过每月的流量限制，而是让我们假设用户想保留这些额外的流量看 Taylor Swift 的 gif。
+
+使用 HTTP/2 和多路复用，您可以开发一些最高效的网站，但它需要一些重新思考、甚至​​撤销之前的最佳做法。重复一次，我的目的是加快 HTTP/2 的会话，使用我们新的工具，我们可以发现这些新的最佳的做法。
+
+在我的下一篇文章，[我将探索建设基于 HTTP/2 的网站的一些最好方式][6]。
+
+--------------------------------------------------------------------------------
+
+via: https://www.viget.com/articles/getting-started-with-http-2-part-1?imm_mid=0eb24a&cmp=em-web-na-na-newsltr_20161130
+
+作者：[Ben][a]
+译者：[hkurj](https://github.com/hkurj)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.viget.com/about/team/btinsley
+[1]:https://twitter.com/home?status=Using%20pizza%20to%20show%20how%20HTTP%2F2%20beats%20HTTP%2F1.1%20when%20your%20orders%20get%20too%20big.%20https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
+[2]:https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
+[3]:http://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
+[4]:https://w3techs.com/technologies/details/ce-http2/all/all
+[5]:https://blog.kissmetrics.com/speed-is-a-killer/
+[6]:https://www.viget.com/articles/getting-started-with-http-2-part-2
+[7]:https://www.viget.com/about/team/btinsley
diff --git a/translated/talk/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD b/published/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD
similarity index 60%
rename from translated/talk/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD
rename to published/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD
index fca26ca316..026e10c717 100644
--- a/translated/talk/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD	
+++ b/published/20160826 Forget Technical Debt —Here'sHowtoBuild Technical Wealth.MD	
@@ -1,16 +1,17 @@
-#忘记技术债务 —— 教你如何创造技术财富
+忘记技术债务 —— 教你如何创造技术财富
+===============
 
-电视里正播放着《老屋》节目，[Andrea Goulet][58] 和她商业上的合作伙伴正悠闲地坐在客厅里，商讨着他们的战略计划。那正是大家思想的火花碰撞出创新事物的时刻。他们正在寻求一种能够实现自身价值的方式 —— 为其它公司清理<ruby>遗留代码<rt>legacy code</rt></ruby>及科技债务。他们此刻的情景，像极了电视里的场景。（译者注：《老屋》电视节目提供专业的家装，家庭改建，重新装饰，创意等等信息，与软件的改造有异曲同工之处）。
+电视里正播放着《老屋》节目，[Andrea Goulet][58] 和她的商业合作伙伴正悠闲地坐在客厅里，商讨着他们的战略计划。那正是大家思想的火花碰撞出创新事物的时刻。他们正在寻求一种能够实现自身价值的方式 —— 为其它公司清理<ruby>遗留代码<rt>legacy code</rt></ruby>及科技债务。他们此刻的情景，像极了电视里的场景。（LCTT 译注：《老屋》电视节目提供专业的家装、家庭改建、重新装饰、创意等等信息，与软件的改造有异曲同工之处）。
 
-“我们意识到我们现在做的工作不仅仅是清理遗留代码，实际上我们是在用重建老屋的方式来重构软件，让系统运行更持久，更稳定，更高效，”Goulet 说。“这让我开始思考公司如何花钱来改善他们的代码，以便让他们的系统运行更高效。就好比为了让屋子变得更有价值，你不得不使用一个全新的屋顶。这并不吸引人，但却是至关重要的，然而很多人都搞错了。“
+“我们意识到我们现在做的工作不仅仅是清理遗留代码，实际上我们是在用重建老屋的方式来重构软件，让系统运行更持久、更稳定、更高效，”Goulet 说。“这让我开始思考公司如何花钱来改善他们的代码，以便让他们的系统运行更高效。就好比为了让屋子变得更有价值，你不得不使用一个全新的屋顶。这并不吸引人，但却是至关重要的，然而很多人都搞错了。“
 
-如今，她是 [Corgibytes][57] 公司的 CEO —— 一家提高软件现代化和进行系统重构方面的咨询公司。她曾经见过各种各样糟糕的系统，遗留代码，以及严重的科技债务事件。Goulet 认为创业公司需要转变思维模式，不是偿还债务，而是创造科技财富，不是要铲除旧代码，而是要逐步修复代码。她解释了这种新的方法，以及如何完成这些看似不可能完成的事情 —— 实际上是聘用优秀的工程师来完成这些工作。
+如今，她是 [Corgibytes][57] 公司的 CEO —— 这是一家提高软件现代化和进行系统重构方面的咨询公司。她曾经见过各种各样糟糕的系统、遗留代码，以及严重的科技债务事件。Goulet 认为**创业公司需要转变思维模式，不是偿还债务，而是创造科技财富，不是要铲除旧代码，而是要逐步修复代码**。她解释了这种新的方法，以及如何完成这些看似不可能完成的事情 —— 实际上是聘用优秀的工程师来完成这些工作。
 
 ### 反思遗留代码
 
-关于遗留代码最常见的定义是由 Michael Feathers 在他的著作[<ruby>《高效利用遗留代码》<rt>Working Effectively with Legacy Code</rt></ruby>][56]一书中提出：遗留代码就是没有被测试的代码。这个定义比大多数人所认为的 —— 遗留代码仅指那些古老陈旧的系统这个说法要妥当得多。但是 Goulet 认为这两种定义都不够明确。“遗留代码与软件的年头儿毫无关系。一个两年的应用程序，其代码可能已经进入遗留状态了，”她说。“关键要看软件质量提高的难易程度。”
+关于遗留代码最常见的定义是由 Michael Feathers 在他的著作[<ruby>《高效利用遗留代码》<rt>Working Effectively with Legacy Code</rt></ruby>][56]一书中提出：遗留代码就是没有被测试所覆盖的代码。这个定义比大多数人所认为的 —— 遗留代码仅指那些古老、陈旧的系统这个说法要妥当得多。但是 Goulet 认为这两种定义都不够明确。“遗留代码与软件的年头儿毫无关系。一个两年的应用程序，其代码可能已经进入遗留状态了，”她说。“**关键要看软件质量提高的难易程度。**”
 
-这意味着代码写得不够清楚，缺少解释说明，没有包含任何关于代码构思和决策制定的流程。单元测试可以有一定帮助，但也要包括所有的写那部分代码的原因以及逻辑推理相关的文档。如果想要提升代码，但没办法搞清楚原开发者的意图 —— 那些代码就属于遗留代码了。
+这意味着写得不够清楚、缺少解释说明的代码，是没有包含任何关于代码构思和决策制定的流程的成果。单元测试就是这样的一种成果，但它并没有包括了写那部分代码的原因以及逻辑推理相关的所有文档。如果想要提升代码，但没办法搞清楚原开发者的意图 —— 那些代码就属于遗留代码了。
 
 > **遗留代码不是技术问题，而是沟通上的问题。**
 
@@ -18,35 +19,35 @@
 
 如果你像 Goulet 所说的那样迷失在遗留代码里，你会发现每一次的沟通交流过程都会变得像那条[<ruby>康威定律<rt>Conway’s Law</rt></ruby>][54]所描述的一样。
 
-Goulet 说：“这个定律认为系统的基础架构能反映出整个公司的组织沟通结构，如果想修复公司的遗留代码，而没有一个好的组织沟通方式是不可能完成的。那是很多人都没注意到的一个重要环节。”
+Goulet 说：“这个定律认为你的代码能反映出整个公司的组织沟通结构，如果想修复公司的遗留代码，而没有一个好的组织沟通方式是不可能完成的。那是很多人都没注意到的一个重要环节。”
 
 Goulet 和她的团队成员更像是考古学家一样来研究遗留系统项目。他们根据前开发者写的代码构件相关的线索来推断出他们的思想意图。然后再根据这些构件之间的关系来做出新的决策。
 
-最重要的代码是什么样子呢？**良好的代码结构、清晰的思想意图、整洁的代码**。例如，如果使用通用的名称如 “foo” 或 “bar” 来命名一个变量，半年后再返回来看这段代码时，根本就看不出这个变量的用途是什么。
+代码构件最重要的什么呢？**良好的代码结构、清晰的思想意图、整洁的代码**。例如，如果使用通用的名称如 “foo” 或 “bar” 来命名一个变量，半年后再返回来看这段代码时，根本就看不出这个变量的用途是什么。
 
 如果代码读起来很困难，可以使用源代码控制系统，这是一个非常有用的工具，因为它可以提供代码的历史修改信息，并允许软件开发者写明他们作出本次修改的原因。
 
-Goulet 说：“我一个朋友认为提交代码时附带的信息，如需要，每一个概要部分的内容应该有推文的一半多，而代码的描述信息应该有一篇博客那么长。你得用这个方式来为你修改的代码写一个合理的说明。这不会浪费太多额外的时间，并且能给后期的项目开发者提供非常多的有用的信息，但是让人惊讶的是很少有人会这么做。我们经常听到一些开发人员在调试代码的过程中，很沮丧的报怨这是谁写的这烂代码，最后发现还不是他们自己写的。”
+Goulet 说：“我一个朋友认为提交代码时附带的信息，每一个概要部分的内容应该有半条推文那么长（几十个字），如需要的话，代码的描述信息应该有一篇博客那么长。你得用这个方式来为你修改的代码写一个合理的说明。这不会浪费太多额外的时间，并且能给后期的项目开发者提供非常多的有用信息，但是让人惊讶的是很少有人会这么做。我们经常能看到一些开发人员在被一段代码激怒之后，要用 `git blame` 扒代码库找出这些垃圾是谁干的，结果最后发现是他们自己干的。”
 
 使用自动化测试对于理解程序的流程非常有用。Goulet 解释道：“很多人都比较认可 Michael Feathers 提出的关于遗留代码的定义。测试套件对于理解开发者的意图来说是非常有用的工具，尤其当用来与[<ruby>行为驱动开发模式<rt>Behavior Driven Development</rt></ruby>][53]相结合时，比如编写测试场景。”
 
-理由很简单，如果你想利用好遗留代码，你得多注意使代码在将来易于理解和工作的一些细节上。编写并运行单元程序、接受、认可，并且进行集成测试，写清楚注释的内容。方便以后你自己或是别人来理解你写的代码。
+理由很简单，如果你想将遗留代码限制在一定程度下，注意到这些细节将使代码更易于理解，便于在以后也能工作。编写并运行一个代码单元，接受、认可，并且集成测试。写清楚注释的内容，方便以后你自己或是别人来理解你写的代码。
 
-尽管如此，由于很多已知的和不可意料的原因，遗留代码仍然会发生。
+尽管如此，由于很多已知的和不可意料的原因，遗留代码仍然会出现。
 
 在创业公司刚成立初期，公司经常会急于推出很多新的功能。开发人员在巨大的交付压力下，测试常常半途而废。Corgibytes 团队就遇到过好多公司很多年都懒得对系统做详细的测试了。
 
-确实如此，当你急于开发出系统原型的时候，强制性地去做太多的测试也许意义不大。但是，一旦产品开发完成并投入使用后，你就需要投入时间精力来维护及完善系统了。Goulet 说：“很多人觉得运维没什么好担心的，重要的是产品功能特性上的强大。如果真这样，当系统规模到一定程序的时候，就很难再扩展了。同时也就失去市场竞争力了。
+确实如此，当你急于开发出系统原型的时候，强制性地去做太多的测试也许意义不大。但是，一旦产品开发完成并投入使用后，你就需要投入时间精力来维护及完善系统了。Goulet 说：“很多人说，‘别在维护上费心思，重要的是功能！’ **如果真这样，当系统规模到一定程序的时候，就很难再扩展了。同时也就失去市场竞争力了。**”
 
-最后才明白过来，原来热力学第二定律对代码也同样适用：你所面临的一切将向熵增的方向发展。你需要与混乱无序的技术债务进行一场无休无止的战斗。遗留代码随着时间的增长，也逐渐变成一种债务。
+最后才明白过来，原来热力学第二定律对代码也同样适用：**你所面临的一切将向熵增的方向发展。**你需要与混乱无序的技术债务进行一场无休无止的战斗。随着时间的推移，遗留代码也逐渐变成一种债务。
 
-她说：“我们再次拿家来做比喻。你必须坚持每天收拾餐具，打扫卫生，倒垃圾。如果你不这么做，情况将来越来越糟糕，直到有一天你不得不向 HazMat 团队求助。”(译者注：HazMat 团队，危害物质专队) 
+她说：“我们再次拿家来做比喻。你必须坚持每天收拾餐具、打扫卫生、倒垃圾。如果你不这么做，情况将来越来越糟糕，直到有一天你不得不向 HazMat 团队求助。”（LCTT 译注：HazMat 团队，危害物质专队) 
 
 就跟这种情况一样，Corgibytes 团队接到很多公司 CEO 的求助电话，比如 Features 公司的 CEO 在电话里抱怨道：“现在我们公司的开发团队工作效率太低了，三年前只需要两个星期就完成的工作，现在却要花费12个星期。”
 
-> **技术债务往往反应出公司运作上的问题。**
+> **技术债务往往反映出公司运作上的问题。**
 
-很多公司的 CTO 明知会发生技术债务的问题，但是他们很难说服其它同事相信，花钱来修复那些已经存在的问题是值得的。这看起来像是在走回头路，很乏味或者没有新的产品。有些公司直到系统已经严重影响了日常工作效率时，才着手去处理这些技术债务方面的问题，那时付出的代价就太高了。
+很多公司的 CTO 明知会发生技术债务的问题，但是他们很难说服其它同事相信花钱来修复那些已经存在的问题是值得的。这看起来像是在走回头路，很乏味，也不是新的产品。有些公司直到系统已经严重影响了日常工作效率时，才着手去处理这些技术债务方面的问题，那时付出的代价就太高了。
 
 ### 忘记债务，创造技术财富
 
@@ -66,90 +67,90 @@ Goulet 说：“我一个朋友认为提交代码时附带的信息，如需要
 
 这就像对一栋房子，要实现其现代化及维护的方式有两种：小动作，表面上的更改（“我买了一块新的小地毯！”）和大改造，需要很多年才能偿还所有债务（“我想我们应替换掉所有的管道...”)。你必须考虑好两者，才能让你们已有的产品和整个团队顺利地运作起来。
 
-这还需要提前预算好 —— 否则那些较大的花销将会是硬伤。定期维护是最基本的预期费用。让人震惊的是，很多公司在商务上都没把维护成本预算进来。
+这还需要提前预算好 —— 否则那些较大的花销将会是硬伤。定期维护是最基本的预期费用。让人震惊的是，很多公司都没把维护当成商务成本预算进来。
 
-这就是 Goulet 提出“**<ruby>软件重构<rt>software remodeling</rt></ruby>**”这个术语的原因。当你房子里的一些东西损坏的时候，你并不是铲除整个房子，从头开始重建。同样的，当你们公司出现老的，损坏的代码时，重写代码通常不是最明智的选择。
+这就是 Goulet 提出“**<ruby>软件重构<rt>software remodeling</rt></ruby>**”这个术语的原因。当你房子里的一些东西损坏的时候，你并不是铲除整个房子，从头开始重建。同样的，当你们公司出现老的、损坏的代码时，重写代码通常不是最明智的选择。
 
 下面是 Corgibytes 公司在重构客户代码用到的一些方法：
 
-*   把大型的应用系统分解成轻量级的更易于维护的微服务。
-*   相互功能模块之间降低耦合性以便于扩展。
-*   更新品牌和提升用户前端界面体验。
-*   集合自动化测试来检查代码可用性。
-*   重构或者修改代码库来提高易用性。
+* 把大型的应用系统分解成轻量级的更易于维护的微服务。
+* 让功能模块彼此解耦以便于扩展。
+* 更新形象和提升用户前端界面体验。
+* 集合自动化测试来检查代码可用性。
+* 代码库可以让重构或者修改更易于操作。
 
-系统重构也进入到运维领域。比如，Corgibytes 公司经常推荐新客户使用 [Docker][50]，以便简单快速的部署新的开发环境。当你们团队有30个工程师的时候，把初始化配置时间从 10 小时减少到 10 分钟对完成更多的工作很有帮助。系统重构不仅仅是应用于软件开发本身，也包括如何进行系统重构。
+系统重构也进入到 DevOps 领域。比如，Corgibytes 公司经常推荐新客户使用 [Docker][50]，以便简单快速的部署新的开发环境。当你们团队有 30 个工程师的时候，把初始化配置时间从 10 小时减少到 10 分钟对完成更多的工作很有帮助。系统重构不仅仅是应用于软件开发本身，也包括如何进行系统重构。
 
-如果你知道做些什么能让你们的代码管理起来更容易更高效，就应该把这它们写入到每年或季度的项目规划中。别指望它们会自动呈现出来。但是也别给自己太大的压力来马上实施它们。Goulets 看到很多公司从一开始就致力于100% 覆盖率测试而陷入困境。
+如果你知道做些什么能让你们的代码管理起来更容易更高效，就应该把这它们写入到每年或季度的项目规划中。别指望它们会自动呈现出来。但是也别给自己太大的压力来马上实施它们。Goulets 看到很多公司从一开始就致力于 100% 测试覆盖率而陷入困境。
 
 **具体来说，每个公司都应该把以下三种类型的重构工作规划到项目建设中来：**
 
-*   自动化测试
-*   持续性交付
+*   自动测试
+*   持续交付
 *   文化提升
 
 咱们来深入的了解下每一项内容。
 
-**自动化测试**
+#### 自动测试
 
- “有一位客户即将进行第二轮融资，但是他们没办法在短期内招聘到足够的人才。我们帮助他们引进了一种自动化测试框架，这让他们的团队在 3 个月的时间内工作效率翻了一倍，”Goulets说。“这样他们就可以在他们的投资人面前自豪的说，‘我们一个精英团队完成的任务比两个普通的团队要多。’”
+ “有一位客户即将进行第二轮融资，但是他们没办法在短期内招聘到足够的人才。我们帮助他们引进了一种自动化测试框架，这让他们的团队在 3 个月的时间内工作效率翻了一倍，”Goulets 说。“这样他们就可以在他们的投资人面前自豪的说，‘我们一个精英团队完成的任务比两个普通的团队要多。’”
 
-自动化测试从根本上来讲就是单个测试的组合。你可以使用单元测试再次检查某一行代码。可以使用集成测试来确保系统的不同部分都正常运行。还可以使用验收性测试来检验系统的功能特性是否跟你想像的一样。当你把这些测试写成测试脚本后，你只需要简单地用鼠标点一下按钮就可以让系统自行检验了，而不用手工的去梳理并检查每一项功能。
+自动化测试从根本上来讲就是单个测试的组合，就是可以再次检查某一行代码的单元测试。可以使用集成测试来确保系统的不同部分都正常运行。还可以使用验收性测试来检验系统的功能特性是否跟你想像的一样。当你把这些测试写成测试脚本后，你只需要简单地用鼠标点一下按钮就可以让系统自行检验了，而不用手工的去梳理并检查每一项功能。
 
-在产品市场尚未打开之前就来制定自动化测试机制有些言之过早。但是一旦你有一款感到满满，并且客户也很依赖的产品，就应该把这件事付诸实施了。
+在产品市场尚未打开之前就来制定自动化测试机制有些言之过早。但是一旦你有一款感到满意，并且客户也很依赖的产品，就应该把这件事付诸实施了。
 
-**持续性交付**
+#### 持续交付
 
-这是与自动化交付相关的工作，过去是需要人工完成。目的是当系统部分修改完成时可以迅速进行部署，并且短期内得到反馈。这使公司在其它竞争对手面前有很大的优势，尤其是在售后服务行业。
+这是与自动化交付相关的工作，过去是需要人工完成。目的是当系统部分修改完成时可以迅速进行部署，并且短期内得到反馈。这使公司在其它竞争对手面前有很大的优势，尤其是在客户服务行业。
 
 “比如说你每次部署系统时环境都很复杂。熵值无法有效控制，”Goulets 说。“我们曾经见过花 12 个小时甚至更多的时间来部署一个很大的集群环境。在这种情况下，你不会愿意频繁部署了。因为太折腾人了，你还会推迟系统功能上线的时间。这样，你将落后于其它公司并失去竞争力。”
 
 **在持续性改进的过程中常见的其它自动化任务包括：**
 
-*   在提交完成之后检查中断部分。
-*   在出现故障时进行回滚操作。
-*   审查自动化代码的质量。
-*   根据需求增加或减少服务器硬件资源。
-*   让开发，测试及生产环境配置简单易懂。
+* 在提交完成之后检查构建中断部分。
+* 在出现故障时进行回滚操作。
+* 自动化审查代码的质量。
+* 根据需求增加或减少服务器硬件资源。
+* 让开发、测试及生产环境配置简单易懂。
 
 举一个简单的例子，比如说一个客户提交了一个系统 Bug 报告。开发团队越高效解决并修复那个 Bug 越好。对于开发人员来说，修复 Bug 的挑战根本不是个事儿，这本来也是他们的强项，主要是系统设置上不够完善导致他们浪费太多的时间去处理 bug 以外的其它问题。
 
-使用持续改进的方式时，在你决定哪些工作应该让机器去做，哪些最好交给研发去完成的时候，你会变得更干脆了。如果机器更擅长，那就使其自动化完成。这样也能让研发愉快地去解决其它有挑战性的问题。同时客户也会很高兴地看到他们报怨的问题被快速处理了。你的待修复的未完成任务数减少了，之后你就可以把更多的时间投入到运用新的方法来提高公司产品质量上了。**这是创造科技财富的一种转变。**因为开发人员可以修复 bug 后立即发布新代码，这样他们就有时间和精力做更多事。
+使用持续改进的方式时，你要严肃地决定决定哪些工作应该让机器去做，哪些交给研发去完成更好。如果机器更擅长，那就使其自动化完成。这样也能让研发愉快地去解决其它有挑战性的问题。同时客户也会很高兴地看到他们报怨的问题被快速处理了。你的待修复的未完成任务数减少了，之后你就可以把更多的时间投入到运用新的方法来提高产品的质量上了。**这是创造科技财富的一种转变。**因为开发人员可以修复 bug 后立即发布新代码，这样他们就有时间和精力做更多事。
 
 “你必须时刻问自己，‘我应该如何为我们的客户改善产品功能？如何做得更好？如何让产品运行更高效？’不过还要不止于此。”Goulets 说。“一旦你回答完这些问题后，你就得询问下自己，如何自动去完成那些需要改善的功能。”
 
-**提升企业文化**
+#### 文化提升
 
-Corgibytes公司每天都会看到同样的问题：一家创业公司建立了一个对开发团队毫无影响的文化环境。公司 CEO 抱着双臂思考着为什么这样的环境对员工没多少改变。然而事实却是公司的企业文化对工作并不利。为了激励工程师，你必须全面地了解他们的工作环境。
+Corgibytes 公司每天都会看到同样的问题：一家创业公司建立了一个对开发团队毫无推动的文化环境。公司 CEO 抱着双臂思考着为什么这样的环境对员工没多少改变。然而事实却是公司的企业文化对工作并不利。为了激励工程师，你必须全面地了解他们的工作环境。
 
 为了证明这一点，Goulet 引用了作者 Robert Henry 说过的一段话：
 
 > **目的不是创造艺术，而是在最美妙的状态下让艺术应运而生。**
 
- “你们也要开始这样思考一下你们的软件，”她说。“你们的企业文件就类似状态。你们的目标是总能创造一个让艺术品应运而生的环境，这件艺术品就是你们公司的代码，一流的售后服务、充满幸福感的开发者、良好的市场、盈利能力等等。这些都息息相关。”
+“你们也要开始这样思考一下你们的软件，”她说。“你们的企业文件就类似那个状态。你们的目标就是创造一个让艺术品应运而生的环境，这件艺术品就是你们公司的代码、一流的售后服务、充满幸福感的开发者、良好的市场预期、盈利能力等等。这些都息息相关。”
 
-优先考虑公司的技术债务和遗留代码也是一种文化。那是真正为开发团队清除障碍，以制造影响的方法。同时，这也会让你将来有更多的时间精力去完成更重要的工作。如果你不从根本上改变固有的企业文化环境，你就不可能重构公司产品。改变对产品维护及现代化上投资的态度是开始实施变革的第一步，最理想情况是从公司的CEO开始转变。
+优先考虑解决公司的技术债务和遗留代码也是一种文化。那是真正为开发团队清除障碍，以制造影响的方法。同时，这也会让你将来有更多的时间精力去完成更重要的工作。如果你不从根本上改变固有的企业文化环境，你就不可能重构公司产品。改变对产品维护及现代化的投资的态度是开始实施变革的第一步，最理想情况是从公司的 CEO 开始自顶向下转变。
 
 以下是 Goulet 关于建立那种流态文化方面提出的建议：
 
-*   反对公司嘉奖那些加班到深夜的“英雄”。提倡高效率的工作方式。
-*   了解协同开发技术，比如 Woody Zuill 提出的[<ruby>合作编程<rt>Mob Programming</rt></ruby>][44]模式。
-*   遵从 4 个[现代敏捷开发][42] 原则：用户至上、实践及快速学习、把系统安全放在首位、持续交付价值。
-*   每周为研发提供项目外的职业发展时间。
-*   把[日工作记录][43]作为一种驱动开发团队主动解决问题的方式。
-*   把同情心放在第一位。Corgibytes 公司让员工参加 [Brene Brown 勇气工厂][40]的培训是非常有用的。
+* 反对公司嘉奖那些加班到深夜的“英雄”。提倡高效率的工作方式。
+* 了解协同开发技术，比如 Woody Zuill 提出的[<ruby>合作编程<rt>Mob Programming</rt></ruby>][44]模式。
+* 遵从 4 个[现代敏捷开发][42]原则：用户至上、实践及快速学习、把安全放在首位、持续交付价值。
+* 每周为研发人员提供项目外的职业发展时间。
+* 把[日工作记录][43]作为一种驱动开发团队主动解决问题的方式。
+* 把同情心放在第一位。Corgibytes 公司让员工参加 [Brene Brown 勇气工厂][40]的培训是非常有用的。
 
-“如果公司高管和投资者不支持这种升级方式，你得从客户服务的角度去说服他们，”Goulet 说，“告诉他们通过这次调整后，最终产品将如何给公司的大客户提高更好的体验。这是你能做的一个很有力的论点。”
+“如果公司高管和投资者不支持这种升级方式，你得从客户服务的角度去说服他们，”Goulet 说，“告诉他们通过这次调整后，最终产品将如何给公司的大多数客户提高更好的体验。这是你能做的一个很有力的论点。”
 
 ### 寻找最具天才的代码重构者
 
 整个行业都认为顶尖的工程师不愿意干修复遗留代码的工作。他们只想着去开发新的东西。大家都说把他们留在维护部门真是太浪费人才了。
 
-其实这些都是误解。如果你知道去哪里和如何找工程师，并为他们提供一个愉快的工作环境，你就可以找到技术非常精湛的工程师，来帮你解决那些最棘手的技术债务问题。
+**其实这些都是误解。如果你知道去哪里和如何找工程师，并为他们提供一个愉快的工作环境，你就可以找到技术非常精湛的工程师，来帮你解决那些最棘手的技术债务问题。**
 
-“每一次开会的时候，我们都会问现场的同事‘谁喜欢去干遗留代码的工作？’每次只有不到 10% 的同事会举手。”Goulet 说。“但是我跟这些人交流后，我发现这些工程师恰好是喜欢最具挑战性工作的人才。”
+“每次在会议上，我们都会问现场的同事‘谁喜欢去在遗留代码上工作？’每次只有不到 10% 的与会者会举手。”Goulet  说。“但是我跟这些人交流后，我发现这些工程师恰好是喜欢最具挑战性工作的人才。”
 
-有一位客户来寻求她的帮助，他们使用国产的数据库，没有任何相关文档，也没有一种有效的方法来弄清楚他们公司的产品架构。她称修理这种情况的一类工程师为“修正者”。在Corgibytes公司，她有一支这样的修正者团队由她支配，热衷于通过研究二进制代码来解决技术问题。
+有一位客户来寻求她的帮助，他们使用国产的数据库，没有任何相关文档，也没有一种有效的方法来弄清楚他们公司的产品架构。她称修理这种情况的一类工程师为“修正者”。在 Corgibytes 公司，她有一支这样的修正者团队由她支配，热衷于通过研究二进制代码来解决技术问题。
 
 ![](https://s3.amazonaws.com/marquee-test-akiaisur2rgicbmpehea/BeX5wWrESmCTaJYsuKhW_Screen%20Shot%202016-08-11%20at%209.17.04%20AM.png)
 
@@ -163,7 +164,7 @@ Corgibytes公司每天都会看到同样的问题：一家创业公司建立了
 
 但是随着时间的推移，她发现可以重新定义招聘流程来帮助她识别出更出色的候选人。比如说，她在应聘要求中写道，“公司 CEO 将会重新审查你的简历，因此请确保求职信中致意时不用写明性别。所有以‘尊敬的先生’或‘先生’开头的信件将会被当垃圾处理掉”。这些只是她的招聘初期策略。
 
-“我开始这么做是因为很多申请人把我当成一家软件公司的男性 CEO，这让我很厌烦，”Goulet 说。“所以，有一天我想我应该它当作应聘要求放到网上，看有多少人注意到这个问题。令我惊讶的是，这让我过滤掉一些不太严谨的申请人。还突显出了很多擅于从事遗留代码方面工作的人。”
+“我开始这么做是因为很多申请人把我当成男性，因为我是一家软件公司的男性 CEO，我必须是男性！？”Goulet 说。“所以，有一天我想我应该它当作应聘要求放到网上，看有多少人注意到这个问题。令我惊讶的是，这让我过滤掉一些不太严谨的申请人。还突显出了很多擅于从事遗留代码方面工作的人。”
 
 Goulet 想起一个应聘者发邮件给我说，“我查看了你们网站的代码（我喜欢这个网站，这也是我的工作）。你们的网站架构很奇特，好像是用 PHP 写的，但是你们却运行在用 Ruby 语言写的 Jekyll 下。我真的很好奇那是什么呢。”
 
@@ -177,9 +178,9 @@ Goulet 从她的设计师那里得知，原来，在 HTML、CSS 和 JavaScript 
 
 如果他们通过首轮面试，Goulet 将会让候选者阅读一篇 Arlo Belshee 写的文章“[<ruby>命名是一个过程<rt>Naming is a Process</rt></ruby>][46]”。它讲的是非常详细的处理遗留代码的的过程。她最经典的指导方法是：“阅读完这段代码并且告诉我，你是怎么理解的。”
 
-她将找出对问题的理解很深刻并且也愿意接受文章里提出的观点的候选者。这对于区分有深刻理解的候选者和仅仅想获得工作的候选者中来说，是极其有用的办法。她强烈要求候选者找出一段与他操作相关的代码，来证明他是充满激情的、有主见的及善于分析问题的人。
+她将找出对问题的理解很深刻并且也愿意接受文章里提出的观点的候选者。这对于区分有深刻理解的候选者和仅仅想获得工作的候选者来说，是极其有用的办法。她强烈要求候选者找出一段与他操作相关的代码，来证明他是充满激情的、有主见的及善于分析问题的人。
 
-最后，她会让候选者跟公司里当前的团队成员一起使用 [Exercism.io][45] 工具进行编程。这是一个开源项目，它允许开发者学习如何在不同的编程语言环境下使用一系列的测试驱动开发的练习进行编程。第一部分的协同编程课程允许候选者选择其中一种语言进行内建。下一个练习中，面试者可以选择一种语言进行编程。他们总能看到那些人处理异常的方法、随机应便的能力以及是否愿意承认某些自己不了解的技术。
+最后，她会让候选者跟公司里当前的团队成员一起使用 [Exercism.io][45] 工具进行编程。这是一个开源项目，它允许开发者学习如何在不同的编程语言环境下使用一系列的测试驱动开发的练习进行编程。结对编程课程的第一部分允许候选者选择其中一种语言来使用。下一个练习中，面试官可以选择一种语言进行编程。他们总能看到那些人处理异常的方法、随机应便的能力以及是否愿意承认某些自己不了解的技术。
 
 “当一个人真正的从执业者转变为大师的时候，他会毫不犹豫的承认自己不知道的东西，”Goulet说。
 
@@ -189,30 +190,28 @@ Goulet 从她的设计师那里得知，原来，在 HTML、CSS 和 JavaScript 
 
 如果一个有天赋的修正者在眼前，Goulet 懂得如何让他走向成功。下面是如何让这种类型的开发者感到幸福及高效工作的一些方式：
 
-*   给他们高度的自主权。把问题解释清楚，然后安排他们去完成，但是永不命令他们应该如何去解决问题。
-*   如果他们要求升级他们的电脑配置和相关工具，尽管去满足他们。他们明白什么样的需求才能最大限度地提高工作效率。
-*   帮助他们[避免更换任务][39]。他们喜欢全身心投入到某一个任务直至完成。
+* 给他们高度的自主权。把问题解释清楚，然后安排他们去完成，但是永不命令他们应该如何去解决问题。
+* 如果他们要求升级他们的电脑配置和相关工具，尽管去满足他们。他们明白什么样的需求才能最大限度地提高工作效率。
+* 帮助他们[避免分心][39]。他们喜欢全身心投入到某一个任务直至完成。
 
-总之，这些方法已经帮助 Corgibytes 公司培养出 20 几位对遗留代码充满激情的专业开发者。
+总之，这些方法已经帮助 Corgibytes 公司培养出二十几位对遗留代码充满激情的专业开发者。
 
 ### 稳定期没什么不好
 
-大多数创业公司都都不想跳过他们的成长期。一些公司甚至认为成长期应该是永无止境的。而且，他们觉得也没这个必要，即便他们已经进入到了下一个阶段：稳定期。完全进入到稳定期意味着你拥有人力资源及管理方法来创造技术财富，同时根据优先权适当支出。
+大多数创业公司都都不想跳过他们的成长期。一些公司甚至认为成长期应该是永无止境的。而且，他们觉得也没这个必要跳过成长期，即便他们已经进入到了下一个阶段：稳定期。**完全进入到稳定期意味着你拥有人力资源及管理方法来创造技术财富，同时根据优先权适当支出。**
 
-“在成长期和稳定期之间有个转折点，就是维护人员必须要足够壮大，并且相对于专注新功能的产品开发人员，你开始更公平的对待维护人员，”Goulet说。“你们公司的产品开发完成了。现在你得让他们更加稳定地运行。”
+“在成长期和稳定期之间有个转折点，就是维护人员必须要足够壮大，并且相对于专注新功能的产品开发人员，你开始更公平的对待维护人员，”Goulet 说。“你们公司的产品开发完成了。现在你得让他们更加稳定地运行。”
 
 这就意味着要把公司更多的预算分配到产品维护及现代化方面。“你不应该把产品维护当作是一个不值得关注的项目，”她说。“这必须成为你们公司固有的一种企业文化 —— 这将帮助你们公司将来取得更大的成功。“
 
-最终，你通过这些努力创建的技术财富，将会为你的团队带来一大批全新的开发者：他们就像侦查兵一样，有充足的时间和资源去探索新的领域，挖掘新客户资源并且给公司创造更多的机遇。当你们在新的市场领域做得更广泛并且不断发展得更好 —— 那么你们公司已经真正地进入到繁荣发展的状态了。
+最终，你通过这些努力创建的技术财富，将会为你的团队带来一大批全新的开发者：他们就像侦查兵一样，有充足的时间和资源去探索新的领域，挖掘新客户资源并且给公司创造更多的机遇。当你们在新的市场领域做得更广泛并且不断取得进展 —— 那么你们公司已经真正地进入到繁荣发展的状态了。
 
 --------------------------------------------------------------------------------
 
 via: http://firstround.com/review/forget-technical-debt-heres-how-to-build-technical-wealth/
 
 作者：[http://firstround.com/][a]
-
 译者：[rusking](https://github.com/rusking)
-
 校对：[jasminepeng](https://github.com/jasminepeng)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/published/20160929 Getting Started with HTTP2 - Part 2.md b/published/20160929 Getting Started with HTTP2 - Part 2.md
new file mode 100644
index 0000000000..c7f566a0da
--- /dev/null
+++ b/published/20160929 Getting Started with HTTP2 - Part 2.md	
@@ -0,0 +1,181 @@
+初识 HTTP/2（二） 
+============================================================
+ ![](https://static.viget.com/_284x284_crop_center-center/ben-t-http-blog-thumb-01_360.png?mtime=20160928234634) 
+
+> HTTP/2 时代的开启为前端开发带来了最佳体验。 
+
+如果你对 HTTP/2 有所了解，那你可能用过它，或者至少想过怎样能把它融入你的项目中。尽管有很多关于它如何改变工作流程，提高 Web 速度和效率等方面的猜想，但最佳使用方式还没有定下来。这里我想讲的就是我在之前的项目中所发现的 HTTP/2  的最佳实践。
+
+如果你还不确定什么是 HTTP/2，或者为什么它能改进你的工作，可以先看看我[介绍背景方面的第一篇文章][4]。 
+
+记住：开始之前，我要告诉你，尽管你的浏览器可能支持 HTTP/2，但你的服务器可能不支持。检查你的主机托管服务，看看他们是否提供 HTTP/2 的支持。否则你可能要建立你自己的服务器。这篇文章并不会涉及这方面该如何做，但你可以查看 [http2 github][5] 页面，找一找这方面的工具。 
+
+### 🙏 [热身工作]
+
+首先组织好你的文件。看一看下面的文件树结构，作为组织你的样式表的起点： 
+
+```
+/styles
+|── /setup
+|     /* 变量、混入（minin）和函数 */
+|── /global
+|     /* 能放在任何组件和部分中的可重用组件 */
+|── /components
+|     /* 特殊组件和部分 */
+|── setup.scss // setup 样式索引
+|── global.scss // 全局样式索引
+```
+
+这会把你的样式分到三个目录下面：`setup`、`global` 和 `componenets`。接下来我会说明这些目录对你的项目有什么用。 
+
+### setup 目录
+
+`setup` 目录保存所有的变量、函数、混入（minin）以及一些正常编译需要的其它文件的定义。要想让这个目录物尽其用，把这个目录下所有内容导入到 `setup.scss` 文件中是个很不错的主意，这样这个文件就会像下面所展示的一样：
+
+```
+/* setup.scss */
+
+/* 变量 */
+@import "setup/variables/colors";
+
+/* 混入 */
+@import "setup/mixins/color";
+
+/* 函数 */
+@import "setup/functions/color";
+
+... 等等
+```
+
+现在我们能快速引用这个站点中的所有定义，应该确保在所有的样式文件顶部包含我们这里创建的这个文件。
+
+### global 目录
+
+接下来的目录，global 目录，应该包含可在当前站点的多个部分或者每一个页面中重复使用的组件。像按钮、文本、主要样式，以及你的浏览器默认设置应该放在这里。我不建议把页面的头部或底部样式放在这儿，因为某些项目中没有头部，或者不同页面头部不同。而且，底部永远是页面的最后一个元素，所以在用户加载完当前站点的其它东西前，不必过分优先考虑加载底部样式。
+
+记住，如果没有那些定义在 setup 目录下的东西，你的 global 样式就可能没有作用，你的 global 文件看起来应该像这样：
+
+```
+/* global.scss */
+
+/* 应用定义 */
+@import "setup";
+
+/* 全局样式 */
+@import "global/reset";
+@import "global/buttons";
+@import "global/typography";
+@import "global/grid";
+
+... 等等
+```
+
+注意，首先要做的就是导入 setup 样式。这样的话，之后的文件都可以引用这个样式里的定义。
+
+由于站点内的每个页面都需要 global 样式，我们可以用典型的方式，在 `<head>` 标签内用一个 `<link>` 标签来加载它们。你所看到的将是一个十分小巧的 css 文件，或者说理论上小巧的，这取决于你需要多少全局样式。
+
+### 最后，你的组件
+
+注意，我没有在上述目录树中的 components 目录里包含索引文件。这是 HTTP/2 所带来的效用。直到现在，我们已经按照标准步骤构建了一个典型的站点，保持相当简单的结构，仅选择全局化那些最重要的样式。组件充当它们自己的索引文件。
+
+大多数开发者有独特的组织组件的方式，因此我并不想影响你的策略。但是，你所有的组件看起来应该像这样：
+
+```
+/* header.scss */
+
+/* 应用定义 */
+@import "../setup";
+
+header {
+  // 样式
+}
+
+... 等等
+```
+
+同样的，你要把 setup 样式包含进来，确保所有东西在编译时都定义过。除了编译这些文件，以及可能要把他们放到 `/assets` 目录，以便很容易找到模版，对这些文件你不必 <ruby>拼接<rt>concatenate</rt></ruby>、<ruby>压缩<rt>minify</rt></ruby> 它们或者改变什么。
+
+现在样式表已经差不多了，构建站点应该很简单。
+
+### 构建组件
+
+或许对于模板语言你有自己的选择，这取决于你的项目，有可能是 Twig、Rails、Jade 或者 Handlebars。我认为考虑组件最好的方式是它是否有自己的模版文件，它该有个与名字相应的样式。这样你的项目中，模版和样式的比例就会是个不错的 1:1 的比例，而且你知道哪个文件有哪些东西，哪里有哪个文件，因为它们的命名是有规律的。
+
+现在它正步入正轨，用好 HTTP/2 的多种功能十分简单，让我们做一个模版：
+
+```
+{# header.html #}
+
+{# compiled header styles #}
+<link href="assets/components/header.css" rel="stylesheet" media="all">
+
+<header>
+  <h1>This Awesome HTTP/2 Site</h1>
+  ... 等等
+```
+
+非常好！在模版里你可能有更简单的方式链接到资源，但这里显示你所要做的仅是在开始构建时，在模版文件中链接一个小小的头部样式。这将允许你的站点仅仅加载特定资源到任意给定页面的组件中，而且，能够设定页面从头到脚的组件的优先级。
+
+### 结合在一起
+
+现在所有的组件都有结构，浏览器将会类似以下方式来渲染它们：
+
+```
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" media="all" href="/assets/global.css">
+  </head>
+  <body>
+
+    <link rel="stylesheet" media="all" href="/assets/components/header.css">
+    <header>
+      ... etc
+    </header>
+
+    <link rel="stylesheet" media="all" href="/assets/components/title.css">
+    <section class="title">
+      ... etc
+    </section>
+
+    <link rel="stylesheet" media="all" href="/assets/components/image-component.css">
+    <section class="image-component">
+      ... etc
+    </section>
+
+    <link rel="stylesheet" media="all" href="/assets/components/text-component.css">
+    <section class="text-component">
+      ... etc
+    </section>
+
+    <link rel="stylesheet" media="all" href="/assets/components/footer.css">
+    <footer>
+      ... etc
+    </footer>
+
+  </body>
+</html>
+```
+
+这是一个高级别方法，但你的项目中可能有调整的更细致的组件。例如，在头部的 `<nav>` 组件可能要加载自己的样式表。尽你所能地自由发挥，让组件更有作用 - HTTP/2 不会因这些需求而阻碍你！
+
+### 结论
+
+这只是一个关于如何在前端用 HTTP/2 构建项目的基本介绍，仅是皮毛而已。你可能注意到我上面所用的方法有的还有改进的空间。请不吝赐教！正如我在第一篇文章中所说的，HTTP/2 可能颠覆自 HTTP/1 以来我们所熟知的某些标准，所以要慎重思考和实践，以便高效使用 HTTP/2 的开发环境。
+
+--------------------------------------------------------------------------------
+
+via: https://www.viget.com/articles/getting-started-with-http-2-part-2
+
+作者：[Ben][a]
+译者：[GitFuture](https://github.com/GitFuture)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.viget.com/about/team/btinsley
+[1]:https://twitter.com/home?status=Firmly%20planting%20a%20flag%20in%20the%20sand%20for%20HTTP%2F2%20best%20practices%20for%20front%20end%20development.%20https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
+[2]:https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
+[3]:http://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
+[4]:https://linux.cn/article-8111-1.html
+[5]:https://github.com/http2/http2-spec/wiki/Tools
diff --git a/translated/tech/20161005  GETTING STARTED WITH ANSIBLE.md b/published/20161005  GETTING STARTED WITH ANSIBLE.md
similarity index 54%
rename from translated/tech/20161005  GETTING STARTED WITH ANSIBLE.md
rename to published/20161005  GETTING STARTED WITH ANSIBLE.md
index e118e56fa4..c3a92075d1 100644
--- a/translated/tech/20161005  GETTING STARTED WITH ANSIBLE.md	
+++ b/published/20161005  GETTING STARTED WITH ANSIBLE.md	
@@ -1,29 +1,29 @@
-开始使用Ansible
+Ansible 起步指南
 ==========
 
-
-这是一篇关于 Ansible 的课程，你也可以用来作小项目的模板，或者继续深入这个工具。在本指南的最后，你将了解足够的自动化服务器配置、部署等。
+这是一篇关于 Ansible 的速成课程，你可以用作小项目的模板，或者帮你深入了解这个神奇的工具。阅读了本指南之后，你将对自动化服务器配置、部署等有足够的了解。
 
 ### Ansible 是什么，为什么你该了解？
 
-Ansible是一个简单的配置管理系统。你只需要访问你的服务器或设备的ssh。它也不同于其他工具，因为它使用push的方式，而不是像chef那样使用pull的方式。你可以将代码部署到任意数量的服务器上，配置网络设备或在基础架构中自动执行任何操作。
+Ansible 简单的说是一个配置管理系统（configuration management system）。你只需要可以使用 ssh 访问你的服务器或设备就行。它也不同于其他工具，因为它使用推送的方式，而不是像 puppet 或 chef 那样使用拉取的方式。你可以将代码部署到任意数量的服务器上，配置网络设备或在基础架构中自动执行任何操作。
 
-#### 要求
+### 前置要求
 
-假设你使用 Mac 或 Linux 作为你的工作站，Ubuntu Trusty为你的服务器，并有一些安装软件包的经验。此外，你的计算机上将需要以下软件。所以，如果你还没有它们，请先安装：
+假设你使用 Mac 或 Linux 作为你的工作站，Ubuntu Trusty 作为你的服务器，并有一些安装软件包的经验。此外，你的计算机上将需要以下软件。所以，如果你还没有它们，请先安装：
 
-- Virtualbox
-- Vagrant
-- Mac 用户: Homebrew
+- [Virtualbox](https://www.virtualbox.org/)
+- [Vagrant](https://www.vagrantup.com/downloads.html)
+- Mac 用户：[Homebrew](http://brew.sh/)
 
-#### 情景
-我们将模拟2个连接到MySQL数据库的Web应用程序服务器。Web应用程序使用Rails 5和Puma。
+### 情景
+
+我们将模拟 2 个连接到 MySQL 数据库的 Web 应用程序服务器。Web 应用程序使用 Rails 5 和 Puma。
 
 ### 准备
 
 #### Vagrantfile
 
-为这个项目创建一个文件夹并将下面的内容保存到：Vagrantfile
+为这个项目创建一个文件夹，并将下面的内容保存到名为 `Vagrantfile` 的文件。
 
 ```
 VMs = [
@@ -46,9 +46,9 @@ Vagrant.configure(2) do |config|
 end
 ```
 
-### 配置你的虚拟网络
+#### 配置你的虚拟网络
 
-我们希望我们的虚拟机能互相交互，但不要让流量流出到真实的网络，所以我们将在Virtualbox中创建一个仅在主机的网络适配器。
+我们希望我们的虚拟机能互相交互，但不要让流量流出到真实的网络，所以我们将在 Virtualbox 中创建一个仅主机（HOST-Only）的网络适配器。
 
 1. 打开 Virtualbox
 2. 转到 Preferences
@@ -56,18 +56,18 @@ end
 4. 单击 Host-Only
 5. 单击添加网络
 6. 单击 Adapter
-7. 将IPv4设置为 10.1.1.1，IPv4网络掩码：255.255.255.0
+7. 将 IPv4 设置为 `10.1.1.1`，IPv4 网络掩码：`255.255.255.0`
 8. 单击 “OK”
 
 #### 测试虚拟机及虚拟网络
 
-在终端中，在具有Vagrantfile的目录中，输入下面的命令：
+在终端中，在存放 `Vagrantfile` 的项目目录中，输入下面的命令：
 
 ```
 vagrant up
 ```
 
-这回创建你的虚拟机，因此会花费一会时间。输入下面的命令并验证输出来检查是否已经工作：
+它会创建你的虚拟机，因此会花费一会时间。输入下面的命令并验证输出内容以检查是否已经工作：
 
 ```
 $ vagrant status
@@ -82,8 +82,7 @@ above with their current state. For more information about a specific
 VM, run `vagrant status NAME`.
 ```
 
-现在使用用户名和密码为vagrant，Vagrantfile中的IP登录其中一台虚拟机，这将验证虚拟机并将它们的密钥添加到你的已知主机文件中。
-
+现在使用 `vagrant` 的用户名和密码 ，按 `Vagrantfile` 中的 IP 登录其中一台虚拟机，这将验证虚拟机并将它们的密钥添加到你的已知主机（`known_hosts`）文件中。
 
 ```
 ssh vagrant@10.1.1.11 # password is `vagrant`
@@ -107,16 +106,16 @@ $ brew install ansible
 $ sudo apt install ansible
 ```
 
-确保你使用了ansible最近的版本 2.1 或者更高的版本：
+确保你使用了ansible 最近的版本 2.1 或者更高的版本：
 
 ```
 $ ansible --version
 ansible 2.1.1.0
 ```
 
-### inventory
+### 清单
 
-Ansible 使用 inventory 来了解要使用的服务器，以及如何将它们分组以并行执行任务。让我们为这个项目创建我们的 inventory，并将 inventory 放在与 Vagrantfile 相同的文件夹中：
+Ansible 使用清单文件来了解要使用的服务器，以及如何将它们分组以并行执行任务。让我们为这个项目创建我们的清单文件 `inventory`，并将它放在与 `Vagrantfile` 相同的文件夹中：
 
 ```
 [all:children]
@@ -135,21 +134,20 @@ web2 ansible_host=10.1.1.12
 dbserver ansible_host=10.1.1.21
 ```
 
-- `[all：children]` 定义一个组（all）的组
-- `[all：vars]` 定义属于组all的变量
-- `[webs]` 定义一个组，就像[dbs]
-- 文件的其余部分只是主机的声明，带有它们的名称和IP
+- `[all：children]` 定义一个组的组（`all`）
+- `[all：vars]` 定义属于组 `all` 的变量
+- `[webs]` 定义一个组，就像 `[db]` 一样
+- 文件的其余部分只是主机的声明，带有它们的名称和 IP
 - 空行表示声明结束
 
-现在我们有了一个inventory，我们可以从命令行开始使用 ansible，指定一个主机或一个组来执行命令。以下是检查与服务器的连接的命令示例：
+现在我们有了一个清单，我们可以从命令行开始使用 ansible，指定一个主机或一个组来执行命令。以下是检查与服务器的连接的命令示例：
 
 ```
 $ ansible -i inventory all -m ping
 ```
-
-- `-i` 指定inventory文件
+- `-i` 指定清单文件
 - `all` 指定要操作的服务器或服务器组
-- `-m' 指定一个ansible模块，在这种情况下为ping
+- `-m' 指定一个 ansible 模块，在这种情况下为 `ping`
 
 下面是命令输出：
 
@@ -168,9 +166,9 @@ web2 | SUCCESS => {
 }
 ```
 
-服务器以不同的顺序响应，这只取决于谁先响应，但是这个没有相关，因为ansible独立保持每台服务器的状态。
+服务器以不同的顺序响应，这只取决于谁先响应，但是这个没有关系，因为 ansible 独立保持每台服务器的状态。
 
-你也可以使用另外一个选项运行任何命令：
+你也可以使用另外一个选项来运行任何命令：
 
 - `-a <command>`
 
@@ -195,11 +193,11 @@ Filesystem      Size  Used Avail Use% Mounted on
 /dev/sda1        40G  1.4G   37G   4% /
 ```
 
-### Playbook
+### 剧本
 
-Playbook 只是 YAML 文件，它将inventory中的服务器组与命令关联。ansible的正确用法是任务，它可以是期望的状态，shell 命令或许多其他选项。有关 ansible 可做的所有事情列表，可以查看所有模块的列表。
+剧本（playbook）只是个 YAML 文件，它将清单文件中的服务器组与命令关联。在 ansible 中的对于关键字是 `tasks`，它可以是一个预期的状态、shell 命令或许多其它的选项。有关 ansible 可做的所有事情列表，可以查看[所有模块的列表](http://docs.ansible.com/ansible/list_of_all_modules.html)。
 
-下面是一个运行 shell 命令的 playbook 示例，将其保存为 playbook1.yml：
+下面是一个运行 shell 命令的剧本示例，将其保存为 `playbook1.yml`：
 
 ```
 ---
@@ -211,8 +209,8 @@ Playbook 只是 YAML 文件，它将inventory中的服务器组与命令关联
 - `---` 是 YAML 文件的开始
 - ` - hosts`：指定要使用的组
 - `tasks`：标记任务列表的开始
-- ` - shell`：指定使用shell模块的第一个任务
-- 记住：YAML 需要缩进，确保你始终遵循playbook中的正确结构
+- ` - shell`：指定第一个任务使用 [shell] (http://docs.ansible.com/ansible/shell_module.html) 模块
+- **记住：YAML 需要缩进结构，确保你始终遵循剧本中的正确结构**
 
 用下面的命令运行它：
 
@@ -237,14 +235,13 @@ web1                       : ok=2    changed=1    unreachable=0    failed=0
 web2                       : ok=2    changed=1    unreachable=0    failed=0
 ```
 
-正如你所见，ansible 运行了 2 个任务，而不是只有 playbook 中的一个。TASK [setup]是一个隐式任务，它会首先运行以捕获服务器的信息，如主机名、IP、分布和更多详细信息，然后可以使用该信息运行条件任务。
+正如你所见，ansible 运行了 2 个任务，而不是只有剧本中的一个。`TASK [setup]` 是一个隐式任务，它会首先运行以捕获服务器的信息，如主机名、IP、发行版和更多详细信息，然后可以使用这些信息运行条件任务。
 
-还有一个最后的PLAY RECAP，其中 ansible 显示了有多少个运行的任务以及每个对应的状态。在我们的例子中，因为我们运行了一个 shell 命令，ansible 不知道结果的状态，它被认为是 changed。
+还有最后的 `PLAY RECAP`，其中 ansible 显示了运行了多少个任务以及每个对应的状态。在我们的例子中，因为我们运行了一个 shell 命令，ansible 不知道结果的状态，它被认为是 `changed`。
 
+#### 安装软件
 
-### 安装软件
-
-我们将使用 apt 在我们的服务器上安装软件，因为我们需要root，所以我们必须使用 become 语句，将这个内容保存在 playbook2.yml 中并运行它（ansible-playbook playbook2.yml）：
+我们将使用 [apt](http://docs.ansible.com/ansible/apt_module.html) 在我们的服务器上安装软件，因为我们需要 root 权限，所以我们必须使用 `become` 语句，将这个内容保存在 `playbook2.yml` 中并运行它（`ansible-playbook playbook2.yml`）：
 
 ```
 ---
@@ -255,7 +252,7 @@ web2                       : ok=2    changed=1    unreachable=0    failed=0
     - apt: name=git state=present
 ```
 
-有可以应用于 ansible 中所有模块的语句; 一个是 name 语句，让我们可以打印关于正在执行的任务的更具描述性的文本。要使用它，任务还是一样，但是添加 name 字段：描述性文本作为第一行，所以我们以前的文本将是：
+有一些语句可以应用于 ansible 中所有模块；一个是 `name` 语句，可以让我们输出关于正在执行的任务的更具描述性的文本。要使用它，保持任务内容一样，但是添加 `name ：描述性文本` 作为第一行，所以我们以前的文本将改成：
 
 ```
 ---
@@ -267,9 +264,9 @@ web2                       : ok=2    changed=1    unreachable=0    failed=0
       apt: name=git state=present
 ```
 
-### 使用 `with_items`
+#### 使用 `with_items`
 
-当你在处理一个项目列表、要安装的包、要创建的文件等时可以用 ansible 提供的 with_items。下面是我们如何在 playbook3.yml 中使用它，同时添加一些我们已经知道的其他语句：
+当你要处理一个列表时，比如要安装的项目和软件包、要创建的文件，可以用 ansible 提供的 `with_items`。下面是我们如何在 `playbook3.yml` 中使用它，同时添加一些我们已经知道的其他语句：
 
 ```
 ---
@@ -287,9 +284,9 @@ web2                       : ok=2    changed=1    unreachable=0    failed=0
         - python-software-properties
 ```
 
-### 使用 `template` 和 `vars`
+#### 使用 `template` 和 `vars`
 
-`vars` 是一个定义变量语句，可以在 `task` 语句或 `template` 文件中使用。 Jinja2 是 Ansible 中使用的模板引擎，但是关于它你不需要学习很多。在你的 playbook 中定义变量，如下所示：
+`vars` 是一个定义变量语句，可以在 `task` 语句或 `template` 文件中使用。 [Jinja2](http://jinja.pocoo.org/docs/dev/) 是 Ansible 中使用的模板引擎，但是关于它你不需要学习很多。在你的剧本中定义变量，如下所示：
 
 ```
 ---
@@ -302,7 +299,7 @@ web2                       : ok=2    changed=1    unreachable=0    failed=0
       template: src=myconfig.j2 dest={{path_to_vault}}/app.conf
 ```
 
-正如你看到的，我可以使用 {{path_to_vault}} 作为 playbook 的一部分，但也因为我使用了模板语句，我可以使用 myconfig.j2 中的任何变量，它必须存在一个名为 templates 的子文件夹中。你项目树应该如下所示：
+正如你看到的，我可以使用 `{{path_to_vault}}` 作为剧本的一部分，但也因为我使用了 `template`语句，我可以使用 `myconfig.j2` 中的任何变量，该文件必须存在一个名为 `templates` 的子文件夹中。你项目树应该如下所示：
 
 ```
 ├── Vagrantfile
@@ -313,15 +310,15 @@ web2                       : ok=2    changed=1    unreachable=0    failed=0
     └── myconfig.j2
 ```
 
-当 ansible 找到一个模板语句后它会在模板文件夹内查找，并将把被“{{”和“}}”括起来的变量展开来。
+当 ansible 找到一个 `template` 语句后它会在  `templates` 文件夹内查找，并将把被 `{{` 和 `}}` 括起来的变量展开来。
 
-示例模板:
+示例模板：
 
 ```
 this is just an example vault_dir: {{path_to_vault}} secret_password: {{secret_key}}
 ```
 
-即使你不扩展变量你也可以使用`模板`。考虑到将来会添加所以我先做了。比如创建一个 `hosts.j2` 模板并加入主机名和IP。
+即使你不扩展变量你也可以使用  `template`。考虑到将来会添加所以我先做了。比如创建一个 `hosts.j2` 模板并加入主机名和 IP。
 
 ```
 10.1.1.11 web1
@@ -329,31 +326,31 @@ this is just an example vault_dir: {{path_to_vault}} secret_password: {{secret_k
 10.1.1.21 dbserver
 ```
 
-这里要求像这样的语句：
+这里要用像这样的语句：
 
 ```
   -  name: Installing the hosts file in all servers
      template: src=hosts.j2 dest=/etc/hosts mode=644
 ```
 
-### shell 命令
+#### shell 命令
 
-你应该总是尝试使用模块，因为 Ansible 可以跟踪任务的状态，并避免不必要的重复，但有时 shell 命令是不可避免的。 对于这些情况，Ansible 提供两个选项：
+你应该尽量使用模块，因为 Ansible 可以跟踪任务的状态，并避免不必要的重复，但有时 shell 命令是不可避免的。 对于这些情况，Ansible 提供两个选项：
 
-- command：直接运行一个命令，没有环境变量或重定向（|，<，>等）
-- shell：运行 /bin/sh 并展开变量和重定向
+- [command](http://docs.ansible.com/ansible/command_module.html)：直接运行一个命令，没有环境变量或重定向（`|`，`<`，`>` 等）
+- [shell](http://docs.ansible.com/ansible/shell_module.html)：运行 `/bin/sh` 并展开变量和支持重定向
 
 #### 其他有用的模块
 
-- apt_repository - Debian家族中添加/删除包仓库
-- yum_repository - RedHat系列中添加/删除包仓库
-- service - 启动/停止/重新启动/启用/禁用服务
-- git - 从git服务器部署代码
-- unarchive - 从Web或本地源解开软件包
+- [apt_repository](http://docs.ansible.com/ansible/apt_repository_module.html) - 在 Debian 系的发行版中添加/删除包仓库
+- [yum_repository](https://docs.ansible.com/ansible/yum_repository_module.html) - 在 RedHat 系的发行版中添加/删除包仓库
+- [service](http://docs.ansible.com/ansible/service_module.html) - 启动/停止/重新启动/启用/禁用服务
+- [git](http://docs.ansible.com/ansible/git_module.html) - 从 git 服务器部署代码
+- [unarchive](http://docs.ansible.com/ansible/unarchive_module.html) - 从 Web 或本地源解开软件包
 
 #### 只在一台服务器中运行任务
 
-Rails 使用 `migrations` 来逐步更改数据库，但由于你有多个应用程序服务器，因此这些迁移不能被分配为组任务，而只需要一个服务器来运行迁移。在这种情况下，当使用 run_once 时，run_once 将分派任务到一个服务器，并继续下一个任务，直到这个任务完成。你只需要在你的任务中设置 run_once：true。
+Rails 使用 [migrations](http://edgeguides.rubyonrails.org/active_record_migrations.html) 来逐步更改数据库，但由于你有多个应用程序服务器，因此这些迁移任务不能被分配为组任务，而我们只需要一个服务器来运行迁移。在这种情况下，当使用 `run_once` 时，`run_once` 将分派任务到一个服务器，并直到这个任务完成继续下一个任务。你只需要在你的任务中设置 `run_once：true`。
 
 ```
     - name: 'Run db:migrate'
@@ -361,9 +358,9 @@ Rails 使用 `migrations` 来逐步更改数据库，但由于你有多个应用
       run_once: true
 ```
 
-##### 会失败的任务
+#### 会失败的任务
 
-通过指定 ignore_errors：true，你可以运行可能会失败但不影响剩余 playbook 完成的任务。这是非常有用的，例如，当删除最初不存在的日志文件时。
+通过指定 `ignore_errors：true`，你可以运行可能会失败的任务，但不会影响剧本中剩余的任务完成。这是非常有用的，例如，当删除最初并不存在的日志文件时。
 
 ```
     - name: 'Delete logs'
@@ -371,11 +368,11 @@ Rails 使用 `migrations` 来逐步更改数据库，但由于你有多个应用
       ignore_errors: true
 ```
 
-##### 放到一起
+### 放到一起
 
 现在用我们先前学到的，这里是每个文件的最终版：
 
-Vagrantfile：
+`Vagrantfile`：
 
 ```
 VMs = [
@@ -398,7 +395,7 @@ Vagrant.configure(2) do |config|
 end
 ```
 
-inventory:
+`inventory`：
 
 ```
 [all:children]
@@ -417,7 +414,7 @@ web2 ansible_host=10.1.1.12
 dbserver ansible_host=10.1.1.21
 ```
 
-templates/hosts.j2:
+`templates/hosts.j2`:
 
 ```
 10.1.1.11 web1
@@ -425,7 +422,7 @@ templates/hosts.j2:
 10.1.1.21 dbserver
 ```
 
-templates/my.cnf.j2:
+`templates/my.cnf.j2`：
 
 ```
 [client]
@@ -470,9 +467,11 @@ max_allowed_packet  = 16M
 key_buffer      = 16M
 
 !includedir /etc/mysql/conf.d/
+```
 
-final-playbook.yml:
+`final-playbook.yml`：
 
+```
 - hosts: all
   become_user: root
   become: true
@@ -551,7 +550,7 @@ final-playbook.yml:
       shell: cd {{appdir}};rails server -b 0.0.0.0 -p 80 --pid /run/puma.pid -d
 ```
 
-### 打开你的环境
+### 放在你的环境中
 
 将这些文件放在相同的目录，运行下面的命令打开你的开发环境：
 
@@ -560,9 +559,9 @@ vagrant up
 ansible-playbook -i inventory final-playbook.yml
 ```
 
-#### 部署新的代码
+### 部署新的代码
 
-确保修改了代码并push到了仓库中。接下来，确保你git语句中有正确的分支：
+确保修改了代码并推送到了仓库中。接下来，确保你 git 语句中使用了正确的分支：
 
 ```
     - name: 'Clone app repo'
@@ -573,19 +572,19 @@ ansible-playbook -i inventory final-playbook.yml
            force=yes
 ```
 
-作为一个例子，你可以在master上修改version字段，再次运行 playbook：
+作为一个例子，你可以修改 `version` 字段为 `master`，再次运行剧本：
 
 ```
 ansible-playbook -i inventory final-playbook.yml
 ```
 
-检查所有的 web 服务器上的页面是否已更改：`http：// 10.1.1.11` 或 `http：// 10.1.1.12`。将其更改为 `version = staging` 并重新运行 playbook 并再次检查页面。
+检查所有的 web 服务器上的页面是否已更改：`http://10.1.1.11` 或 `http://10.1.1.12`。将其更改为 `version = staging` 并重新运行剧本并再次检查页面。
 
-你还可以创建只包含与部署相关的任务的替代 playbook，以便其运行更快。
+你还可以创建只包含与部署相关的任务的替代剧本，以便其运行更快。
 
 ### 接下来是什么 ？！
 
-这只是可以做的很小一部分。我们没有接触角色、过滤器、调试器等许多其他很棒的功能，但我希望它给了你一个良好的开始！所以，请继续学习并使用它。如果你有任何问题，你可以在 twitter 或评论栏联系我，让我知道你还想知道哪些关于 ansible 的东西！
+这只是可以做的很小一部分。我们没有接触角色（role）、过滤器（filter）、调试等许多其他很棒的功能，但我希望它给了你一个良好的开始！所以，请继续学习并使用它。如果你有任何问题，你可以在 [twitter](https://twitter.com/c0d5x) 或评论栏联系我，让我知道你还想知道哪些关于 ansible 的东西！
 
 
 --------------------------------------------------------------------------------
@@ -593,10 +592,8 @@ ansible-playbook -i inventory final-playbook.yml
 via: https://gorillalogic.com/blog/getting-started-with-ansible/?utm_source=webopsweekly&utm_medium=email
 
 作者：[JOSE HIDALGO][a]
-
 译者：[geekpi](https://github.com/geekpi)
-
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
 
diff --git a/published/20161012 Introduction to FirewallD on CentOS.md b/published/20161012 Introduction to FirewallD on CentOS.md
new file mode 100644
index 0000000000..6f81f890f1
--- /dev/null
+++ b/published/20161012 Introduction to FirewallD on CentOS.md	
@@ -0,0 +1,347 @@
+CentOS 上的 FirewallD 简明指南
+============================================================
+
+[FirewallD][4] 是 iptables 的前端控制器，用于实现持久的网络流量规则。它提供命令行和图形界面，在大多数 Linux 发行版的仓库中都有。与直接控制 iptables 相比，使用 FirewallD 有两个主要区别：
+
+1. FirewallD 使用区域和服务而不是链式规则。
+2. 它动态管理规则集，允许更新规则而不破坏现有会话和连接。
+
+> FirewallD 是 iptables 的一个封装，可以让你更容易地管理 iptables 规则 - 它并*不是* iptables 的替代品。虽然 iptables 命令仍可用于 FirewallD，但建议使用 FirewallD 时仅使用 FirewallD 命令。
+
+本指南将向您介绍 FirewallD 的区域和服务的概念，以及一些基本的配置步骤。
+
+### 安装与管理 FirewallD
+
+CentOS 7 和 Fedora 20+ 已经包含了 FirewallD，但是默认没有激活。可以像其它的 systemd 单元那样控制它。
+
+1、 启动服务，并在系统引导时启动该服务：
+
+```
+sudo systemctl start firewalld
+sudo systemctl enable firewalld
+```
+
+要停止并禁用：
+
+```
+sudo systemctl stop firewalld
+sudo systemctl disable firewalld
+```
+
+2、 检查防火墙状态。输出应该是 `running` 或者 `not running`。
+
+```
+sudo firewall-cmd --state
+``` 
+
+3、 要查看 FirewallD 守护进程的状态：
+
+```
+sudo systemctl status firewalld
+```
+
+示例输出
+
+```
+firewalld.service - firewalld - dynamic firewall daemon
+   Loaded: loaded (/usr/lib/systemd/system/firewalld.service; disabled)
+   Active: active (running) since Wed 2015-09-02 18:03:22 UTC; 1min 12s ago
+ Main PID: 11954 (firewalld)
+   CGroup: /system.slice/firewalld.service
+   └─11954 /usr/bin/python -Es /usr/sbin/firewalld --nofork --nopid
+```
+
+4、 重新加载 FirewallD 配置：
+
+```
+sudo firewall-cmd --reload
+```
+
+### 配置 FirewallD
+
+FirewallD 使用 XML 进行配置。除非是非常特殊的配置，你不必处理它们，而应该使用 `firewall-cmd`。
+
+配置文件位于两个目录中：
+
+* `/usr/lib/FirewallD` 下保存默认配置，如默认区域和公用服务。 避免修改它们，因为每次 firewall 软件包更新时都会覆盖这些文件。
+* `/etc/firewalld` 下保存系统配置文件。 这些文件将覆盖默认配置。
+
+#### 配置集
+
+FirewallD 使用两个_配置集_：“运行时”和“持久”。 在系统重新启动或重新启动 FirewallD 时，不会保留运行时的配置更改，而对持久配置集的更改不会应用于正在运行的系统。
+
+默认情况下，`firewall-cmd` 命令适用于运行时配置，但使用 `--permanent` 标志将保存到持久配置中。要添加和激活持久性规则，你可以使用两种方法之一。
+
+1、 将规则同时添加到持久规则集和运行时规则集中。
+
+```
+sudo firewall-cmd --zone=public --add-service=http --permanent
+sudo firewall-cmd --zone=public --add-service=http
+```
+ 
+2、 将规则添加到持久规则集中并重新加载 FirewallD。
+
+```
+sudo firewall-cmd --zone=public --add-service=http --permanent
+sudo firewall-cmd --reload
+```
+
+> `reload` 命令会删除所有运行时配置并应用永久配置。因为 firewalld 动态管理规则集，所以它不会破坏现有的连接和会话。
+
+### 防火墙的区域
+
+“区域”是针对给定位置或场景（例如家庭、公共、受信任等）可能具有的各种信任级别的预构建规则集。不同的区域允许不同的网络服务和入站流量类型，而拒绝其他任何流量。 首次启用 FirewallD 后，`public` 将是默认区域。
+
+区域也可以用于不同的网络接口。例如，要分离内部网络和互联网的接口，你可以在 `internal` 区域上允许 DHCP，但在`external` 区域仅允许 HTTP 和 SSH。未明确设置为特定区域的任何接口将添加到默认区域。
+
+要找到默认区域：
+
+```
+sudo firewall-cmd --get-default-zone
+```
+
+要修改默认区域：
+
+```
+sudo firewall-cmd --set-default-zone=internal
+```
+
+要查看你网络接口使用的区域：
+ 
+```
+sudo firewall-cmd --get-active-zones
+```
+
+示例输出：
+
+```
+public
+  interfaces: eth0
+```
+ 
+要得到特定区域的所有配置：
+
+```
+sudo firewall-cmd --zone=public --list-all
+```
+
+示例输出：
+
+```
+public (default, active)
+  interfaces: ens160
+  sources:
+  services: dhcpv6-client http ssh
+  ports: 12345/tcp
+  masquerade: no
+  forward-ports:
+  icmp-blocks:
+  rich rules:
+```
+ 
+要得到所有区域的配置：
+
+```
+sudo firewall-cmd --list-all-zones
+```
+
+示例输出：
+
+```
+block
+  interfaces:
+  sources:
+  services:
+  ports:
+  masquerade: no
+  forward-ports:
+  icmp-blocks:
+  rich rules:
+
+  ...
+
+work
+  interfaces:
+  sources:
+  services: dhcpv6-client ipp-client ssh
+  ports:
+  masquerade: no
+  forward-ports:
+  icmp-blocks:
+  rich rules:
+```
+ 
+
+#### 与服务一起使用
+
+FirewallD 可以根据特定网络服务的预定义规则来允许相关流量。你可以创建自己的自定义系统规则，并将它们添加到任何区域。 默认支持的服务的配置文件位于 `/usr/lib /firewalld/services`，用户创建的服务文件在 `/etc/firewalld/services` 中。
+
+要查看默认的可用服务：
+
+```
+sudo firewall-cmd --get-services
+```
+ 
+比如，要启用或禁用 HTTP 服务：
+
+```
+sudo firewall-cmd --zone=public --add-service=http --permanent
+sudo firewall-cmd --zone=public --remove-service=http --permanent
+```
+
+#### 允许或者拒绝任意端口/协议
+
+比如：允许或者禁用 12345 端口的 TCP 流量。
+
+```
+sudo firewall-cmd --zone=public --add-port=12345/tcp --permanent
+sudo firewall-cmd --zone=public --remove-port=12345/tcp --permanent
+```
+
+#### 端口转发
+
+下面是**在同一台服务器上**将 80 端口的流量转发到 12345 端口。
+
+```
+sudo firewall-cmd --zone="public" --add-forward-port=port=80:proto=tcp:toport=12345
+``` 
+
+要将端口转发到**另外一台服务器上**：
+
+1、 在需要的区域中激活 masquerade。
+
+```
+sudo firewall-cmd --zone=public --add-masquerade
+```
+
+2、 添加转发规则。例子中是将 IP 地址为 ：123.456.78.9 的_远程服务器上_ 80 端口的流量转发到 8080 上。
+
+
+```
+sudo firewall-cmd --zone="public" --add-forward-port=port=80:proto=tcp:toport=8080:toaddr=123.456.78.9
+```
+
+要删除规则，用 `--remove` 替换 `--add`。比如：
+
+```
+sudo firewall-cmd --zone=public --remove-masquerade
+```
+
+### 用 FirewallD 构建规则集
+
+例如，以下是如何使用 FirewallD 为你的服务器配置基本规则（如果您正在运行 web 服务器）。
+
+1. 将 `eth0` 的默认区域设置为 `dmz`。 在所提供的默认区域中，dmz（非军事区）是最适合于这个程序的，因为它只允许 SSH 和 ICMP。
+
+```
+sudo firewall-cmd --set-default-zone=dmz
+sudo firewall-cmd --zone=dmz --add-interface=eth0
+```
+
+2、 把 HTTP 和 HTTPS 添加永久的服务规则到 dmz 区域中：
+
+```
+sudo firewall-cmd --zone=dmz --add-service=http --permanent
+sudo firewall-cmd --zone=dmz --add-service=https --permanent
+```
+
+3、 重新加载 FirewallD 让规则立即生效：
+
+```
+sudo firewall-cmd --reload
+```
+
+如果你运行 `firewall-cmd --zone=dmz --list-all`， 会有下面的输出：
+
+```
+dmz (default)
+  interfaces: eth0
+  sources:
+  services: http https ssh
+  ports:
+  masquerade: no
+  forward-ports:
+  icmp-blocks:
+  rich rules:
+```
+
+这告诉我们，`dmz` 区域是我们的**默认**区域，它被用于 `eth0` 接口**中所有网络的**源地址**和**端口**。 允许传入 HTTP（端口 80）、HTTPS（端口 443）和 SSH（端口 22）的流量，并且由于没有 IP 版本控制的限制，这些适用于 IPv4 和 IPv6。 不允许**IP 伪装**以及**端口转发**。 我们没有 **ICMP 块**，所以 ICMP 流量是完全允许的。没有**丰富（Rich）规则**，允许所有出站流量。
+
+### 高级配置
+
+服务和端口适用于基本配置，但对于高级情景可能会限制较多。  丰富（Rich）规则和直接（Direct）接口允许你为任何端口、协议、地址和操作向任何区域 添加完全自定义的防火墙规则。
+
+#### 丰富规则
+
+丰富规则的语法有很多，但都完整地记录在 [firewalld.richlanguage(5)][5] 的手册页中（或在终端中 `man firewalld.richlanguage`）。 使用 `--add-rich-rule`、`--list-rich-rules` 、 `--remove-rich-rule` 和 firewall-cmd 命令来管理它们。
+
+这里有一些常见的例子：
+
+允许来自主机 192.168.0.14 的所有 IPv4 流量。
+
+```
+sudo firewall-cmd --zone=public --add-rich-rule 'rule family="ipv4" source address=192.168.0.14 accept'
+```
+
+拒绝来自主机 192.168.1.10 到 22 端口的 IPv4 的 TCP 流量。
+
+```
+sudo firewall-cmd --zone=public --add-rich-rule 'rule family="ipv4" source address="192.168.1.10" port port=22 protocol=tcp reject'
+```
+
+允许来自主机 10.1.0.3 到 80 端口的 IPv4 的 TCP 流量，并将流量转发到 6532 端口上。
+
+```
+sudo firewall-cmd --zone=public --add-rich-rule 'rule family=ipv4 source address=10.1.0.3 forward-port port=80 protocol=tcp to-port=6532'
+```
+
+将主机 172.31.4.2 上 80 端口的 IPv4 流量转发到 8080 端口（需要在区域上激活 masquerade）。
+
+```
+sudo firewall-cmd --zone=public --add-rich-rule 'rule family=ipv4 forward-port port=80 protocol=tcp to-port=8080 to-addr=172.31.4.2'
+```
+
+列出你目前的丰富规则：
+
+```
+sudo firewall-cmd --list-rich-rules
+```
+
+### iptables 的直接接口
+
+对于最高级的使用，或对于 iptables 专家，FirewallD 提供了一个直接（Direct）接口，允许你给它传递原始 iptables 命令。 直接接口规则不是持久的，除非使用 `--permanent`。
+
+要查看添加到 FirewallD 的所有自定义链或规则：
+
+```
+firewall-cmd --direct --get-all-chains
+firewall-cmd --direct --get-all-rules
+```
+
+讨论 iptables 的具体语法已经超出了这篇文章的范围。如果你想学习更多，你可以查看我们的 [iptables 指南][6]。
+
+### 更多信息
+
+你可以查阅以下资源以获取有关此主题的更多信息。虽然我们希望我们提供的是有效的，但是请注意，我们不能保证外部材料的准确性或及时性。
+
+* [FirewallD 官方网站][1]
+* [RHEL 7 安全指南：FirewallD 简介][2]
+* [Fedora Wiki：FirewallD][3]
+
+--------------------------------------------------------------------------------
+
+via: https://www.linode.com/docs/security/firewalls/introduction-to-firewalld-on-centos
+
+作者：[Linode][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linode.com/docs/security/firewalls/introduction-to-firewalld-on-centos
+[1]:http://www.firewalld.org/
+[2]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Security_Guide/sec-Using_Firewalls.html#sec-Introduction_to_firewalld
+[3]:https://fedoraproject.org/wiki/FirewallD
+[4]:http://www.firewalld.org/
+[5]:https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.richlanguage.html
+[6]:https://www.linode.com/docs/networking/firewalls/control-network-traffic-with-iptables
diff --git a/translated/tech/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md b/published/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md
similarity index 57%
rename from translated/tech/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md
rename to published/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md
index 86f701dad8..f20d8601ec 100644
--- a/translated/tech/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md	
+++ b/published/20161024 How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10.md	
@@ -1,13 +1,13 @@
-如何在 Ubuntu 16.10 的 Unity 8 上使用之前的 Xorg 程序
+如何在 Ubuntu 16.10 的 Unity 8 上运行老式 Xorg 程序
 ====
 
 ![](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2016/10/unity8-feature-image.jpg "How to Use Old Xorg Apps in Unity 8 on Ubuntu 16.10s")
 
-随着 Ubuntu 16.10 的发布，Unity 8 吸引到了比平时更多的目光。这是因为这个大家最爱的 Linux 发行版的最新版本进行着一项桌面显示实验。桌面发行版是人们最熟悉的 Unity 环境，但有一点点不同。它不再使用 X11 图形技术，Ubuntu的开发者选择了另一种截然不同的方式。
+随着 Ubuntu 16.10 的发布，Unity 8 越来越吸引到了更多人的关注。这是因为在这个大家最爱的 Linux 发行版的最新版本中可以体验其带有的试验性桌面。桌面发行版是人们最熟悉的 Unity 环境，但有一点点不同。它不再使用 X11 图形技术，Ubuntu 的开发者选择了另一种截然不同的方式。
 
-原来，Unity 8 用的是 Mir，这是 Ubuntu 对 Linux 上更好显示服务的号召所做出的回答。这项技术已经 Ubuntu phone 和平板上大量使用，但是这次新版是我们在桌面环境上第一次见到 Mir 。
+原来，Unity 8 用的是 Mir，这是 Ubuntu 为了在 Linux 上提供显示服务而做出的努力。这项技术已经在 Ubuntu phone 和平板上大量使用，但是这次新版是我们在桌面环境上第一次见到 Mir 。
 
-这项技术相当新颖，结果是没多少 Linux 程序能运行在它之上。不是所有，那也是大部分的程序被设计在 Xorg 和 X11 之上运行。如果你一直尝试在 Unity 8 上运行这些程序，当你了解到在 Unity 8上确实有可能运行之前的 Xorg 程序时，你会很开心的。接下来是如何做！
+这项技术相当新颖，结果是没多少 Linux 程序能运行在它之上。不是所有，那也是大部分的程序设计在 Xorg 和 X11 之上运行。如果你想要试试在 Unity 8 上运行这些程序，你肯定会为在 Unity 8上确实能够运行之前的 Xorg 程序而高兴。接下来是如何做！
 
 ### 登录进 Unity 8
 
@@ -19,7 +19,7 @@ Unity 8 在 Ubuntu 16.10 上是一个可选会话。在使用之前只须牢记
 
 ### 安装 Libertine 
 
-Xorg 程序（例如 Firefox 等）确实能在 Unity 8 上使用，在使用之前需要一点小调整。在 Mir 桌面上用终端打开 Libertine ，在 scopes 窗口中点击终端图标就能完成。一旦打开，输入你的密码。接下来，输入以下的命令：
+Xorg 程序（例如 Firefox 等）确实能在 Unity 8 上使用，在使用之前需要一点小调整。在 Mir 桌面上用终端打开 Libertine ，在 Scopes 窗口中点击终端图标就能完成。一旦打开，输入你的密码。接下来，输入以下的命令：
 
 ![unity8-installing-libertine-in-terminal](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2016/10/unity8-installing-libertine-in-terminal.jpg "unity8-installing-libertine-in-terminal")
 
@@ -27,15 +27,15 @@ Xorg 程序（例如 Firefox 等）确实能在 Unity 8 上使用，在使用之
 sudo apt install libertine-tools libertine-scope libertine
 ```
 
-当这些程序完成安装后，点击并拖动 scopes 窗口以刷新内容。然后，在面板上点击来启动libertine。
+当这些程序完成安装后，点击并拖动 Scopes 窗口以刷新内容。然后，在面板上点击来启动 libertine。
 
 ### 新建 Xorg 容器
 
-打开 Libertine，就到时间来新建一些容器了。这些容器很特别，因为他们能让基于 X11 的 Linux 程序在 Mir/Unity 8 桌面上的容器之中运行。另外，点击“i386 multiarch support"复选框来获得 32 位支持。否则，什么都不要动（或者输入名字和密码），点击”OK”。
+打开 Libertine，就可以新建一些（应用）容器了。这些容器很特别，因为它们能让基于 X11 的 Linux 程序在 Mir/Unity 8 桌面上的容器之中运行。另外，如果需要支持 32 位应用，勾选“i386 multiarch support”复选框。否则，什么都不要动（或者输入名字和密码），点击“OK”。
 
 ![unity8-libertine-create-new-container](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2016/10/unity8-libertine-create-new-container.jpg "unity8-libertine-create-new-container")
 
-在这之后，这个 Xorg 容器就准备好以供使用了。在 Libertine 找到它并启动。删除也很容易，右键点击容器，选择“删除”选项。
+在这之后，这个 Xorg 容器就准备好，可以使用了。在 Libertine 找到它并启动。删除也很容易，右键点击容器，选择“删除”选项。
 
 **注意**：每一个 Xorg 容器有 500 MB的最大内存限制。所以多个容器是有必要的。
 
@@ -43,23 +43,21 @@ sudo apt install libertine-tools libertine-scope libertine
 
 ![unity8-libertine-install-software](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2016/10/unity8-libertine-install-software.jpg "unity8-libertine-install-software")
 
-两天内在 Libertine 容器中安装好软件。第一步允许用户启动容器后选择“输入包名或者 Debian 文件”，这意味着用户可以在软件中心或者终端找到一个软件的名字，然后输入 Libertine 来安装，也可以指定特定的 DEB 文件来安装，也可以在Libertine LXC 容器中直接搜索安装包。
+在 Libertine 容器中安装软件有两个方法。第一种是允许用户启动容器后选择“输入包名或者 Debian 文件”，这意味着用户可以在软件中心或者终端找到一个软件的名字，然后在 Libertine 中输入它来安装。也可以指定特定的 DEB 文件来安装，可以在Libertine LXC 容器中直接搜索安装包。
 
 **注意**：Unity 8 非常新，一些程序或许不能在 Libertine 里加载或者完全安装。
 
 ### 结论
 
-Unity 8展现了不少的新特性，它现代、时髦，而且比之前任何一个 Unity 迭代版本都快。唯一限制它的就是使用率。事实是大部分用户更乐意选择实用的应用程序，而不是一个别致新颖的桌面环境。某种程度上来说，使用 Libertine 能解决这个问题，但它不会永久有效。早晚有一天，Canonical 将有必要自行引进程序或者向社区求助来彻底解决这个问题。
+Unity 8 展现了不少的新特性，它现代、时髦，而且比之前任何一个 Unity 迭代版本都快。唯一限制它的就是使用率。事实是大部分用户更乐意选择实用的应用程序，而不是一个别致新颖的桌面环境。某种程度上来说，使用 Libertine 能解决这个问题，但它不会永久有效。早晚有一天，Canonical 都需要自行移植这些程序或者向社区求助来彻底解决这个问题。
 
 --------------------------------------------------------------------------------
 
 via: https://www.maketecheasier.com/use-old-xorg-apps-unity-8/
 
 作者：[Derrik Diener][a]
-
 译者：[ypingcn](https://github.com/ypingcn)
-
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
 
diff --git a/published/20161028 Inkscape: Adding some colour.md b/published/20161028 Inkscape: Adding some colour.md
new file mode 100644
index 0000000000..8e3b6969ab
--- /dev/null
+++ b/published/20161028 Inkscape: Adding some colour.md	
@@ -0,0 +1,50 @@
+使用 Inkscape：添加颜色
+=========
+
+![inkscape-addingcolour](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-addingcolour-945x400.png) 
+
+在我们先前的 Inkscape 文章中，[我们介绍了 Inkscape 的基础][2] - 安装，以及如何创建基本形状及操作它们。我们还介绍了使用 Palette 更改 inkscape 对象的颜色。 虽然 Palette 对于从预定义列表快速更改对象颜色非常有用，但大多数情况下，你需要更好地控制对象的颜色。这时我们使用 Inkscape 中最重要的对话框之一 - <ruby>填充和轮廓<rt>Fill and Stroke</rt></ruby> 对话框。
+
+**关于文章中的动画的说明：**动画中的一些颜色看起来有条纹。这只是动画创建导致的。当你在 Inkscape 尝试时，你会看到很好的平滑渐变的颜色。
+
+### 使用 Fill/Stroke 对话框
+
+要在 Inkscape 中打开 “Fill and Stroke” 对话框，请从主菜单中选择 `Object`>`Fill and Stroke`。打开后，此对话框中的三个选项卡允许你检查和更改当前选定对象的填充颜色、描边颜色和描边样式。
+
+![open-fillstroke](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/open-fillstroke.gif) 
+
+在 Inkscape 中，Fill 用来给予对象主体颜色。对象的轮廓是你的对象的可选择外框，可在<ruby>轮廓样式<rt>Stroke style</rt></ruby>选项卡中进行配置，它允许您更改轮廓的粗细，创建虚线轮廓或为轮廓添加圆角。 在下面的动画中，我会改变星形的填充颜色，然后改变轮廓颜色，并调整轮廓的粗细：
+
+![using-fillstroke](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/using-fillstroke.gif) 
+
+### 添加并编辑渐变效果
+
+对象的填充（或者轮廓）也可以是渐变的。要从 “Fill and Stroke” 对话框快速设置渐变填充，请先选择 “Fill” 选项卡，然后选择<ruby>线性渐变<rt>linear gradient </rt></ruby> 选项：
+
+ ![create-gradient](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/create-gradient.gif) 
+
+要进一步编辑我们的渐变，我们需要使用专门的<ruby>渐变工具<rt>Gradient Tool</rt></ruby>。 从工具栏中选择“Gradient Tool”，会有一些渐变编辑锚点出现在你选择的形状上。 **移动锚点**将改变渐变的位置。 如果你**单击一个锚点**，您还可以在“Fill and Stroke”对话框中更改该锚点的颜色。 要**在渐变中添加新的锚点**，请双击连接锚点的线，然后会出现一个新的锚点。
+
+ ![editing-gradient](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/editing-gradient.gif) 
+
+* * *
+
+这篇文章介绍了在 Inkscape 图纸中添加一些颜色和渐变的基础知识。 **“Fill and Stroke”** 对话框还有许多其他选项可供探索，如图案填充、不同的渐变样式和许多不同的轮廓样式。另外，查看**<ruby>工具控制栏<rt>Tools control bar</rt></ruby>** 的 **Gradient Tool** 中的其他选项，看看如何以不同的方式调整渐变。
+
+-----------------------
+
+作者简介：Ryan 是一名 Fedora 设计师。他使用 Fedora Workstation 作为他的主要桌面，还有来自 Libre Graphics 世界的最好的工具，尤其是矢量图形编辑器 Inkscape。
+
+--------------------------------------------------------------------------------
+
+via: https://fedoramagazine.org/inkscape-adding-colour/
+
+作者：[Ryan Lerch][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: http://ryanlerch.id.fedoraproject.org/
+[1]:https://fedoramagazine.org/inkscape-adding-colour/
+[2]:https://linux.cn/article-8079-1.html
diff --git a/translated/tech/20161104 Create a simple wallpaper with Fedora and Inkscape.md b/published/20161104 Create a simple wallpaper with Fedora and Inkscape.md
similarity index 81%
rename from translated/tech/20161104 Create a simple wallpaper with Fedora and Inkscape.md
rename to published/20161104 Create a simple wallpaper with Fedora and Inkscape.md
index 5a0fbce7b4..a9317d1dfd 100644
--- a/translated/tech/20161104 Create a simple wallpaper with Fedora and Inkscape.md	
+++ b/published/20161104 Create a simple wallpaper with Fedora and Inkscape.md	
@@ -1,6 +1,7 @@
-### 使用 Fedora 和 Inkscape 制作一张简单的壁纸
+使用 Fedora 和 Inkscape 制作一张简单的壁纸
+================
 
- ![inkscape-wallpaper](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-wallpaper-945x400.png) 
+![inkscape-wallpaper](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-wallpaper-945x400.png) 
 
 在先前的两篇 Inkscape 的文章中，我们已经[介绍了 Inkscape 的基本使用、创建对象][18]以及[一些基本操作和如何修改颜色。][17]
 
@@ -14,7 +15,7 @@
  ![Screenshot from 2016-09-07 08-37-01](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-08-37-01.png) 
 ][16]
 
-对于这张壁纸而言，我们会将尺寸改为**1024px x 768px**。要改变文档的尺寸，进入`File` > `Document Properties…`。在<ruby>文档属性<rt>Document Properties</rt></ruby>对话框中<ruby>自定义文档大小<rt>Custom Size</rt></ruby>区域中输入宽度为 1024px，高度为 768px：
+对于这张壁纸而言，我们会将尺寸改为**1024px x 768px**。要改变文档的尺寸，进入`File` > `Document Properties...`。在<ruby>文档属性<rt>Document Properties</rt></ruby>对话框中<ruby>自定义文档大小<rt>Custom Size</rt></ruby>区域中输入宽度为 `1024`，高度为 `768` ，单位是 `px`：
 
 [
  ![Screenshot from 2016-09-07 09-00-00](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-00-00.png) 
@@ -34,13 +35,13 @@
  ![rect](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/rect.png) 
 ][13]
 
-接着在矩形中添加一个<ruby>渐变填充<rt>Gradient Fill</rt></ruby>。[如果你需要复习添加渐变，请阅读先前添加色彩的文章。][12]
+接着在矩形中添加一个<ruby>渐变填充<rt>Gradient Fill</rt></ruby>。如果你需要复习添加渐变，请阅读先前添加色彩的[那篇文章][12]。
 
 [
  ![Screenshot from 2016-09-07 09-41-13](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-41-13.png) 
 ][11]
 
-你的矩形可能也设置了轮廓颜色。 使用<ruby>填充和轮廓<rt> Fill and Stroke</rt></ruby>对话框将轮廓设置为 **none**。
+你的矩形也可以设置轮廓颜色。 使用<ruby>填充和轮廓<rt> Fill and Stroke</rt></ruby>对话框将轮廓设置为 **none**。
 
 [
  ![Screenshot from 2016-09-07 09-44-15](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-44-15.png) 
@@ -48,19 +49,19 @@
 
 ### 绘制图样
 
-接下来我们画一个三角形，使用 3个 顶点的星型/多边形工具。你可以**按住 CTRL** 键给三角形一个角度并使之对称。
+接下来我们画一个三角形，使用 3 个顶点的星型/多边形工具。你可以按住 `CTRL` 键给三角形一个角度并使之对称。
 
 [
  ![Screenshot from 2016-09-07 09-52-38](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-52-38.png) 
 ][9]
 
-选中三角形并按下 **CTRL+D** 来复制它（复制的图形会覆盖在原来图形的上面），**因此在复制后确保将它移动到别处。**
+选中三角形并按下 `CTRL+D` 来复制它（复制的图形会覆盖在原来图形的上面），**因此在复制后确保将它移动到别处。**
 
 [
  ![Screenshot from 2016-09-07 10-44-01](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-10-44-01.png) 
 ][8]
 
-如图选中一个三角形，进入**OBJECT > FLIP-HORIZONTAL（水平翻转）**。
+如图选中一个三角形，进入`Object` > `FLIP-HORIZONTAL`（水平翻转）。
 
 [
  ![Screenshot from 2016-09-07 09-57-23](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-57-23.png) 
@@ -82,7 +83,7 @@
 
 ### 导出背景
 
-最后，我们需要将我们的文档导出为 PNG 文件。点击 **FILE > EXPORT PNG**，打开导出对话框，选择文件位置和名字，确保选中的是 Drawing 标签，并点击 **EXPORT**。
+最后，我们需要将我们的文档导出为 PNG 文件。点击 `File` > `EXPORT PNG`，打开导出对话框，选择文件位置和名字，确保选中的是 `Drawing` 标签，并点击 `EXPORT`。
 
 [
  ![Screenshot from 2016-09-07 11-07-05](https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-11-07-05-1.png) 
@@ -100,9 +101,7 @@
 via: https://fedoramagazine.org/inkscape-design-imagination/
 
 作者：[a2batic][a]
-
 译者：[geekpi](https://github.com/geekpi)
-
 校对：[jasminepeng](https://github.com/jasminepeng)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
@@ -119,11 +118,11 @@ via: https://fedoramagazine.org/inkscape-design-imagination/
 [9]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-52-38.png
 [10]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-44-15.png
 [11]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-41-13.png
-[12]:https://fedoramagazine.org/inkscape-adding-colour/
+[12]:https://linux.cn/article-8084-1.html
 [13]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/rect.png
 [14]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-01-03.png
 [15]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-09-00-00.png
 [16]:https://1504253206.rsc.cdn77.org/wp-content/uploads/2016/10/Screenshot-from-2016-09-07-08-37-01.png
-[17]:https://fedoramagazine.org/inkscape-adding-colour/
-[18]:https://fedoramagazine.org/getting-started-inkscape-fedora/
+[17]:https://linux.cn/article-8084-1.html
+[18]:https://linux.cn/article-8079-1.html
 [19]:https://fedoramagazine.org/inkscape-design-imagination/
diff --git a/published/20161126 Building Vim from source.md b/published/20161126 Building Vim from source.md
new file mode 100644
index 0000000000..cbd91bb51d
--- /dev/null
+++ b/published/20161126 Building Vim from source.md	
@@ -0,0 +1,120 @@
+从源代码编译 Vim 8.0
+========
+
+从源代码编译 Vim 实际上并不那么困难。下面是你所要做的：
+
+1、首先，安装包括 Git 在内的所有必备的库。对于一个 Debian 类的 Linux 发行版，例如 Ubuntu，命令如下：
+
+```
+sudo apt-get install libncurses5-dev libgnome2-dev libgnomeui-dev \
+    libgtk2.0-dev libatk1.0-dev libbonoboui2-dev \
+    libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev \
+    python3-dev ruby-dev lua5.1 lua5.1-dev libperl-dev git
+```
+
+在 Ubuntu 16.04 上，lua 开发包的名称是 `liblua5.1-dev` 而非 `lua5.1-dev`。
+
+如果你知道你将使用哪种语言，可随意删去你不需要的包。例如：Python2 `python-dev` 或者是 Ruby `ruby-dev`。这一原则适用于本文的大部分内容。
+
+对于 Fedora 20，将是以下命令:
+
+```
+sudo yum install -y ruby ruby-devel lua lua-devel luajit \
+    luajit-devel ctags git python python-devel \
+    python3 python3-devel tcl-devel \
+    perl perl-devel perl-ExtUtils-ParseXS \
+    perl-ExtUtils-XSpp perl-ExtUtils-CBuilder \
+    perl-ExtUtils-Embed
+```
+
+在 Fedora 20 上需要这一步来纠正安装 XSubPP 时出现的问题：
+
+```
+# 从 /usr/bin 到 perl 目录做个 xsubpp (perl) 的符号链接
+sudo ln -s /usr/bin/xsubpp /usr/share/perl5/ExtUtils/xsubpp 
+```
+
+2、 如果你已经安装了 vim，删掉它。
+
+```
+sudo apt-get remove vim vim-runtime gvim
+```
+
+如果是 Ubuntu 12.04.2，你或许也需要同时删除下面这些软件包:
+
+```
+sudo apt-get remove vim-tiny vim-common vim-gui-common vim-nox
+```
+
+3、 一旦上述内容都被安装好之后，获取 vim 源代码很容易。
+
+注意：如果你使用 python，你的配置目录或许有一个特定的机器名 (例如 `config-3.5m-x86_64-linux-gnu`)。检查 `/usr/lib/python[2/3/3.5]` 目录来找到你的 python 配置目录，据此更改 `python-config-dir` 和/或 `python3-config-dir `的参数。
+
+添加/删除下面的编译参数以适合您的设置。例如，如果您不打算写任何 Lua 脚本，您可以删去 `enable-luainterp`。
+
+同时，如果你使用的不是 vim 8.0，请确认下面 `VIMRUNTIMEDIR` 参数设置正确（例如，如果使用 vim 8.0a, 就用 `/usr/share/vim/vim80a`）。记住，一些 vim 安装是直接安装在 `/usr/share/vim` 下的；调整好参数以适应你的系统:
+   
+```
+cd ~
+git clone https://github.com/vim/vim.git
+cd vim
+./configure --with-features=huge \
+    --enable-multibyte \
+    --enable-rubyinterp=yes \
+    --enable-pythoninterp=yes \
+    --with-python-config-dir=/usr/lib/python2.7/config \
+    --enable-python3interp=yes \
+    --with-python3-config-dir=/usr/lib/python3.5/config \
+    --enable-perlinterp=yes \
+    --enable-luainterp=yes \
+    --enable-gui=gtk2 --enable-cscope --prefix=/usr
+make VIMRUNTIMEDIR=/usr/share/vim/vim80
+```
+    
+在 Ubuntu 16.04 上，由于同时开启了 Python2 和 Python3，Python 支持将不工作。 阅读 [chirinosky 的回答](http://stackoverflow.com/questions/23023783/vim-compiled-with-python-support-but-cant-see-sys-version) 以获取变通的处理方法。
+
+如果你想将来轻松卸载 vim，可以使用 `checkinstall` 来安装 。
+    
+```
+sudo apt-get install checkinstall
+cd ~/vim
+sudo checkinstall
+```
+
+否则，可以使用 `make` 来安装。
+    
+```
+cd ~/vim
+sudo make install
+```
+
+要让 vim 成为你默认的编辑器，请使用 `update-alternatives`。
+    
+```
+sudo update-alternatives --install /usr/bin/editor editor /usr/bin/vim 1
+sudo update-alternatives --set editor /usr/bin/vim
+sudo update-alternatives --install /usr/bin/vi vi /usr/bin/vim 1
+sudo update-alternatives --set vi /usr/bin/vim
+```
+
+4、 再检查下，通过查看 `vim --version` 输出来确认确实在运行新的 Vim 应用程序版本。
+
+**如果你的 gvim 不工作（在 ubuntu 12.04.1 LTS 上），试着把 `--enable-gui=gtk2` 参数变为 `--enable-gui=gnome2`。**
+
+如果你遇到问题，仔细检查在步骤 3 开始提到的，使用正确的 Python 配置目录配置 `configure`。
+
+这些 `configure` 和 `make` 命令假设你是一个 Debian 发行版，Vim 的运行库文件目录放在 `/usr/share/vim/vim80/`，这不是 vim 的默认路径。 在 `configure` 命令中的 `--prefix=/usr` 也是如此。这些参数或许对一个不是基于 Debian 的 Linux 发行版来说是有所不同的，在这种情况下，试着移除 `configure` 命令中的 `--prefix` 变量和 `make` 命令中的 `VIMRUNTIMEDIR` (换句话说，使用这些参数的默认值)。
+
+如果你遇到麻烦, 这里是一些[其它编译 Vim 的有用的信息](http://vim.wikia.com/wiki/Building_Vim)。
+
+--------------------------------------------------------------------------------
+
+via: https://github.com/Valloric/YouCompleteMe/wiki/Building-Vim-from-source
+
+作者：[Val Markovic][a]
+译者：[zky001](https://github.com/zky001)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:   https://github.com/Valloric
diff --git a/published/20161128 Managing devices in Linux.md b/published/20161128 Managing devices in Linux.md
new file mode 100644
index 0000000000..f81a0afa82
--- /dev/null
+++ b/published/20161128 Managing devices in Linux.md	
@@ -0,0 +1,184 @@
+在 Linux 中管理设备
+=============
+
+探索 `/dev` 目录可以让您知道如何直接访问到 Linux 中的设备。
+
+![Managing devices in Linux](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/OSDC_Penguin_Image_520x292_12324207_0714_mm_v1a.png itok=WfAkwbFy "Managing devices in Linux") 
+
+*照片提供：Opensource.com*
+
+Linux 目录结构中有很多有趣的功能，这次我会讲到 `/dev` 目录一些迷人之处。在继续阅读这篇文章之前，建议你看看我前面的文章。[Linux 文件系统][9]，[一切皆为文件][8]，这两篇文章介绍了一些有趣的 Linux 文件系统概念。请先看看 - 我会等你看完再回来。
+
+……
+
+太好了 ！欢迎回来。现在我们可以继续更详尽地探讨 `/dev` 目录。
+
+### 设备文件
+
+设备文件也称为[设备特定文件][4]。设备文件用来为操作系统和用户提供它们代表的设备接口。所有的 Linux 设备文件均位于 `/dev` 目录下，是根 （`/`） 文件系统的一个组成部分，因为这些设备文件在操作系统启动过程中必须可以使用。
+
+关于这些设备文件，要记住的一件重要的事情，就是它们大多不是设备驱动程序。更准确地描述来说，它们是设备驱动程序的门户。数据从应用程序或操作系统传递到设备文件，然后设备文件将它传递给设备驱动程序，驱动程序再将它发给物理设备。反向的数据通道也可以用，从物理设备通过设备驱动程序，再到设备文件，最后到达应用程序或其他设备。
+
+让我们以一个典型命令的数据流程来直观地看看。
+
+ ![dboth-dev-dir_0.png](https://opensource.com/sites/default/files/images/life-uploads/dboth-dev-dir_0.png) 
+
+*图 1：一个典型命令的简单数据流程。*
+
+在上面的图 1 中，显示一个简单命令的简化数据流程。从一个 GUI 终端仿真器，例如 Konsole 或 xterm 中发出 `cat /etc/resolv.conf` 命令，它会从磁盘中读取 `resolv.conf` 文件，磁盘设备驱动程序处理设备的具体功能，例如在硬盘驱动器上定位文件并读取它。数据通过设备文件传递，然后从命令到设备文件，然后到 6 号伪终端的设备驱动，然后在终端会话中显示。
+
+当然， `cat` 命令的输出可以以下面的方式被重定向到一个文件， `cat /etc/resolv.conf > /etc/resolv.bak` ，这样会创建该文件的备份。在这种情况下，图 1 左侧的数据流量将保持不变，而右边的数据流量将通过 `/dev/sda2` 设备文件、硬盘设备驱动程序，然后到硬盘驱动器本身。
+
+这些设备文件使得使用标准流 (STD/IO) 和重定向访问 Linux 或 Unix 计算机上的任何一个设备非常容易。只需将数据流定向到设备文件，即可将数据发送到该设备。
+
+### 设备文件类别
+
+设备文件至少可以按两种方式划分。第一种也是最常用的分类是根据与设备相关联的数据流进行划分。比如，tty (teletype) 和串行设备被认为是基于字符的，因为数据流的传送和处理是以一次一个字符或字节进行的；而块类型设备（如硬盘驱动器）是以块为单位传输数据，通常为 256 个字节的倍数。
+
+您可以在终端上以一个非 root 用户，改变当前工作目录（`PWD`）到 `/dev` ，并显示长目录列表。 这将显示设备文件列表、文件权限及其主、次设备号。 例如，下面的设备文件只是我的 Fedora 24 工作站上 `/dev` 目录中的几个文件。 它们表示磁盘和 tty 设备类型。 注意输出中每行的最左边的字符。 `b` 代表是块类型设备，`c` 代表字符设备。
+
+```
+brw-rw----   1 root disk        8,   0 Nov  7 07:06 sda 
+brw-rw----   1 root disk        8,   1 Nov  7 07:06 sda1 
+brw-rw----   1 root disk        8,  16 Nov  7 07:06 sdb 
+brw-rw----   1 root disk        8,  17 Nov  7 07:06 sdb1 
+brw-rw----   1 root disk        8,  18 Nov  7 07:06 sdb2
+crw--w----   1 root tty         4,   0 Nov  7 07:06 tty0 
+crw--w----   1 root tty         4,   1 Nov  7 07:07 tty1 
+crw--w----   1 root tty         4,  10 Nov  7 07:06 tty10 
+crw--w----   1 root tty         4,  11 Nov  7 07:06 tty11
+```
+
+识别设备文件更详细和更明确的方法是使用设备主要以及次要号。 磁盘设备主设备号为 8，将它们指定为 SCSI 块设备。请注意，所有 PATA 和 SATA 硬盘驱动器都由 SCSI 子系统管理，因为旧的 ATA 子系统多年前就由于代码质量糟糕而被认为不可维护。造成的结果就是，以前被称为 “hd[a-z]” 的硬盘驱动器现在被称为 “sd[a-z]”。
+
+你大概可以从上面的示例中推出磁盘驱动器次设备号的模式。次设备号 0、 16、 32 等等，直到 240，是整个磁盘的号。所以主/次 8/16 表示整个磁盘 `/dev/sdb` ， 8/17 是第一个分区的设备文件，`/dev/sdb1`。数字 8/34 代表 `/dev/sdc2`。
+
+在上面列表中的 tty 设备文件编号更简单一些，从 tty0 到 tty63 。
+
+Kernel.org 上的 [Linux 下的已分配设备][5]文件是设备类型和主次编号分配的正式注册表。它可以帮助您了解所有当前定义的设备的主要/次要号码。
+
+### 趣味设备文件
+
+让我们花几分钟时间，执行几个有趣的实验，演示 Linux 设备文件的强大和灵活性。 大多数 Linux 发行版都有 1 到 7 个虚拟控制台，可用于使用 shell 接口登录到本地控制台会话。 可以使用 `Ctrl-Alt-F1`（控制台 1），`Ctrl-Alt-F2`（控制台 2）等键盘组合键来访问。
+
+请按 `Ctrl-Alt-F2` 切换到控制台 2。在某些发行版，登录显示的信息包括了与此控制台关联的 tty 设备，但大多不包括。它应该是 tty2，因为你是在控制台 2 中。
+
+以非 root 用户身份登录。 然后你可以使用 `who am i` 命令 — 是的，就是这个命令，带空格 — 来确定哪个 tty 设备连接到这个控制台。
+
+在我们实际执行此实验之前，看看 `/dev` 中的 tty2 和 tty3 的设备列表。
+
+```
+ls -l /dev/tty[23]
+```
+
+有大量的 tty 设备，但我们不关心他们中的大多数，只注意 tty2 和 tty3 设备。 作为设备文件，它们没什么特别之处。它们都只是字符类型设备。我们将使用这些设备进行此实验。 tty2 设备连接到虚拟控制台 2，tty3 设备连接到虚拟控制台 3。
+
+按 `Ctrl-Alt-F3` 切换到控制台 3。再次以同一非 root 用户身份登录。 现在在控制台 3 上输入以下命令。 
+
+```
+echo "Hello world" > /dev/tty2
+```
+
+按 `Ctrl-Alt-f2` 键以返回到控制台 2。字符串 “Hello world”（没有引号）将显示在控制台 2。
+
+该实验也可以使用 GUI 桌面上的终端仿真器来执行。 桌面上的终端会话使用 `/dev` 中的伪终端设备，如 `/dev/pts/1`。 使用 Konsole 或 Xterm 打开两个终端会话。 确定它们连接到哪些伪终端，并使用一个向另一个发送消息。
+
+现在继续实验，使用 `cat` 命令，试试在不同的终端上显示 `/etc/fstab` 文件。
+
+另一个有趣的实验是使用 `cat` 命令将文件直接打印到打印机。 假设您的打印机设备是 `/dev/usb/lp0`，并且您的打印机可以直接打印 PDF 文件，以下命令将在您的打印机上打印 `test.pdf` 文件。
+
+```
+cat test.pdf > /dev/usb/lp0
+```
+
+`/dev` 目录包含一些非常有趣的设备文件，这些文件是硬件的入口，人们通常不认为这是硬盘驱动器或显示器之类的设备。 例如，系统存储器 RAM 不是通常被认为是“设备”的东西，而 `/dev/mem` 是通过其可以实现对存储器的直接访问的入口。 下面的例子有一些有趣的结果。
+
+```
+dd if=/dev/mem bs=2048 count=100
+```
+
+上面的 `dd` 命令提供比简单地使用 `cat` 命令 dump 所有系统的内存提供了更多的控制。 它提供了指定从 `/dev/mem` 读取多少数据的能力，还允许指定从存储器哪里开始读取数据。虽然读取了一些内存，但内核响应了以下错误，在 `/var/log/messages` 中可以看到。
+
+```
+Nov 14 14:37:31 david kernel: usercopy: kernel memory exposure attempt detected from ffff9f78c0010000 (dma-kmalloc-512) (2048 bytes)
+```
+
+这个错误意味着内核正在通过保护属于其他进程的内存来完成它的工作，这正是它应该工作的方式。 所以，虽然可以使用 `/dev/mem` 来显示存储在 RAM 内存中的数据，但是访问的大多数内存空间是受保护的并且会导致错误。 只可以访问由内核内存管理器分配给运行 `dd` 命令的 BASH shell 的虚拟内存，而不会导致错误。 抱歉，但你不能窥视不属于你的内存，除非你发现了一个可利用的漏洞。
+
+`/dev` 中还有一些非常有趣的设备文件。 设备文件 `null`，`zero`，`random` 和 `urandom` 不与任何物理设备相关联。
+
+例如，空设备 `/dev/null` 可以用作来自 shell 命令或程序的输出重定向的目标，以便它们不显示在终端上。 我经常在我的 BASH 脚本中使用这个，以防止向用户展示可能会让他们感到困惑的输出。 `/dev/null` 设备可用于产生一个空字符串。 使用如下所示的 `dd` 命令查看 `/dev/null` 设备文件的一些输出。
+
+```
+# dd if=/dev/null  bs=512 count=500 | od -c     
+0+0 records in
+0+0 records out
+0 bytes copied, 1.5885e-05 s, 0.0 kB/s
+0000000
+```
+
+注意，因为空字符什么也没有所以确实没有可见的输出。 注意看看字节数。
+
+`/dev/random` 和 `/dev/urandom` 设备也很有趣。 正如它们的名字所暗示的，它们都产生随机输出，不仅仅是数字，而是任何字节组合。 `/dev/urandom` 设备产生的是**确定性**的随机输出，并且非常快。 这意味着输出由算法确定，并使用种子字符串作为起点。 结果，如果原始种子是已知的，则黑客可以再现输出，尽管非常困难，但这是有可能的。 使用命令 `cat /dev/urandom` 可以查看典型的输出，使用 `Ctrl-c` 退出。
+
+`/dev/random` 设备文件生成**非确定性**的随机输出，但它产生的输出更慢一些。 该输出不是由依赖于先前数字的算法确定的，而是由击键动作和鼠标移动而产生的。 这种方法使得复制特定系列的随机数要困难得多。使用 `cat` 命令去查看一些来自 `/dev/random` 设备文件输出。尝试移动鼠标以查看它如何影响输出。
+
+正如其名字所暗示的，`/dev/zero` 设备文件产生一个无止境的零作为输出。 注意，这些是八进制零，而不是ASCII字符零（`0`）。 使用如下所示的 `dd` 查看 `/dev/zero` 设备文件中的一些输出
+
+```
+# dd if=/dev/zero  bs=512 count=500 | od -c
+0000000  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0
+*
+500+0 records in
+500+0 records out
+256000 bytes (256 kB, 250 KiB) copied, 0.00126996 s, 202 MB/s
+0764000
+```
+
+请注意，此命令的字节数不为零。
+
+### 创建设备文件
+
+在过去，在 `/dev` 中的设备文件都是在安装时创建的，导致一个目录中有几乎所有的设备文件，尽管大多数文件永远不会用到。 在不常发生的情况，例如需要新的设备文件，或意外删除后需要重新创建设备文件，可以使用 `mknod` 程序手动创建设备文件。 前提是你必须知道设备的主要和次要号码。
+
+CentOS 和 RHEL 6、7，以及 Fedora 的所有版本——可以追溯到至少 Fedora 15，使用较新的创建设备文件的方法。 所有设备文件都是在引导时创建的。 这是因为 udev 设备管理器在设备添加和删除发生时会进行检测。这可实现在主机启动和运行时的真正的动态即插即用功能。 它还在引导时执行相同的任务，通过在引导过程的很早的时期检测系统上安装的所有设备。 [Linux.com][6] 上有一篇很棒的对 [udev 的描述][7]。
+
+回到 `/dev` 中的文件列表，注意文件的日期和时间。 所有文件都是在上次启动时创建的。 您可以使用 `uptime` 或者 `last` 命令来验证这一点。在上面我的设备列表中，所有这些文件都是在 11 月 7 日上午 7:06 创建的，这是我最后一次启动系统。
+
+当然， `mknod` 命令仍然可用, 但新的 `MAKEDEV` （是的，所有字母大写，在我看来是违背 Linux 使用小写命令名的原则的) 命令提供了一个创建设备文件的更容易的界面。 在当前版本的 Fedora 或 CentOS 7 中，默认情况下不安装 `MAKEDEV` 命令；它安装在 CentOS 6。您可以使用 YUM 或 DNF 来安装 MAKEDEV 包。
+
+### 结论
+
+有趣的是，我很久没有创建一个设备文件的需要了。 然而，最近我遇到一个有趣的情况，其中一个我常使用的设备文件没有创建，我不得不创建它。 之后该设备再没出过问题。所以丢失设备文件的情况仍然可以发生，知道如何处理它可能很重要。
+
+设备文件有无数种，您遇到的设备文件我可能没有涵盖到。 这些信息在所下面引用的资源中有大量的细节信息可用。 关于这些文件的功能和工具，我希望我已经给您一些基本的了解，下一步您自己可以探索更多。
+
+资源
+
+- [一切皆文件][1]， David Both, Opensource.com
+- [Linux 文件系统介绍][2]， David Both, Opensource.com
+- [文件系统层次结构][10]， The Linux Documentation Project
+- [设备文件][4]， Wikipedia
+- [Linux 下已分配设备][5]， Kernel.org
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/16/11/managing-devices-linux
+
+作者：[David Both][a]
+译者：[erlinux](http://www.itxdm.me)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/dboth
+[1]:https://opensource.com/life/15/9/everything-is-a-file
+[2]:https://opensource.com/life/16/10/introduction-linux-filesystems
+[4]:https://en.wikipedia.org/wiki/Device_file
+[5]:https://www.kernel.org/doc/Documentation/devices.txt
+[6]:https://www.linux.com/
+[7]:https://www.linux.com/news/udev-introduction-device-management-modern-linux-system
+[8]:https://opensource.com/life/15/9/everything-is-a-file
+[9]:https://opensource.com/life/16/10/introduction-linux-filesystems
+[10]:http://www.tldp.org/LDP/Linux-Filesystem-Hierarchy/html/dev.html
+
diff --git a/published/20160505 A daughter of Silicon Valley shares her 'nerd' story.md b/published/201612/20160505 A daughter of Silicon Valley shares her 'nerd' story.md
similarity index 100%
rename from published/20160505 A daughter of Silicon Valley shares her 'nerd' story.md
rename to published/201612/20160505 A daughter of Silicon Valley shares her 'nerd' story.md
diff --git a/published/20160516 Securing Your Server.md b/published/201612/20160516 Securing Your Server.md
similarity index 100%
rename from published/20160516 Securing Your Server.md
rename to published/201612/20160516 Securing Your Server.md
diff --git a/published/20160525 What containers and unikernels can learn from Arduino and Raspberry Pi.md b/published/201612/20160525 What containers and unikernels can learn from Arduino and Raspberry Pi.md
similarity index 100%
rename from published/20160525 What containers and unikernels can learn from Arduino and Raspberry Pi.md
rename to published/201612/20160525 What containers and unikernels can learn from Arduino and Raspberry Pi.md
diff --git a/published/20160615 Excel Filter and Edit - Demonstrated in Pandas.md b/published/201612/20160615 Excel Filter and Edit - Demonstrated in Pandas.md
similarity index 100%
rename from published/20160615 Excel Filter and Edit - Demonstrated in Pandas.md
rename to published/201612/20160615 Excel Filter and Edit - Demonstrated in Pandas.md
diff --git a/published/20160627 Linux Practicality vs Activism.md b/published/201612/20160627 Linux Practicality vs Activism.md
similarity index 100%
rename from published/20160627 Linux Practicality vs Activism.md
rename to published/201612/20160627 Linux Practicality vs Activism.md
diff --git a/published/20160817 Building a Real-Time Recommendation Engine with Data Science.md b/published/201612/20160817 Building a Real-Time Recommendation Engine with Data Science.md
similarity index 100%
rename from published/20160817 Building a Real-Time Recommendation Engine with Data Science.md
rename to published/201612/20160817 Building a Real-Time Recommendation Engine with Data Science.md
diff --git a/published/20160817 Dependency Injection for the Android platform 101 - Part 1.md b/published/201612/20160817 Dependency Injection for the Android platform 101 - Part 1.md
similarity index 100%
rename from published/20160817 Dependency Injection for the Android platform 101 - Part 1.md
rename to published/201612/20160817 Dependency Injection for the Android platform 101 - Part 1.md
diff --git a/published/20160908 Using webpack with the Amazon Cognito Identity SDK for JavaScript.md b/published/201612/20160908 Using webpack with the Amazon Cognito Identity SDK for JavaScript.md
similarity index 100%
rename from published/20160908 Using webpack with the Amazon Cognito Identity SDK for JavaScript.md
rename to published/201612/20160908 Using webpack with the Amazon Cognito Identity SDK for JavaScript.md
diff --git a/published/20160913 The Five Principles of Monitoring Microservices.md b/published/201612/20160913 The Five Principles of Monitoring Microservices.md
similarity index 100%
rename from published/20160913 The Five Principles of Monitoring Microservices.md
rename to published/201612/20160913 The Five Principles of Monitoring Microservices.md
diff --git a/published/20160915 Should Smartphones Do Away with the Headphone Jack Here Are Our Though.md b/published/201612/20160915 Should Smartphones Do Away with the Headphone Jack Here Are Our Though.md
similarity index 100%
rename from published/20160915 Should Smartphones Do Away with the Headphone Jack Here Are Our Though.md
rename to published/201612/20160915 Should Smartphones Do Away with the Headphone Jack Here Are Our Though.md
diff --git a/translated/tech/20160921 How To Install The PyCharm Python In Linux.md b/published/201612/20160921 How To Install The PyCharm Python In Linux.md
similarity index 55%
rename from translated/tech/20160921 How To Install The PyCharm Python In Linux.md
rename to published/201612/20160921 How To Install The PyCharm Python In Linux.md
index 3e1a84e2b9..5894aaad37 100644
--- a/translated/tech/20160921 How To Install The PyCharm Python In Linux.md	
+++ b/published/201612/20160921 How To Install The PyCharm Python In Linux.md	
@@ -1,104 +1,101 @@
-如何在 Linux 下安装 Python IDE - PyCharm
+如何在 Linux 下安装 PyCharm
 ============================================
 
-![][7]
+![](https://fthmb.tqn.com/ju1u-Ju56vYnXabPbsVRyopd72Q=/768x0/filters:no_upscale()/about/pycharmstart-57e2cb405f9b586c351a4cf7.png)
+
 ### 简介
 
-Linux 经常被看成是一个远离外部世界，只有极客才会使用的操作系统，虽然这是一个误解，但事实上，如果你想开发软件，那么 Linux 系统能够为你提供一个很好的开发环境。
+Linux 经常被看成是一个远离外部世界，只有极客才会使用的操作系统，但是这是不准确的，如果你想开发软件，那么 Linux 能够为你提供一个非常棒的开发环境。
 
-刚开始学习编程的新手们经常会问这样一个问题：应该使用哪种语言？当涉及到 Linux 系统的时候，通常的选择是 C、C++、Python、Java、PHP、Perl 和 Ruby On Rails
+刚开始学习编程的新手们经常会问这样一个问题：应该使用哪种语言？当涉及到 Linux 系统的时候，通常的选择是 C、C++、Python、Java、PHP、Perl 和 Ruby On Rails。
 
-Linux 系统的许多核心程序都是用 C 语言写的，但是如果离开 Linux 系统的世界， C 语言不再像其他语言比如 Java 和 Python 那么常用。
+Linux 系统的许多核心程序都是用 C 语言写的，但是如果离开 Linux 系统的世界， C 语言就不如其它语言比如 Java 和 Python 那么常用。
 
-对于学习编程的人来说， Python 和 Java 都是不错的选择，因为它们是跨平台的，因此，你在 Linux 系统上写的程序在 Windows 系统和 Macs 系统上也能够很好的工作。
+对于学习编程的人来说， Python 和 Java 都是不错的选择，因为它们是跨平台的，因此，你在 Linux 系统上写的程序在 Windows 系统和 Mac 系统上也能够很好的工作。
 
-虽然你可以使用任何编辑器来开发 Python 程序，但是如果你使用一个同时包含编辑器和调试器的优秀集成开发环境（IDE）来进行开发，那么你的编程生涯将会变得更加轻松。
+虽然你可以使用任何编辑器来开发 Python 程序，但是如果你使用一个同时包含编辑器和调试器的优秀的集成开发环境（IDE）来进行开发，那么你的编程生涯将会变得更加轻松。
 
-PyCharm 是由 Jetbrains 公司开发的一个跨平台编辑器。如果你之前是在 Windows 环境下进行开发，那么你会立刻认出 Jetbrains 公司，它就是那个开发了 Resharper 的公司。 Resharper 是一个用于重构代码的优秀产品，它能够指出代码可能存在的问题以及自动添加声明：比如当你在使用一个类的时候它会自动为你导入。
+PyCharm 是由 Jetbrains 公司开发的一个跨平台编辑器。如果你之前是在 Windows 环境下进行开发，那么你会立刻认出 Jetbrains 公司，它就是那个开发了 Resharper 的公司。 Resharper 是一个用于重构代码的优秀产品，它能够指出代码可能存在的问题，自动添加声明，比如当你在使用一个类的时候它会自动为你导入。
 
 这篇文章将讨论如何在 Linux 系统上获取、安装和运行 PyCharm 。
 
 ### 如何获取 PyCharm
 
-你可以通过访问[这儿][1]获取 PyCharm 。屏幕中央有一个很大的 'Download' 按钮。
+你可以通过访问[https://www.jetbrains.com/pycharm/][1]获取 PyCharm 。
 
-你可以选择下载专业版或者社区版。如果你只是习惯于用 Python 编程那么推荐下载社区版。
+屏幕中央有一个很大的 'Download' 按钮。
 
-然而，如果你打算进行专业化的编程，那么专业版的一些优秀特性是不容忽视的。
+你可以选择下载专业版或者社区版。如果你刚刚接触 Python 编程那么推荐下载社区版。然而，如果你打算发展到专业化的编程，那么专业版的一些优秀特性是不容忽视的。
 
 ### 如何安装 PyCharm
 
-下载好的文件的名称可能是 ‘pycharm-professional-2016.2.3.tar.gz’。
+下载好的文件的名称可能类似这种样子 ‘pycharm-professional-2016.2.3.tar.gz’。
 
-以 “tar.gz” 结尾的文件是被 [gzip][2] 工具压缩过的，并且用 [tar][3] 工具进行了归档从而保证文件夹结构在一个地方。
+以 “tar.gz” 结尾的文件是被 [gzip][2] 工具压缩过的，并且把文件夹用 [tar][3] 工具归档到了一起。你可以阅读关于[提取 tar.gz 文件][4]指南的更多信息。
 
-你可以阅读关于[提取 tar.gz 文件][4]指南的更多信息。
+加快速度，为了解压文件，你需要做的是首先打开终端，然后通过下面的命令进入下载文件所在的文件夹：
 
-加快节奏，为了解压文件，你需要做的是首先打开终端，然后通过下面的命令进入下载文件所在的文件夹：
-
-  ```
-  cd ~/Downloads
-  ```
+```
+cd ~/Downloads
+```
 
 现在，通过运行下面的命令找到你下载的文件的名字：
 
-  ```
-  ls pycharm*
-  ```
+```
+ls pycharm*
+```
 
 然后运行下面的命令解压文件：
 
-  ```
-  tar -xvzf pycharm-professional-2016.2.3.tar.gz -C ~
-  ```
+```
+tar -xvzf pycharm-professional-2016.2.3.tar.gz -C ~
+```
 
-记得把上面命令中的文件名替换成通过 ‘ls’ 命令获知的 pycharm 文件名。（也就是你下载的文件的名字）
-
-上面的命令将会把 PyCharm 软件安装在 ‘home’ 目录中。
+记得把上面命令中的文件名替换成通过 `ls` 命令获知的 pycharm 文件名。（也就是你下载的文件的名字）。上面的命令将会把 PyCharm 软件安装在 `home` 目录中。
 
 ### 如何运行 PyCharm
 
-要运行 PyCharm， 首先需要进入 ‘home’ 目录：
+要运行 PyCharm， 首先需要进入 `home` 目录：
 
-  ```
-  cd ~
-  ```
+```
+cd ~
+```
 
-运行 ‘ls’ 命令查找文件夹名：
+运行 `ls` 命令查找文件夹名：
 
-  ```
-  ls
-  ```
+```
+ls
+```
 
 查找到文件名以后，运行下面的命令进入 PyCharm 目录：
 
-  ```
-  cd pycharm-2016.2.3/bin
-  ```
+```
+cd pycharm-2016.2.3/bin
+```
 
 最后，通过运行下面的命令来运行 PyCharm：
 
-  ```
-  sh pycharm.sh &
-  ```
+```
+sh pycharm.sh &
+```
 
-如果你是在一个桌面环境比如 GNOME、KDE、Unity、Cinnamon 或者其他现代桌面上运行，那么你也可以通过针对桌面环境的菜单或者快捷方式来找到 PyCharm 。
+如果你是在一个桌面环境比如 GNOME 、 KDE 、 Unity 、 Cinnamon 或者其他现代桌面环境上运行，你也可以通过桌面环境的菜单或者快捷方式来找到 PyCharm 。
 
 ### 总结
 
 现在， PyCharm 已经安装好了，你可以开始使用它来开发一个桌面应用、 web 应用和各种工具。
 
-如果你想学习如何使用 Python 编程，那么这儿有很好的[学习资源][5]值得一看。里面的文章更多的是关于 Linux 学习，但也有一些资源比如 Pluralsight 和 Udemy 提供了关于 Python 学习的一些很好的教程。
+如果你想学习如何使用 Python 编程，那么这里有很好的[学习资源][5]值得一看。里面的文章更多的是关于 Linux 学习，但也有一些资源比如 Pluralsight 和 Udemy 提供了关于 Python 学习的一些很好的教程。
 
-如果想了解 PyCharm 的所有可用特性，请点击[这儿][6]来查看。它覆盖了从创建项目到描述用户界面、调试以及代码重构的全部内容。
+如果想了解 PyCharm 的更多特性，请点击[这儿][6]来查看。它覆盖了从创建项目到描述用户界面、调试以及代码重构的全部内容。
 
 -----------------------------------------------------------------------------------------------------------
 
 via: https://www.lifewire.com/how-to-install-the-pycharm-python-ide-in-linux-4091033
 
-作者：[ Gary Newell][a]
+作者：[Gary Newell][a]
 译者：[ucasFL](https://github.com/ucasFL)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[oska874](https://github.com/oska874)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
 
diff --git a/published/20160923 PyCharm - The Best Linux Python IDE.md b/published/201612/20160923 PyCharm - The Best Linux Python IDE.md
similarity index 100%
rename from published/20160923 PyCharm - The Best Linux Python IDE.md
rename to published/201612/20160923 PyCharm - The Best Linux Python IDE.md
diff --git a/published/20161014 IS OPEN SOURCE DESIGN A THING.md b/published/201612/20161014 IS OPEN SOURCE DESIGN A THING.md
similarity index 100%
rename from published/20161014 IS OPEN SOURCE DESIGN A THING.md
rename to published/201612/20161014 IS OPEN SOURCE DESIGN A THING.md
diff --git a/published/20161014 WattOS - A Rock-Solid Lightning-Fast Lightweight Linux Distro For All.md b/published/201612/20161014 WattOS - A Rock-Solid Lightning-Fast Lightweight Linux Distro For All.md
similarity index 100%
rename from published/20161014 WattOS - A Rock-Solid Lightning-Fast Lightweight Linux Distro For All.md
rename to published/201612/20161014 WattOS - A Rock-Solid Lightning-Fast Lightweight Linux Distro For All.md
diff --git a/published/20161017 How To Manually Backup Your SMS MMS Messages On Android.md b/published/201612/20161017 How To Manually Backup Your SMS MMS Messages On Android.md
similarity index 100%
rename from published/20161017 How To Manually Backup Your SMS MMS Messages On Android.md
rename to published/201612/20161017 How To Manually Backup Your SMS MMS Messages On Android.md
diff --git a/published/20161018 An Everyday Linux User Review Of Xubuntu 16.10 - A Good Place To Start.md b/published/201612/20161018 An Everyday Linux User Review Of Xubuntu 16.10 - A Good Place To Start.md
similarity index 100%
rename from published/20161018 An Everyday Linux User Review Of Xubuntu 16.10 - A Good Place To Start.md
rename to published/201612/20161018 An Everyday Linux User Review Of Xubuntu 16.10 - A Good Place To Start.md
diff --git a/translated/tech/20161021 Getting started with Inkscape on Fedora.md b/published/201612/20161021 Getting started with Inkscape on Fedora.md
similarity index 56%
rename from translated/tech/20161021 Getting started with Inkscape on Fedora.md
rename to published/201612/20161021 Getting started with Inkscape on Fedora.md
index 66170f8fa4..99a1d40413 100644
--- a/translated/tech/20161021 Getting started with Inkscape on Fedora.md	
+++ b/published/201612/20161021 Getting started with Inkscape on Fedora.md	
@@ -1,26 +1,27 @@
-### [在 Fedora 中使用 Inkscape][2]
+Fedora 中使用 Inkscape 起步
+=============
 
- ![inkscape-gettingstarted](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-gettingstarted-945x400.png) 
+![inkscape-gettingstarted](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-gettingstarted-945x400.png) 
 
-Inkscape 是一个流行的、功能齐全、免费和开源的矢量[图形编辑器][3]，它已经在 Fedora 官方仓库中。它专门为[SVG格式][4]中创建矢量图形而定制。Inkscape 非常适合创建和操作图片和插图。它也适用于创建图表和模拟用户界面。
+Inkscape 是一个流行的、功能齐全、自由而开源的矢量[图形编辑器][3]，它已经在 Fedora 官方仓库中。它特别适合创作 [SVG 格式][4]的矢量图形。Inkscape 非常适于创建和操作图片和插图，以及创建图表和用户界面设计。
 
 [
  ![cyberscoty-landscape-800px](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/cyberscoty-landscape-800px.png) 
 ][5]
 
-使用inkscape创建的[风车景色][1]的插图
+*使用 inkscape 创建的[风车景色][1]的插图*
 
-[官方网站上的截图页][6]上有一些很好的例子，说明Inkscape可以做些什么。Fedora杂志上的大多数精选图片也是使用 Inkscape 创建的，包括最近的精选图片：
+[其官方网站的截图页][6]上有一些很好的例子，说明 Inkscape 可以做些什么。<ruby>Fedora 杂志<rt>Fedora Magazine</rt></ruby>上的大多数精选图片也是使用 Inkscape 创建的，包括最近的精选图片：
 
 [
  ![communty](https://cdn.fedoramagazine.org/wp-content/uploads/2016/09/communty.png) 
 ][7]
 
-最近使用 Inkscape 创建的 Fedora 杂志精选图片
+*Fedora 杂志最近使用 Inkscape 创建的精选图片*
 
-### 在 Fedora 中安装 Inkscape
+### 在 Fedora 上安装 Inkscape
 
-**Inkscape 已经[在 Fedora 官方仓库中了][8]，因此可以非常简单地在 Fedora Workstation 使用 Software 这个程序安装它：**
+**Inkscape 已经[在 Fedora 官方仓库中了][8]，因此可以非常简单地在 Fedora Workstation 上使用 Software 这个应用来安装它：**
 
 [
  ![inkscape-gnome-software](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-gnome-software.png) 
@@ -32,9 +33,9 @@ Inkscape 是一个流行的、功能齐全、免费和开源的矢量[图形编
 sudo dnf install inkscape
 ```
 
-### (开始)深入 Inkscape
+### （开始）深入 Inkscape
 
-当第一次打开程序是，你会看到一个空白页面，并且有一组不同的工具栏。对于初学者，最重要的三个工具栏是：Toolbar、Tools Control Bar、 Colour Palette：
+当第一次打开程序时，你会看到一个空白页面，并且有一组不同的工具栏。对于初学者，最重要的三个工具栏是：Toolbar、Tools Control Bar、 Colour Palette（调色板）：
 
 [
  ![inkscape_window](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape_window.png) 
@@ -43,35 +44,35 @@ sudo dnf install inkscape
 **Toolbar**提供了创建绘图的所有基本工具，包括以下工具：
 
 * 矩形工具：用于绘制矩形和正方形
-* 星/多边形（形状）工具
+* 星形/多边形（形状）工具
 * 圆形工具：用于绘制椭圆和圆
 * 文本工具：用于添加标签和其他文本
 * 路径工具：用于创建或编辑更复杂或自定义的形状
 * 选择工具：用于选择图形中的对象
 
-**Colour Palette** 提供了一种快速方式来设置当前选定对象的颜色。 **Tools Control Bar** 提供了工具栏中当前选定工具的所有设置。每次选择新工具时，Tools Control Bar 会变成该工具的设置：
+**Colour Palette** 提供了一种设置当前选定对象的颜色的快速方式。 **Tools Control Bar** 提供了工具栏中当前选定工具的所有设置。每次选择新工具时，Tools Control Bar 会变成该工具的相应设置：
 
 [
  ![](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-toolscontrolbar.gif) 
 ][11]
 
-### 绘画图形
+### 绘图
 
-接下来，让我们使用 Inkscape 绘制一个星星。 首先，从 **Toolbar** 中选择星形工具，**然后单击并拖动主绘图区域。**
+接下来，让我们使用 Inkscape 绘制一个星星。 首先，从 **Toolbar** 中选择星形工具，**然后在主绘图区域上单击并拖动。**
 
-你可能会注意到你的星看起来很像一个三角形。要更改它，请使用 “Tools Control Bar” 中的 “Corners” 选项，然后再添加几个点。 最后，当你完成后，当星星仍被选中时，从“调色板”中选择一种颜色来改变星星的颜色：
+你可能会注意到你画的星星看起来很像一个三角形。要更改它，请使用 **Tools Control Bar** 中的 **Corners** 选项，再添加几个点。 最后，当你完成后，在星星仍被选中的状态下，从 **Palette**（调色板）中选择一种颜色来改变星星的颜色：
 
 [
  ![inkscape-drawastar](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-drawastar.gif) 
 ][12]
 
-接下来，在Toolbar中实验一些其他形状工具，如矩形工具，螺旋工具和圆形工具。每个工具都设置下来创建一些独特的图形。
+接下来，可以在 Toolbar 中实验一些其他形状工具，如矩形工具，螺旋工具和圆形工具。通过不同的设置，每个工具都可以创建一些独特的图形。
 
-### 在绘图中选择移动对象
+### 在绘图中选择并移动对象
 
-现在你有一堆图形了，你使用选择工具来移动它们。要使用选择工具，首先从工具栏中选择它，然后单击要操作的形状，接着将图形拖动到您想要的位置。
+现在你有一堆图形了，你可以使用 Select 工具来移动它们。要使用 Select 工具，首先从工具栏中选择它，然后单击要操作的形状，接着将图形拖动到您想要的位置。
 
-选择形状时，你还可以使用调整大小手柄来缩放图形。此外，如果你单击所选的图形，调整大小控点将变为旋转模式，并允许你旋转图形：
+选择形状后，你还可以使用尺寸句柄调整图形大小。此外，如果你单击所选的图形，尺寸句柄将转变为旋转模式，并允许你旋转图形：
 
 [
  ![inkscape-movingshapes](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-movingshapes.gif) 
@@ -83,7 +84,7 @@ Inkscape是一个很棒的软件，它还包含了更多的工具和功能。在
 
 -----------------------
 
-作者简介：Ryan是一名 Fedora 设计师。他使用 Fedora Workstation 作为他的主要桌面，还有来自Libre Graphics 世界的最好的工具，尤其是矢量图形编辑器 Inkscape。
+作者简介：Ryan 是一名 Fedora 设计师。他使用 Fedora Workstation 作为他的主要桌面，还有来自 Libre Graphics 世界的最好的工具，尤其是矢量图形编辑器 Inkscape。
 
 
 --------------------------------------------------------------------------------
@@ -92,7 +93,7 @@ via: https://fedoramagazine.org/getting-started-inkscape-fedora/
 
 作者：[Ryan Lerch][a]
 译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[jasminepeng](https://github.com/jasminepeng)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
 
diff --git a/published/20161021 Livepatch – Apply Critical Security Patches to Ubuntu Linux Kernel Without Rebooting.md b/published/201612/20161021 Livepatch – Apply Critical Security Patches to Ubuntu Linux Kernel Without Rebooting.md
similarity index 100%
rename from published/20161021 Livepatch – Apply Critical Security Patches to Ubuntu Linux Kernel Without Rebooting.md
rename to published/201612/20161021 Livepatch – Apply Critical Security Patches to Ubuntu Linux Kernel Without Rebooting.md
diff --git a/published/20161023 HOW TO SHARE STEAM GAME FILES BETWEEN LINUX AND WINDOWS.md b/published/201612/20161023 HOW TO SHARE STEAM GAME FILES BETWEEN LINUX AND WINDOWS.md
similarity index 100%
rename from published/20161023 HOW TO SHARE STEAM GAME FILES BETWEEN LINUX AND WINDOWS.md
rename to published/201612/20161023 HOW TO SHARE STEAM GAME FILES BETWEEN LINUX AND WINDOWS.md
diff --git a/published/20161024 Getting Started with Webpack 2.md b/published/201612/20161024 Getting Started with Webpack 2.md
similarity index 100%
rename from published/20161024 Getting Started with Webpack 2.md
rename to published/201612/20161024 Getting Started with Webpack 2.md
diff --git a/published/20161026 24 MUST HAVE ESSENTIAL LINUX APPLICATIONS IN 2016.md b/published/201612/20161026 24 MUST HAVE ESSENTIAL LINUX APPLICATIONS IN 2016.md
similarity index 100%
rename from published/20161026 24 MUST HAVE ESSENTIAL LINUX APPLICATIONS IN 2016.md
rename to published/201612/20161026 24 MUST HAVE ESSENTIAL LINUX APPLICATIONS IN 2016.md
diff --git a/published/20161026 Fedora-powered computer lab at our university.md b/published/201612/20161026 Fedora-powered computer lab at our university.md
similarity index 100%
rename from published/20161026 Fedora-powered computer lab at our university.md
rename to published/201612/20161026 Fedora-powered computer lab at our university.md
diff --git a/published/20161027 DTrace for Linux 2016.md b/published/201612/20161027 DTrace for Linux 2016.md
similarity index 100%
rename from published/20161027 DTrace for Linux 2016.md
rename to published/201612/20161027 DTrace for Linux 2016.md
diff --git a/published/20161027 Would You Consider Riding in a Driverless Car.md b/published/201612/20161027 Would You Consider Riding in a Driverless Car.md
similarity index 100%
rename from published/20161027 Would You Consider Riding in a Driverless Car.md
rename to published/201612/20161027 Would You Consider Riding in a Driverless Car.md
diff --git a/published/20161030 I dont understand Pythons Asyncio.md b/published/201612/20161030 I dont understand Pythons Asyncio.md
similarity index 100%
rename from published/20161030 I dont understand Pythons Asyncio.md
rename to published/201612/20161030 I dont understand Pythons Asyncio.md
diff --git a/published/20161102 5 Best FPS Games For Linux.md b/published/201612/20161102 5 Best FPS Games For Linux.md
similarity index 100%
rename from published/20161102 5 Best FPS Games For Linux.md
rename to published/201612/20161102 5 Best FPS Games For Linux.md
diff --git a/published/20161104 4 Easy Ways To Generate A Strong Password In Linux.md b/published/201612/20161104 4 Easy Ways To Generate A Strong Password In Linux.md
similarity index 100%
rename from published/20161104 4 Easy Ways To Generate A Strong Password In Linux.md
rename to published/201612/20161104 4 Easy Ways To Generate A Strong Password In Linux.md
diff --git a/published/20161105 How to Install Security Updates Automatically on Debian and Ubuntu.md b/published/201612/20161105 How to Install Security Updates Automatically on Debian and Ubuntu.md
similarity index 100%
rename from published/20161105 How to Install Security Updates Automatically on Debian and Ubuntu.md
rename to published/201612/20161105 How to Install Security Updates Automatically on Debian and Ubuntu.md
diff --git a/published/20161110 4 Ways to Batch Convert Your PNG to JPG and Vice-Versa.md b/published/201612/20161110 4 Ways to Batch Convert Your PNG to JPG and Vice-Versa.md
similarity index 100%
rename from published/20161110 4 Ways to Batch Convert Your PNG to JPG and Vice-Versa.md
rename to published/201612/20161110 4 Ways to Batch Convert Your PNG to JPG and Vice-Versa.md
diff --git a/published/20161110 How To Update Wifi Network Password From Terminal In Arch Linux.md b/published/201612/20161110 How To Update Wifi Network Password From Terminal In Arch Linux.md
similarity index 100%
rename from published/20161110 How To Update Wifi Network Password From Terminal In Arch Linux.md
rename to published/201612/20161110 How To Update Wifi Network Password From Terminal In Arch Linux.md
diff --git a/published/201612/20161110 How to check if port is in use on Linux or Unix.md b/published/201612/20161110 How to check if port is in use on Linux or Unix.md
new file mode 100644
index 0000000000..951cf2a490
--- /dev/null
+++ b/published/201612/20161110 How to check if port is in use on Linux or Unix.md	
@@ -0,0 +1,119 @@
+如何在 Linux/Unix 系统中验证端口是否被占用
+==========
+
+[![](https://s0.cyberciti.org/images/category/old/linux-logo.png)][1]
+
+在 Linux 或者类 Unix 中，我该如何检查某个端口是否被占用？我又该如何验证 Linux 服务器中有哪些端口处于监听状态？
+
+验证哪些端口在服务器的网络接口上处于监听状态是非常重要的。你需要注意那些开放端口来检测网络入侵。除了网络入侵，为了排除故障，确认服务器上的某个端口是否被其他应用程序占用也是必要的。比方说，你可能会在同一个系统中安装了 Apache 和 Nginx 服务器，所以了解是 Apache 还是 Nginx 占用了 # 80/443 TCP 端口真的很重要。这篇快速教程会介绍使用 `netstat` 、 `nmap` 和 `lsof` 命令来检查端口使用信息并找出哪些程序正在使用这些端口。
+
+### 如何检查 Linux 中的程序和监听的端口
+
+1、 打开一个终端，如 shell 命令窗口。
+2、 运行以下任意一行命令：
+
+```
+sudo lsof -i -P -n | grep LISTEN
+sudo netstat -tulpn | grep LISTEN
+sudo nmap -sTU -O IP地址
+```
+
+下面我们看看这些命令和它们的详细输出内容：
+
+### 方式 1：lsof 命令
+
+语法如下：
+
+```
+$ sudo lsof -i -P -n
+$ sudo lsof -i -P -n | grep LISTEN
+$ doas lsof -i -P -n | grep LISTEN  ### OpenBSD
+```
+
+输出如下：
+
+[![Fig.01: Check the listening ports and applications with lsof command](https://s0.cyberciti.org/uploads/faq/2016/11/lsof-outputs.png)][2]
+
+*图 1：使用 lsof 命令检查监听端口和程序*
+
+仔细看上面输出的最后一行：
+
+```
+sshd    85379     root    3u  IPv4 0xffff80000039e000      0t0  TCP 10.86.128.138:22 (LISTEN)
+```
+
+- `sshd` 是程序的名称
+- `10.86.128.138` 是 `sshd` 程序绑定 (LISTEN) 的 IP 地址
+- `22` 是被使用 (LISTEN) 的 TCP 端口
+- `85379` 是 `sshd` 任务的进程 ID (PID)
+
+### 方式 2：netstat 命令
+
+你可以如下面所示使用 `netstat` 来检查监听的端口和程序。
+
+**Linux 中 netstat 语法**
+
+```
+$ netstat -tulpn | grep LISTEN
+```
+
+**FreeBSD/MacOS X 中 netstat 语法**
+
+```
+$ netstat -anp tcp | grep LISTEN
+$ netstat -anp udp | grep LISTEN
+```
+
+**OpenBSD 中 netstat 语法**
+
+```
+$ netstat -na -f inet | grep LISTEN
+$ netstat -nat | grep LISTEN
+```
+
+### 方式 3：nmap 命令
+
+语法如下：
+
+```
+$ sudo nmap -sT -O localhost
+$ sudo nmap -sU -O 192.168.2.13 ### 列出打开的 UDP 端口
+$ sudo nmap -sT -O 192.168.2.13 ### 列出打开的 TCP 端口
+```
+
+示例输出如下：
+
+[![Fig.02: Determines which ports are listening for TCP connections using nmap](https://s0.cyberciti.org/uploads/faq/2016/11/nmap-outputs.png)][3]
+
+*图 2：使用 nmap 探测哪些端口监听 TCP 连接*
+
+你可以用一句命令合并 TCP/UDP 扫描：
+
+```
+$ sudo nmap -sTU -O 192.168.2.13
+```
+
+### 赠品：对于 Windows 用户
+
+在 windows 系统下可以使用下面的命令检查端口使用情况：
+
+```
+netstat -bano | more
+netstat -bano | grep LISTENING
+netstat -bano | findstr /R /C:"[LISTING]"
+```
+
+----------------------------------------------------
+
+via: https://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/
+
+作者：[VIVEK GITE][a]
+译者：[GHLandy](https://github.com/GHLandy)
+校对：[oska874](https://github.com/oska874)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/
+[1]:https://www.cyberciti.biz/faq/category/linux/
+[2]:http://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/lsof-outputs/
+[3]:http://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/nmap-outputs/
diff --git a/published/20161112 Neofetch – Shows Linux System Information with Distribution Logo.md b/published/201612/20161112 Neofetch – Shows Linux System Information with Distribution Logo.md
similarity index 100%
rename from published/20161112 Neofetch – Shows Linux System Information with Distribution Logo.md
rename to published/201612/20161112 Neofetch – Shows Linux System Information with Distribution Logo.md
diff --git a/published/20161114 Introduction to Eclipse Che a next-generation web-based IDE.md b/published/201612/20161114 Introduction to Eclipse Che a next-generation web-based IDE.md
similarity index 100%
rename from published/20161114 Introduction to Eclipse Che a next-generation web-based IDE.md
rename to published/201612/20161114 Introduction to Eclipse Che a next-generation web-based IDE.md
diff --git a/published/20161116 Fix Unable to lock the administration directory in Ubuntu.md b/published/201612/20161116 Fix Unable to lock the administration directory in Ubuntu.md
similarity index 100%
rename from published/20161116 Fix Unable to lock the administration directory in Ubuntu.md
rename to published/201612/20161116 Fix Unable to lock the administration directory in Ubuntu.md
diff --git a/published/20161121 Create an Active Directory Infrastructure with Samba4 on Ubuntu – Part 1.md b/published/201612/20161121 Create an Active Directory Infrastructure with Samba4 on Ubuntu – Part 1.md
similarity index 100%
rename from published/20161121 Create an Active Directory Infrastructure with Samba4 on Ubuntu – Part 1.md
rename to published/201612/20161121 Create an Active Directory Infrastructure with Samba4 on Ubuntu – Part 1.md
diff --git a/published/20161123 How to find a file on a Linux VPS.md b/published/201612/20161123 How to find a file on a Linux VPS.md
similarity index 100%
rename from published/20161123 How to find a file on a Linux VPS.md
rename to published/201612/20161123 How to find a file on a Linux VPS.md
diff --git a/published/20161124 Fedora 25 Workstation Installation Guide.md b/published/201612/20161124 Fedora 25 Workstation Installation Guide.md
similarity index 100%
rename from published/20161124 Fedora 25 Workstation Installation Guide.md
rename to published/201612/20161124 Fedora 25 Workstation Installation Guide.md
diff --git a/published/20161124 How to Manage Samba4 AD Infrastructure from Linux Command Line – Part 2.md b/published/201612/20161124 How to Manage Samba4 AD Infrastructure from Linux Command Line – Part 2.md
similarity index 100%
rename from published/20161124 How to Manage Samba4 AD Infrastructure from Linux Command Line – Part 2.md
rename to published/201612/20161124 How to Manage Samba4 AD Infrastructure from Linux Command Line – Part 2.md
diff --git a/published/20161126 Find Out All Live Hosts IP Addresses Connected on Network in Linux.md b/published/201612/20161126 Find Out All Live Hosts IP Addresses Connected on Network in Linux.md
similarity index 100%
rename from published/20161126 Find Out All Live Hosts IP Addresses Connected on Network in Linux.md
rename to published/201612/20161126 Find Out All Live Hosts IP Addresses Connected on Network in Linux.md
diff --git a/published/20161128 Moving with SQL Server to Linux - Move from SQL Server to MySQL as well.md b/published/201612/20161128 Moving with SQL Server to Linux - Move from SQL Server to MySQL as well.md
similarity index 100%
rename from published/20161128 Moving with SQL Server to Linux - Move from SQL Server to MySQL as well.md
rename to published/201612/20161128 Moving with SQL Server to Linux - Move from SQL Server to MySQL as well.md
diff --git a/published/20161128 Uncommon-but-useful-GCC-command-line-options-part-1.md b/published/201612/20161128 Uncommon-but-useful-GCC-command-line-options-part-1.md
similarity index 100%
rename from published/20161128 Uncommon-but-useful-GCC-command-line-options-part-1.md
rename to published/201612/20161128 Uncommon-but-useful-GCC-command-line-options-part-1.md
diff --git a/published/20161130 Install Security Patches or Updates Automatically on CentOS and RHEL.md b/published/201612/20161130 Install Security Patches or Updates Automatically on CentOS and RHEL.md
similarity index 100%
rename from published/20161130 Install Security Patches or Updates Automatically on CentOS and RHEL.md
rename to published/201612/20161130 Install Security Patches or Updates Automatically on CentOS and RHEL.md
diff --git a/published/20161130 Locking Down Your Linux Server.md b/published/201612/20161130 Locking Down Your Linux Server.md
similarity index 100%
rename from published/20161130 Locking Down Your Linux Server.md
rename to published/201612/20161130 Locking Down Your Linux Server.md
diff --git a/published/2016118-How-To-Enable-Shell-Script-Debugging Mode in Linux.md b/published/201612/2016118-How-To-Enable-Shell-Script-Debugging Mode in Linux.md
similarity index 100%
rename from published/2016118-How-To-Enable-Shell-Script-Debugging Mode in Linux.md
rename to published/201612/2016118-How-To-Enable-Shell-Script-Debugging Mode in Linux.md
diff --git a/published/20161201 3 open source password managers.md b/published/201612/20161201 3 open source password managers.md
similarity index 100%
rename from published/20161201 3 open source password managers.md
rename to published/201612/20161201 3 open source password managers.md
diff --git a/published/20161201 5 Ways to Empty or Delete a Large File Content in Linux.md b/published/201612/20161201 5 Ways to Empty or Delete a Large File Content in Linux.md
similarity index 100%
rename from published/20161201 5 Ways to Empty or Delete a Large File Content in Linux.md
rename to published/201612/20161201 5 Ways to Empty or Delete a Large File Content in Linux.md
diff --git a/published/20161201 How to Build an Email Server on Ubuntu Linux.md b/published/201612/20161201 How to Build an Email Server on Ubuntu Linux.md
similarity index 100%
rename from published/20161201 How to Build an Email Server on Ubuntu Linux.md
rename to published/201612/20161201 How to Build an Email Server on Ubuntu Linux.md
diff --git a/published/20161201 Uncommon but useful GCC command line options - part 2.md b/published/201612/20161201 Uncommon but useful GCC command line options - part 2.md
similarity index 100%
rename from published/20161201 Uncommon but useful GCC command line options - part 2.md
rename to published/201612/20161201 Uncommon but useful GCC command line options - part 2.md
diff --git a/published/20161202 httpstat – A Curl Statistics Tool to Check Website Performance.md b/published/201612/20161202 httpstat – A Curl Statistics Tool to Check Website Performance.md
similarity index 100%
rename from published/20161202 httpstat – A Curl Statistics Tool to Check Website Performance.md
rename to published/201612/20161202 httpstat – A Curl Statistics Tool to Check Website Performance.md
diff --git a/published/201612/20161203 Redirect a Website URL from One Server to Different Server in Apache.md b/published/201612/20161203 Redirect a Website URL from One Server to Different Server in Apache.md
new file mode 100644
index 0000000000..f0b37fa394
--- /dev/null
+++ b/published/201612/20161203 Redirect a Website URL from One Server to Different Server in Apache.md	
@@ -0,0 +1,63 @@
+如何在 Apache 中重定向 URL 到另外一台服务器
+============================================================
+
+如我们前面两篇文章（[使用 mod_rewrite 执行内部重定向][1]和[基于浏览器来显示自定义内容][2]）中提到的，在本文中，我们将解释如何在 Apache 中使用 mod_rewrite 模块重定向对已移动到另外一台服务器上的资源的访问。
+
+假设你正在重新设计公司的网站。你已决定将内容和样式（HTML文件、JavaScript 和 CSS）存储在一个服务器上，将文档存储在另一个服务器上 - 这样可能会更稳健。
+
+**建议阅读：** [5 个提高 Apache Web 服务器性能的提示][3] 。
+
+但是，你希望这个更改对用户是透明的，以便他们仍然能够通过之前的网址访问文档。
+
+在下面的例子中，名为 `assets.pdf` 的文件已从 `192.168.0.100`（主机名：`web`）中的 `/var/www/html` 移动到`192.168.0.101`（主机名：`web2`）中的相同位置。
+
+为了让用户在浏览到 `192.168.0.100/assets.pdf` 时可以访问到此文件，请打开 `192.168.0.100` 上的 Apache 配置文件并添加以下重写规则（或者也可以将以下规则添加到 [.htaccess 文件][4]）中：
+
+```
+RewriteRule "^(/assets\.pdf$)" "http://192.168.0.101$1"  [R,L]
+```
+
+其中 `$1` 占位符，代表与括号中的正则表达式匹配的任何内容。
+
+现在保存更改，不要忘记重新启动 Apache，让我们看看当我们打开 `192.168.0.100/assets.pdf`，尝试访问 `assets.pdf` 时会发生什么：
+
+**建议阅读：** [25 个有用的网站 .htaccess 技巧] [5]
+
+在下面我们就可以看到，为 `192.168.0.100` 上的 `assets.pdf` 所做的请求实际上是由 `192.168.0.101` 处理的。
+
+```
+# tail -n 1 /var/log/apache2/access.log
+```
+[
+ ![Check Apache Logs](http://www.tecmint.com/wp-content/uploads/2016/11/Check-Apache-Logs.png) 
+][6]
+
+*检查 Apache 日志*
+
+在本文中，我们讨论了如何对已移动到其他服务器的资源进行重定向。 总而言之，我强烈建议你看看 [mod_rewrite][7] 指南和 [Apache 重定向指南][8]，以供将来参考。
+
+一如既往那样，如果您对本文有任何疑虑，请随时使用下面的评论栏回复。 我们期待你的回音！
+
+--------------------------------------------------------------------------------
+
+作者简介：Gabriel Cánepa 是来自阿根廷圣路易斯 Villa Mercedes 的 GNU/Linux 系统管理员和 Web 开发人员。 他在一家全球领先的消费品公司工作，非常高兴使用 FOSS 工具来提高他日常工作领域的生产力。
+
+-----------
+
+via: http://www.tecmint.com/redirect-website-url-from-one-server-to-different-server/
+
+作者：[Gabriel Cánepa][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/gacanepa/
+[1]:http://www.tecmint.com/redirection-with-mod_rewrite-in-apache/
+[2]:http://www.tecmint.com/mod_rewrite-redirect-requests-based-on-browser/
+[3]:http://www.tecmint.com/apache-performance-tuning/
+[4]:http://www.tecmint.com/tag/htaccess/
+[5]:http://www.tecmint.com/apache-htaccess-tricks/
+[6]:http://www.tecmint.com/wp-content/uploads/2016/11/Check-Apache-Logs.png
+[7]:http://mod-rewrite-cheatsheet.com/
+[8]:https://httpd.apache.org/docs/2.4/rewrite/remapping.html
diff --git a/published/20161203 The Complete Guide to Flashing Factory Images Using Fastboot.md b/published/201612/20161203 The Complete Guide to Flashing Factory Images Using Fastboot.md
similarity index 100%
rename from published/20161203 The Complete Guide to Flashing Factory Images Using Fastboot.md
rename to published/201612/20161203 The Complete Guide to Flashing Factory Images Using Fastboot.md
diff --git a/published/20161209 How to Copy a File to Multiple Directories in Linux.md b/published/201612/20161209 How to Copy a File to Multiple Directories in Linux.md
similarity index 100%
rename from published/20161209 How to Copy a File to Multiple Directories in Linux.md
rename to published/201612/20161209 How to Copy a File to Multiple Directories in Linux.md
diff --git a/published/20161210 How to Perform Syntax Checking Debugging Mode in Shell Scripts.md b/published/201612/20161210 How to Perform Syntax Checking Debugging Mode in Shell Scripts.md
similarity index 100%
rename from published/20161210 How to Perform Syntax Checking Debugging Mode in Shell Scripts.md
rename to published/201612/20161210 How to Perform Syntax Checking Debugging Mode in Shell Scripts.md
diff --git a/published/20161212 Add Rainbow Colors to Linux Command Output in Slow Motion.md b/published/201612/20161212 Add Rainbow Colors to Linux Command Output in Slow Motion.md
similarity index 100%
rename from published/20161212 Add Rainbow Colors to Linux Command Output in Slow Motion.md
rename to published/201612/20161212 Add Rainbow Colors to Linux Command Output in Slow Motion.md
diff --git a/translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 2.md b/published/201612/20161215 Building an Email Server on Ubuntu Linux - Part 2.md
similarity index 51%
rename from translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 2.md
rename to published/201612/20161215 Building an Email Server on Ubuntu Linux - Part 2.md
index 7dc77cbec5..e982646542 100644
--- a/translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 2.md	
+++ b/published/201612/20161215 Building an Email Server on Ubuntu Linux - Part 2.md	
@@ -1,55 +1,49 @@
-在Ubuntu上搭建一台Email服务器（二）
+如何在 Ubuntu 环境下搭建邮件服务器（二）
 ============================================================
 
-### [dovecot-email.jpg][4]
+![Dovecot email](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/dovecot-email.jpg?itok=tY4veggw "Dovecot email") 
 
- ![Dovecot email](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/dovecot-email.jpg?itok=tY4veggw "Dovecot email") 
-本教程的第2部分将介绍如何使用Dovecot将邮件从Postfix服务器移动到用户的收件箱。以[Creative Commons Zero][2]Pixabay方式授权发布
+本教程的第 2 部分将介绍如何使用 Dovecot 将邮件从 Postfix 服务器移动到用户的收件箱。以[Creative Commons Zero][2] 方式授权发布
 
-在[第一部分][5]中，我们安装并测试了Postfix SMTP服务器。Postfix或任何SMTP服务器都不是一个完整的邮件服务器，因为它所做的是在SMTP服务器之间移动邮件。我们需要Dovecot将邮件从Postfix服务器移动到用户的收件箱中。
+在[第一部分][5]中，我们安装并测试了 Postfix SMTP 服务器。Postfix 或任何 SMTP 服务器都不是一个完整的邮件服务器，因为它所做的只是在 SMTP 服务器之间移动邮件。我们需要 Dovecot 将邮件从 Postfix 服务器移动到用户的收件箱中。
 
-Dovecot支持两种标准邮件协议：IMAP（Internet邮件访问协议）和POP3（邮局协议）。 IMAP服务器保留服务器上的所有邮件。您的用户可以选择将邮件下载到计算机或仅在服务器上访问它们。 IMAP对于有多台机器的用户是方便的。但对你而言会有更多的工作，因为你必须确保你的服务器始终可用，而且IMAP服务器需要大量的存储和内存。
+Dovecot 支持两种标准邮件协议：IMAP（Internet 邮件访问协议）和 POP3（邮局协议）。 IMAP 服务器会在服务器上保留所有邮件。您的用户可以选择将邮件下载到计算机或仅在服务器上访问它们。 IMAP 对于有多台机器的用户是方便的。但对你而言需要更多的工作，因为你必须确保你的服务器始终可用，而且 IMAP 服务器需要大量的存储和内存。
 
-POP3是较旧的协议。POP3服务器可以比IMAP服务器服务更多的用户，因为邮件会下载到用户的计算机。大多数邮件客户端可以选择在服务器上保留一定天数的邮件，因此POP3的行为有点像IMAP。但它不是IMAP，当你像IMAP那样做那么常常会下载多次或意外删除。
+POP3 是较旧的协议。POP3 服务器可以比 IMAP 服务器服务更多的用户，因为邮件会下载到用户的计算机。大多数邮件客户端可以选择在服务器上保留一定天数的邮件，因此 POP3 的行为有点像 IMAP。但它又不是 IMAP，当你像 IMAP 那样（在多台计算机上使用它时）那么常常会下载多次或意外删除。
 
 ### 安装 Dovecot
 
-启动你信任的Ubuntu系统并安装Dovecot：
+启动你的 Ubuntu 系统并安装 Dovecot：
 
 ```
-
 $ sudo apt-get install dovecot-imapd dovecot-pop3d
 ```
 
-它会在安装可用的配置并在完成后自动启动，你可以用`ps ax | grep dovecot`确认：
+它会安装可用的配置，并在完成后自动启动，你可以用 `ps ax | grep dovecot` 确认：
 
 ```
-
 $ ps ax | grep dovecot
 15988 ?  Ss 0:00 /usr/sbin/dovecot
 15990 ?  S  0:00 dovecot/anvil
 15991 ?  S  0:00 dovecot/log
 ```
 
-打开你的Postfix配置文件`/etc/postfix/main.cf`，确保配置了maildirs而不是mbox邮件存储，mbox是对于每个用户的大文件，而maildir是每条消息都有一个文件。大量的小文件比一个庞大的文件更稳定且易于管理。下面添加两行，第二行告诉Postfix你需要maildir格式，并且在每个用户的家目录下创建一个`.Mail`目录。你可以取任何名字，不一定要是`.Mail`：
+打开你的 Postfix 配置文件 `/etc/postfix/main.cf`，确保配置了maildir 而不是 mbox 的邮件存储方式，mbox 是给每个用户一个单一大文件，而 maildir 是每条消息都存储为一个文件。大量的小文件比一个庞大的文件更稳定且易于管理。添加如下两行，第二行告诉 Postfix 你需要 maildir 格式，并且在每个用户的家目录下创建一个 `.Mail` 目录。你可以取任何名字，不一定要是 `.Mail`：
 
 ```
-
 mail_spool_directory = /var/mail
 home_mailbox = .Mail/
 ```
 
-现在调整你的Dovecot配置。首先把原始的`dovecot.conf`文件重命名，因为它会调用`conf.d`中的文件来让事情简单些：
+现在调整你的 Dovecot 配置。首先把原始的 `dovecot.conf` 文件重命名放到一边，因为它会调用存放在 `conf.d` 中的文件，在你刚刚开始学习时把配置放一起更简单些：
 
 ```
-
 $ sudo mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot-oldconf
 ```
 
-现在创建一个新的`/etc/dovecot/dovecot.conf`：
+现在创建一个新的 `/etc/dovecot/dovecot.conf`：
 
 ```
-
 disable_plaintext_auth = no
 mail_location = maildir:~/.Mail
 namespace inbox {
@@ -74,30 +68,27 @@ userdb {
 }
 ```
 
-注意`mail_location = maildir` 必须和`main.cf`中的`home_mailbox`参数匹配。保存你的更改并重新加载Postfix和Dovecot配置：
+注意 `mail_location = maildir` 必须和 `main.cf` 中的 `home_mailbox` 参数匹配。保存你的更改并重新加载 Postfix 和 Dovecot 配置：
 
 ```
-
 $ sudo postfix reload
 $ sudo dovecot reload
 ```
 
 ### 快速导出配置
 
-使用下面的命令来查看你的Postfix和Dovecot配置：
+使用下面的命令来快速查看你的 Postfix 和 Dovecot 配置：
 
 ```
-
 $ postconf -n
 $ doveconf -n
 ```
 
 ### 测试 Dovecot
 
-现在再次启动telnet，并且给自己发送一条测试消息。粗体显示的是你输入的命令。`studio`是我服务器的主机名，因此你必须用自己的：
+现在再次启动 telnet，并且给自己发送一条测试消息。粗体显示的是你输入的命令。`studio` 是我服务器的主机名，因此你必须用自己的：
 
 ```
-
 $ telnet studio 25
 Trying 127.0.1.1...
 Connected to studio.
@@ -132,7 +123,7 @@ quit
 Connection closed by foreign host.
 ```
 
-现在请求Dovecot来取回你的新消息，使用你的Linux用户名和密码登录：
+现在请求 Dovecot 来取回你的新消息，使用你的 Linux 用户名和密码登录：
 
 ```
 
@@ -173,12 +164,11 @@ quit
 Connection closed by foreign host.
 ```
 
-花一点时间比较第一个例子中输入的消息和第二个例子中接收的消息。 它很容易欺骗返回地址和日期，但Postfix不会这样。大多数邮件客户端默认显示一个最小的标头集，但是你需要读取完整的标头以查看真实的回溯。
+花一点时间比较第一个例子中输入的消息和第二个例子中接收的消息。 返回地址和日期是很容易伪造的，但 Postfix 不会被愚弄。大多数邮件客户端默认显示一个最小的标头集，但是你需要读取完整的标头才能查看真实的回溯。
 
-You can also read your messages by looking in your `~/Mail/cur` directory. They are plain text. Mine has two test messages:
+你也可以在你的 `~/Mail/cur` 目录中查看你的邮件，它们是普通文本，我已经有两封测试邮件：
 
 ```
-
 $ ls .Mail/cur/
 1480540325.V806I28e0229M351743.studio:2,S
 1480555224.V806I28e000eM41463.studio:2,S
@@ -186,10 +176,9 @@ $ ls .Mail/cur/
 
 ### 测试 IMAP
 
-我们Dovecot同时启用了POP3和IMAP，因此我们使用telnet测试IMAP。
+我们 Dovecot 同时启用了 POP3 和 IMAP 服务，因此让我们使用 telnet 测试 IMAP。
 
 ```
-
 $ telnet studio imap2   
 Trying 127.0.1.1...
 Connected to studio.
@@ -221,28 +210,25 @@ A4 OK Logout completed.
 Connection closed by foreign host
 ```
 
-### Thunderbird邮件客户端
+### Thunderbird 邮件客户端
 
-图1中的屏幕截图显示了我局域网上另一台主机上的图形邮件客户端中的邮件。
+图 1 中的屏幕截图显示了我局域网上另一台主机上的图形邮件客户端中的邮件。
 
+![thunderbird mail](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/thunderbird-mail.png?itok=IkWK5Ti_ "thunderbird mail") 
 
-### [thunderbird-mail.png][3]
+*图1： Thunderbird mail*
 
- ![thunderbird mail](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/thunderbird-mail.png?itok=IkWK5Ti_ "thunderbird mail") 
+此时，你已有一个可以工作的 IMAP 和 POP3 邮件服务器，并且你也知道该如何测试你的服务器。你的用户可以在他们设置邮件客户端时选择要使用的协议。如果您只想支持一个邮件协议，那么只需要在您的 Dovecot 配置中留下你要的协议名字。
 
-图1： Thunderbird mail.[Used with permission][1]
-
-此时，你已有一个工作的IMAP和POP3邮件服务器，并且你也知道该如何测试你的服务器。你的用户将在他们设置邮件客户端时选择要使用的协议。如果您只想支持一个邮件协议，那么只需要命名您的Dovecot配置中的一个。
-
-然而，这还远远没有完成。这是一个非常简单、没有加密的开放的安装。它也只适用于与邮件服务器在同一系统上的用户。这是不可扩展的，并具有一些安全风险，例如没有密码保护。 我们会在[下周][6]了解如何创建与系统用户分开的邮件用户，以及如何添加加密。
+然而，这还远远没有完成。这是一个非常简单、没有加密的、大门敞开的安装。它也只适用于与邮件服务器在同一系统上的用户。这是不可扩展的，并具有一些安全风险，例如没有密码保护。 我们会在[下篇][6]了解如何创建与系统用户分开的邮件用户，以及如何添加加密。
 
 --------------------------------------------------------------------------------
 
 via: https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-part-2
 
-作者：[ CARLA SCHRODER][a]
+作者：[CARLA SCHRODER][a]
 译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
 
@@ -251,5 +237,5 @@ via: https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-par
 [2]:https://www.linux.com/licenses/category/creative-commons-zero
 [3]:https://www.linux.com/files/images/thunderbird-mailpng
 [4]:https://www.linux.com/files/images/dovecot-emailjpg
-[5]:https://www.linux.com/learn/how-build-email-server-ubuntu-linux
+[5]:https://linux.cn/article-8071-1.html
 [6]:https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-part-3
diff --git a/published/20161215 Installation of CentOS 7.3 Guide.md b/published/201612/20161215 Installation of CentOS 7.3 Guide.md
similarity index 100%
rename from published/20161215 Installation of CentOS 7.3 Guide.md
rename to published/201612/20161215 Installation of CentOS 7.3 Guide.md
diff --git a/published/20161215 Installation of Red Hat Enterprise Linux 7.3 Guide.md b/published/201612/20161215 Installation of Red Hat Enterprise Linux 7.3 Guide.md
similarity index 100%
rename from published/20161215 Installation of Red Hat Enterprise Linux 7.3 Guide.md
rename to published/201612/20161215 Installation of Red Hat Enterprise Linux 7.3 Guide.md
diff --git a/published/Arch Linux In a world of polish, DIY never felt so good.md b/published/201612/Arch Linux In a world of polish, DIY never felt so good.md
similarity index 100%
rename from published/Arch Linux In a world of polish, DIY never felt so good.md
rename to published/201612/Arch Linux In a world of polish, DIY never felt so good.md
diff --git a/published/20161201 How to Configure a Firewall with UFW.md b/published/20161201 How to Configure a Firewall with UFW.md
new file mode 100644
index 0000000000..bc247f6511
--- /dev/null
+++ b/published/20161201 How to Configure a Firewall with UFW.md	
@@ -0,0 +1,225 @@
+在 Ubuntu 中用 UFW 配置防火墙
+============================================================
+
+UFW，即简单防火墙（uncomplicated firewall），是一个 Arch Linux、Debian 或 Ubuntu 中管理防火墙规则的前端。 UFW 通过命令行使用（尽管它有可用的 GUI），它的目的是使防火墙配置简单（即不复杂（uncomplicated））。
+
+![How to Configure a Firewall with UFW](https://www.linode.com/docs/assets/ufw_tg.png "How to Configure a Firewall with UFW") 
+
+### 开始之前
+
+1、 熟悉我们的[入门][1]指南，并完成设置服务器主机名和时区的步骤。
+
+2、 本指南将尽可能使用 `sudo`。 在完成[保护你的服务器][2]指南的章节，创建一个标准用户帐户，强化 SSH 访问和移除不必要的网络服务。 **但不要**跟着创建防火墙部分 - 本指南是介绍使用 UFW 的，它对于 iptables 而言是另外一种控制防火墙的方法。
+
+3、 更新系统
+
+**Arch Linux**
+```
+sudo pacman -Syu
+```
+**Debian / Ubuntu**
+```
+sudo apt-get update && sudo apt-get upgrade
+```
+### 安装 UFW
+
+UFW 默认包含在 Ubuntu 中，但在 Arch 和 Debian 中需要安装。 Debian 将自动启用 UFW 的 systemd 单元，并使其在重新启动时启动，但 Arch 不会。 这与告诉 UFW 启用防火墙规则不同，因为使用 systemd 或者 upstart 启用 UFW 仅仅是告知 init 系统打开 UFW 守护程序。
+
+默认情况下，UFW 的规则集为空，因此即使守护程序正在运行，也不会强制执行任何防火墙规则。 强制执行防火墙规则集的部分[在下面][3]。
+
+#### Arch Linux
+
+1、  安装 UFW：
+
+```
+sudo pacman -S ufw
+```
+
+2、 启动并启用 UFW 的 systemd 单元：
+
+```
+sudo systemctl start ufw
+sudo systemctl enable ufw
+```
+
+#### Debian / Ubuntu
+
+1、  安装 UFW
+
+```
+sudo apt-get install ufw
+```
+
+### 使用 UFW 管理防火墙规则
+
+#### 设置默认规则
+
+大多数系统只需要打开少量的端口接受传入连接，并且关闭所有剩余的端口。 从一个简单的规则基础开始，`ufw default`命令可以用于设置对传入和传出连接的默认响应动作。 要拒绝所有传入并允许所有传出连接，那么运行：
+
+```
+sudo ufw default allow outgoing
+sudo ufw default deny incoming
+```
+
+`ufw default` 也允许使用 `reject` 参数。
+
+> 警告：
+
+> 除非明确设置允许规则，否则配置默认 `deny` 或 `reject` 规则会锁定你的服务器。确保在应用默认 `deny` 或 `reject` 规则之前，已按照下面的部分配置了 SSH 和其他关键服务的允许规则。
+
+#### 添加规则
+
+可以有两种方式添加规则：用**端口号**或者**服务名**表示。
+
+要允许 SSH 的 22 端口的传入和传出连接，你可以运行：
+
+```
+sudo ufw allow ssh
+```
+
+你也可以运行：
+
+```
+sudo ufw allow 22
+```
+ 
+相似的，要在特定端口（比如 111）上 `deny` 流量，你需要运行：
+
+```
+sudo ufw deny 111
+```
+ 
+为了更好地调整你的规则，你也可以允许基于 TCP 或者 UDP 的包。下面例子会允许 80 端口的 TCP 包：
+
+```
+sudo ufw allow 80/tcp
+sudo ufw allow http/tcp
+```
+ 
+这个会允许 1725 端口上的 UDP 包：
+
+```
+sudo ufw allow 1725/udp
+```
+ 
+#### 高级规则
+
+除了基于端口的允许或阻止，UFW 还允许您按照 IP 地址、子网和 IP 地址/子网/端口的组合来允许/阻止。
+
+允许从一个 IP 地址连接：
+
+```
+sudo ufw allow from 123.45.67.89
+```
+ 
+允许特定子网的连接：
+
+```
+sudo ufw allow from 123.45.67.89/24
+```
+ 
+允许特定 IP/ 端口的组合：
+
+```
+sudo ufw allow from 123.45.67.89 to any port 22 proto tcp
+```
+
+`proto tcp` 可以删除或者根据你的需求改成 `proto udp`，所有例子的 `allow` 都可以根据需要变成 `deny`。
+
+#### 删除规则
+
+要删除一条规则，在规则的前面加上 `delete`。如果你希望不再允许 HTTP 流量，你可以运行：
+
+```
+sudo ufw delete allow 80
+```
+ 
+删除规则同样可以使用服务名。
+
+### 编辑 UFW 的配置文件
+
+虽然可以通过命令行添加简单的规则，但仍有可能需要添加或删除更高级或特定的规则。 在运行通过终端输入的规则之前，UFW 将运行一个文件 `before.rules`，它允许回环接口、ping 和 DHCP 等服务。要添加或改变这些规则，编辑 `/etc/ufw/before.rules` 这个文件。 同一目录中的 `before6.rules` 文件用于 IPv6 。
+
+还存在一个 `after.rule` 和 `after6.rule` 文件，用于添加在 UFW 运行你通过命令行输入的规则之后需要添加的任何规则。
+
+还有一个配置文件位于 `/etc/default/ufw`。 从此处可以禁用或启用 IPv6，可以设置默认规则，并可以设置 UFW 以管理内置防火墙链。
+
+### UFW 状态
+
+你可以在任何时候使用命令：`sudo ufw status` 查看 UFW 的状态。这会显示所有规则列表，以及 UFW 是否处于激活状态：
+
+```
+Status: active
+
+To                         Action      From
+--                         ------      ----
+22                         ALLOW       Anywhere
+80/tcp                     ALLOW       Anywhere
+443                        ALLOW       Anywhere
+22 (v6)                    ALLOW       Anywhere (v6)
+80/tcp (v6)                ALLOW       Anywhere (v6)
+443 (v6)                   ALLOW       Anywhere (v6)
+```
+ 
+### 启用防火墙
+
+随着你选择规则完成，你初始运行 `ufw status` 可能会输出 `Status: inactive`。 启用 UFW 并强制执行防火墙规则：
+
+```
+sudo ufw enable
+```
+ 
+相似地，禁用 UFW 规则：
+
+```
+sudo ufw disable
+```
+
+> UFW 会继续运行，并且在下次启动时会再次启动。
+
+### 日志记录
+
+你可以用下面的命令启动日志记录：
+
+```
+sudo ufw logging on
+```
+
+可以通过运行 `sudo ufw logging low|medium|high` 设计日志级别，可以选择 `low`、 `medium` 或者 `high`。默认级别是 `low`。
+
+常规日志类似于下面这样，位于 `/var/logs/ufw`：
+
+```
+Sep 16 15:08:14 <hostname> kernel: [UFW BLOCK] IN=eth0 OUT= MAC=00:00:00:00:00:00:00:00:00:00:00:00:00:00 SRC=123.45.67.89 DST=987.65.43.21 LEN=40 TOS=0x00 PREC=0x00 TTL=249 ID=8475 PROTO=TCP SPT=48247 DPT=22 WINDOW=1024 RES=0x00 SYN URGP=0
+```
+ 
+前面的值列出了你的服务器的日期、时间、主机名。剩下的重要信息包括：
+
+* **[UFW BLOCK]**：这是记录事件的描述开始的位置。在此例中，它表示阻止了连接。
+* **IN**：如果它包含一个值，那么代表该事件是传入事件
+* **OUT**：如果它包含一个值，那么代表事件是传出事件
+* **MAC**：目的地和源 MAC 地址的组合
+* **SRC**：包源的 IP
+* **DST**：包目的地的 IP
+* **LEN**：数据包长度
+* **TTL**：数据包 TTL，或称为 time to live。 在找到目的地之前，它将在路由器之间跳跃，直到它过期。
+* **PROTO**：数据包的协议
+* **SPT**：包的源端口
+* **DPT**：包的目标端口
+* **WINDOW**：发送方可以接收的数据包的大小
+* **SYN URGP**：指示是否需要三次握手。 `0` 表示不需要。
+
+--------------------------------------------------------------------------------
+
+via: https://www.linode.com/docs/security/firewalls/configure-firewall-with-ufw
+
+作者：[Linode][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linode.com/docs/security/firewalls/configure-firewall-with-ufw
+[1]:https://www.linode.com/docs/getting-started
+[2]:https://www.linode.com/docs/security/securing-your-server
+[3]:http://localhost:4567/docs/security/firewalls/configure-firewall-with-ufw#enable-the-firewall
diff --git a/published/20161201 Using the NTP time synchronization.md b/published/20161201 Using the NTP time synchronization.md
new file mode 100644
index 0000000000..e95eaa0f84
--- /dev/null
+++ b/published/20161201 Using the NTP time synchronization.md	
@@ -0,0 +1,133 @@
+在 Ubuntu 中使用 NTP 进行时间同步
+==========
+
+NTP 是通过网络来同步时间的一种 TCP/IP 协议。通常客户端向服务器请求当前的时间，并根据结果来设置其时钟。
+
+这个描述是挺简单的，实现这一功能却是极为复杂的 - 首先要有多层 NTP 服务器，第一层 NTP 服务器连接原子时钟，第二层、第三层服务器则担起负载均衡的责任，以处理因特网传来的所有请求。另外，客户端可能也超乎你想象的复杂 - 它必须排除通讯延迟，调整时间的同时不干扰其它在服务器中运行的进程。幸运的是，所有的这些复杂性都进行了封装，你是不可见也不需要见到的。
+
+在 Ubuntu 中，是使用 `ntpdate` 和 `ntpd` 来同步时间的。
+
+* [timedatectl](#timedatectl)
+* [timesyncd](#timesyncd)
+* [ntpdate](#ntpdate)
+* [timeservers](#timeservers)
+* [ntpd](#ntpd)
+* [安装](#installation)
+* [配置](#configuration)
+* [View status](#status)
+* [PPS Support](#Support)
+* [参考资料](#reference)
+
+### <span id="timedatectl">timedatectl</span>
+
+在最新的 Ubuntu 版本中，`timedatectl` 替代了老旧的 `ntpdate`。默认情况下，`timedatectl` 在系统启动的时候会立刻同步时间，并在稍后网络连接激活后通过 socket 再次检查一次。
+
+如果已安装了 `ntpdate` / `ntp`，`timedatectl` 会退而让你使用之前的设置。这样确保了两个时间同步服务不会相互冲突，同时在你升级的时候还保留原本的行为和配置。但这也意味着从旧版本的发行版升级时 `ntp`/`ntpdate` 仍会安装，因此会导致新的基于 systemd 的时间服务被禁用。
+
+### <span id="timesyncd">timesyncd</span>
+
+在最新的 Ubuntu 版本中，`timesyncd` 替代了 `ntpd` 的客户端的部分。默认情况下 `timesyncd` 会定期检测并同步时间。它还会在本地存储更新的时间，以便在系统重启时做时间单步调整。
+
+通过 `timedatectl` 和 `timesyncd` 设置的当前时间状态和时间配置，可以使用 `timedatectl status` 命令来进行确认。
+
+```
+timedatectl status
+      Local time: Fri 2016-04-29 06:32:57 UTC
+  Universal time: Fri 2016-04-29 06:32:57 UTC
+        RTC time: Fri 2016-04-29 07:44:02
+       Time zone: Etc/UTC (UTC, +0000)
+ Network time on: yes
+NTP synchronized: no
+ RTC in local TZ: no
+```
+
+如果安装了 NTP，并用它替代 `timedatectl` 来同步时间，则 `NTP synchronized` 将被设置为 `yes`。
+
+`timedatectl` 和 `timesyncd` 用来获取时间的 nameserver 可以通过 `/etc/systemd/timesyncd.conf` 来指定，另外在 `/etc/systemd/timesyncd.conf.d/` 下还有灵活的附加配置文件。
+
+### <span id="ntpdate">ntpdate</span>
+
+由于 `timedatectl` 的存在，各发行版已经弃用了 `ntpdate`，默认不再进行安装。如果你安装了，它会在系统启动的时候根据 Ubuntu 的 NTP 服务器来设置你电脑的时间。之后每当一个新的网络接口启动时，它就会重新尝试同步时间 —— 在这期间只要其涵盖的时间差不是太大，它就会慢慢偏移时间。该行为可以通过 `-B`/`-b` 开关来进行控制。
+
+```
+ntpdate ntp.ubuntu.com
+```
+
+### <span id="timeservers">时间服务器</span>
+
+默认情况下，基于 systemd 的工具都是从 `ntp.ubuntu.com` 请求时间同步的。经典的基于 `ntpd` 的服务基本上都是使用 `[0-3].ubuntu.pool.ntp.org` 池中的 `2.ubuntu.pool.ntp.org`，还有 `ntp.ubuntu.com`，此外需要的话还支持 IPv6。如果想强制使用 IPv6，可以使用 `ipv6.ntp.ubuntu.com`，不过这并非默认配置。
+
+### <span id="ntpd">ntpd</span>
+
+ntp 的守护进程 `ntpd` 会计算你的系统时钟的时间偏移量并且持续的进行调整，所以不会出现时间差距较大的更正，比如说，不会导致不连续的日志。该进程只花费少量的进程资源和内存，但对于现代的服务器来说实在是微不足道的了。
+
+### <span id="installation">安装</span>
+
+要安装 `ntpd`，在终端命令行中输入：
+
+```
+sudo apt install ntp
+```
+
+### <span id="configuration">配置</span>
+
+编辑 `/etc/ntp.conf` —— 增加/移除 `server` 行。默认配置有以下服务器：
+
+```
+# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
+# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
+# more information.
+server 0.ubuntu.pool.ntp.org
+server 1.ubuntu.pool.ntp.org
+server 2.ubuntu.pool.ntp.org
+server 3.ubuntu.pool.ntp.org
+```
+
+修改配置文件之后，你需要重新加载 `ntpd`：
+
+```
+sudo systemctl reload ntp.service
+```
+
+### <span id="status">查看状态</span>
+
+使用 `ntpq` 来查看更多信息：
+
+```
+# sudo ntpq -p
+     remote           refid      st t when poll reach   delay   offset  jitter
+==============================================================================
++stratum2-2.NTP. 129.70.130.70    2 u    5   64  377   68.461  -44.274 110.334
++ntp2.m-online.n 212.18.1.106     2 u    5   64  377   54.629  -27.318  78.882
+*145.253.66.170  .DCFa.           1 u   10   64  377   83.607  -30.159  68.343
++stratum2-3.NTP. 129.70.130.70    2 u    5   64  357   68.795  -68.168 104.612
++europium.canoni 193.79.237.14    2 u   63   64  337   81.534  -67.968  92.792
+```
+
+### <span id="Support">PPS 支持</span>
+
+从 Ubuntu 16.04 开始，ntp 支持 PPS 规范，给 ntp 提供了本地时间源，以提供更高的精度。查看下边列出的链接来获取更多配置信息。
+
+### <span id="reference">参考资料</span>
+
+* 参考 [Ubuntu Time][1] wiki 页来获取更多信息
+
+* [ntp.org，网络时间协议项目主页][2]
+
+* [ntp.org，关于配置 PPS 的 FAQ][3]
+
+--------------------------------------------------------------------------------
+
+via: https://help.ubuntu.com/lts/serverguide/NTP.html
+
+作者：[Ubuntu][a]
+译者：[GHLandy](https://github.com/GHLandy)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://help.ubuntu.com/lts/serverguide/NTP.html
+[1]:https://help.ubuntu.com/community/UbuntuTime
+[2]:http://www.ntp.org/
+[3]:http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#S-CONFIG-ADV-PPS
+
diff --git a/published/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md b/published/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md
new file mode 100644
index 0000000000..b15430ca91
--- /dev/null
+++ b/published/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md	
@@ -0,0 +1,357 @@
+使用 Windows 10 的 RSAT 工具来管理 Samba4 活动目录架构 （三）
+============================================================
+
+这一节的[Samba4 AD DC 架构系列文章][8]，我们将会讨论如何把 Windows 10 系统的电脑添加到 Samba4 域环境中，以及如何在 Windows 10 系统下管理域环境。
+
+一旦 Windows 10 系统加入到 Samba4 AD DC ，我们就可以在 Windows 10 系统中创建、删除或者禁用域用户和组了，可以创建新的组织单元，创建、编辑和管理域策略，还可以管理 Samba4 域 DNS 服务。
+
+上面所有的功能和其它一些复杂的与域管理相关的工作都可以通过 Windows 环境下的 RSAT 工具来完成—— Microsoft 远程服务器管理工具。
+
+#### 要求
+
+1、 [在 Ubuntu 系统上使用 Samba4 来创建活动目录架构（一）][1]
+2、 [在 Linux 命令行下管理 Samba4 AD 架构（二）][2]
+
+### 第1步：配置域时间同步
+
+1、在使用 Windows 10 系统的 RSAT 工具来管理 Samba4 ADDC 之前，我们需要了解与活动目录相关的一个很重要的服务，该服务要求[精确的时间同步][9]
+
+在大多数的 Linux 发行版中，都由 NTP 进程提供时间同步机制。AD 环境默认允许最大的时间差距是 5 分钟。
+
+如果时间差距超过 5 分钟，你将会遇到各种各样的异常报错，最严重的会影响到 AD 用户、域成员服务器或共享访问等。
+
+为了在 Ubuntu 系统中安装网络时间协议进程和 NTP 客户端工具，可执行以下命令：
+
+```
+$ sudo apt-get install ntp ntpdate
+```
+[
+ ![Install NTP on Ubuntu](http://www.tecmint.com/wp-content/uploads/2016/12/Install-NTP-on-Ubuntu.png) 
+][10]
+
+*在 Ubuntu 系统下安装 NTP 服务*
+
+2、下一步，修改 NTP 配置文件，使用一个离你最近的 NTP 服务地址列表替换默认的 NTP 池服务列表。
+
+NTP 服务器地址列表可以从 NTP 地址库项目官方网站获取：[http://www.pool.ntp.org/en/][11]。
+
+```
+$ sudo nano /etc/ntp.conf
+```
+
+在每一行 `pool` 前添加一个 ‘#’ 符号以注释默认的服务器列表，并替换为适合你的 NTP 服务器地址，如下图所示：
+
+```
+pool 0.ro.pool.ntp.org iburst
+pool 1.ro.pool.ntp.org iburst
+pool 2.ro.pool.ntp.org iburst
+# Use Ubuntu's ntp server as a fallback.
+pool 3.ro.pool.ntp.org
+```
+
+[
+ ![Configure NTP Server in Ubuntu](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-NTP-Server-in-Ubuntu.png) 
+][12]
+
+*在 Ubuntu 系统下配置 NTP 服务*
+
+3、此时，先不要关闭该文件。移动光标到文件顶部，在 `driftfile` 参数后面添加下面一行内容。该设置是为了让客户端查询该服务时使用 AD 的 NTP 签署请求。
+
+```
+ntpsigndsocket /var/lib/samba/ntp_signd/
+```
+[
+ ![Sync AD with NTP](http://www.tecmint.com/wp-content/uploads/2016/12/Sync-AD-with-NTP.png) 
+][13]
+
+*使用 NTP 来同步 AD*
+
+4、最后，移动光标到文件底部并添加如下一行内容，如截图所示，仅允许网络客户端查询该服务器上的时间。
+
+```
+restrict default kod nomodify notrap nopeer mssntp
+```
+[
+ ![Query Clients to NTP Server](http://www.tecmint.com/wp-content/uploads/2016/12/Query-Client-to-NTP-Server.png) 
+][14]
+
+*限制 NTP 服务的查询客户端*
+
+5、设置完成之后，保存并关闭 NTP 配置文件，为了让 NTP 服务读取 `ntp_signed` 目录，需要授予 NTP 服务合适的权限。
+
+以下是 Samba NTP socket 的系统路径。之后，重启 NTP 服务以应用更改，并使用 [netstat 命令][15]与[grep 过滤][16]相接合来检查 NTP 服务是否正常。
+
+```
+$ sudo chown root:ntp /var/lib/samba/ntp_signd/
+$ sudo chmod 750 /var/lib/samba/ntp_signd/
+$ sudo systemctl restart ntp
+$ sudo netstat –tulpn | grep ntp
+```
+[
+ ![Grant Permission to NTP](http://www.tecmint.com/wp-content/uploads/2016/12/Grant-Permission-to-NTP.png) 
+][17]
+
+*给 NTP 服务授权*
+
+使用 ntpq 命令行工具来监控 NTP 进程，加上 '-p' 参数来显示摘要信息。
+
+```
+$ ntpq -p
+```
+[
+ ![Monitor NTP Server Pool](http://www.tecmint.com/wp-content/uploads/2016/12/Monitor-NTP-Server-Pool.png) 
+][18]
+
+*监控 NTP  服务器池*
+
+### 第二步：处理 NTP 时间同步异常问题
+
+6、有时候 NTP 进程在尝试与上游 ntp 服务端同步时间的计算过程中会卡住，导致客户端使用 `ntpdate` 工具手动强制同步时间时报如下错误：
+
+```
+# ntpdate -qu adc1
+ntpdate[4472]: no server suitable for synchronization found
+```
+[
+ ![NTP Time Synchronization Error](http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Time-Synchronization-Error.png) 
+][19]
+
+*NTP 时间同步异常*
+
+`ntpdate` 命令加上 `-d` 调试选项：
+
+```
+# ntpdate -d adc1.tecmint.lan
+Server dropped: Leap not in sync
+```
+[
+ ![NTP Server Dropped Leap Not in Sync](http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Server-Dropped-Leap-Not-Sync.png) 
+][20]
+
+*NTP Server Dropped Leap Not in Sync*
+
+7、为了避免出现该问题，使用下面的方法来解决这个问题：在服务器上停止 NTP 服务，使用 `ntpdate` 客户端工具加上 `-b` 参数指定外部 peer 地址来手动强制同步时间，如下图所示：
+
+```
+# systemctl stop ntp.service
+# ntpdate -b 2.ro.pool.ntp.org  [你的 ntp peer]
+# systemctl start ntp.service
+# systemctl status ntp.service
+```
+[
+ ![Force NTP Time Synchronization](http://www.tecmint.com/wp-content/uploads/2016/12/Force-NTP-Time-Synchronization.png) 
+][21]
+
+*强制 NTP 时间同步*
+
+8、当时间正确同步之后，启动服务器上的 NTP 服务，并且在客户端服务器上执行如下命令来验证 NTP 时间同步服务是否可用：
+
+```
+# ntpdate -du adc1.tecmint.lan    [your_adc_server]
+```
+[
+ ![Verify NTP Time Synchronization](http://www.tecmint.com/wp-content/uploads/2016/12/Verify-NTP-Time-Synchronization.png) 
+][22]
+
+*验证 NTP 时间同步*
+
+至此， NTP 服务应该已经工作正常了。
+
+### 第 3 步：把 Windows 10 系统加入域环境
+
+9、从我们的前一篇文章可以看出，[Samba4 活动目录可以使用 samba-tool 工具在命令行下管理][23]，可以直接在服务器上的 VTY 控制台或者通过 SSH 工具远程连接到服务器上进行管理。
+
+另外，更直观更灵活的方式是使用已加入域的 Windows 电脑中的微软远程服务器管理工具（RSAT）来管理我们的 Samba4 AD 域控制器。这些工具在当前的大多数 Windows 系统中都可以使用。
+
+把 Windows 10 或是之前版本的微软操作系统加入到 Samba4 AD DC 环境中的过程也是非常容易的。首先，确保你的 Windows 10 电脑已经设置了正确的 Samba4 DNS 服务器的 IP 地址，以查询出准确的域解析结果。
+
+打开“控制面板 -> 网络和 Internet -> 网络和共享中心 -> 网卡设置 -> 属性 -> IPv4 -> 属性 -> 使用下面的 DNS 服务器地址”，并且手动输入 Samba4 AD 服务器的 IP 地址，如下图所示：
+
+[
+ ![join Windows to Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-to-Samba4-AD.png) 
+][24]
+
+*把 Windows 10 加入到 Samba4 AD 环境*
+
+[
+ ![Add DNS and Samba4 AD IP Address](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-and-Samba4-AD-IP-Address.png) 
+][25]
+
+*添加 DNS 和 Samba4 AD 服务器地址*
+
+这里的 `192.168.1.254` 是 Samba4 AD 域控服务器的地址，用于域名解析。相应替换该 IP 地址。
+
+10、下一步，点击 OK 按钮以应用网络设置，打开 CMD 命令行窗口，通过 ping 域名和 Samba4 服务器的 FQDN 地址来测试通过 DNS 解析到域是否连通。
+
+```
+ping tecmint.lan
+ping adc1.tecmint.lan
+```
+[
+ ![Check Network Connectivity Between Windows and Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Check-Samba4-AD-from-Windows.png) 
+][26]
+
+*检查 Windows 和 Samb4 AD 服务器的网络连通性*
+
+11、如果 Windows 客户端 DNS 查询的结果解析正确，那么，你还需要确认客户端时间是否已跟域环境同步。
+
+打开“控制面板 -> 时钟、语言和区域 -> 设置时间和日期 -> Internet 时间页 -> 更改设置”，输入你同步时间的域名和 Internet 时间服务器字段。
+
+点击立即更新按钮来强制与域同步时间，点击 OK 关闭窗口。
+
+[
+ ![Synchronize Time with Internet Server](http://www.tecmint.com/wp-content/uploads/2016/12/Synchronize-Time-with-Internet-Server.png) 
+][27]
+
+*与 Internet 服务器同步时间*
+
+12、最后，通过打开“系统属性 -> 更改 -> 域成员 -> 输入域名”，点击 OK，输入你的域管理员账号和密码，再次点击 OK。
+
+
+应该弹出一个新的窗口通知你已经是一个域成员了。点击 OK 关闭弹出窗口，并且重启机器以应用域更改。
+
+下面的截图将说明这些操作步骤。
+
+[
+ ![Join Windows Domain to Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-Domain-to-Samba4-AD.png) 
+][28]
+
+*把 Windows 域加入到 Samba4 AD 环境*
+[
+ ![Enter Domain Administration Login](http://www.tecmint.com/wp-content/uploads/2016/12/Enter-Domain-Administration-Login.png) 
+][29]
+
+*输入域管理员账号登录*
+
+[
+ ![Domain Joined to Samba4 AD Confirmation](http://www.tecmint.com/wp-content/uploads/2016/12/Domain-Joined-to-Samba4-AD.png) 
+][30]
+
+*确认域已加入到 Samba4 AD 环境*
+
+[
+ ![Restart Windows Server for Changes](http://www.tecmint.com/wp-content/uploads/2016/12/Restart-Windows-Server-for-Changes.png) 
+][31]
+
+*重启 Windows 服务器以应用更改*
+
+13、重启之后，单击其它用户并且使用具有管理员权限的 Samba4 域账号登录到 Windows 系统，你已经准备好进入到后边几个步骤了。
+
+[
+ ![Login to Windows Using Samba4 AD Account](http://www.tecmint.com/wp-content/uploads/2016/12/Login-to-Windows-Using-Samba4-AD-Account.png) 
+][32]
+
+*使用 Samba4 AD 账号登录到 Windows*
+
+#### 第 4 步：使用 RSAT 工具来管理 Samba4 AD DC
+
+14、微软远程服务器管理工具（RSAT）被广泛地用来管理 Samba4 活动目录，你可以根据你的 Windows 系统版本从下面的地址来下载该工具：
+
+1.  Windows 10: [https://www.microsoft.com/en-us/download/details.aspx?id=45520][4]
+2.  Windows 8.1: [http://www.microsoft.com/en-us/download/details.aspx?id=39296][5]
+3.  Windows 8: [http://www.microsoft.com/en-us/download/details.aspx?id=28972][6]
+4.  Windows 7: [http://www.microsoft.com/en-us/download/details.aspx?id=7887][7]
+
+一旦 Windows 10 独立安装包下载完成，运行安装包，等待安装完成并重启机器以应用所有更新。
+
+重启之后，打开“控制面板 -> 程序（卸载程序） -> 启用或关闭 Windows 功能”，勾选所有的远程服务器管理工具。
+
+点击 OK 开始安装，安装完成之后重启系统。
+[
+ ![Administer Samba4 AD from Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Administer-Samba4-AD-from-Windows.png) 
+][33]
+
+*从 Windows 系统下管理 Samba4 AD*
+
+15、要进入 RSAT 工具集，打开“控制面板 -> 系统和安全 -> 管理工具”。
+
+这些工具也可以在开始工菜单的管理工具菜单中找到。另外，你也可以打开 Windows MMC 工具和管理单元，从“文件 -> 添加/删除管理单元”菜单中访问它们。
+
+[
+ ![Access Remote Server Administration Tools](http://www.tecmint.com/wp-content/uploads/2016/12/Access-Remote-Server-Administration-Tools.png) 
+][34]
+
+*访问远程服务器管理工具集*
+
+最常用的工具，比如 AD UC ，DNS 和组策略管理工具可以通过从右键菜单发送到功能来新建快捷方式到桌面直接运行。
+
+16、你可以通过 AD UC 和列出域里的电脑（新加入的 Windows 机器应该出现在列表中）来验证 RSAT 功能，创建一个组织单元或组。
+
+在 Samba4 服务器上使用 `wbinf` 命令来检查用户和组是否已经创建成功。
+
+[
+ ![Active Directory Users and Computers](http://www.tecmint.com/wp-content/uploads/2016/12/Active-Directory-Users-and-Computers.png) 
+][35]
+
+*活动目录用户和计算机*
+
+[
+ ![Create Organizational Units and New Users](http://www.tecmint.com/wp-content/uploads/2016/12/Create-Organizational-Unit-and-Users.png) 
+][36]
+
+*创建组织单元和新用户*
+
+[
+ ![Confirm Samba4 AD Users](http://www.tecmint.com/wp-content/uploads/2016/12/Confirm-Samba4-AD-Users.png) 
+][37]
+
+*确认 Samba4 AD 用户*
+
+就这些吧！该主题的下一篇文章将包含其它 Samba4 活动目录的重要内容，包括通过 RSAT 工具来管理 Samba4 活动目录，比如，如何管理 DNS 服务器，添加 DNS 记录和创建 DNS 解析查询区，如何管理及应用域策略以及域用户如何创建交互式登录提示信息。
+
+------
+作者简介：我是一个电脑迷，开源软件及 Linux 系统爱好者，有近4年的 Linux 桌面和服务器系统及 bash 编程经验。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
+
+作者：[Matei Cezar][a]
+译者：[rusking](https://github.com/rusking)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/cezarmatei/
+[1]:https://linux.cn/article-8065-1.html
+[2]:https://linux.cn/article-8070-1.html
+[3]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/
+[4]:https://www.microsoft.com/en-us/download/details.aspx?id=45520
+[5]:http://www.microsoft.com/en-us/download/details.aspx?id=39296
+[6]:http://www.microsoft.com/en-us/download/details.aspx?id=28972
+[7]:http://www.microsoft.com/en-us/download/details.aspx?id=7887
+[8]:http://www.tecmint.com/category/samba4-active-directory/
+[9]:http://www.tecmint.com/how-to-synchronize-time-with-ntp-server-in-ubuntu-linux-mint-xubuntu-debian/
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Install-NTP-on-Ubuntu.png
+[11]:http://www.pool.ntp.org/en/
+[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-NTP-Server-in-Ubuntu.png
+[13]:http://www.tecmint.com/wp-content/uploads/2016/12/Sync-AD-with-NTP.png
+[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Query-Client-to-NTP-Server.png
+[15]:http://www.tecmint.com/20-netstat-commands-for-linux-network-management/
+[16]:http://www.tecmint.com/12-practical-examples-of-linux-grep-command/
+[17]:http://www.tecmint.com/wp-content/uploads/2016/12/Grant-Permission-to-NTP.png
+[18]:http://www.tecmint.com/wp-content/uploads/2016/12/Monitor-NTP-Server-Pool.png
+[19]:http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Time-Synchronization-Error.png
+[20]:http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Server-Dropped-Leap-Not-Sync.png
+[21]:http://www.tecmint.com/wp-content/uploads/2016/12/Force-NTP-Time-Synchronization.png
+[22]:http://www.tecmint.com/wp-content/uploads/2016/12/Verify-NTP-Time-Synchronization.png
+[23]:https://linux.cn/article-8070-1.html
+[24]:http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-to-Samba4-AD.png
+[25]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-and-Samba4-AD-IP-Address.png
+[26]:http://www.tecmint.com/wp-content/uploads/2016/12/Check-Samba4-AD-from-Windows.png
+[27]:http://www.tecmint.com/wp-content/uploads/2016/12/Synchronize-Time-with-Internet-Server.png
+[28]:http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-Domain-to-Samba4-AD.png
+[29]:http://www.tecmint.com/wp-content/uploads/2016/12/Enter-Domain-Administration-Login.png
+[30]:http://www.tecmint.com/wp-content/uploads/2016/12/Domain-Joined-to-Samba4-AD.png
+[31]:http://www.tecmint.com/wp-content/uploads/2016/12/Restart-Windows-Server-for-Changes.png
+[32]:http://www.tecmint.com/wp-content/uploads/2016/12/Login-to-Windows-Using-Samba4-AD-Account.png
+[33]:http://www.tecmint.com/wp-content/uploads/2016/12/Administer-Samba4-AD-from-Windows.png
+[34]:http://www.tecmint.com/wp-content/uploads/2016/12/Access-Remote-Server-Administration-Tools.png
+[35]:http://www.tecmint.com/wp-content/uploads/2016/12/Active-Directory-Users-and-Computers.png
+[36]:http://www.tecmint.com/wp-content/uploads/2016/12/Create-Organizational-Unit-and-Users.png
+[37]:http://www.tecmint.com/wp-content/uploads/2016/12/Confirm-Samba4-AD-Users.png
+[38]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
+[39]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
+[40]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
+[41]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
+[42]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#comments
diff --git a/published/20161206 How to Find Recent or Today’s Modified Files in Linux.md b/published/20161206 How to Find Recent or Today’s Modified Files in Linux.md
new file mode 100644
index 0000000000..6d098f2922
--- /dev/null
+++ b/published/20161206 How to Find Recent or Today’s Modified Files in Linux.md	
@@ -0,0 +1,121 @@
+如何在 Linux 中找出最近或今天被修改的文件
+============================================================
+
+在本文中，我们将解释两个简单的[命令行小技巧][5]，它可以帮你只列出所有的今天的文件。
+
+Linux 用户在命令行上遇到的常见问题之一是[定位具有特定名称的文件][6]，如果你知道确定的文件名则可能会容易得多。
+
+不过，假设你忘记了白天早些时候创建的文件的名称（在你包含了数百个文件的 `home` 文件夹中），但现在你有急用。
+
+下面用不同的方式只[列出所有你今天创建或修改的文件][7]（直接或间接）。
+
+1、 使用 [ls 命令][8]，只列出你的 home 文件夹中今天的文件。
+
+```
+# ls  -al --time-style=+%D | grep 'date +%D'
+```
+
+其中：
+
+- `-a` - 列出所有文件，包括隐藏文件
+- `-l` - 启用长列表格式
+- `--time-style=FORMAT` - 显示指定 FORMAT 的时间
+- `+％D` - 以 `％m/％d/％y` （月/日/年）格式显示或使用日期
+
+[
+ ![Find Recent Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Recent-Files-in-Linux.png) 
+][9]
+
+*在Linux中找出最近的文件*
+
+此外，你使用可以 `-X` 标志来[按字母顺序对结果排序][10]：
+
+```
+# ls -alX --time-style=+%D | grep 'date +%D'
+```
+
+你也可以使用 `-S` 标志来基于大小（由大到小）来排序：
+
+```
+# ls -alS --time-style=+%D | grep 'date +%D'
+```
+
+2、 另外，使用 [find 命令][11]会更灵活，并且提供比 `ls` 更多的选项，可以实现相同的目的。
+
+-  `-maxdepth` 级别用于指定在搜索操作的起点下（在这个情况下为当前目录）的搜索层级（子目录层级数）。
+-  `-newerXY`，用于所寻找的文件的时间戳 `X` 比参照文件的时间戳 `Y` 更新一些的文件。 `X` 和 `Y` 表示以下任何字母：
+     -  `a` - 参照文件的访问时间
+     -  `B` - 参照文件的创建时间
+     -  `c` - 参照文件的 inode 状态改变时间
+     -  `m` - 参照文件的修改时间
+     -  `t` - 直接指定一个绝对时间
+
+下面的命令意思是只找出 2016-12-06 这一天修改的文件：
+
+```
+# find . -maxdepth 1 -newermt "2016-12-06"
+```
+[
+ ![Find Today's Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Files-in-Linux.png) 
+][12]
+
+*在 Linux 中找出今天的文件*
+
+重要：在上面的 [find 命令][13]中使用正确的**日期格式**作为参照时间，一旦你使用了错误的格式，你会得到如下错误：
+
+```
+# find . -maxdepth 1 -newermt "12-06-2016"
+find: I cannot figure out how to interpret '12-06-2016' as a date or time
+```
+
+或者，使用下面的正确格式：
+
+```
+# find . -maxdepth 1 -newermt "12/06/2016"
+或者
+# find . -maxdepth 1 -newermt "12/06/16"
+```
+[
+ ![Find Todays Modified Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Modified-Files.png) 
+][14]
+
+*在 Linux 中找出今天修改的文件*
+
+你可以在我们的下面一系列文章中获得 `ls `和 `find` 命令的更多使用信息。
+
+- [用 15 例子的掌握 Linux ‘ls’ 命令][1]
+- [对 Linux 用户有用的 7 个奇特技巧][2]
+- [用 35 个例子掌握 Linux ‘find’ 命令][3]
+- [在 Linux 中使用扩展查找多个文件名的方法][4]
+
+在本文中，我们解释了如何使用 ls 和 find 命令帮助只列出今天的文件。 请使用以下反馈栏向我们发送有关该主题的任何问题或意见。 你也可以提醒我们其他可以用于这个目的的命令。
+
+--------------------------------------------------------------------------------
+
+作者简介：Aaron Kili是一名 Linux 和 F.O.S.S 的爱好者，未来的 Linux 系统管理员、网站开发人员，目前是 TecMint 的内容创作者，他喜欢用电脑工作，并乐于分享知识。
+
+------------------
+
+via: http://www.tecmint.com/find-recent-modified-files-in-linux/
+
+作者：[Aaron Kili][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/15-basic-ls-command-examples-in-linux/
+[2]:http://www.tecmint.com/linux-ls-command-tricks/
+[3]:http://www.tecmint.com/35-practical-examples-of-linux-find-command/
+[4]:http://www.tecmint.com/linux-find-command-to-search-multiple-filenames-extensions/
+[5]:http://www.tecmint.com/tag/linux-tricks/
+[6]:http://www.tecmint.com/linux-find-command-to-search-multiple-filenames-extensions/
+[7]:http://www.tecmint.com/sort-ls-output-by-last-modified-date-and-time/
+[8]:http://www.tecmint.com/tag/linux-ls-command/
+[9]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Recent-Files-in-Linux.png
+[10]:http://www.tecmint.com/sort-command-linux/
+[11]:http://www.tecmint.com/35-practical-examples-of-linux-find-command/
+[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Files-in-Linux.png
+[13]:http://www.tecmint.com/find-directory-in-linux/
+[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Modified-Files.png
diff --git a/published/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md b/published/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md
new file mode 100644
index 0000000000..23150cac95
--- /dev/null
+++ b/published/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md	
@@ -0,0 +1,190 @@
+九款开源或商业的数据中心基础设施管理软件
+============================================================
+
+当一个公司发展壮大时，相应地对计算资源的需求也会与日俱增。无论是普通公司还是服务提供商，包括那些出租服务器的公司，当服务器数量过多时都不得不面对很多问题。
+
+如何盘存服务器和备件？如何维护使数据中心保持健康运作，及时定位并修复潜在的威胁？如何快速找到宕机设备的机架位置？如何准备物理机上线工作？做完这些事情需要花费大量的时间，或者需要 IT 部门有一大帮管理员支持才能办到。
+
+现在有一个更好的方案解决这些问题，使用特定软件来实现数据中心管理自动化，下文将介绍当前市场上已有的一些数据中心管理工具。
+
+### 1、 Opendcim
+
+这是该类目前唯一的自由软件，该软件开源并且按照商业化<ruby>数据中心基础设施管理<rt>Data Center Infrastructure Management</rt></ruby>（DCIM）解决方案的替代方案来设计。该软件可以管理库存、生成数据中心的地图和监控机房温度与电力消耗。
+
+不过，它不支持远程关机、服务器重启、操作系统安装等功能。尽管如此，它仍然被全球很多非商业机构使用。
+
+由于该软件开源，有研发能力的公司可以修改它，使 [opendcim][2] 更适合自己的公司。
+
+[
+ ![openDCIM](http://www.tecmint.com/wp-content/uploads/2016/12/openDCIM.png) 
+][3]
+
+*openDCIM*
+
+### 2、 NOC-PS
+
+这是一款可以管理物理和虚拟设备的商业软件。它有很多可以用于初始化设备的工具，比如：操作系统和其他软件安装、网络配置，并且集成了 WHMCS 和 Blesta。美中不足的是，如果你希望能够看到数据中心设备地图或者机架位置，那该软件就不是你的最佳选择了。
+
+[NOC-PS][4] 每 100 台服务器每年管理费需要 100€，比较适合中小企业使用。
+
+[
+ ![NOC-PS](http://www.tecmint.com/wp-content/uploads/2016/12/NOC-PS.png) 
+][5]
+
+*NOC-PS*
+
+### 3、 DCImanager
+
+[DCImanager][6] 是一个专用的解决方案，正如宣传所说的，考虑了 DC 工程师和托管服务提供商的需求。该软件集成了很多有名的计费软件，比如 WHMCS、Hostbill、BILLmanager 等。
+
+该软件的主要功能有：服务器配置、模板化安装操作系统、传感器监控、流量和电力消耗报告、VLAN 管理。除此之外，企业版还可以生成数据中心服务器地图、以及对服务器和备件进行盘点管理。
+
+你可以试用免费版，但是免费版最多支持 5 台物理服务器管理，而收费版每 100 台服务器每年的授权使用费是 120€。
+
+根据版本不同，收费版可适用中小企业或者大企业。
+
+[
+ ![DCImanager](http://www.tecmint.com/wp-content/uploads/2016/12/DCImanager.png) 
+][8]
+
+*DCImanager*
+
+### 4、 EasyDCIM
+
+[EasyDCIM][9] 是一款主要面向服务提供商的收费软件。拥有可以安装操作系统或其他软件的特点，并且能方便地生成机房目录及机架分布图。
+
+该软件本身并不支持对 IP 和 DNS 进行管理。不过可以通过安装模块的方式获得这些功能，这些模块可能付费或者免费（包括 WHMCS 集成模块）。
+
+该软件每 100 台服务器每年的服务费起步价 $999。对于小公司来说这个价格有点贵，不过中型或者大型企业可以尝试使用。
+
+[
+ ![EasyDCIM](http://www.tecmint.com/wp-content/uploads/2016/12/EasyDCIM.png) 
+][10]
+
+*EasyDCIM*
+
+### 5、 Ansible Tower
+
+[Ansible Tower][11] 是红帽出品的企业级计算中心管理软件。该解决方案的核心思想是实现对服务器和不同用户设备的集中式部署。
+
+由于 **Ansible Tower** 能够通过集成软件的方式使用几乎所有的工具程序，并且该软件的数据统计收集模块特别好用。不好的一面则是缺乏和当前比较流行的计费软件的集成，而且价格也不便宜。
+
+每 100 台设备每年的服务器费是 $5000,这个价格估计只有大公司才能接受。
+
+[
+ ![Ansible Tower](http://www.tecmint.com/wp-content/uploads/2016/12/Ansible_Tower.png) 
+][12]
+
+*Ansible Tower*
+
+### 6、 Puppet Enterprise
+
+在商业基础上发展而来并作为 IT 部门的辅助软件。该软件用于在服务器或者用户设备上安装操作系统及其他软件，无论是初步部署或者进一步开发都适用。
+
+不幸的是，盘存和其他更好的交互方案(电缆连接、协议等)仍然处于开发中。
+
+[Puppet Enterprise][13] 对于小于 10 台服务器的管理免费并且开放全部功能。而收费版则是每台服务器每年 $120。
+
+这个价格适合大公司使用。
+
+[
+ ![Puppet Enterprise](http://www.tecmint.com/wp-content/uploads/2016/12/Puppet-Enterprise.png) 
+][14]
+
+*Puppet Enterprise*
+
+### 7、 Device 42
+
+该软件主要用于数据中心监控。有一个很棒的盘存工具，自动创建软硬件依赖关系图。通过 [Device 42][15] 生成数据中心地图，给不同机架标特定颜色，并可以通过图表方式反映温度、空闲空间情况和机架的其他指标。但是不支持软件安装和计费软件的集成。
+
+每 100 台服务器每年的收费是 $1499，这个价位比较适合大中型企业。
+
+[
+ ![Device42](http://www.tecmint.com/wp-content/uploads/2016/12/Device42.png) 
+][16]
+
+*Device42*
+
+### 8、 CenterOS
+
+这是一款适合数据中心管理的操作系统，主要功能是设备盘点。除此之外可以生成数据中心地图及机架方案，并连接了一个评价不错的服务器状态监控系统，方便内部技术管理工作。
+
+该软件还有一个特性就是能够通过简单的几次点击就可以找到某个设备对应的人（可能是设备所有人、技术管理员或者该设备的制造商），当出现紧急问题时这个就特别有用了。
+
+**建议阅读:** [8 Open Source/Commercial Billing Platforms for Hosting Providers][17]
+
+该软件不是开源的，并且价格也只能在咨询后才能知道。
+
+该软件价格的神秘性也决定了软件的目标客户，极有可能这个软件是给大公司用的。
+
+[
+ ![CenterOS](http://www.tecmint.com/wp-content/uploads/2016/12/CenterOS.png) 
+][19]
+
+*CenterOS*
+
+### 9、 LinMin
+
+这是一款用于初始化物理设备以便后期使用的软件。使用 PXE 安装选定的操作系统，并可随后部署一系列必要的软件安装。
+
+与同类软件不同的是，[LinMin][20] 有一个开发完善的硬盘备份系统，可以迅速在系统崩溃后恢复以及大规模部署相同配置的服务器。
+
+该软件每 100 台服务器一年的收费是 $1999，这价格也只有大中型企业能用了。
+
+[
+ ![LinMin](http://www.tecmint.com/wp-content/uploads/2016/12/LinMin.jpg) 
+][21]
+
+*LinMin*
+
+现在来总结下，当前市场上大部分能够自动化管理大量的基础设施的软件，可以分为两类。
+
+第一类，主要用于完成设备的准备工作，以便能够进一步管理。另一类就是设备的盘点管理。找到一个通用的包含所有功能的软件并不容易，你在选择的时候可以放弃一些设备提供商提供的那些功能比较有限的工具。
+
+现在你知道了这些解决方案，那么你可以逐个尝试下。值得注意的是这里列出的开源产品，如果你有好的开发人员，那么可以尝试定制软件来满足你需求。
+
+希望通过这篇回顾能够帮你找到适合的软件让你的工作更轻松。另，祝您的服务器永不出错。
+
+
+-----------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/ae5edcc20865ae20859fb566c796b97a?s=128&d=blank&r=g)
+
+Nikita Nesmiyanov
+
+我是一名俄罗斯西伯利亚托管软件开发公司的技术专家。我希望能够在新的 Linux 软件工具和托管行业的发展趋势、可能性、发展历史和发展机遇等方面拓展我的知识。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/data-center-server-management-tools/
+
+作者：[Nikita Nesmiyanov][a]
+译者：[beyondworld](https://github.com/beyondworld)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/nesmiyanov/
+[1]:http://www.tecmint.com/web-control-panels-to-manage-linux-servers/
+[2]:http://opendcim.org/
+[3]:http://www.tecmint.com/wp-content/uploads/2016/12/openDCIM.png
+[4]:http://noc-ps.com/
+[5]:http://www.tecmint.com/wp-content/uploads/2016/12/NOC-PS.png
+[6]:https://www.ispsystem.com/software/dcimanager
+[7]:http://www.tecmint.com/opensource-commercial-control-panels-manage-virtual-machines/
+[8]:http://www.tecmint.com/wp-content/uploads/2016/12/DCImanager.png
+[9]:https://www.easydcim.com/
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/EasyDCIM.png
+[11]:https://www.ansible.com/
+[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Ansible_Tower.png
+[13]:https://puppet.com/
+[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Puppet-Enterprise.png
+[15]:http://www.device42.com/
+[16]:http://www.tecmint.com/wp-content/uploads/2016/12/Device42.png
+[17]:http://www.tecmint.com/open-source-commercial-billing-software-system-web-hosting/
+[18]:http://www.centeros.com/
+[19]:http://www.tecmint.com/wp-content/uploads/2016/12/CenterOS.png
+[20]:http://www.linmin.com/
+[21]:http://www.tecmint.com/wp-content/uploads/2016/12/LinMin.jpg
diff --git a/published/20161215 Building an Email Server on Ubuntu Linux - Part 3.md b/published/20161215 Building an Email Server on Ubuntu Linux - Part 3.md
new file mode 100644
index 0000000000..ab13217d87
--- /dev/null
+++ b/published/20161215 Building an Email Server on Ubuntu Linux - Part 3.md	
@@ -0,0 +1,210 @@
+如何在 Ubuntu 上搭建一台 Email 服务器（三）
+============================================================
+
+ ![Mail server](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/mail-server.jpg?itok=Ox1SCDsV "Mail server") 
+
+在本系列的最后，我们将详细介绍如何在 Dovecot 和 Postfix 中设置虚拟用户和邮箱。
+
+欢迎回来，热心的 Linux 系统管理员们！ 在本系列的[第一部分][3]和[第二部分][4]中，我们学习了如何将 Postfix 和 Dovecot 组合在一起，搭建一个不错的 IMAP 和 POP3 邮件服务器。 现在我们将学习设置虚拟用户，以便我们可以管理所有 Dovecot 中的用户。
+
+### 抱歉，还不能配置 SSL
+
+我知道我答应过教你们如何设置一个受 SSL 保护的服务器。 不幸的是，我低估了这个话题的范围。 所以，我会下个月再写一个全面的教程。
+
+今天，在本系列的最后一部分中，我们将详细介绍如何在 Dovecot 和 Postfix 中设置虚拟用户和邮箱。 在你看来这是有点奇怪，所以我尽量让下面的例子简单点。我们将使用纯文本文件和纯文本来进行身份验证。 你也可以选择使用数据库后端和较强的加密认证形式，具体请参阅文末链接了解有关这些的更多信息。
+
+### 虚拟用户
+
+我们希望邮件服务器上用的是虚拟用户而不是 Linux 系统用户。使用 Linux 系统用户不能扩展，并且它们会暴露系统登录账号，给你的服务器带来不必要的风险。 设置虚拟用户需要在 Postfix 和 Dovecot 中编辑配置文件。我们将从 Postfix 开始。首先，我们将从一个干净、简化的 `/etc /postfix/main.cf` 开始。移动你原始的 `main.cf` 到别处做个备份，创建一个新的干净的文件，内容如下：
+
+```
+compatibility_level=2
+smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu/GNU)
+biff = no
+append_dot_mydomain = no
+
+myhostname = localhost
+alias_maps = hash:/etc/aliases
+alias_database = hash:/etc/aliases
+myorigin = $myhostname
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 192.168.0.0/24
+mailbox_size_limit = 0
+recipient_delimiter = +
+inet_interfaces = all
+
+virtual_mailbox_domains = /etc/postfix/vhosts.txt
+virtual_mailbox_base = /home/vmail
+virtual_mailbox_maps = hash:/etc/postfix/vmaps.txt
+virtual_minimum_uid = 1000
+virtual_uid_maps = static:5000
+virtual_gid_maps = static:5000
+virtual_transport = lmtp:unix:private/dovecot-lmtp0
+```
+
+你可以直接拷贝这份文件，除了 `mynetworks` 参数的设置 `192.168.0.0/24`，它应该是你的本地子网掩码。
+
+接下来，创建用户和组 `vmail` 来拥有你的虚拟邮箱。虚拟邮箱保存在  `vmail` 的家目录下。
+
+```
+$ sudo groupadd -g 5000 vmail
+$ sudo useradd -m -u 5000 -g 5000 -s /bin/bash vmail
+```
+
+接下来重新加载 Postfix 配置：
+
+```
+$ sudo postfix reload
+[sudo] password for carla: 
+postfix/postfix-script: refreshing the Postfix mail system
+```
+
+### Dovecot 虚拟用户
+
+我们会使用 Dovecot 的 `lmtp` 协议来连接到 Postfix。你可以这样安装：
+
+```
+$ sudo apt-get install dovecot-lmtpd
+```
+
+`main.cf` 的最后一行涉及到 `lmtp`。复制这个 `/etc/dovecot/dovecot.conf` 示例文件来替换已存在的文件。再说一次，我们只使用这一个文件，而不是 `/etc/dovecot/conf.d` 内的所有文件。
+
+```
+protocols = imap pop3 lmtp
+log_path = /var/log/dovecot.log
+info_log_path = /var/log/dovecot-info.log
+ssl = no
+disable_plaintext_auth = no
+mail_location = maildir:~/.Mail
+pop3_uidl_format = %g
+auth_verbose = yes
+auth_mechanisms = plain
+
+passdb {
+  driver = passwd-file
+  args = /etc/dovecot/passwd
+}
+
+userdb {
+  driver = static
+  args = uid=vmail gid=vmail home=/home/vmail/studio/%u
+}
+
+service lmtp {
+ unix_listener /var/spool/postfix/private/dovecot-lmtp {
+   group = postfix
+   mode = 0600
+   user = postfix
+  }
+}
+
+protocol lmtp {
+  postmaster_address = postmaster@studio
+}
+service lmtp {
+  user = vmail
+}
+```
+
+最后，你可以创建一个含有用户和密码的文件 `/etc/dovecot/passwd`。对于纯文本验证，我们只需要用户的完整邮箱地址和密码：
+
+```
+alrac@studio:{PLAIN}password
+layla@studio:{PLAIN}password
+fred@studio:{PLAIN}password
+molly@studio:{PLAIN}password
+benny@studio:{PLAIN}password
+```
+
+Dovecot 虚拟用户独立于 Postfix 虚拟用户，因此你需要管理 Dovecot 中的用户。保存所有的设置并重启 Postfix 和 Dovecot：
+
+```
+$ sudo service postfix restart
+$ sudo service dovecot restart
+```
+
+现在让我们使用老朋友 telnet 来看下 Dovecot 是否设置正确。
+
+```
+$ telnet studio 110
+Trying 127.0.1.1...
+Connected to studio.
+Escape character is '^]'.
++OK Dovecot ready.
+user molly@studio
++OK
+pass password
++OK Logged in.
+quit
++OK Logging out.
+Connection closed by foreign host.
+```
+
+现在一切都好！让我们用 `mail` 命令，发送测试消息给我们的用户。确保使用用户的完整电子邮箱地址而不只是用户名。
+
+```
+$ mail benny@studio
+Subject: hello and welcome!
+Please enjoy your new mail account!
+.
+```
+
+最后一行的**英文句点**表示发送消息。让我们看下它是否到达了正确的邮箱。
+
+```
+$ sudo ls -al /home/vmail/studio/benny@studio/.Mail/new
+total 16
+drwx------ 2 vmail vmail 4096 Dec 14 12:39 .
+drwx------ 5 vmail vmail 4096 Dec 14 12:39 ..
+-rw------- 1 vmail vmail  525 Dec 14 12:39 1481747995.M696591P5790.studio,S=525,W=540
+```
+
+找到了。这是一封我们可以阅读的纯文本文件：
+
+```
+$ less 1481747995.M696591P5790.studio,S=525,W=540
+Return-Path: <carla@localhost>
+Delivered-To: benny@studio
+Received: from localhost
+        by studio (Dovecot) with LMTP id V01ZKRuuUVieFgAABiesew
+        for <benny@studio>; Wed, 14 Dec 2016 12:39:55 -0800
+Received: by localhost (Postfix, from userid 1000)
+        id 9FD9CA1F58; Wed, 14 Dec 2016 12:39:55 -0800 (PST)
+Date: Wed, 14 Dec 2016 12:39:55 -0800
+To: benny@studio
+Subject: hello and welcome!
+User-Agent: s-nail v14.8.6
+Message-Id: <20161214203955.9FD9CA1F58@localhost>
+From: carla@localhost (carla)
+
+Please enjoy your new mail account!
+```
+
+你还可以使用 telnet 进行测试，如本系列前面部分所述，并在你最喜欢的邮件客户端中设置帐户，如 Thunderbird，Claws-Mail 或 KMail。
+
+### 故障排查
+
+当邮件工作不正常时，请检查日志文件（请参阅配置示例），然后运行 `journalctl -xe`。 这时会提供定位输入错误、未安装包和可以 Google 的短语等所有需要的信息。
+
+### 接下来？
+
+假设你的 LAN 名称服务配置正确，你现在有一台很好用的 LAN 邮件服务器。 显然，以纯文本发送消息不是最佳的，不支持互联网的邮件也是绝对不可以的。 请参阅 [Dovecot SSL 配置][5]和 [Postfix TLS 支持][6]，[VirtualUserFlatFilesPostfix][7] 涵盖了 TLS 和数据库后端。并请期待我之后的 SSL 指南。这次我说的是真的。
+
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-part-3
+
+作者：[CARLA SCHRODER][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linux.com/users/cschroder
+[1]:https://www.linux.com/licenses/category/creative-commons-zero
+[2]:https://www.linux.com/files/images/mail-serverjpg
+[3]:https://linux.cn/article-8071-1.html
+[4]:https://linux.cn/article-8077-1.html
+[5]:http://wiki.dovecot.org/SSL/DovecotConfiguration
+[6]:http://www.postfix.org/TLS_README.html
+[7]:http://wiki2.dovecot.org/HowTo/VirtualUserFlatFilesPostfix
diff --git a/published/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md b/published/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md
new file mode 100644
index 0000000000..53c405211f
--- /dev/null
+++ b/published/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md	
@@ -0,0 +1,161 @@
+sshpass：一个很棒的免交互 SSH 登录工具，但不要用在生产服务器上
+============================================================
+
+在大多数情况下，Linux 系统管理员使用 SSH 登录到程 Linux 服务器时，要么是通过密码，要么是[无密码 SSH 登录][1]或基于密钥的 SSH 身份验证。
+
+如果你想自动在 SSH 登录提示符中提供**密码**和**用户名**怎么办？这时 **sshpass** 就可以帮到你了。
+
+sshpass 是一个简单、轻量级的命令行工具，通过它我们能够向命令提示符本身提供密码（非交互式密码验证），这样就可以通过 [cron 调度器][2]执行自动化的 shell 脚本进行备份。
+
+ssh 直接使用 TTY 访问，以确保密码是用户键盘输入的。 sshpass 在专门的 tty 中运行 ssh，以误导 ssh 相信它是从用户接收到的密码。
+
+重要：使用 **sshpass** 是最不安全的，因为所有系统上的用户在命令行中通过简单的 “**ps**” 命令就可看到密码。因此，如果必要，比如说在生产环境，我强烈建议使用 [SSH 无密码身份验证][3]。
+
+### 在 Linux 中安装 sshpass
+
+在基于 **RedHat/CentOS** 的系统中，首先需要[启用 Epel 仓库][4]并使用 [yum 命令][5]安装它。
+
+```
+# yum install sshpass
+# dnf install sshpass    [Fedora 22 及以上版本]
+```
+
+在 Debian/Ubuntu 和它的衍生版中，你可以使用 [apt-get 命令][6]来安装。
+
+```
+$ sudo apt-get install sshpass
+```
+
+另外，你也可以从最新的源码安装 `sshpass`，首先下载源码并从 tar 文件中解压出内容：
+
+```
+$ wget http://sourceforge.net/projects/sshpass/files/latest/download -O sshpass.tar.gz
+$ tar -xvf sshpass.tar.gz
+$ cd sshpass-1.06
+$ ./configure
+# sudo make install 
+```
+
+### 如何在 Linux 中使用 sshpass
+
+**sshpass** 与 **ssh** 一起使用，使用下面的命令可以查看 `sshpass` 的使用选项的完整描述：
+
+```
+$ sshpass -h
+```
+
+下面为显示的 sshpass 帮助内容：
+
+```
+Usage: sshpass [-f|-d|-p|-e] [-hV] command parameters
+-f filename   Take password to use from file
+-d number     Use number as file descriptor for getting password
+-p password   Provide password as argument (security unwise)
+-e            Password is passed as env-var "SSHPASS"
+With no parameters - password will be taken from stdin
+-h            Show help (this screen)
+-V            Print version information
+At most one of -f, -d, -p or -e should be used
+```
+
+正如我之前提到的，**sshpass** 在用于脚本时才更可靠及更有用，请看下面的示例命令。
+
+使用用户名和密码登录到远程 Linux ssh 服务器（10.42.0.1），并[检查文件系统磁盘使用情况][7]，如图所示。
+
+```
+$ sshpass -p 'my_pass_here' ssh aaronkilik@10.42.0.1 'df -h' 
+```
+
+**重要提示**：此处，在命令行中提供了密码，这是不安全的，不建议使用此选项。
+
+[
+ ![sshpass - Linux Remote Login via SSH](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Linux-Remote-Login.png) 
+][8]
+
+*sshpass – 使用 SSH 远程登录 Linux*
+
+但是，为了防止在屏幕上显示密码，可以使用 `-e` 标志，并将密码作为 SSHPASS 环境变量的值输入，如下所示：
+
+```
+$ export SSHPASS='my_pass_here'
+$ echo $SSHPASS
+$ sshpass -e ssh aaronkilik@10.42.0.1 'df -h' 
+```
+
+[
+ ![sshpass - Hide Password in Prompt](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Hide-Password-in-Prompt.png) 
+][9]
+
+*sshpass – 在终端中隐藏密码*
+
+**注意：**在上面的示例中，`SSHPASS` 环境变量仅用于临时目的，并将在重新启动后删除。
+
+要永久设置 `SSHPASS` 环境变量，打开 `/etc/profile` 文件，并在文件开头输入 `export` 语句：
+
+```
+export SSHPASS='my_pass_here'
+```
+
+保存文件并退出，接着运行下面的命令使更改生效：
+
+```
+$ source /etc/profile 
+```
+
+另外，也可以使用 `-f` 标志，并把密码放在一个文件中。 这样，您可以从文件中读取密码，如下所示：
+
+```
+$ sshpass -f password_filename ssh aaronkilik@10.42.0.1 'df -h'
+```
+[
+ ![sshpass - Supply Password File to Login](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Provide-Password-File.png) 
+][10]
+
+*sshpass – 在登录时提供密码文件*
+
+你也可以使用 `sshpass` [通过 scp 传输文件][11]或者 [rsync 备份/同步文件][12]，如下所示：
+
+```
+------- Transfer Files Using SCP ------- 
+$ scp -r /var/www/html/example.com --rsh="sshpass -p 'my_pass_here' ssh -l aaronkilik" 10.42.0.1:/var/www/html
+------- Backup or Sync Files Using Rsync -------
+$ rsync --rsh="sshpass -p 'my_pass_here' ssh -l aaronkilik" 10.42.0.1:/data/backup/ /backup/
+```
+
+更多的用法，建议阅读 `sshpass` 的 man 页面，输入：
+
+```
+$ man sshpass
+```
+
+在本文中，我们解释了 `sshpass` 是一个非交互式密码验证的简单工具。 虽然这个工具可能是有帮助的，但还是强烈建议使用更安全的 ssh 公钥认证机制。
+
+请在下面的评论栏写下任何问题或评论，以便可以进一步讨论。
+
+--------------------------------------------------------------------------------
+
+作者简介：Aaron Kili 是一位 Linux 和 F.O.S.S 爱好者，未来的 Linux 系统管理员，web 开发人员， 还是 TecMint 原创作者，热爱电脑工作，并乐于分享知识。
+
+-----------
+
+via: http://www.tecmint.com/sshpass-non-interactive-ssh-login-shell-script-ssh-password/
+
+作者：[Aaron Kili][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/ssh-passwordless-login-using-ssh-keygen-in-5-easy-steps/
+[2]:http://www.tecmint.com/11-cron-scheduling-task-examples-in-linux/
+[3]:http://www.tecmint.com/ssh-passwordless-login-using-ssh-keygen-in-5-easy-steps/
+[4]:https://linux.cn/article-2324-1.html
+[5]:http://www.tecmint.com/20-linux-yum-yellowdog-updater-modified-commands-for-package-mangement/
+[6]:http://www.tecmint.com/useful-basic-commands-of-apt-get-and-apt-cache-for-package-management/
+[7]:http://www.tecmint.com/how-to-check-disk-space-in-linux/
+[8]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Linux-Remote-Login.png
+[9]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Hide-Password-in-Prompt.png
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Provide-Password-File.png
+[11]:http://www.tecmint.com/scp-commands-examples/
+[12]:http://www.tecmint.com/rsync-local-remote-file-synchronization-commands/
diff --git a/published/20161221 HOW TO INSTALL AND REMOVE SOFTWARE IN UBUNTU .md b/published/20161221 HOW TO INSTALL AND REMOVE SOFTWARE IN UBUNTU .md
new file mode 100644
index 0000000000..37bd762b5d
--- /dev/null
+++ b/published/20161221 HOW TO INSTALL AND REMOVE SOFTWARE IN UBUNTU .md	
@@ -0,0 +1,293 @@
+完全指南之在 Ubuntu 操作系统中安装及卸载软件
+============================================================
+
+![Complete guide for installing and removing applications in Ubuntu](https://itsfoss.com/wp-content/uploads/2016/12/Managing-Software-in-Ubuntu-1.jpg) 
+
+摘要：这篇文章详尽地说明了在 Ubuntu Linux 系统中安装及卸载软件的各种方法。
+
+当你从 Windows 系统[转向 Linux 系统][14]的时候，刚开始的体验绝对是非比寻常的。在 Ubuntu 系统下就连最基本的事情，比如安装个应用程序都会让（刚从 Windows 世界来的）人感到无比困惑。
+
+但是你也不用太担心。因为 Linux 系统提供了各种各样的方法来完成同一个任务，刚开始你感到困惑那也是正常的。你并不孤单，我们大家都是这么经历过来的。
+
+在这篇初学者指南中，我将会教大家在 Ubuntu 系统里以最常用的方式来安装软件，以及如何卸载之前已安装的软件。
+
+关于在 Ubuntu 上应使用哪种方法来安装软件，我也会提出自己的建议。请用心学习。这篇文章写得很长也很详细，你从中绝对能够学到东西。
+
+### 在 Ubuntu 系统中安装和卸载软件
+
+在这篇教程中我使用的是运行着 Unity 桌面环境的 Ubuntu 16.04 版本的系统。除了一些截图外，这篇教程也同样适用于其它版本的 Ubuntu 系统。
+
+### 1.1 使用 Ubuntu 软件中心来安装软件 【推荐使用】
+
+在 Ubuntu 系统中查找和安装软件最简单便捷的方法是使用 Ubuntu 软件中心。在 Ubuntu Unity 桌面里，你可以在 Dash 下搜索 Ubuntu 软件中心，然后选中打开即可：
+
+[
+ ![Run Ubuntu Software Center](https://itsfoss.com/wp-content/uploads/2016/12/Ubuntu-Software-Center.png) 
+][15]
+
+你可以把 Ubuntu 软件中心想像成 Google 的 Play 商店或者是苹果的 App 商店。它包含 Ubuntu 系统下所有可用的软件。你可以通过应用程序的名称来搜索应用程序或者是通过浏览各种软件目录来进行查找软件。你还可以根据作者进行查询。这由你自己来选择。
+
+![Installing software in Ubuntu using Ubuntu Software Center](https://itsfoss.com/wp-content/uploads/2016/12/install-software-Ubuntu-linux.jpeg) 
+
+一旦你找到自己想要的应用程序，选中它。软件中心将打开该应用程序的描述页面。你可以阅读关于这款软件的说明，评分等级和用户的评论。如果你愿意，也可以写一条评论。
+
+一旦你确定想安装这款软件，你可以点击安装按钮来安装已选择的应用程序。在 Ubuntu 系统中，你需要输入 root 账号的密码才能安装该应用程序。
+
+[
+ ![Installing software in Ubuntu: The easy way](https://itsfoss.com/wp-content/uploads/2016/12/install-software-Ubuntu-linux-1.jpg) 
+][16]
+
+还有什么比这更简单的吗？我觉得应该没有了吧！
+
+提示：正如我[在 Ubuntu 16.04 系统安装完成后你需要做的事情][17]这篇文章提到的那样，你应该启用 Canonical 合作伙伴仓库。默认情况下，Ubuntu 系统仅提供了那些源自自身软件库（Ubuntu 认证）的软件。
+
+但是还有一个 Canonical 合伙伙伴软件库，它包含一些闭源专属软件，Ubuntu 并不直接管控它。启用该仓库后将让你能够访问更多的软件。[在 Ubuntu 系统下安装 Skype 软件][18]就是通过那种方式安装完成的。
+
+在 Unity Dash 中，找到软件或更新工具。
+
+[
+ ![Ubuntu Software Update Settings](https://itsfoss.com/wp-content/uploads/2014/08/Software_Update_Ubuntu.jpeg) 
+][19]
+
+如下图，打开其它软件标签面，勾选 Canonical 合作伙伴选项。
+
+[
+ ![Enable Canonical partners in Ubuntu 14.04](https://itsfoss.com/wp-content/uploads/2014/04/Enable_Canonical_Partner.jpeg) 
+][20]
+
+### 1.2 从 Ubuntu 软件中心卸载软件（推荐方式）
+
+我们刚刚演示了如何在 Ubuntu 软件中心安装软件。那么如何使用同样的方法来卸载已安装的软件呢？
+
+在 Ubuntu 软件中心卸载软件跟安装软件的步骤一样简单。
+
+打开软件中心然后点击已安装的软件标签面。它将显示所有已安装的软件。或者，你也可以只搜索应用程序的名称。
+
+要卸载 Ubuntu 系统中的应用程序，点击删除按钮即中。你同样需要输入 root 账号的密码。
+
+[
+ ![Uninstall software installed in Ubuntu](https://itsfoss.com/wp-content/uploads/2016/12/Uninstall-Software-Ubuntu.jpeg) 
+][22]
+
+### 2.1 在 Ubuntu 系统中使用 .DEB 文件来安装软件
+
+.deb 文件跟 Windows 下的 .exe 文件很相似。这是一种安装软件的简易方式。很多软件开发商都会提供 .deb 格式的安装包。
+
+Google Chrome 浏览器就是这样的。你可以下载从其官网下载 .deb 安装文件
+
+[
+ ![Downloading deb packaging](https://itsfoss.com/wp-content/uploads/2016/12/install-software-deb-package.png) 
+][23]
+
+一旦你下载完成 .deb 安装文件之后，只需要双击运行即可。它将在 Ubuntu 软件中心打开，你就可以使用前面 1.1 节中同样的方式来安装软件。
+
+或者，你也可以使用轻量级的安装程序 [在 Ubuntu 系统中使用 Gdebi 工具来安装 .deb 安装文件][24]。
+
+软件安装完成后，你可以随意删除下载的 .deb 安装包。
+
+提示：在使用 .deb 文件的过程中需要注意的一些问题：
+
+* 确保你是从官网下载的 .deb 安装文件。仅使用官网或者 GitHub 上提供的软件包。
+* 确保你下载的 .deb 文件系统类型正确（32 位或是 64 位）。请阅读我们写的快速指南[如何查看你的 Ubuntu 系统是 32 位的还是 64 位的][8]
+
+### 2.2 使用 .DEB 文件来删除已安装的软件
+
+卸载 .deb 文件安装的软件跟我们在 1.2 节看到的步骤一样的。只需要打开 Ubuntu 软件中心，搜索应用程序名称，然后单击移除并卸载即可。
+
+或者你也可以使用[新立得包管理器][25]。这也不是必须的，但是如果在 Ubuntu 软件中心找不到已安装的应用程序的情况下，就可以使用这个工具了。新立得软件包管理器会列出你系统里已安装的所有可用的软件。这是一个非常强大和有用的工具。
+
+这个工具很强大非常有用。在 Ubuntu 软件中心被开发出来提供一种更友好的安装软件方式之前，新立得包管理器是 Ubuntu 系统中默认的安装和卸载软件的工具。
+
+你可以单击下面的链接来安装新立得软件包管器（它将会在 Ubuntu 软件中心中打开）。
+
+- [安装新立得包管理器][26]
+
+打开新立得包管理器，然后找到你想卸载的软件。已安装的软件标记为绿色按钮。单击并选择“标记为删除”。然后单击“应用”来删除你所选择的软件。
+
+[
+ ![Using Synaptic to remove software in Ubuntu](https://itsfoss.com/wp-content/uploads/2016/12/uninstall-software-ubuntu-synaptic.jpeg) 
+][27]
+
+### 3.1 在 Ubuntu 系统中使用 APT 命令来安装软件（推荐方式）
+
+你应该看到过一些网站告诉你使用 `sudo apt-get install` 命令在 Ubuntu 系统下安装软件。
+
+实际上这种命令行方式跟第 1 节中我们看到的安装方式一样。只是你没有使用 Ubuntu 软件中心来安装或卸载软件，而是使用的是命令行接口。别的没什么不同。
+
+使用 `apt-get` 命令来安装软件超级简单。你只需要执行下面的命令：
+
+```
+sudo apt-get install package_name
+```
+
+上面使用 `sudo` 是为了获取“管理员”或 “root” （Linux 专用术语）账号权限。你可以替换 package_name 为你想要安装的软件包名。
+
+`apt-get` 命令可以自动补全，你只需要输入一些字符并按 tab 键即可， `apt-get` 命令将会列出所有与该字符相匹配的程序。
+
+### 3.2 在 Ubuntu 系统下使用 APT 命令来卸载软件（推荐方式）
+
+在命令行下，你可以很轻易的卸载 Ubuntu 软件中心安装的软件，以及使用 `apt` 命令或是使用 .deb 安装包安装的各种软件。
+
+你只需要使用下面的命令，替换 package-name 为你想要删除的软件名。
+
+```
+sudo apt-get remove package_name
+```
+
+同样地，你也可以通过按 tab 键来利用 `apt-get` 命令的自动补全功能。
+
+使用 `apt-get` 命令来安装卸载或卸载并不算什么高深的技能。这实际上非常简便。通过这些简单命令的运用，你可以熟悉 Ubuntu Linux 系统的命令行操作，长期使用对你学习 Linux 系统的帮忙也很大。建议你看下我写的一篇很详细的[apt-get 命令使用指导][28]文章来进一步的了解该命令的使用。
+
+- 建议阅读：[Linux 系统下 apt-get 命令初学者完全指南][29]
+
+### 4.1 使用 PPA 命令在 Ubuntu 系统下安装应用程序
+
+PPA 是[个人软件包归档（ Personal Package Archive）][30]的缩写。这是开发者为 Ubuntu 用户提供软件的另一种方式。
+
+在第 1 节中出现了一个叫做 ‘仓库（repository）’ 的术语。仓库本质上是一个软件集。 Ubuntu 官方仓库主要用于提供经过 Ubuntu 自己认证过的软件。 Canonical 合作伙伴仓库包含来自合作厂商提供的各种应用软件。
+
+同时，PPA 允许开发者创建自己的 APT 仓库。当用户在系统里添加了一个仓库时（`sources.list` 中增加了该仓库），用户就可以使用开发者自己的仓库里提供的软件了。
+
+现在你也许要问既然我们已经有 Ubuntu 的官方仓库了，还有什么必要使用 PPA 方式呢？
+
+答案是并不是所有的软件都会自动添加到 Ubuntu 的官方仓库中。只有受信任的软件才会添加到其中。假设你开发出一款很棒的 Linux 应用程序，然后你想为用户提供定期的更新，但是在它被添加到 Ubuntu 仓库之前，这需要花费好几个月的时间（如果是在被允许的情况下）。 PPA 的出现就是为了解决这个问题。
+
+除此之外， Ubuntu 官方仓库通常不会把最新版的软件添加进来。这会影响到 Ubuntu 系统的安全性及稳定性。新版本的软件或许会有影响到系统的[回退][31]。这就是为什么在新款软件进入到官方仓库前要花费一定的时间，有时候需要等待几个月。
+
+但是，如果你不想等待最新版出现在 Ubuntu 仓库中呢？这个时候 PPA 就对你有帮助了。通过 PPA 方式，你可以获得该应用程序的最新版本。
+
+通常情况下， PPA 通过这三个命令来进行使用。第一个命令添加 PPA 仓库到源列表中。第二个命令更新软件缓存列表，这样你的系统就可以获取到可用的新版本软件了。第三个命令用于从 PPA 安装软件。
+
+我将演示使用 PPA 方式来安装 [Numix 主题][32]：
+
+```
+sudo add-apt-repository ppa:numix/ppa
+sudo apt-get update
+sudo apt-get install numix-gtk-theme numix-icon-theme-circle
+```
+
+在上面的实例中，我们添加了一个[Numix 项目][33]提供的 PPA 。在更新软件信息之后，我们安装了两个 Numix PPA 中可用的应用程序。
+
+如果你想使用带有图形界面的应用程序，你可以使用 [Y-PPA 应用程序][34]。通过它你可以很方便地查询 PPA，添加和删除软件。
+
+注意：PPA 的安全性经常受到争议。我的建议是你应该从受信任的源添加 PPA，最好是从官方软件源添加。
+
+### 4.2 卸载使用 PPA 方式安装的应用程序
+
+在之前的文章[在 Ubuntu 系统下移除 PPA][35] 中我已经写得很详细了。你可以跳转到这篇文章去深入学习卸载 PPA 方式安装的软件。
+
+这里简要提一下，你可以使用下面的两个命令来卸载：
+
+```
+sudo apt-get remove numix-gtk-theme numix-icon-theme-circle
+
+sudo add-apt-repository --remove ppa:numix/ppa
+```
+
+第一个命令是卸载通过 PPA 方式安装的软件。第二个命令是从 `source.list` 中删除该 PPA。
+
+### 5.1 在 Ubuntu Linux 系统中使用源代码来安装软件（不推荐使用）
+
+我并不建议你使用[软件源代码][36]来安装该应用程序。这种方法很麻烦，容易出问题而且还非常地不方便。你得费尽周折去解决依赖包的问题。你还得保留源代码文件，以便将来卸载该应用程序。
+
+但是还是有一些用户喜欢通过源代码编译的方式来安装软件，尽管他们自己本身并不会开发软件。实话告诉你，我曾经也经常使用这种方式来安装软件，不过那都是 5 年前的事了，那时候我还是一个实习生，我必须在 Ubuntu 系统下开发一款软件出来。但是，从那之后我更喜欢使用其它方式在 Ubuntu 系统中安装应用程序。我觉得，对于普通的 Linux 桌面用户，最好不要使用源代码的方式来安装软件。
+
+在这一小节中我将简要地列出使用源代码方式来安装软件的几个步骤：
+* 下载你想要安装软件的源代码。
+* 解压下载的文件。
+* 进入到解压目录里并找到 `README` 或者 `INSTALL` 文件。一款开发完善的软件都会包含这样的文件，用于提供安装或卸载软件的指导方法。
+* 找到名为 `configure` 的配置文件。如果在当前目录下，使用这个命令来执行该文件：`./configure` 。它将会检查你的系统是否包含所有的必须的软件（在软件术语中叫做‘依赖包’）来安装该应用程序。（LCTT 译注：你可以先使用 `./configure --help` 来查看有哪些编译选项，包括安装的位置、可选的特性和模块等等。）注意并不是所有的软件都包括该配置文件，我觉得那些开发很糟糕的软件就没有这个配置文件。
+* 如果配置文件执行结果提示你缺少依赖包，你得先安装它们。
+* 一旦你安装完成所有的依赖包后，使用 `make` 命令来编译该应用程序。
+* 编译完成后，执行 `sudo make install` 命令来安装该应用程序。
+
+注意有一些软件包会提供一个安装软件的脚本文件，你只需要运行这个文件即可安装完成。但是大多数情况下，你可没那么幸运。
+
+还有，使用这种方式安装的软件并不会像使用 Ubuntu 软件库、 PPA 方式或者 .deb 安装方式那样安装的软件会自动更新。
+
+如果你坚持使用源代码方式来安装软件，我建议你看下这篇很详细的文章[在 Ubuntu 系统中使用源代码安装软件][37]。
+
+### 5.2 卸载使用源代码方式安装的软件（不推荐使用）
+
+如果你觉得使用源代码安装软件的方式太难了，再想想看，当你卸载使用这种方式安装的软件将会更痛苦。
+
+* 首先，你不能删除用于安装该软件的源代码。
+* 其次，你必须确保在安装的时候也有对应的方式来卸载它。一款设计上很糟糕的应用程序就不会提供卸载软件的方法，因此你不得不手动去删除那个软件包安装的所有文件。
+
+正常情况下，你应该切换到源代码的解压目录下，使用下面的命令来卸载那个应用程序：
+
+```
+sudo make uninstall
+```
+
+但是，这也不能保证你每次都会很顺利地卸载完成。
+
+看到了吧，使用源代码方式来安装软件实在是太麻烦了。这就是为什么我不推荐大家在 Ubuntu 系统中使用源代码来安装软件的原因。
+
+### 其它一些在 Ubuntu 系统中安装软件的方法
+
+另外，还有一些在 Ubuntu 系统下并不常用的安装软件的方法。由于这篇文章已经写得够长了，我就不再深入探讨了。下面我将把它们列出来：
+* Ubuntu 新推出的 [Snap 打包][9]方式
+* 使用 [dpkg][10] 命令
+* [AppImage][11] 方式
+* [pip][12] : 用于安装基于 Python 语言的应用程序
+
+### 你是如何在 UBUNTU 系统中安装软件的呢？
+
+如果你一直都在使用 Ubuntu 系统，那么你在 Ubuntu Linux 系统下最喜欢使用什么方式来安装软件呢？你觉得这篇文章对你有用吗？请分享你的一些观点，建议和提出相关的问题。
+
+--------------------
+
+作者简介：
+![](https://secure.gravatar.com/avatar/20749c268f5d3e4d2c785499eb6a17c0?s=70&d=mm&r=g)
+
+我叫 Abhishek Prakash ，F.O.S.S 开发者。我的工作是一名专业的软件开发人员。我是一名狂热的 Linux 系统及开源软件爱好者。我使用 Ubuntu 系统，并且相信分享是一种美德。除了 Linux 系统之外，我喜欢经典的侦探神秘小说。我是 Agatha Christie 作品的真爱粉。
+
+--------------------------------------------------------------------------------
+
+via: https://itsfoss.com/remove-install-software-ubuntu/
+
+作者：[ABHISHEK PRAKASH][a]
+译者：[rusking](https://github.com/rusking)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://itsfoss.com/author/abhishek/
+[1]:https://itsfoss.com/author/abhishek/
+[2]:https://itsfoss.com/remove-install-software-ubuntu/#comments
+[3]:http://www.facebook.com/share.php?u=https%3A%2F%2Fitsfoss.com%2Fremove-install-software-ubuntu%2F%3Futm_source%3Dfacebook%26utm_medium%3Dsocial%26utm_campaign%3DSocialWarfare
+[4]:https://twitter.com/share?original_referer=/&text=How+To+Install+And+Remove+Software+In+Ubuntu+%5BComplete+Guide%5D&url=https://itsfoss.com/remove-install-software-ubuntu/%3Futm_source%3Dtwitter%26utm_medium%3Dsocial%26utm_campaign%3DSocialWarfare&via=abhishek_pc
+[5]:https://plus.google.com/share?url=https%3A%2F%2Fitsfoss.com%2Fremove-install-software-ubuntu%2F%3Futm_source%3DgooglePlus%26utm_medium%3Dsocial%26utm_campaign%3DSocialWarfare
+[6]:https://www.linkedin.com/cws/share?url=https%3A%2F%2Fitsfoss.com%2Fremove-install-software-ubuntu%2F%3Futm_source%3DlinkedIn%26utm_medium%3Dsocial%26utm_campaign%3DSocialWarfare
+[7]:https://www.reddit.com/submit?url=https://itsfoss.com/remove-install-software-ubuntu/&title=How+To+Install+And+Remove+Software+In+Ubuntu+%5BComplete+Guide%5D
+[8]:https://itsfoss.com/32-bit-64-bit-ubuntu/
+[9]:https://itsfoss.com/use-snap-packages-ubuntu-16-04/
+[10]:https://help.ubuntu.com/lts/serverguide/dpkg.html
+[11]:http://appimage.org/
+[12]:https://pypi.python.org/pypi/pip
+[13]:https://itsfoss.com/remove-install-software-ubuntu/managing-software-in-ubuntu-1/
+[14]:https://itsfoss.com/reasons-switch-linux-windows-xp/
+[15]:https://itsfoss.com/wp-content/uploads/2016/12/Ubuntu-Software-Center.png
+[16]:https://itsfoss.com/remove-install-software-ubuntu/install-software-ubuntu-linux-1/
+[17]:https://itsfoss.com/things-to-do-after-installing-ubuntu-16-04/
+[18]:https://itsfoss.com/install-skype-ubuntu-1404/
+[19]:https://itsfoss.com/ubuntu-notify-updates-frequently/software_update_ubuntu/
+[20]:https://itsfoss.com/things-to-do-after-installing-ubuntu-14-04/enable_canonical_partner/
+[21]:https://itsfoss.com/essential-linux-applications/
+[22]:https://itsfoss.com/remove-install-software-ubuntu/uninstall-software-ubuntu/
+[23]:https://itsfoss.com/remove-install-software-ubuntu/install-software-deb-package/
+[24]:https://itsfoss.com/gdebi-default-ubuntu-software-center/
+[25]:http://www.nongnu.org/synaptic/
+[26]:apt://synaptic
+[27]:https://itsfoss.com/remove-install-software-ubuntu/uninstall-software-ubuntu-synaptic/
+[28]:https://itsfoss.com/apt-get-linux-guide/
+[29]:https://itsfoss.com/apt-get-linux-guide/
+[30]:https://help.launchpad.net/Packaging/PPA
+[31]:https://en.wikipedia.org/wiki/Software_regression
+[32]:https://itsfoss.com/install-numix-ubuntu/
+[33]:https://numixproject.org/
+[34]:https://itsfoss.com/easily-manage-ppas-ubuntu-1310-ppa-manager/
+[35]:https://itsfoss.com/how-to-remove-or-delete-ppas-quick-tip/
+[36]:https://en.wikipedia.org/wiki/Source_code
+[37]:http://www.howtogeek.com/105413/how-to-compile-and-install-from-source-on-ubuntu/
diff --git a/published/20161224 10 Interesting Linux Command Line Tricks and Tips Worth Knowing.md b/published/20161224 10 Interesting Linux Command Line Tricks and Tips Worth Knowing.md
new file mode 100644
index 0000000000..4d5be796d8
--- /dev/null
+++ b/published/20161224 10 Interesting Linux Command Line Tricks and Tips Worth Knowing.md	
@@ -0,0 +1,262 @@
+你值得了解的 10 个有趣的 Linux 命令行小技巧
+============================================================
+
+我非常喜欢使用命令，因为它们比 GUI（图形用户界面）应用程序对 Linux 系统提供更多的控制，因此，我一直在寻找一些有趣的方法[让 Linux 的操作变得简单好玩][1]，主要是基于终端操作。
+
+当我们发现[使用 Linux 的新技巧][2]时，尤其是像我这样的命令行极客，我们总会感到非常来劲。
+
+**建议阅读：** [5 有趣的 Linux 命令行技巧 - 第一部分][3]
+
+而且我们也会很想与数百万 Linux 用户分享新学到的实践或命令，特别是那些还在使用自己的方式操作这个令人兴奋的操作系统的新手们。
+
+
+**建议阅读：** [10 个对新手有用的 Linux 命令行技巧 - 第二部分][4]
+
+在这篇文章中，我们将回顾一系列[有用的命令行小技巧][4]，它们可以显著地提高你的 Linux 使用技能。
+
+### 1、 在 Linux 中锁定或隐藏文件或目录
+
+锁定文件或目录最简单的方法是使用 Linux 文件权限。如果你是文件或目录的所有者，你可以阻止其他用户和组访问（删除、读取、写入、执行）它，如下所示：
+
+```
+$ chmod 700 tecmint.info
+或
+$ chmod go-rwx tecmint.info
+```
+
+想要了解更多有关 Linux 文件权限的内容，请阅读这篇文章[在 Linux 中管理用户和组，文件权限和属性][5]。
+
+为了实现对系统中的其他用户隐藏文件或目录，可以通过在文件或目录开头添加 `.` 的方式重命名：
+
+```
+$ mv filename .tecmint.info
+```
+
+### 2、 在 Linux 中将 rwx 权限转为八进制格式
+
+默认情况下，当你运行 [ls 命令][6]之后，它会使用 `rwx` 格式显示文件权限，为了了解 rwx 格式和八进制格式的等同性，你可以学习如何[在 Linux 中将 rwx 权限转为八进制格式][7]。
+
+### 3、 当 `sudo` 命令执行失败时怎么使用 `su` 命令
+
+虽然 [sudo 命令][8]被用来以超级用户权限执行命令，但是在某些情况下它也会执行失败，如下所示。
+
+在这里，我想[清空一个大文件的内容][9]，其文件名为 `uptime.log`，但是即便我是使用 sudo 命令也执行失败了。
+
+```
+$ cat /dev/null >/var/log/uptime.log
+$ sudo cat /dev/null >/var/log/uptime.log
+```
+[
+ ![在 Linux 中清空大文件的内容](http://www.tecmint.com/wp-content/uploads/2016/12/Empty-Large-File-Content-in-Linux.png)
+][10]
+
+*在 Linux 中清空大文件的内容*
+
+遇到这种情况，你需要使用 `su` 命令切换到 `root` 用户，然后像下面这样去执行清空操作：
+
+```
+$ su
+$ sudo cat /dev/null >/var/log/uptime.log
+$ cat /var/log/uptime.log
+```
+
+[
+ ![切换到超级用户](http://www.tecmint.com/wp-content/uploads/2016/12/Switch-to-Super-User.png)
+][11]
+
+*切换到超级用户*
+
+尝试理解 [su 和 sudo 之间的区别][12]，另外，通过阅读它们的手册页以了解更多的使用指南：
+
+```
+$ man sudo
+$ man su
+```
+
+### 4、 在 Linux 中结束一个进程
+
+有些时候，当你想[使用 kill、killall、pkill 命令结束一个进程][13]时，它们有可能无法生效，你可能会看到该进程仍然还在系统上运行。
+
+如果要强制结束一个进程，可以发送 `-KILL` 信号给该进程。
+
+首先[获取指定进程 ID][14]，然后像下面这样结束该进程：
+
+```
+$ pidof vlc
+$ sudo kill -KILL 10279
+```
+[
+ ![在 Linux 中查找和结束进程](http://www.tecmint.com/wp-content/uploads/2016/12/Find-and-Kill-Process-in-Linux.png) 
+][15]
+
+*在 Linux 中查找和结束进程*
+
+查看 [kill 命令][16]以获取更多的使用选项和信息。
+
+### 5、 在 Linux 中永久删除文件
+
+一般情况下，我们通过使用 `rm` 命令将文件从 Linux 系统中删除。然而，这些文件并没有被真正的删除，它们仍被存储在那里并隐藏在你的硬盘中，其他用户仍然可以[在 Linux 中恢复删除的文件][17]并查看。
+
+为了防止这种情况发生，我们可以使用 `shred` 命令来覆写文件内容，并在覆盖完成后选择删除文件。
+
+```
+$ shred -zvu tecmint.pdf
+```
+
+上述命令中所使用的选项说明：
+
+1. `-z` – 最后一次使用 0 进行覆盖以隐藏覆写动作。
+2. `-u` – 覆写后截断并移除文件。
+3. `-v` – 显示详细过程。
+
+[
+ ![在 Linux 中永久删除文件](http://www.tecmint.com/wp-content/uploads/2016/12/Delete-File-Permanently-in-Linux.png) 
+][18]
+
+*在 Linux 中永久删除文件*
+
+阅读 `shred` 手册以获取更多的使用信息。
+
+```
+$ man shred
+```
+
+### 6、 在 Linux 中重命名多个文件
+
+你可以通过使用 `rename` 命令随时[在 Linux 中重命名多个文件][19]。
+
+`rename` 命令会根据第一个参数中的规则重命名指定文件。
+
+以下命令会将所有 `.pdf` 文件重命名为 `.doc` 文件，使用的规则为 `'s/\.pdf$/\.doc/'`：
+
+```
+$ rename -v 's/\.pdf$/\.doc/' *.pdf
+```
+
+[
+ ![在 Linux 中重命名多个文件](http://www.tecmint.com/wp-content/uploads/2016/12/Rename-Multiple-Files-in-Linux.png) 
+][20]
+
+*在 Linux 中重命名多个文件*
+
+在接下来的例子中，我们将通过重命名所有匹配 `"*.bak"` 的文件来移除其拓展名，使用的规则是 `'s/\e.bak$//'`：
+
+```
+$ rename -v 's/\e.bak$//' *.bak
+```
+
+### 7、 在 Linux 中检查单词拼写
+
+`look` 命令用于显示文件中以指定字符串为前缀的任意行，同时它也可以帮你检查命令行中给定单词的拼写。尽管它并不是那么有效和可靠，但它仍然算得上是其他强大的拼写检查工具的有用替代品。
+
+```
+$ look linu
+$ look docum
+```
+
+[
+ ![在 Linux 中检查单词拼写](http://www.tecmint.com/wp-content/uploads/2016/12/Spell-Checking-in-Linux.png) 
+][21]
+
+*在 Linux 中检查单词拼写*
+
+### 8、 按关键字搜索手册页
+
+`man` 命令用于显示命令的手册页，当使用 `-k` 选项时，它会将关键字 `printf`（或者如下命令中的关键字 `adjust`、`apache`、`php` ）作为正则表达式，来搜索所有匹配该名称手册页，并显示其简介。
+
+```
+$ man -k adjust
+$ man -k apache
+$ man -k php
+```
+
+[
+ ![按关键字搜索手册页](http://www.tecmint.com/wp-content/uploads/2016/12/Show-Description-of-Keyword-in-Manual-Pages.png)
+][22]
+
+*按关键字搜索手册页*
+
+### 9、 在 Linux 中实时监测日志
+
+`watch` 命令可以[定期执行另一个 Linux 命令][23]并全屏显示该命令的执行结果。当 `watch` 命令与 [tail 命令][24]（用于查看文件结尾的 Linux 命令）配合使用时，可以监测到日志文件的日志记录情况。
+
+在以下示例中，你将实时监测系统认证日志文件。打开两个终端窗口，在第一个窗口中实时监测该日志文件，如下：
+
+```
+$ sudo watch tail /var/log/auth.log
+```
+
+你也可以使用 [tail 命令][25]（显示文件结尾的 Linux 命令）的 `-f` 选项实时监测文件变化。这样，我们就可以在日志文件中看到日志的生成情况。
+
+```
+$ sudo tail -f /var/log/auth.log
+```
+
+接着，在第二个终端窗口中运行以下命令，之后，你就可以在第一个终端窗口中观察日志文件内容：
+
+```
+$ sudo mkdir -p /etc/test
+$ sudo rm -rf /etc/test
+```
+
+### 10、 列出所有 Shell 内置命令
+
+shell 内置命令是一个命令或者函数，从内部调用并直接在 shell 里执行，而不是从硬盘加载外部的可执行程序来执行。
+
+列出所有 shell 内置命令及其语法，执行如下命令：
+
+```
+$ help
+```
+
+作为结束语，[命令行小技巧][26]不仅能派得上用场，而且让学习和使用 Linux 变得更加简单有趣，尤其是对新手来讲。
+
+你也可以通过留言给我们分享其他在 Linux 中[有用有趣的命令行小技巧][27]。
+
+--------------------------------------------------------------------------------
+
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili 是一名 Linux 和 F.O.S.S 的爱好者，未来的 Linux 系统管理员、网站开发人员，目前是 TecMint 的写作者，他喜欢用电脑工作，并且乐忠于分享知识。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/linux-command-line-tricks-and-tips-worth-knowing/
+
+作者：[Aaron Kili][a]
+译者：[zhb127](https://github.com/zhb127)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/20-funny-commands-of-linux-or-linux-is-fun-in-terminal/
+[2]:http://www.tecmint.com/tag/linux-tricks/
+[3]:https://linux.cn/article-5485-1.html
+[4]:https://linux.cn/article-6314-1.html
+[5]:https://linux.cn/article-7418-1.html
+[6]:http://www.tecmint.com/tag/linux-ls-command/
+[7]:http://www.tecmint.com/check-linux-file-octal-permissions-using-stat-command/
+[8]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[9]:https://linux.cn/article-8024-1.html
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Empty-Large-File-Content-in-Linux.png
+[11]:http://www.tecmint.com/wp-content/uploads/2016/12/Switch-to-Super-User.png
+[12]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[13]:http://www.tecmint.com/how-to-kill-a-process-in-linux/
+[14]:http://www.tecmint.com/find-process-name-pid-number-linux/
+[15]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-and-Kill-Process-in-Linux.png
+[16]:http://www.tecmint.com/how-to-kill-a-process-in-linux/
+[17]:https://linux.cn/article-7974-1.html
+[18]:http://www.tecmint.com/wp-content/uploads/2016/12/Delete-File-Permanently-in-Linux.png
+[19]:http://www.tecmint.com/rename-multiple-files-in-linux/
+[20]:http://www.tecmint.com/wp-content/uploads/2016/12/Rename-Multiple-Files-in-Linux.png
+[21]:http://www.tecmint.com/wp-content/uploads/2016/12/Spell-Checking-in-Linux.png
+[22]:http://www.tecmint.com/wp-content/uploads/2016/12/Show-Description-of-Keyword-in-Manual-Pages.png
+[23]:http://www.tecmint.com/run-repeat-linux-command-every-x-seconds/
+[24]:http://www.tecmint.com/view-contents-of-file-in-linux/
+[25]:http://www.tecmint.com/view-contents-of-file-in-linux/
+[26]:http://www.tecmint.com/tag/linux-tricks/
+[27]:https://linux.cn/article-5485-1.html
\ No newline at end of file
diff --git a/published/20161228 10 Linux System Administrators New Years Resolutions 2017.md b/published/20161228 10 Linux System Administrators New Years Resolutions 2017.md
new file mode 100644
index 0000000000..408ac7e108
--- /dev/null
+++ b/published/20161228 10 Linux System Administrators New Years Resolutions 2017.md	
@@ -0,0 +1,135 @@
+Linux 系统管理员 2017 年的 10 个新决心
+============================================================
+
+当我们告别 2016 时，也到时间定下我们的 **新年决心** 了。不管你身为 Linux 系统管理员的经验水平如何，我们认为，制定接下来 12 个月的成长目标是很值得的。
+
+如果你还没什么想法，我们将会在这篇文章分享 10 个简单的专业提升决心，你可以为 2017 年考虑一下。
+
+### 1、 决定更自动化
+
+你没必要忙得像头无头苍蝇，每天忙于解决可预见的问题。如果你发现自己每天都花费时间在执行重复的任务，你有必要现在就停下来。
+
+在了解了所有[基于 Linux 而且开源的工具][4]后，你可以尽可能地[自动化你的 Linux 任务][5]来给自己一些休闲的时间。
+
+你会发现，接下来的几个决心会帮你在工作上朝着这个目标前进。所以继续看下去吧。
+
+另外，帮自己一个忙，花费几分钟来浏览我们[免费的电子书][6]部分吧。
+
+你将有机会下载与[Bash shell 脚本编程][7]相关的书籍来提升你的技能。开心地自动化！
+
+### 2、 学习一门新的脚本语言
+
+虽然每一个系统管理员应该熟练地使用 Bash 写脚本，但考虑一下其它更现代化、健壮性更强的工具也是很重要的，例如 Python。
+
+不要只是相信我们说的话 —— 看看不久前我们发布的[两篇关于 Python 的系列文章][9]。你将会意识到，与其它语言相比，Python 带来了面向对象编程的力量，使您写出更短、健壮性更强的脚本。
+
+### 3、 学习一门新的编程语言
+
+除了学习一门新的脚本语言，（你也可以）决定花费点时间来开始学习或者提升你的编程技能。不确定从何处开始？今年的 [Stackoverflow 开发者调查][10]表明 Javascript 连续第三年引领最流行语言的榜单。
+
+其他经典例如 Java 和 C 也值得考虑。来看我们 [2016 年最好的编程课程][11]。
+
+### 4、 注册一个 Github 账户并且定期更新
+
+特别是如果你是一个编程新手，你应该考虑一下在 Github 上展示你的成果。通过允许别人去复刻你的脚本或者程序，你就能提高知识水平，并通过别人的帮助创造出更复杂的软件。
+
+在[《如何安装和注册 Github 帐号》][12]一文中了解更多。
+
+### 5、 向一个开源项目做贡献
+
+在 Github 上向一个开源项目做贡献，这是另一个学习或者提高一门新脚本语言或者编程语言能力的好办法。
+
+如果这吸引到了你的兴趣，点击 [Explore Github][13] 页面。这里你能按热度或者编程语言浏览仓库，你能在这里面找到一些有趣的事情来做。
+
+在此基础上，你将因回馈社区而获得满足感。
+
+### 6、 每月尝试一个新的发行版
+
+经常会有新的发行版或者分支出现，你有不同的选项以供选择。谁知道你梦想中的发行版是否就在近前，而你还没发现它？每个月去一次 **Distrowatch** 然后选择一个新的发行版。
+
+也别忘了[订阅 Techmint][14] 来获取新发行版的消息。
+
+如果你想要尝试一个新的发行版，希望我们的评论能帮你做出决定。也可以点击我们这里关于最好的 Linux 发行版的文章：
+
+- [2016年最好的 5 个注重安全的 Linux 发行版][1]
+- [2016年最值得期待的 Linux 发行版][2]
+- [2015年最流行的 10个 Linux 发行版][3]
+
+### 7、 参加一个 Linux 或者开源会议。
+
+如果你住在由 Linux 基金会赞助的会议举办地附近，我强烈建议你去参加会议。
+
+这不仅将会给你一个提高 Linux 知识的机会，而且将是个见见其他开源专家的机会。
+
+### 8、 从 Linux 基金会的免费或付费课程中学习
+
+Linux 基金会分别通过 **edX.org** 和他们自己的门户，不断地提供免费或付费课程。
+
+免费课程的话题包括（但不仅限于）Linux 介绍、云基础设施技术介绍和 OpenStack 介绍。
+
+另一方面，付费课程包括 [LFCS 认证][16] 和 [LFCE 认证][17] 考试的准备，给开发者的 Linux ，内核内部构件，Linux 安全，性能试验，高可用性及其他。
+
+另外，他们对企业课程有折扣，所以尝试去说服你上司来为你和你同事的训练付费。还有，也会提供周期性的免费在线研讨会，所以别忘了订阅他们的 newsletters！
+
+你也可以考虑下看看我们最棒的[在线 Linux 训练课程][18]。
+
+### 9、 每周在 Linux 论坛上回答特定数量的问题
+
+另一个回馈社区的好方法是帮助那些刚开始使用 Linux 的人。你将会发现网上的 Linux 论坛上有许多人正在寻找着答复。
+
+牢记你曾经也是像他们那样是个新手，试着换位思考。
+
+### 10、 教一个孩子或少年使用 Linux 
+
+如果我能回到 20 年前，我希望我能有台电脑，有个能[在青年时学习 Linux ][19]的机会。
+
+我也希望我能比当年还早很多地开始编程。毫无疑问，这样事情就会简单许多。我认为给孩子和青年教授至少是基础的 Linux 和编程技巧（我对我的孩子这样做）是个重要的尝试。
+
+教育成长中的一代如何有效地使用开源技术将会给他们选择的自由，而他们会因此永远感激你。
+
+##### 总结
+
+在这篇文章里我们分享了 10 个适合系统管理员的可能新年决心。[Tecmint.com][20] 祝你在朝着目标的工作顺顺利利，希望你能在 2017 年成为我们网站的常客。
+
+如果你有关于这篇文章的问题或者评论，请不要犹豫使用下面的表格提交。我们期待着收到您的信息。
+
+--------------------------------------------------------------------------------
+
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/d9d14c5b51331864398e6288cb0c2091?s=128&d=blank&r=g)
+
+Gabriel Cánepa 是个  GNU/Linux 系统管理员和网页开发者，他来自阿根廷圣路易斯的 Villa Mercedes 。他供职于全球领先的消费品公司，享受在日常工作的方方面面使用 FOSS（自由及开源软件） 工具来提高生产效率。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/linux-system-administrators-new-years-resolutions-ideas/
+
+作者：[Gabriel Cánepa][a]
+译者：[ypingcn](https://github.com/ypingcn)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: http://www.tecmint.com/author/gacanepa/
+[1]: http://www.tecmint.com/best-security-centric-linux-distributions-of-2016/
+[2]: http://www.tecmint.com/top-linux-distributions-to-look-forward-in-2016/
+[3]: http://www.tecmint.com/10-top-most-popular-linux-distributions-of-2015/
+[4]: http://www.tecmint.com/category/top-tools/
+[5]: http://www.tecmint.com/using-shell-script-to-automate-linux-system-maintenance-tasks/
+[6]: http://tecmint.tradepub.com/category/information-technology-servers-and-linux-server-os/806/
+[7]: http://tecmint.tradepub.com/free/w_syst05/?p=w_syst05
+[8]: http://www.tecmint.com/category/python/
+[9]: https://linux.cn/article-7693-1.html
+[10]: http://stackoverflow.com/research/developer-survey-2016#technology
+[11]: https://deals.tecmint.com/collections/best-of-bundles-2016
+[12]: http://www.tecmint.com/install-git-centos-fedora-redhat/
+[13]: https://help.github.com/articles/where-can-i-find-open-source-projects-to-work-on/
+[14]: http://subscribe.tecmint.com/newsletter
+[15]: http://events.linuxfoundation.org/
+[16]: http://www.tecmint.com/sed-command-to-create-edit-and-manipulate-files-in-linux/
+[17]: http://www.tecmint.com/installing-network-services-and-configuring-services-at-system-boot/
+[18]: http://www.tecmint.com/linux-online-training-courses/
+[19]: http://www.tecmint.com/free-online-linux-learning-guide-for-beginners/
+[20]: http://tecmint.com/
diff --git a/published/20161229 How Setup Go in Docker and Deploy an Application.md b/published/20161229 How Setup Go in Docker and Deploy an Application.md
new file mode 100644
index 0000000000..359b15e0ee
--- /dev/null
+++ b/published/20161229 How Setup Go in Docker and Deploy an Application.md	
@@ -0,0 +1,212 @@
+如何在 Docker 中设置 Go 并部署应用
+============================================================
+
+嗨，在本教程中，我们将学习如何使用 docker 部署 golang web 应用程序。 你可能已经知道，由于 golang 的高性能和可靠性，docker 是完全是用 golang 写的。在我们详细介绍之前，请确保你已经安装了 docker 以及 golang 并对它们有基本了解。
+
+###  关于 docker
+
+Docker 是一个开源程序，它可以将应用及其完整的依赖包捆绑到一起，并打包为容器，与宿主机共享相同的 Linux 内核。另一方面，像 VMware 这样的基于 hypervisor 的虚拟化操作系统容器提供了高级别的隔离和安全性，这是由于客户机和主机之间的通信是通过 hypervisor 来实现的，它们不共享内核空间。但是硬件仿真也导致了性能的开销，所以容器虚拟化诞生了，以提供一个轻量级的虚拟环境，它将一组进程和资源与主机以及其它容器分组及隔离，因此，容器内部的进程无法看到容器外部的进程或资源。
+
+### 用 Go 语言创建一个 “Hello World” web 应用
+
+首先我们为 Go 应用创建一个目录，它会在浏览器中显示 “Hello World”。创建一个 `web-app` 目录并使它成为当前目录。进入 `web-app` 应用目录并编辑一个名为 `main.go` 的文件。
+
+```
+root@demohost:~# mkdir web-app
+root@demohost:~# cd web-app/
+root@demohost:~/web-app# vim.tiny main.go
+
+package main
+import (
+    "fmt"
+    "net/http"
+)
+
+func handler(w http.ResponseWriter, r *http.Request) {
+    fmt.Fprintf(w, "Hello %s", r.URL.Path[1:])
+}
+
+func main() {
+    http.HandleFunc("/World", handler)
+    http.ListenAndServe(":8080", nil)
+}
+```
+
+使用下面的命令运行上面的 “Hello World” Go 程序。在浏览器中输入 `http://127.0.0.1:8080/World` 测试，你会在浏览器中看到 “Hello World”。
+
+```
+root@demohost:~/web-app# PORT=8080 go run main.go
+```
+
+下一步是将上面的应用在 docker 中容器化。因此我们会创建一个 dockerfile 文件，它会告诉 docker 如何容器化我们的 web 应用。
+
+```
+root@demohost:~/web-app# vim.tiny Dockerfile
+
+# 得到最新的 golang docker 镜像
+FROM golang:latest
+
+# 在容器内部创建一个目录来存储我们的 web 应用，接着使它成为工作目录。
+RUN mkdir -p /go/src/web-app
+WORKDIR /go/src/web-app
+
+# 复制 web-app 目录到容器中
+COPY . /go/src/web-app
+
+# 下载并安装第三方依赖到容器中
+RUN go-wrapper download
+RUN go-wrapper install
+
+# 设置 PORT 环境变量
+ENV PORT 8080
+
+# 给主机暴露 8080 端口，这样外部网络可以访问你的应用
+EXPOSE 8080
+
+# 告诉 Docker 启动容器运行的命令
+CMD ["go-wrapper", "run"]
+```
+
+### 构建/运行容器
+
+使用下面的命令构建你的 Go web-app，你会在成功构建后获得确认。
+
+```
+root@demohost:~/web-app# docker build --rm -t web-app .
+Sending build context to Docker daemon 3.584 kB
+Step 1 : FROM golang:latest
+latest: Pulling from library/golang
+386a066cd84a: Already exists
+75ea84187083: Pull complete
+88b459c9f665: Pull complete
+a31e17eb9485: Pull complete
+1b272d7ab8a4: Pull complete
+eca636a985c1: Pull complete
+08158782d330: Pull complete
+Digest: sha256:02718aef869a8b00d4a36883c82782b47fc01e774d0ac1afd434934d8ccfee8c
+Status: Downloaded newer image for golang:latest
+---> 9752d71739d2
+Step 2 : RUN mkdir -p /go/src/web-app
+---> Running in 9aef92fff9e8
+---> 49936ff4f50c
+Removing intermediate container 9aef92fff9e8
+Step 3 : WORKDIR /go/src/web-app
+---> Running in 58440a93534c
+---> 0703574296dd
+Removing intermediate container 58440a93534c
+Step 4 : COPY . /go/src/web-app
+---> 82be55bc8e9f
+Removing intermediate container cae309ac7757
+Step 5 : RUN go-wrapper download
+---> Running in 6168e4e96ab1
++ exec go get -v -d
+---> 59664b190fee
+Removing intermediate container 6168e4e96ab1
+Step 6 : RUN go-wrapper install
+---> Running in e56f093b6f03
++ exec go install -v
+web-app
+---> 584cd410fdcd
+Removing intermediate container e56f093b6f03
+Step 7 : ENV PORT 8080
+---> Running in 298e2a415819
+---> c87fd2b43977
+Removing intermediate container 298e2a415819
+Step 8 : EXPOSE 8080
+---> Running in 4f639a3790a7
+---> 291167229d6f
+Removing intermediate container 4f639a3790a7
+Step 9 : CMD go-wrapper run
+---> Running in 6cb6bc28e406
+---> b32ca91bdfe0
+Removing intermediate container 6cb6bc28e406
+Successfully built b32ca91bdfe0
+```
+
+现在可以运行我们的 web-app 了，可以执行下面的命令。
+
+```
+root@demohost:~/web-app# docker run -p 8080:8080 --name="test" -d web-app
+7644606b9af28a3ef1befd926f216f3058f500ffad44522c1d4756c576cfa85b
+```
+
+进入 `http://localhost:8080/World`  浏览你的 web 应用。你已经成功容器化了一个可重复的/确定性的 Go web 应用。使用下面的命令来启动、停止并检查容器的状态。
+
+```
+### 列出所有容器
+root@demohost:~/ docker ps -a
+
+### 使用 id 启动容器
+root@demohost:~/ docker start CONTAINER_ID_OF_WEB_APP
+
+### 使用 id 停止容器
+root@demohost:~/ docker stop CONTAINER_ID_OF_WEB_APP
+```
+
+### 重新构建镜像
+
+假设你正在开发 web 应用程序并在更改代码。现在要在更新代码后查看结果，你需要重新生成 docker 镜像、停止旧镜像并运行新镜像，并且每次更改代码时都要这样做。为了使这个过程自动化，我们将使用 docker 卷在主机和容器之间共享一个目录。这意味着你不必为在容器内进行更改而重新构建镜像。容器如何检测你是否对 web 程序的源码进行了更改？答案是有一个名为 “Gin” 的好工具 [https://github.com/codegangsta/gin][1]，它能检测是否对源码进行了任何更改，然后重建镜像/二进制文件并在容器内运行更新过代码的进程。
+
+要使这个过程自动化，我们将编辑 Dockerfile 并安装 Gin 将其作为入口命令来执行。我们将开放 `3030` 端口（Gin 代理），而不是 `8080`。 Gin 代理将转发流量到  web 程序的 `8080` 端口。
+
+```
+root@demohost:~/web-app# vim.tiny Dockerfile
+
+# 得到最新的 golang docker 镜像
+FROM golang:latest
+
+# 在容器内部创建一个目录来存储我们的 web 应用，接着使它称为工作目录。
+RUN mkdir -p /go/src/web-app
+WORKDIR /go/src/web-app
+
+# 复制 web 程序到容器中
+COPY . /go/src/web-app
+
+# 下载并安装第三方依赖到容器中
+RUN go get github.com/codegangsta/gin
+RUN go-wrapper download
+RUN go-wrapper install
+
+# 设置 PORT 环境变量
+ENV PORT 8080
+
+# 给主机暴露 8080 端口，这样外部网络可以访问你的应用
+EXPOSE 3030
+
+# 启动容器时运行 Gin
+CMD gin run
+
+# 告诉 Docker 启动容器运行的命令
+CMD ["go-wrapper", "run"]
+```
+
+现在构建镜像并启动容器：
+
+```
+root@demohost:~/web-app# docker build --rm -t web-app .
+```
+
+我们会在当前 web 程序的根目录下运行 docker，并通过暴露的 `3030` 端口链接 CWD （当前工作目录）到容器中的应用目录下。
+
+```
+root@demohost:~/web-app# docker run -p 3030:3030 -v `pwd`:/go/src/web-app --name="test" -d web-app
+````
+
+打开 `http://localhost:3030/World`， 你就能看到你的 web 程序了。现在如果你改变了任何代码，会在浏览器刷新后反映在你的浏览器中。
+
+### 总结
+
+就是这样，我们的 Go web 应用已经运行在 Ubuntu 16.04 Docker 容器中运行了！你可以通过使用 Go 框架来快速开发 API、网络应用和后端服务，从而扩展当前的网络应用。
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/containers/setup-go-docker-deploy-application/
+
+作者：[Dwijadas Dey][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://linoxide.com/author/dwijadasd/
+[1]:https://github.com/codegangsta/gin
diff --git a/published/20161231 How to Trace Execution of Commands in Shell Script with Shell Tracing.md b/published/20161231 How to Trace Execution of Commands in Shell Script with Shell Tracing.md
new file mode 100644
index 0000000000..604f7eaa13
--- /dev/null
+++ b/published/20161231 How to Trace Execution of Commands in Shell Script with Shell Tracing.md	
@@ -0,0 +1,260 @@
+如何在 Shell 脚本中跟踪调试命令的执行
+============================================================
+
+在 [shell 脚本调试系列][3] 中，本文将解释第三种 shell 脚本调试模式，即 shell 跟踪，并查看一些示例来演示它如何工作以及如何使用它。
+
+本系列的前面部分清晰地阐明了另外两种 shell 脚本调试模式：详细模式和语法检查模式，并用易于理解的例子展示了如何在这些模式下启用 shell 脚本调试。
+
+1.  [如何在 Linux 中启用 Shell 脚本的调试模式][1]
+2.  [如何在 Shell 脚本中执行语法检查调试模式][2]
+
+shell 跟踪简单的来说就是跟踪 shell 脚本中的命令的执行。要打开 shell 跟踪，请使用 `-x` 调试选项。
+
+这会让 shell 在终端上显示所有执行的命令及其参数。
+
+我们将使用下面的 `sys_info.sh` shell 脚本，它会简要地打印出你的系统日期和时间、登录的用户数和系统的运行时间。不过，脚本中包含我们需要查找和更正的语法错误。
+
+```
+#!/bin/bash
+#script to print brief system info
+ROOT_ID="0"
+DATE=`date`
+NO_USERS=`who | wc -l`
+UPTIME=`uptime`
+check_root(){
+  if [ "$UID" -ne "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;    
+}
+print_sys_info(){
+  echo "System Time    : $DATE"
+  echo "Number of users: $NO_USERS"
+  echo "System Uptime  : $UPTIME
+}
+check_root
+print_sys_info
+exit 0
+```
+
+保存文件并执行脚本。脚本只能用 root 用户运行，因此如下使用 [sudo 命令][4]运行：
+
+```
+$ chmod +x sys_info.sh
+$ sudo bash -x sys_info.sh
+```
+
+[
+ ![Shell Tracing - Show Error in Script](http://www.tecmint.com/wp-content/uploads/2016/12/Shell-Tracing-Errors.png) 
+][5]
+
+*shell 跟踪 - 显示脚本中的错误*
+
+从上面的输出我们可以观察到，首先执行命令，然后其输出做为一个变量的值。
+
+例如，先执行 `date`，其输出做为变量 `DATE` 的值。
+
+我们可以执行语法检查来只显示其中的语法错误，如下所示：
+
+```
+$ sudo bash -n sys_info.sh 
+```
+
+[
+ ![Syntax Checking in Script](http://www.tecmint.com/wp-content/uploads/2016/12/Syntax-Checking-in-Script.png) 
+][6]
+
+*脚本中语法检查*
+
+如果我们审视这个 shell 脚本，我们就会发现 `if`  语句缺少了封闭条件的 `fi` 关键字。因此，让我们加上它，新的脚本应该看起来像这样：
+
+```
+#!/bin/bash
+#script to print brief system info
+ROOT_ID="0"
+DATE=`date`
+NO_USERS=`who | wc -l`
+UPTIME=`uptime`
+check_root(){
+  if [ "$UID" -ne "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;
+  fi    
+}
+print_sys_info(){
+  echo "System Time    : $DATE" 
+  echo "Number of users: $NO_USERS"
+  echo "System Uptime  : $UPTIME
+}
+check_root
+print_sys_info
+exit 0
+```
+
+再次保存文件并以 root 执行，同时做语法检查：
+
+```
+$ sudo bash -n sys_info.sh
+```
+[
+ ![Perform Syntax Check in Shell Scripts](http://www.tecmint.com/wp-content/uploads/2016/12/Syntax-Check-in-Shell-Scripts.png) 
+][7]
+
+*在 shell 脚本中执行语法检查*
+
+上面的语法检查操作的结果仍然显示在脚本的第 21 行还有一个错误。所以，我们仍然要纠正一些语法。
+
+再一次分析脚本，会发现第 21 行的错误是由于在 `print_sys_info` 函数内最后一个 [echo 命令][8]中没有闭合双引号 `"`。
+
+我们将在 `echo` 命令中添加闭合双引号并保存文件。修改过的脚本如下：
+
+```
+#!/bin/bash
+#script to print brief system info
+ROOT_ID="0"
+DATE=`date`
+NO_USERS=`who | wc -l`
+UPTIME=`uptime`
+check_root(){
+  if [ "$UID" -ne "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;
+  fi
+}
+print_sys_info(){
+  echo "System Time    : $DATE"
+  echo "Number of users: $NO_USERS"
+  echo "System Uptime  : $UPTIME"
+}
+check_root
+print_sys_info
+exit 0
+```
+
+现在再一次检查语法。
+
+```
+$ sudo bash -n sys_info.sh
+```
+
+上面的命令不会产生任何输出，因为我们的脚本语法上正确。我们也可以再次跟踪脚本执行，它应该工作得很好：
+
+```
+$ sudo bash -x sys_info.sh
+```
+[
+ ![Trace Shell Script Execution](http://www.tecmint.com/wp-content/uploads/2016/12/Trace-Shell-Execution.png) 
+][9]
+
+*跟踪 shell 脚本执行*
+
+现在运行脚本。
+
+```
+$ sudo ./sys_info.sh
+```
+[
+ ![Shell Script to Show Date, Time and Uptime](http://www.tecmint.com/wp-content/uploads/2016/12/Script-to-Show-Date-and-Uptime.png) 
+][10]
+
+*用 shell 脚本显示日期、时间和运行时间*
+
+### shell 跟踪执行的重要性
+
+shell 脚本跟踪可以帮助我们识别语法错误，更重要的是识别逻辑错误。例如，在 `sys_info.sh` shell 脚本中的 `check_root` 函数，它用于确定用户是否为 root，因为脚本只允许由超级用户执行。
+
+```
+check_root(){
+  if [ "$UID" -ne "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;
+  fi
+}
+```
+
+这里的魔法是由 `if` 语句表达式 `["$ UID" -ne "$ ROOT_ID"]` 控制的，一旦我们不使用合适的数字运算符（示例中为 `-ne`，这意味着不相等），我们最终可能会出一个逻辑错误。
+
+假设我们使用 `-eq` （意思是等于），这将允许任何系统用户以及 root 用户运行脚本，因此是一个逻辑错误。
+
+```
+check_root(){
+  if [ "$UID" -eq "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;
+  fi
+}
+```
+
+注意：我们在本系列开头介绍过，`set` 这个 shell 内置命令可以在 shell 脚本的特定部分激活调试。
+
+因此，下面的行将帮助我们通过跟踪脚本的执行在其中找到这个逻辑错误：
+
+具有逻辑错误的脚本：
+
+```
+#!/bin/bash
+#script to print brief system info
+ROOT_ID="0"
+DATE=`date`
+NO_USERS=`who | wc -l`
+UPTIME=`uptime`
+check_root(){
+  if [ "$UID" -eq "$ROOT_ID" ]; then
+    echo "You are not allowed to execute this program!"
+    exit 1;
+  fi
+}
+print_sys_info(){
+  echo "System Time    : $DATE"
+  echo "Number of users: $NO_USERS"
+  echo "System Uptime  : $UPTIME"
+}
+#turning on and off debugging of check_root function
+set -x ; check_root;  set +x ;
+print_sys_info
+exit 0
+```
+
+保存文件并调用脚本，在输出中，我们可以看到一个普通系统用户可以在未 sudo 的情况下运行脚本。 这是因为 `USER_ID` 的值为 100，不等于为 0 的 root 的 `ROOT_ID` 。
+
+```
+$ ./sys_info.sh
+```
+[
+ ![Run Shell Script Without Sudo](http://www.tecmint.com/wp-content/uploads/2016/12/Run-Shell-Script-Without-Sudo.png) 
+][11]
+
+**未 sudo 的情况下运行 shell 脚本**
+
+那么，现在我们已经完成了 [shell 脚本调试系列][12]，可以在下面的反馈栏里给我们关于本篇或者本系列提出问题或反馈。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili 是 Linux 和 F.O.S.S 爱好者，将来的 Linux SysAdmin、web 开 发人员，目前是 TecMint 的内容创作者，他喜欢用电脑工作，并坚信分享知识。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/trace-shell-script-execution-in-linux/
+
+作者：[Aaron Kili][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:https://linux.cn/article-8028-1.html
+[2]:https://linux.cn/article-8045-1.html
+[3]:https://linux.cn/article-8028-1.html
+[4]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[5]:http://www.tecmint.com/wp-content/uploads/2016/12/Shell-Tracing-Errors.png
+[6]:http://www.tecmint.com/wp-content/uploads/2016/12/Syntax-Checking-in-Script.png
+[7]:http://www.tecmint.com/wp-content/uploads/2016/12/Syntax-Check-in-Shell-Scripts.png
+[8]:http://www.tecmint.com/echo-command-in-linux/
+[9]:http://www.tecmint.com/wp-content/uploads/2016/12/Trace-Shell-Execution.png
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Script-to-Show-Date-and-Uptime.png
+[11]:http://www.tecmint.com/wp-content/uploads/2016/12/Run-Shell-Script-Without-Sudo.png
+[12]:https://linux.cn/article-8028-1.html
diff --git a/published/20170102 A Guide To Buying A Linux Laptop.md b/published/20170102 A Guide To Buying A Linux Laptop.md
new file mode 100644
index 0000000000..eb53de1f72
--- /dev/null
+++ b/published/20170102 A Guide To Buying A Linux Laptop.md	
@@ -0,0 +1,100 @@
+Linux 笔记本电脑选购指南
+============================================================
+
+众所周知，如果你去电脑城[购买一个新的笔记本电脑][5]，你所见到的尽是预安装了 Windows 或是 Mac 系统的笔记本电脑。无论怎样，你都会被迫支付一笔额外的费用—— 微软系统的许可费用或是苹果电脑背后的商标使用权费用。
+
+当然，你也可以选择购买一款笔记本电脑，然后安装自己喜欢的操作系统。然而，最困难的可能是需要找到一款硬件跟你想安装的操作系统兼容性良好的笔记本电脑。
+
+在此之上，我们还需要考虑硬件驱动程序的可用性。那么，你应该怎么办呢？答案很简单：[购买一款预安装了 Linux 系统的笔记本电脑][6]。
+
+幸运的是，正好有几家值得依赖的公司提供质量好、有名气，并且预安装了 Linux 系统的笔记本电脑，这样你就不用再担心驱动程序的可用性了。
+
+也就是说，在这篇文章中，我们将根据用户对笔记本电脑的用途列出 3 款可供用户选择的高性价比机器。
+
+### 普通用户使用的 Linux 笔记本电脑
+
+如果你正在寻找一款能够满足日常工作及娱乐需求的 Linux 笔记本电脑，它能够正常运行办公软件，有诸如 Firefox或是 Chrome 这样的 Web 浏览器，有局域网 / Wifi 连接功能，那么你可以考虑选择 [System76][7] 公司生产的 Linux 笔记本电脑，它可以根据用户的定制化需求选择处理器类型，内存及磁盘大小，以及其它配件。
+
+除此之外， System76 公司为他们所有的 Ubuntu 系统的笔记本电脑提供终身技术支持。如果你觉得这听起来不错，并且也比较感兴趣，你可以考虑下 [Lemur][8] 或者 [Gazelle][9] 这两款笔记本电脑。
+
+![Lemur Laptop for Linux](http://www.tecmint.com/wp-content/uploads/2016/11/Lemur-Laptop.png) 
+
+*Lemur Linux 笔记本电脑*
+
+
+![Gazelle Laptop for Linux](http://www.tecmint.com/wp-content/uploads/2016/11/Gazelle-Laptop.png) 
+
+*Gazelle Linux 笔记本电脑*
+
+
+### 开发者使用的 Linux 笔记本电脑
+
+如果你想找一款坚固可靠，外观精美，并且性能强悍的笔记本电脑用于开发工作，你可以考虑一下 [Dell 的 XPS 13 笔记本电脑][10]。
+
+这款 13 英寸的精美笔记本电脑，配置全高清 HD 显示器，触摸板，售价范围视其配置情况而定，CPU 代号/型号：Intel 的第 7 代处理器 i5 和 i7，固态硬盘大小：128 至 512 GB，内存大小：8 至 16 GB。
+
+
+![Dells XPS Laptop for Linux](http://www.tecmint.com/wp-content/uploads/2016/11/Dells-XPS-Laptops.png) 
+
+*Dell XPS Linux 笔记本电脑*
+
+这些都是你应该考虑在内的重要因素，Dell 已经做得很到位了。不幸的是，Dell ProSupport 为该型号的笔记本电脑仅提供 Ubuntu 16.04 LTS 系统的技术支持（在写本篇文章的时候 - 2016 年 12 月）。 
+
+### 系统管理员使用的 Linux 笔记本电脑
+
+虽然系统管理员可以顺利搞定在裸机上安装 Linux 系统的工作，但是使用 System76 的产品，你可以避免寻找各种驱动并解决兼容性问题上的麻烦。
+
+之后，你可以根据自己的需求来配置电脑特性，你可以提高笔记本电脑的性能，增加内存到 32 GB 以确保你可以运行虚拟化环境并进行各种系统管理相关的任务。
+
+如果你对此比较感兴趣，你可以考虑购买 [Kudu][12] 或者是 [Oryx Pro][13] 笔记本电脑。
+
+![Kudu Linux Laptop](http://www.tecmint.com/wp-content/uploads/2016/11/Kudu-Linux-Laptop.png) 
+
+*Kudu Linux 笔记本电脑*
+
+
+![Oryx Pro Linux Laptop](http://www.tecmint.com/wp-content/uploads/2016/11/Oryx-Pro-Linux-Laptop.png) 
+
+*Oryx Pro 笔记本电脑*
+
+### 总结
+
+在这篇文章中，我们探讨了对于普通用户、开发者及系统管理员来说，为什么购买一款预安装了 Linux 系统的笔记本是一个不错的选择。一旦你决定好，你就可以轻松自如的考虑下应该如何消费这笔省下来的钱了。
+
+你觉得在购买一款 Linux 系统的笔记本电脑时还应该注意些什么？请在下面的评论区与大家分享。
+
+像往常一样，如果你对这篇文章有什么意见和看法，请随时提出来。我们很期待看到你的回复。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/d9d14c5b51331864398e6288cb0c2091?s=128&d=blank&r=g)
+
+Gabriel Cánepa 来自 Argentina，San Luis，Villa Mercedes ，他是一名 GNU/Linux 系统管理员和网站开发工程师。目前在一家世界领先的消费品公司工作，在日常工作中，他非常善于使用 FOSS 工具来提高公司在各个领域的生产率。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/buy-linux-laptops/
+
+作者：[Gabriel Cánepa][a]
+译者：[rusking](https://github.com/rusking)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+
+[a]:http://www.tecmint.com/author/gacanepa/
+[1]:http://www.tecmint.com/wp-content/uploads/2016/11/Lemur-Laptop.png
+[2]:http://www.tecmint.com/wp-content/uploads/2016/11/Gazelle-Laptop.png
+[3]:http://www.tecmint.com/wp-content/uploads/2016/11/Kudu-Linux-Laptop.png
+[4]:http://www.tecmint.com/wp-content/uploads/2016/11/Oryx-Pro-Linux-Laptop.png
+[5]:http://amzn.to/2fPxTms
+[6]:http://amzn.to/2fPxTms
+[7]:https://system76.com/laptops
+[8]:https://system76.com/laptops/lemur
+[9]:https://system76.com/laptops/gazelle
+[10]:http://amzn.to/2fBLMGj
+[11]:http://www.tecmint.com/wp-content/uploads/2016/11/Dells-XPS-Laptops.png
+[12]:https://system76.com/laptops/kudu
+[13]:https://system76.com/laptops/oryx
diff --git a/published/20170103 How to Customize Bash Colors and Content in Linux Terminal Prompt copy.md b/published/20170103 How to Customize Bash Colors and Content in Linux Terminal Prompt copy.md
new file mode 100644
index 0000000000..a418ca22a7
--- /dev/null
+++ b/published/20170103 How to Customize Bash Colors and Content in Linux Terminal Prompt copy.md	
@@ -0,0 +1,152 @@
+在 Linux 终端中自定义 Bash 配色和提示内容
+============================================================
+
+现今，大多数（如果不是全部的话）现代 Linux 发行版的默认 shell 都是 Bash。然而，你可能已经注意到这样一个现象，在各个发行版中，其终端配色和提示内容都各不相同。
+
+如果你一直都在考虑，或者只是一时好奇，如何定制可以使 Bash 更好用。不管怎样，请继续读下去 —— 本文将告诉你怎么做。
+
+### PS1 Bash 环境变量
+
+命令提示符和终端外观是通过一个叫 `PS1` 的变量来进行管理的。根据 **Bash** 手册页说明，**PS1** 代表了 shell 准备好读取命令时显示的主体的提示字符串。
+
+**PS1** 所允许的内容包括一些反斜杠转义的特殊字符，可以查看手册页中 **PRMPTING** 部分的内容来了解它们的含义。
+
+为了演示，让我们先来显示下我们系统中 `PS1` 的当前内容吧（这或许看上去和你们的有那么点不同）：
+
+```
+$ echo $PS1
+[\u@\h \W]\$
+```
+
+现在，让我们来了解一下怎样自定义 PS1 吧，以满足我们各自的需求。
+
+#### 自定义 PS1 格式
+
+根据手册页 PROMPTING 章节的描述，下面对各个特殊字符的含义作如下说明：
+
+-  `\u:` 显示当前用户的 **用户名**。
+-  `\h:` <ruby>完全限定域名 <rt>Fully-Qualified Domain Name</rt></ruby>（FQDN）中第一个点（.）之前的**主机名**。
+-  `\W:` 当前工作目录的**基本名**，如果是位于 `$HOME` （家目录）通常使用波浪符号简化表示（`~`）。
+-  `\$:` 如果当前用户是 root，显示为 `#`，否则为 `$`。
+
+例如，如果我们想要显示当前命令的历史数量，可以考虑添加 `\!`；如果我们想要显示 FQDN 全称而不是短服务器名，那么可以考虑添加 `\H`。
+
+在下面的例子中，我们同时将这两个特殊字符引入我们当前的环境中，命令如下：
+
+```
+PS1="[\u@\H \W \!]\$"
+```
+
+当按下回车键后，你将会看到提示内容会变成下面这样。可以对比执行命令修改前和修改后的提示内容：
+
+[
+ ![Customize Linux Terminal Prompt PS1](http://www.tecmint.com/wp-content/uploads/2017/01/Customize-Linux-Terminal-Prompt.png) 
+][1]
+
+*自定义 Linux 终端提示符 PS1*
+
+现在，让我们再深入一点，修改命令提示符中的用户名和主机名 —— 同时修改文本和环境背景。
+
+实际上，我们可以对提示符进行 3 个方面的自定义：
+
+<table>
+        <tr>
+            <th>文本格式</th>
+            <th>前景色（文本）</th>
+            <th>背景色 </th>
+            </tr>
+        <tr>
+            <th>0: 常规文本</th>
+            <th>30: 黑色</th>
+            <th>40: 黑色</th>
+        </tr>
+        <tr>
+            <th>1: 加粗</th>
+            <th>31: 红色</th>
+            <th>41: 红色</th>
+        </tr>
+        <tr>
+            <th>4: 下划线文本</th>
+            <th> 32: 绿色</th>
+            <th>42: 绿色</th>
+        </tr>
+        <tr>
+            <th></th>
+            <th>33: 黄色</th>
+            <th>43: 黄色</th>
+        </tr>
+        <tr>
+            <th></th>
+            <th>34: 蓝色</th>
+            <th>44: 蓝色</th>
+        </tr>
+        <tr>
+            <th></th>
+            <th>35: 紫色</th>
+            <th>45: 紫色</th>
+        </tr>
+        <tr>
+            <th></th>
+            <th>36: 青色</th>
+            <th>46: 青色</th>
+        </tr>
+        <tr>
+            <th></th>
+            <th>37: 白色</th>
+            <th>47: 白色</th>
+        </tr>
+    </table>
+
+我们将在开头使用 `\e` 特殊字符，跟着颜色序列，在结尾使用 `m` 来表示结束。
+
+在该序列中，三个值（**背景**，**格式**和**前景**）由分号分隔（如果不赋值，则假定为默认值）。
+
+**建议阅读：** [在 Linux 中学习 Bash shell 脚本][2]。
+
+此外，由于值的范围不同，指定背景，格式，或者前景的先后顺序没有关系。
+
+例如，下面的 `PS1` 将导致提示符为黄色带下划线文本，并且背景为红色：
+
+```
+PS1="\e[41;4;33m[\u@\h \W]$ "
+```
+[
+ ![Change Linux Terminal Color Prompt PS1](http://www.tecmint.com/wp-content/uploads/2017/01/Change-Linux-Terminal-Color-Prompt.png) 
+][3]
+
+*修改 Linux 终端提示符配色 PS1*
+
+虽然它看起来那么漂亮，但是这个自定义将只会持续到当前用户会话结束。如果你关闭终端，或者退出本次会话，所有修改都会丢失。
+
+为了让修改永久生效，你必须将下面这行添加到 `~/.bashrc`或者 `~/.bash_profile`，这取决于你的版本。
+
+```
+PS1="\e[41;4;33m[\u@\h \W]$ "
+```
+
+尽情去玩耍吧，你可以尝试任何色彩，直到找出最适合你的。
+
+##### 小结
+
+在本文中，我们讲述了如何来自定义 Bash 提示符的配色和提示内容。如果你对本文还有什么问题或者建议，请在下面评论框中写下来吧。我们期待你们的声音。
+
+--------------------------------------------------------------------------------
+
+作者简介：Aaron Kili 是一位 Linux 及 F.O.S.S 的狂热爱好者，一位未来的 Linux 系统管理员，web 开发者，而当前是 TechMint 的原创作者，他热爱计算机工作，并且信奉知识分享。
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/customize-bash-colors-terminal-prompt-linux/
+
+作者：[Aaron Kili][a]
+译者：[GOLinux](https://github.com/GOLinux)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/wp-content/uploads/2017/01/Customize-Linux-Terminal-Prompt.png
+[2]:http://www.tecmint.com/category/bash-shell/
+[3]:http://www.tecmint.com/wp-content/uploads/2017/01/Change-Linux-Terminal-Color-Prompt.png
diff --git a/published/20170104 5 Ways to Find a Binary Command Description and Location on File System.md b/published/20170104 5 Ways to Find a Binary Command Description and Location on File System.md
new file mode 100644
index 0000000000..1468fe38df
--- /dev/null
+++ b/published/20170104 5 Ways to Find a Binary Command Description and Location on File System.md	
@@ -0,0 +1,173 @@
+5 个找出“二进制命令”描述和系统中位置的方法
+============================================================
+
+在数千个 [Linux 系统上的命令/程序][1]中，知道给定命令的类型和目的以及其在系统上的位置（绝对路径）对于新手来说可能是一个挑战。
+
+知道命令/程序的一些细节不仅有助于 [Linux 用户掌握大量命令][2]，还能使用户理解命令行或脚本在系统上的操作。
+
+因此，在本文中我们将向你解释五个有用的命令，用于显示给定命令的简短描述和位置。
+
+要在系统上发现新命令，请查看 PATH 环境变量中的所有目录。这些目录存储系统上安装的所有命令/程序。
+
+一旦你找到一个有趣的命令，在继续阅读更多关于它的手册页之前，请尝试如下收集一些简要的信息。
+
+假设你输出了 `PATH` 的值，然后进到其中的一个目录 `/usr/local/bin`，注意到一个名为 [`fswatch`（监视文件修改更改）][3]的新命令：
+
+```
+$ echo $PATH
+$ cd /usr/local/bin
+```
+
+[
+ ![Find New Commands in Linux](http://www.tecmint.com/wp-content/uploads/2017/01/Find-New-Commands-in-Linux.png) 
+][4]
+
+*在 Linux 中找出新命令*
+
+现在让我们在 Linux 中用不同的方法找出 `fswatch` 命令的描述和位置。
+
+### 1、 whatis 命令
+
+`whatis` 用于显示你作为参数输入的命令名的单行描述（例如下面命令中的 `fswatch`）。
+
+如果描述太长，一些部分在默认情况下会被省略，使用 `-l` 标志来显示完整的描述。
+
+```
+$ whatis fswatch
+$ whatis -l fswatch
+```
+[
+ ![Linux whatis Command Example](http://www.tecmint.com/wp-content/uploads/2017/01/Whatis-Command-Example.png) 
+][5]
+
+*Linux whatis 命令示例*
+
+### 2、 apropos 命令
+
+`apropos` 会搜索手册页名称和关键字描述（以命令名作为正则表达式搜索）。
+
+使用 `-l` 标志来显示完整的描述。
+
+```
+$ apropos fswatch 
+$ apropos -l fswatch
+```
+
+[
+ ![Linux apropos Command Example](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-apropos-Command-Example.png) 
+][6]
+
+*Linux apropos 命令示例*
+
+默认上，`apropos` 会如示例那样输出所有匹配的行。你可以使用 `-e` 选项来精确匹配：
+
+```
+$ apropos fmt
+$ apropos -e fmt
+```
+[
+ ![Linux apropos Command Show by Keyword](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-apropos-Command-Keyword-Example.png) 
+][7]
+
+*Linux apropos 命令根据关键词显示*
+
+### 3、 type 命令
+
+`type` 命令会输出给定命令的完整路径名，此外，如果输入的命令名不是做为独立存储在磁盘的文件的程序，`type` 还会告诉你命令分类：
+
+- shell 内置命令
+- shell 关键字或保留字
+- 别名
+
+```
+$ type fswatch 
+```
+
+[
+ ![Linux type Command Example](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-type-Command-Example.png) 
+][8]
+
+*Linux type 命令示例*
+
+当命令是另外一个命令的别名时，`type` 会显示运行别名时所执行的命令。使用 `alias` 命令可以查看你系统上创建的所有别名：
+
+```
+$ alias
+$ type l
+$ type ll
+```
+
+[
+ ![Show All Aliases in Linux](http://www.tecmint.com/wp-content/uploads/2017/01/Show-All-Aliases-in-Linux.png) 
+][9]
+
+*显示 Linux 中所有别名*
+
+### 4、 which 命令
+
+`which` 可以帮助命令定位命令，它会打印出命令的绝对路径：
+
+```
+$ which fswatch 
+```
+
+[
+ ![Find Linux Command Location](http://www.tecmint.com/wp-content/uploads/2017/01/Find-Linux-Command-Location.png) 
+][10]
+
+*找出 Linux 命令位置*
+
+一些二进制文件存在于 `PATH` 环境变量中的多个目录，使用 `-a` 标志来找出所有匹配的路径名。
+
+### 5、 whereis 命令
+
+`whereis` 定位指定命令名的二进制、源和帮助页文件，如下所示：
+
+```
+$ whereis fswatch
+$ whereis mkdir 
+$ whereis rm
+```
+[
+ ![Linux whereis Command Example](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-whereis-Command-Example.png) 
+][11]
+
+*Linux whereis 命令示例*
+
+虽然上面的命令对于查找关于命令/程序的一些快速信息很重要，但是该命令的手册总是可以提供完整的文档，它还包括其他相关程序的列表：
+
+```
+$ man fswatch
+```
+
+在本文中，我们回顾了五个简单的命令，用于显示命令的简短的手册描述和位置。 你可以在反馈栏中对此文章做出贡献或提出问题。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili 是 Linux 和 F.O.S.S 爱好者，将来的 Linux SysAdmin、web 开发人员，目前是 TecMint 的内容创作者，他喜欢用电脑工作，并坚信分享知识。
+
+--------------------------------------------------------------------------------
+via: http://www.tecmint.com/find-linux-command-description-and-location/
+
+作者：[Aaron Kili][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/category/top-tools/
+[2]:http://www.tecmint.com/tag/linux-tricks/
+[3]:http://www.tecmint.com/fswatch-monitors-files-and-directory-changes-modifications-in-linux/
+[4]:http://www.tecmint.com/wp-content/uploads/2017/01/Find-New-Commands-in-Linux.png
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Whatis-Command-Example.png
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-apropos-Command-Example.png
+[7]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-apropos-Command-Keyword-Example.png
+[8]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-type-Command-Example.png
+[9]:http://www.tecmint.com/wp-content/uploads/2017/01/Show-All-Aliases-in-Linux.png
+[10]:http://www.tecmint.com/wp-content/uploads/2017/01/Find-Linux-Command-Location.png
+[11]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-whereis-Command-Example.png
diff --git a/translated/tech/LXD/Part 5 - LXD 2.0--Image management.md b/published/LXD/Part 5 - LXD 2.0--Image management.md
similarity index 54%
rename from translated/tech/LXD/Part 5 - LXD 2.0--Image management.md
rename to published/LXD/Part 5 - LXD 2.0--Image management.md
index 505a5cbf0d..f201ab1cf9 100644
--- a/translated/tech/LXD/Part 5 - LXD 2.0--Image management.md	
+++ b/published/LXD/Part 5 - LXD 2.0--Image management.md	
@@ -3,27 +3,27 @@ LXD 2.0 系列（五）：镜像管理
 
 这是 [LXD 2.0 系列介绍文章][0]的第五篇。
 
-因为lxd容器管理有很多命令，因此这篇文章会很长。 如果你想要快速地浏览这些相同的命令，你可以[尝试下我们的在线演示][1]！
+因为 lxd 容器管理有很多命令，因此这篇文章会很长。 如果你想要快速地浏览这些相同的命令，你可以[尝试下我们的在线演示][1]！
 
 ![](https://linuxcontainers.org/static/img/containers.png)
 
 ### 容器镜像
 
-如果你以前使用过LXC，你可能还记得那些LXC“模板”，基本上都是导出一个容器文件系统以及一点配置的shell脚本。
+如果你以前使用过 LXC，你可能还记得那些 LXC “模板”，基本上都是导出一个容器文件系统以及一点配置的 shell 脚本。
 
-大多数模板通过在本机上根据发行版自举来生成文件系统。这可能需要相当长的时间，并且无法在所有的发行版上可用，另外可能需要大量的网络带宽。
+大多数模板是通过在本机上执行一个完整的发行版自举来生成该文件系统。这可能需要相当长的时间，并且无法在所有的发行版上可用，另外可能需要大量的网络带宽。
 
-回到LXC 1.0，我写了一个“下载”模板，它允许用户下载预先打包的容器镜像，在中央服务器上的模板脚本生成，接着高度压缩、签名并通过https分发。我们很多用户从旧版生成容器切换到使用这种新的，更快更可靠的创建容器的方法。
+回到 LXC 1.0，我写了一个“下载”模板，它允许用户下载预先打包的容器镜像，用模板脚本在中央服务器上生成，接着高度压缩、签名并通过 https 分发。我们很多用户从旧版的容器生成方式切换到了使用这种新的、更快更可靠的创建容器的方式。
 
-使用LXD，我们通过全面的基于镜像的工作流程向前迈进了一步。所有容器都是从镜像创建的，我们在LXD中具有高级镜像缓存和预加载支持，以使镜像存储保持最新。
+使用 LXD，我们通过全面的基于镜像的工作流程向前迈进了一步。所有容器都是从镜像创建的，我们在 LXD 中具有高级镜像缓存和预加载支持，以使镜像存储保持最新。
 
-### 与LXD镜像交互
+### 与 LXD 镜像交互
 
-在更深入了解镜像格式之前，让我们快速了解下LXD可以让你做些什么。
+在更深入了解镜像格式之前，让我们快速了解下 LXD 可以让你做些什么。
 
 #### 透明地导入镜像
 
-所有的容器都是有镜像创建的。镜像可以来自一台远程服务器并使用它的完整hash、短hash或者别名拉取下来，但是最终每个LXD容器都是创建自一个本地镜像。
+所有的容器都是由镜像创建的。镜像可以来自一台远程服务器并使用它的完整 hash、短 hash 或者别名拉取下来，但是最终每个 LXD 容器都是创建自一个本地镜像。
 
 这有个例子：
 
@@ -33,9 +33,9 @@ lxc launch ubuntu:75182b1241be475a64e68a518ce853e800e9b50397d2f152816c24f038c94d
 lxc launch ubuntu:75182b1241be c3
 ```
 
-所有这些引用相同的远程镜像（在写这篇文章时）在第一次运行其中之一时，远程镜像将作为缓存镜像导入本地LXD镜像存储，接着从中创建容器。
+所有这些引用相同的远程镜像（在写这篇文章时），在第一次运行这些命令其中之一时，远程镜像将作为缓存镜像导入本地 LXD 镜像存储，接着从其创建容器。
 
-下一次运行其中一个命令时，LXD将只检查镜像是否仍然是最新的（当不是由指纹引用时），如果是，它将创建容器而不下载任何东西。
+下一次运行其中一个命令时，LXD 将只检查镜像是否仍然是最新的（当不是由指纹引用时），如果是，它将创建容器而不下载任何东西。
 
 现在镜像被缓存在本地镜像存储中，你也可以从那里启动它，甚至不检查它是否是最新的：
 
@@ -49,13 +49,13 @@ lxc launch 75182b1241be c4
 lxc launch my-image c5
 ```
 
-如果你想要改变一些自动缓存或者过期行为，在本系列之前的文章中有一些命令。
+如果你想要改变一些自动缓存或者过期行为，在本系列之前的文章中有[一些命令](https://linux.cn/article-7687-1.html)。
 
 #### 手动导入镜像
 
 ##### 从镜像服务器中复制
 
-如果你想复制远程某个镜像到你本地镜像存储但不立即从它创建一个容器，你可以使用“lxc image copy”命令。它可以让你调整一些镜像标志，比如：
+如果你想复制远程的某个镜像到你本地镜像存储，但不立即从它创建一个容器，你可以使用`lxc image copy`命令。它可以让你调整一些镜像标志，比如：
 
 ```
 lxc image copy ubuntu:14.04 local:
@@ -63,28 +63,29 @@ lxc image copy ubuntu:14.04 local:
 
 这只是简单地复制一个远程镜像到本地存储。
 
-如果您想要通过比其指纹更容易的方式来记住你引用的镜像副本，则可以在复制时添加别名：
-
+如果您想要通过比记住其指纹更容易的方式来记住你引用的镜像副本，则可以在复制时添加别名：
 
 ```
 lxc image copy ubuntu:12.04 local: --alias old-ubuntu
 lxc launch old-ubuntu c6
 ```
 
-如果你想要使用源服务器上设置的别名，你可以要求LXD复制下来：
+如果你想要使用源服务器上设置的别名，你可以要求 LXD 复制下来：
 
+```
 lxc image copy ubuntu:15.10 local: --copy-aliases
 lxc launch 15.10 c7
+```
 
-上面的副本都是一次性拷贝，也就是复制远程镜像的当前版本到本地镜像存储中。如果你想要LXD保持镜像最新，就像它缓存中存储的那样，你需要使用`–auto-update`标志：
+上面的副本都是一次性拷贝，也就是复制远程镜像的当前版本到本地镜像存储中。如果你想要 LXD 保持镜像最新，就像它在缓存中存储的那样，你需要使用 `–auto-update` 标志：
 
 ```
 lxc image copy images:gentoo/current/amd64 local: --alias gentoo --auto-update
 ```
 
-##### 导入tarball
+##### 导入 tarball
 
-如果某人给你提供了一个单独的tarball，你可以用下面的命令导入：
+如果某人给你提供了一个单独的 tarball，你可以用下面的命令导入：
 
 ```
 lxc image import <tarball>
@@ -96,15 +97,15 @@ lxc image import <tarball>
 lxc image import <tarball> --alias random-image
 ```
 
-现在如果你被给了有两个tarball，识别哪个含有LXD的元数据。通常可以通过tarball名称，如果不行就选择最小的那个，元数据tarball包是很小的。 然后将它们一起导入：
+现在如果你被给了两个 tarball，要识别哪个是含有 LXD 元数据的。通常可以通过 tarball 的名称来识别，如果不行就选择最小的那个，元数据 tarball 包是很小的。 然后将它们一起导入：
 
 ```
 lxc image import <metadata tarball> <rootfs tarball>
 ```
 
-##### 从URL中导入
+##### 从 URL 中导入
 
-“lxc image import”也可以与指定的URL一起使用。如果你的一台https网络服务器的某个路径中有LXD-Image-URL和LXD-Image-Hash的标头设置，那么LXD就会把这个镜像拉到镜像存储中。
+`lxc image import` 也可以与指定的 URL 一起使用。如果你的一台 https Web 服务器的某个路径中有 `LXD-Image-URL` 和 `LXD-Image-Hash` 的标头设置，那么 LXD 就会把这个镜像拉到镜像存储中。
 
 可以参照例子这么做：
 
@@ -112,18 +113,17 @@ lxc image import <metadata tarball> <rootfs tarball>
 lxc image import https://dl.stgraber.org/lxd --alias busybox-amd64
 ```
 
-当拉取镜像时，LXD还会设置一些标头，远程服务器可以检查它们以返回适当的镜像。 它们是LXD-Server-Architectures和LXD-Server-Version。
-
-这意味着它可以是一个穷人的镜像服务器。 它可以使任何静态Web服务器提供一个用户友好的方式导入你的镜像。
+当拉取镜像时，LXD 还会设置一些标头，远程服务器可以检查它们以返回适当的镜像。 它们是 `LXD-Server-Architectures` 和 `LXD-Server-Version`。
 
+这相当于一个简陋的镜像服务器。 它可以通过任何静态 Web 服务器提供一中用户友好的导入镜像的方式。
 
 #### 管理本地镜像存储
 
-现在我们本地已经有一些镜像了，让我们瞧瞧可以做些什么。我们已经涵盖了最主要的部分，从它们来创建容器，但是你还可以在本地镜像存储上做更多。
+现在我们本地已经有一些镜像了，让我们瞧瞧可以做些什么。我们已经介绍了最主要的部分，可以从它们来创建容器，但是你还可以在本地镜像存储上做更多。
 
 ##### 列出镜像
 
-要列出所有的镜像，运行“lxc image list”：
+要列出所有的镜像，运行 `lxc image list`：
 
 ```
 stgraber@dakara:~$ lxc image list
@@ -174,7 +174,7 @@ stgraber@dakara:~$ lxc image list os=ubuntu
 +-------------+--------------+--------+---------------------------------------------+--------+----------+------------------------------+
 ```
 
-要了解所有镜像的信息，你可以使用“lxc image info”：
+要了解镜像的所有信息，你可以使用`lxc image info`：
 
 ```
 stgraber@castiana:~$ lxc image info ubuntu
@@ -206,7 +206,7 @@ Source:
 
 ##### 编辑镜像
 
-一个编辑镜像的属性和标志的简单方法是使用：
+编辑镜像的属性和标志的简单方法是使用：
 
 ```
 lxc image edit <alias or fingerprint>
@@ -228,7 +228,7 @@ properties:
 public: false
 ```
 
-你可以修改任何属性，打开或者关闭自动更新，后者标记一个镜像是公共的（以后还有更多）
+你可以修改任何属性，打开或者关闭自动更新，或者标记一个镜像是公共的（后面详述）。
 
 ##### 删除镜像
 
@@ -238,11 +238,11 @@ public: false
 lxc image delete <alias or fingerprint>
 ```
 
-注意你不必移除缓存对象，它们会在过期后被LXD自动移除（默认上，在最后一次使用的10天后）。
+注意你不必移除缓存对象，它们会在过期后被 LXD 自动移除（默认上，在最后一次使用的 10 天后）。
 
 ##### 导出镜像
 
-如果你想得到目前镜像的tarball，你可以使用“lxc image export”，像这样：
+如果你想得到目前镜像的 tarball，你可以使用`lxc image export`，像这样：
 
 ```
 stgraber@dakara:~$ lxc image export old-ubuntu .
@@ -254,34 +254,34 @@ stgraber@dakara:~$ ls -lh *.tar.xz
 
 #### 镜像格式
 
-LXD现在支持两种镜像布局，unified或者split。这两者都是有效的LXD格式，虽然后者在与其他容器或虚拟机一起运行时更容易重新使用文件系统。
+LXD 现在支持两种镜像布局，unified 或者 split。这两者都是有效的 LXD 格式，虽然后者在与其他容器或虚拟机一起运行时更容易重用其文件系统。
 
-LXD专注于系统容器，不支持任何应用程序容器的“标准”镜像格式，我们也不打算这么做。
+LXD 专注于系统容器，不支持任何应用程序容器的“标准”镜像格式，我们也不打算这么做。
 
 我们的镜像很简单，它们是由容器文件系统，以及包含了镜像制作时间、到期时间、什么架构，以及可选的一堆文件模板的元数据文件组成。
 
 有关[镜像格式][1]的最新详细信息，请参阅此文档。
 
-##### unified镜像 (一个tarball)
+##### unified 镜像（一个 tarball）
 
-unified镜像格式是LXD在生成镜像时使用的格式。它们是一个单独的大型tarball，包含“rootfs”目录的容器文件系统，在tarball根目录下有metadata.yaml文件，任何模板都进入“templates”目录。
+unified 镜像格式是 LXD 在生成镜像时使用的格式。它们是一个单独的大型 tarball，包含 `rootfs` 目录下的容器文件系统，在 tarball 根目录下有 `metadata.yaml` 文件，任何模板都放到 `templates` 目录。
 
-tarball可以用任何方式压缩（或者不压缩）。镜像散列是压缩后的tarball的sha256。
+tarball 可以用任何方式压缩（或者不压缩）。镜像散列是压缩后的 tarball 的 sha256 。
 
 
-##### Split镜像 (两个tarball)
+##### Split 镜像（两个 tarball）
 
-这种格式最常用于滚动更新镜像以及某人已经有了一个压缩文件系统tarball。
+这种格式最常用于滚动更新镜像并已经有了一个压缩文件系统 tarball 时。
 
-它们由两个不同的tarball组成，第一个只包含LXD使用的元数据，因此metadata.yaml文件在根目录，任何模板都在“templates”目录。
+它们由两个不同的 tarball 组成，第一个只包含 LXD 使用的元数据， `metadata.yaml` 文件在根目录，任何模板都在 `templates` 目录。
 
-第二个tarball只包含直接位于其根目录下的容器文件系统。大多数发行版已经有这样的tarball，因为它们常用于引导新机器。 此镜像格式允许不修改重新使用。
+第二个 tarball 只包含直接位于其根目录下的容器文件系统。大多数发行版已经有这样的 tarball，因为它们常用于引导新机器。 此镜像格式允许不经修改就重用。
 
-两个tarball都可以压缩（或者不压缩），它们可以使用不同的压缩算法。 镜像散列是元数据和rootfs tarball结合的sha256。
+两个 tarball 都可以压缩（或者不压缩），它们可以使用不同的压缩算法。 镜像散列是元数据的 tarball 和 rootfs 的 tarball 结合的 sha256。
 
 ##### 镜像元数据
 
-典型的metadata.yaml文件看起来像这样：
+典型的 `metadata.yaml` 文件看起来像这样：
 
 ```
 architecture: "i686"
@@ -336,31 +336,31 @@ templates:
 
 ##### 属性
 
-两个唯一的必填字段是“creation date”（UNIX EPOCH）和“architecture”。 其他都可以保持未设置，镜像就可以正常地导入。
+两个唯一的必填字段是 `creation date`（UNIX 纪元时间）和 `architecture`。 其他都可以保持未设置，镜像就可以正常地导入。
 
-额外的属性主要是帮助用户弄清楚镜像是什么。 例如“description”属性是在“lxc image list”中可见的。 用户可以使用其他属性的键/值对来搜索特定镜像。
+额外的属性主要是帮助用户弄清楚镜像是什么。 例如 `description` 属性是在 `lxc image list` 中可见的。 用户可以使用其它属性的键/值对来搜索特定镜像。
 
-相反，这些属性用户可以通过“lxc image edit”来编辑，“creation date”和“architecture”字段是不可变的。
+相反，这些属性用户可以通过 `lxc image edit`来编辑，`creation date` 和 `architecture` 字段是不可变的。
 
 ##### 模板
 
 模板机制允许在容器生命周期中的某一点生成或重新生成容器中的一些文件。
 
-我们使用pongo2模板引擎来做这些，我们将所有我们知道的容器导出到模板。 这样，你可以使用用户定义的容器属性或常规LXD属性的自定义镜像来更改某些特定文件的内容。
+我们使用 [pongo2 模板引擎](https://github.com/flosch/pongo2)来做这些，我们将所有我们知道的容器信息都导出到模板。 这样，你可以使用用户定义的容器属性或常规 LXD 属性来自定义镜像，从而更改某些特定文件的内容。
 
-正如你在上面的例子中看到的，我们使用在Ubuntu中的模板找出cloud-init并关闭一些init脚本。
+正如你在上面的例子中看到的，我们使用在 Ubuntu 中使用它们来进行 `cloud-init` 并关闭一些 init 脚本。
 
 ### 创建你的镜像
 
-LXD专注于运行完整的Linux系统，这意味着我们期望大多数用户只使用干净的发行版镜像，而不是只用自己的镜像。
+LXD 专注于运行完整的 Linux 系统，这意味着我们期望大多数用户只使用干净的发行版镜像，而不是只用自己的镜像。
 
-但是有一些情况下，你有自己的镜像是有用的。 例如生产服务器上的预配置镜像，或者构建那些我们没有构建的发行版或者架构的镜像。
+但是有一些情况下，你有自己的镜像是有必要的。 例如生产服务器上的预配置镜像，或者构建那些我们没有构建的发行版或者架构的镜像。
 
 #### 将容器变成镜像
 
-目前使用LXD构造镜像最简单的方法是将容器变成镜像。
+目前使用 LXD 构造镜像最简单的方法是将容器变成镜像。
 
-可以这么做
+可以这么做：
 
 ```
 lxc launch ubuntu:14.04 my-container
@@ -369,7 +369,7 @@ lxc exec my-container bash
 lxc publish my-container --alias my-new-image
 ```
 
-你甚至可以将一个容器过去的snapshot变成镜像：
+你甚至可以将一个容器过去的快照变成镜像：
 
 ```
 lxc publish my-container/some-snapshot --alias some-image
@@ -379,25 +379,22 @@ lxc publish my-container/some-snapshot --alias some-image
 
 构建你自己的镜像也很简单。
 
-1.生成容器文件系统。 这完全取决于你使用的发行版。 对于Ubuntu和Debian，它将用于启动。
-2.配置容器中正常工作所需的任何东西（如果需要任何东西）。
-3.制作该容器文件系统的tarball，可选择压缩它。
-4.根据上面描述的内容写一个新的metadata.yaml文件。
-5.创建另一个包含metadata.yaml文件的压缩包。
-6.用下面的命令导入这两个tarball作为LXD镜像：
-  ```
-  lxc image import <metadata tarball> <rootfs tarball> --alias some-name
-  ```
+1. 生成容器文件系统。这完全取决于你使用的发行版。对于 Ubuntu 和 Debian，它将用于启动。
+2. 配置容器中该发行版正常工作所需的任何东西（如果需要任何东西）。
+3. 制作该容器文件系统的 tarball，可选择压缩它。
+4. 根据上面描述的内容写一个新的 `metadata.yaml` 文件。
+5. 创建另一个包含 `metadata.yaml` 文件的 tarball。
+6. 用下面的命令导入这两个 tarball 作为 LXD 镜像：`lxc image import <metadata tarball> <rootfs tarball> --alias some-name`
 
-正常工作前你可能需要经历几次这样的工作，调整这里或那里，可能会添加一些模板和属性。
+在一切都正常工作前你可能需要经历几次这样的工作，调整这里或那里，可能会添加一些模板和属性。
 
 ### 发布你的镜像
 
-所有LXD守护程序都充当镜像服务器。除非另有说明，否则加载到镜像存储中的所有镜像都会被标记为私有，因此只有受信任的客户端可以检索这些镜像，但是如果要创建公共镜像服务器，你需要做的是将一些镜像标记为公开，并确保你的LXD守护进程监听网络。
+所有 LXD 守护程序都充当镜像服务器。除非另有说明，否则加载到镜像存储中的所有镜像都会被标记为私有，因此只有受信任的客户端可以检索这些镜像，但是如果要创建公共镜像服务器，你需要做的是将一些镜像标记为公开，并确保你的 LXD 守护进程监听网络。
 
-#### 只运行LXD公共服务器
+#### 只运行 LXD 公共服务器
 
-最简单的共享镜像的方式是运行一个公共的LXD守护进程。
+最简单的共享镜像的方式是运行一个公共的 LXD 守护进程。
 
 你只要运行：
 
@@ -411,35 +408,34 @@ lxc config set core.https_address "[::]:8443"
 lxc remote add <some name> <IP or DNS> --public
 ```
 
-他们就可以像任何默认的镜像服务器一样使用它们。 由于远程服务器添加了“-public”，因此不需要身份验证，并且客户端仅限于使用已标记为public的镜像。
+他们就可以像使用任何默认的镜像服务器一样使用它们。 由于远程服务器添加了 `-public` 选项，因此不需要身份验证，并且客户端仅限于使用已标记为 `public` 的镜像。
 
-要将镜像设置成公共的，只需“lxc image edit”它们，并将public标志设置为true。
+要将镜像设置成公共的，只需使用 `lxc image edit` 编辑它们，并将 `public` 标志设置为 `true`。
 
-#### 使用一台静态web服务器
+#### 使用一台静态 web 服务器
 
-如上所述，“lxc image import”支持从静态http服务器下载。 基本要求是：
+如上所述，`lxc image import` 支持从静态 https 服务器下载。 基本要求是：
 
-*服务器必须支持具有有效证书的HTTPS，TLS1.2和EC密钥
-*当点击“lxc image import”提供的URL时，服务器必须返回一个包含LXD-Image-Hash和LXD-Image-URL的HTTP标头。
+* 服务器必须支持具有有效证书的 HTTPS、TLS 1.2 和 EC 算法。
+* 当访问 `lxc image import` 提供的 URL 时，服务器必须返回一个包含 `LXD-Image-Hash` 和 `LXD-Image-URL` 的 HTTP 标头。
 
-如果你想使它动态化，你可以让你的服务器查找LXD在请求镜像中发送的LXD-Server-Architectures和LXD-Server-Version的HTTP头。 这可以让你返回架构正确的镜像。
+如果你想使它动态化，你可以让你的服务器查找 LXD 在请求镜像时发送的 `LXD-Server-Architectures` 和 `LXD-Server-Version` 的 HTTP 标头，这可以让你返回符合该服务器架构的正确镜像。
 
 #### 构建一个简单流服务器
 
-“ubuntu:”和“ubuntu-daily:”在远端不使用LXD协议（“images:”是的），而是使用不同的协议称为简单流。
+`ubuntu:` 和 `ubuntu-daily:` 远端服务器不使用 LXD 协议（`images:` 使用），而是使用称为简单流（simplestreams）的不同协议。
 
-简单流基本上是一个镜像服务器的描述格式，使用JSON来描述产品以及相关产品的文件列表。
+简单流基本上是一个镜像服务器的描述格式，使用 JSON 来描述产品以及相关产品的文件列表。
 
-它被各种工具，如OpenStack，Juju，MAAS等用来查找，下载或者做镜像系统，LXD将它作为原生协议支持用于镜像检索。
+它被各种工具，如 OpenStack、Juju、MAAS 等用来查找、下载或者做镜像系统，LXD 将它作为用于镜像检索的原生协议。
 
-虽然的确不是提供LXD镜像的最简单的方法，但是如果你的镜像也被其他一些工具使用，那这也许值得考虑一下。
+虽然这的确不是提供 LXD 镜像的最简单的方法，但是如果你的镜像也被其它一些工具使用，那这也许值得考虑一下。
 
-更多信息可以在这里找到。
+关于简单流的更多信息可以在[这里](https://launchpad.net/simplestreams)找到。
 
 ### 总结
 
-我希望关于如何使用LXD管理镜像以及构建和发布镜像这点给你提供了一个好点子。对于以前的LXC而言可以在一组全球分布式系统上得到完全相同的镜像是一个很大的进步，并且让将来的道路更加可复制。
-
+我希望这篇关于如何使用 LXD 管理镜像以及构建和发布镜像文章让你有所了解。对于以前的 LXC 而言，可以在一组全球分布式系统上得到完全相同的镜像是一个很大的进步，并且引导了更多可复制性的发展方向。
 
 ### 额外信息
 
@@ -460,7 +456,7 @@ via: https://www.stgraber.org/2016/03/30/lxd-2-0-image-management-512/
 
 作者：[Stéphane Graber][a]
 译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织翻译，[Linux中国](https://linux.cn/) 荣誉推出
 
diff --git a/sources/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md b/sources/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md
deleted file mode 100644
index df3f70e782..0000000000
--- a/sources/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md	
+++ /dev/null
@@ -1,54 +0,0 @@
-# Build Strong Real-Time Streaming Apps with Apache Calcite
-
-
- ![Calcite](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/calcite.jpg?itok=CUZmjPjy "Calcite ") 
-Calcite is a data framework that lets you to build custom database functionality, explains Microsoft developer Atri Sharma in this preview to his upcoming talk at Apache: Big Data Europe, Nov. 14-16 in Seville, Spain.[Creative Commons Zero][2]Wikimedia Commons: Parent Géry
-
-The [Apache Calcite][7] data management framework contains many pieces of a typical database management system but omits others, such as storage of data and algorithms to process data. In his talk at the upcoming [Apache: Big Data][6] conference in Seville, Spain, Atri Sharma, a Software Engineer for Azure Data Lake at Microsoft, will talk about developing applications using [Apache Calcite][5]'s advanced query planning capabilities. We spoke with Sharma to learn more about Calcite and how existing applications can take advantage of its functionality.
-
- ![Atri Sharma](https://www.linux.com/sites/lcom/files/styles/floated_images/public/atri-sharma.jpg?itok=77cvZWfw "Atri Sharma") 
-
-Atri Sharma, Software Engineer, Azure Data Lake, Microsoft[Used with permission][1]
-
-**Linux.com: Can you provide some background on Apache Calcite? What does it do?**
-
-Atri Sharma: Calcite is a framework that is the basis of many database kernels. Calcite empowers you to build your custom database functionality and use the required resources from Calcite. For example, Hive uses Calcite for cost-based query optimization, Drill and Kylin use Calcite for SQL parsing and optimization, and Apex uses Calcite for streaming SQL.
-
-**Linux.com: What are some features that make Apache Calcite different from other frameworks?**
-
-Atri: Calcite is unique in the sense that it allows you to build your own data platform. Calcite does not manage your data directly but rather allows you to use Calcite's libraries to define your own components. For eg, instead of providing a generic query optimizer, it allows defining custom query optimizers using the Planners available in Calcite.
-
-**Linux.com: Apache Calcite itself does not store or process data. How does that affect application development?**
-
-Atri: Calcite is a dependency in the kernel of your database. It is targeted for data management platforms that wish to extend their functionalities without writing a lot of functionality from scratch.
-
-**Linux.com: Who should be using it? Can you give some examples?**
-
-Atri: Any data management platform looking to extend their functionalities should use Calcite. We are the foundation of your next high-performance database!
-
-Specifically, I think the biggest examples would be Hive using Calcite for query optimization and Flink for parsing and streaming SQL processing. Hive and Flink are full-fledged data management engines, and they use Calcite for highly specialized purposes. This is a good case study for applications of Calcite to further strengthen the core of a data management platform.
-
-**Linux.com: What are some new features that you’re looking forward to?**
-
-Atri: Streaming SQL enhancements are something I am very excited about. These features are exciting because they will enable users of Calcite to develop real-time streaming applications much faster, and the strength and capabilities of these applications will be manifold. Streaming applications are the new de facto, and the strength to have query optimization in streaming SQL will be very useful for a large crowd. Also, there is discussion ongoing about temporal tables, so watch out for more!
-
---------------------------------------------------------------------------------
-
-via: https://www.linux.com/news/build-strong-real-time-streaming-apps-apache-calcite
-
-作者：[AMBER ANKERHOLZ][a]
-
-译者：[译者ID](https://github.com/译者ID)
-
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.linux.com/users/aankerholz
-[1]:https://www.linux.com/licenses/category/used-permission
-[2]:https://www.linux.com/licenses/category/creative-commons-zero
-[3]:https://www.linux.com/files/images/atri-sharmajpg
-[4]:https://www.linux.com/files/images/calcitejpg
-[5]:https://calcite.apache.org/
-[6]:http://events.linuxfoundation.org/events/apache-big-data-europe
-[7]:https://calcite.apache.org/
diff --git a/sources/talk/20161227 2017 is the year that front-end developers should go back and master the basics.md b/sources/talk/20161227 2017 is the year that front-end developers should go back and master the basics.md
new file mode 100644
index 0000000000..abab7015dc
--- /dev/null
+++ b/sources/talk/20161227 2017 is the year that front-end developers should go back and master the basics.md	
@@ -0,0 +1,146 @@
+2017 is the year that front-end developers should go back and master the basics
+============================================================
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*1Xsnx4_M8uJc2klBxEtGLQ.jpeg) 
+
+In our fast-paced ecosystem, we tend to spend our time trying out the latest inventions, then arguing about them on the internet.
+
+I’m not saying we shouldn’t do that. But we should probably slow down a bit and take a look at the things that don’t change all that much. Not only will this improve the quality of our work and the value we deliver — it will actually help us learn these new tools faster.
+
+This post is a mix of my experience and my wishes for the New Year. And I want to hear your suggestions in the comments just as much as I want to share my own.
+
+### Learn how to write readable code
+
+Most of our work lies not in writing new code, but maintaining existing code. That means you end up reading code much more often then writing it, so you need to optimize your code for _the next programmer_, not for the interpreter.
+
+I recommend reading these three amazing books — in this order, from shortest to longest:
+
+*   [The Art of Readable Code][1] by Dustin Boswell
+*   [Clean Code: A Handbook of Agile Software Craftsmanship][2] by Robert C. Martin
+*   [Code Complete: A Practical Handbook of Software Construction][3] by Steve McConnell
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*YQGwR6skf705fovSLCbmXQ.jpeg) 
+
+### Learn JavaScript deeper
+
+When every week we have a new JavaScript framework that’s better than any older framework, it’s easy to spend most of your time learning frameworks rather than the language itself. If you’re using a framework but don’t understand how it works, _stop and start learning the language until you understand how the tools you use work_.
+
+*   A great start is [Kyle][4] Simpson’s book series [You Don’t Know JavaScript][5], which you can read online for free.
+*   [Eric Elliott][6] has a huge list of [JavaScript topics to learn in 2017][7].
+*   [Henrique Alves][8] has a list of [things you should know before using React][9](actually any framework).
+*   [JavaScript Developers: Watch Your Language][10] by Mike Pennisi — understand TC-39 process for new ECMAScript features.
+
+### Learn functional programming
+
+For years we wanted classes in JavaScript. Now we finally have them but don’t want to use them anymore. Functions are all we want! We even write HTML using functions (JSX).
+
+*   [Functional-Light JavaScript][11] by Kyle Simpson.
+*   Professor Frisby’s [Mostly adequate guide to functional programming ebook][12] and [his free course][13].
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*Helkj3sq3oVOc-dtjRgrYQ.jpeg) 
+
+### Learn design basics
+
+As front-end developers, we’re closer to users than anybody else on the team — maybe even closer than designers. And if designers have to verify every pixel you put on screen, you’re doing something wrong.
+
+*   Design for Hackers: [a book][14] and [a free course][15] by [David Kadavy][16].
+*   [Design for Non-Designers][17] talk by [Tracy Osborn][18].
+*   [Design of Web Applications][19] by [Nathan Barry][20].
+*   [On Web Typography][21] by [Jason Santa Maria][22].
+*   [The Inmates Are Running the Asylum: Why High Tech Products Drive Us Crazy and How to Restore the Sanity][23] by Alan Cooper.
+*   A few articles on animation in UI: [How to Use Animation to Improve UX][24], [Transitional Interfaces][25].
+
+### Learn how to work with humans
+
+Some of us come to programming because we prefer to interact with computers more than with humans. Unfortunately, that’s not how it works.
+
+We rarely work in isolation: we have to talk to other developers, designers, managers — and sometimes even users. That’s hard. But it’s important if you want to really understand what you’re doing and why, because that’s where the value in what we do lies.
+
+*   [Soft Skills: The software developer’s life manual][26] by [John Sonmez][27].
+*   [The Clean Coder: A Code of Conduct for Professional Programmers][28] by Robert C. Martin.
+*   [Start with No: The Negotiating Tools that the Pros Don’t Want You to Know][29] by Jim Camp.
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*zv6BXllLujNl-vDqkXQMqw.jpeg) 
+
+### Learn how to write for humans
+
+A big portion of communication with our colleagues and other people are textual: task descriptions and comments, code comments, Git commits, chat messages, emails, tweets, blog posts, etc.
+
+Imagine how much time people spend reading and understanding all that. If you can reduce this time by writing more clearly and concisely, the world will be a better place to work.
+
+*   [On Writing Well: The Classic Guide to Writing Nonfiction][30] by William Zinsser.
+*   [The Elements of Style][31] by William Strunk and E. B. White.
+*   [Orwell’s rules on writing][32].
+*   In Russian: awesome [Glavred course][33].
+
+### Learn the old computer science wisdom
+
+Front-end development isn’t just animated dropdown menus any more. It’s more complicated than ever before. Part of that notorious “JavaScript fatigue” stems from the increased complexity of the tasks we have to solve.
+
+This, however, means that it’s time to learn from all wisdom that non-front-end developers have built up over the decades. And this is where I want to hear your recommendations the most.
+
+Here are a couple resources I personally would recommend on this:
+
+*   [Learn To Think Like A Computer Scientist][34] course at Coursera.
+*   [The five programming books that meant most to me][35] by [DHH][36]
+
+
+* * *
+
+What would you recommend? What are you going to learn in 2017?
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://cdn-images-1.medium.com/fit/c/60/60/0*FXw8cxdKYar82R9X.jpeg)
+
+Web developer, passionate photographer and owner of crazy dogs.
+
+--------------------------------------------------------------------------------
+
+via: https://medium.freecodecamp.com/what-to-learn-in-2017-if-youre-a-frontend-developer-b6cfef46effd#.ss9xbwrew
+
+作者：[Artem Sapegin][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://medium.freecodecamp.com/@sapegin 
+[1]:https://www.amazon.com/gp/product/0596802293/
+[2]:https://www.amazon.com/Clean-Code-Handbook-Software-Craftsmanship/dp/0132350882/
+[3]:https://www.amazon.com/Code-Complete-Practical-Handbook-Construction/dp/0735619670/
+[4]:https://medium.com/u/5dccb9bb4625
+[5]:https://github.com/getify/You-Dont-Know-JS
+[6]:https://medium.com/u/c359511de780
+[7]:https://medium.com/javascript-scene/top-javascript-frameworks-topics-to-learn-in-2017-700a397b711#.zhnbn4rvg
+[8]:https://medium.com/u/b6c3841651ac
+[9]:http://alves.im/blog/before-dive-into-react.html
+[10]:https://bocoup.com/weblog/javascript-developers-watch-your-language
+[11]:https://github.com/getify/Functional-Light-JS
+[12]:https://github.com/MostlyAdequate/mostly-adequate-guide
+[13]:https://egghead.io/courses/professor-frisby-introduces-composable-functional-javascript
+[14]:https://www.amazon.com/Design-Hackers-Reverse-Engineering-Beauty-ebook/dp/B005J578EW
+[15]:http://designforhackers.com/
+[16]:https://medium.com/u/5377a93ef640
+[17]:https://youtu.be/ZbrzdMaumNk
+[18]:https://medium.com/u/e611097a5bd4
+[19]:http://nathanbarry.com/webapps/
+[20]:https://medium.com/u/ac3090433602
+[21]:https://abookapart.com/products/on-web-typography
+[22]:https://medium.com/u/8eddcb9e4ac4
+[23]:https://www.amazon.com/Inmates-Are-Running-Asylum-Products-ebook/dp/B000OZ0N62/
+[24]:http://babich.biz/how-to-use-animation-to-improve-ux/
+[25]:https://medium.com/@pasql/transitional-interfaces-926eb80d64e3#.igcwawszz
+[26]:https://www.amazon.com/Soft-Skills-software-developers-manual/dp/1617292397/
+[27]:https://medium.com/u/56e8cba02b
+[28]:https://www.amazon.com/Clean-Coder-Conduct-Professional-Programmers/dp/0137081073/
+[29]:https://www.amazon.com/Start-No-Negotiating-Tools-that-ebook/dp/B003EY7JEE/
+[30]:https://www.amazon.com/gp/product/0060891548/
+[31]:https://www.amazon.com/Elements-Style-4th-William-Strunk/dp/0205313426/
+[32]:http://www.economist.com/blogs/prospero/2013/07/george-orwell-writing
+[33]:http://maximilyahov.ru/glvrd-pro/
+[34]:https://www.coursera.org/specializations/algorithms
+[35]:https://signalvnoise.com/posts/3375-the-five-programming-books-that-meant-most-to-me
+[36]:https://medium.com/u/54bcbf647830
diff --git a/sources/talk/20170109 How to get started as an open source programmer.md b/sources/talk/20170109 How to get started as an open source programmer.md
new file mode 100644
index 0000000000..45d6975e69
--- /dev/null
+++ b/sources/talk/20170109 How to get started as an open source programmer.md	
@@ -0,0 +1,150 @@
+#rusking translating 
+How to get started as an open source programmer
+============================================================
+ ![How to get started as an open source programmer](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/programming_keys.jpg?itok=_VDcN66X "How to get started as an open source programmer") 
+
+Image credits : 
+
+Zagrev on [Flickr][1]. [CC BY-SA 2.0][2]
+
+Looking out at the world of technology is exciting. It has a lot of moving parts, and it seems the further you dig into it, the deeper it gets, and then it's [turtles all the way down][3]. For that very reason, technology is also overwhelming. Where do you start if you're keen to join in and help shape the way the modern world functions? What's the first step? What's the twentieth step?
+
+The first thing to understand is that open source is open. This might seem obvious, but the phrase "open source" is thrown around so often these days that sometimes people forget it's just a description of a cultural phenomenon, not the name of a Fortune 500 company. Unlike other jobs or groups, you don't have to interview or complete a sign-up sheet or registration form to become an open source programmer. All you do to become an open source programmer is _program_and then share your code, ideally with a guarantee that the code remains open regardless of how it's used.
+
+That's it. You're an open source programmer!
+
+You now have your destination, but what about the logistics?
+
+### Skill trees
+
+Have you ever played an RPG? In these games, there's the concept of linear "skill trees". When you play, you acquire basic skills that you build upon to "level up" and get new skills, which you use to acquire new ones and "level up" again. And so on.
+
+Becoming a programmer is a little like adding to your skill tree. You get some basic skills, you practice them until they're second nature, and then you get new skills, and so on, and then you are progressing along your chosen skill tree.
+
+You'll find you'll encounter more than one skill tree. Open source has many entry points and many individuals with their own unique strengths, talents, and interests. However, certain definable skills contribute to being a great programmer, and developing them is an important part of participating successfully in open source projects.
+
+### Scripting
+
+ ![Scroll--How to program ](https://opensource.com/sites/default/files/scroll.png "Scroll--How to program") 
+
+One of the biggest advantages of a POSIX system like Linux or BSD is that every time you use your computer, you've got the opportunity to practice a little programming. If you have no idea where to start programming, then begin with how you work. Find repetitive tasks that you perform every day, and start automating them. This step can be something simple, like converting or re-sizing batches of photos, checking email, or even just getting the five applications you use each day launched with one click. Whatever the task, take the time to automate something for yourself.
+
+If you can do something from a terminal, then it can be scripted. Learn `bash` or `tsch` and let system scripting be your introduction to writing code and to how your system works.
+
+### Sysadmin
+
+ ![Caesar head](https://opensource.com/sites/default/files/caesar_0.png "Caesar head") 
+
+From this point, you can continue on to become a programmer, or you can cross over to a different skill tree entirely: that of systems administration. The two careers have some overlap (a good sysadmin ought to have a little programming experience, and should be ready to wield Python, Perl, or a similar language to develop unique solutions), but a _programmer_ is someone who builds with code day in and day out.
+
+### Programmer
+
+ ![Wizard hat--How to program](https://opensource.com/sites/default/files/pointy-hat.png "Wizard hat--How to program") 
+
+Open source is a great way to learn programming skills; you get to look at other people's code, borrow ideas and techniques, learn from their mistakes, get a critique of your own code, and if you use Linux or BSD, the _entire_ stack is open to you—as far as the eye can see, it's all yours for the taking.
+
+That's what the travel brochure says, anyway. The reality is that you're probably not going to start digging into the source code of a project and come out the other side with the sudden realization that you accidentally learned to code. Programming is hard work. If it wasn't, everyone would do it.
+
+Luckily, programming is logical and structured, so it builds upon itself. You might not fall into programming, but the more you poke at it, the more you start to understand it.
+
+Understanding how to control and automate a computer is one thing, but knowing how to write the stuff that other people want to automate is the point that you cross over into the realm of _programming_.
+
+### Polyglot
+
+ ![Parrot--How to Program](https://opensource.com/sites/default/files/parrot-head.png "Parrot--How to Program") 
+
+All programming languages aim to do the same thing: make computers compute. Choosing one is a mix of what you think you want to do, what (if any) language is in common use in the industry you are targeting, and what language you happen to best understand given the materials available to you and your learning style.
+
+With a little bit of research, you can get a good idea of a language's complexity, and then decide what to try first based on your own level of comfort.
+
+Another way to choose a language is to look at your goal, find out if other people are working toward the same thing, and then look at what they're using. If your aim is to develop desktop tools, you might learn C and Vala for one, or C++ for another.
+
+At the end of the day, though, don't get overwhelmed with all the available choices. Languages stack well. Once you learn one programming language well enough to fall back on it when you need to get something done, you'll find it a lot easier to pick up another one. A "language" is just a set of syntax and rules, after all; learn one, and it's fairly trivial to superimpose new rules over the same theory.
+
+The primary goal is to learn a language. Pick the one that makes sense to you or the one that's most appealing to you or the one that your friends are using or the one that has the documentation you understand best, but focus on one and learn it.
+
+### Open Whazzit?
+
+Whether or not you're just learning to program or you're an old pro just getting into open source, before jumping head first into this brave new world, you need to learn what makes open source, well, "open source."
+
+Claiming software is open source is the latest marketing approach some software vendors are wielding. Unfortunately, some vendors just mean they've released a public API or that they're receptive ("open") to suggestions from their users. The word "open" isn't trademarked and no committee governs how or when the word is used. However, the [Open Source Initiative][4], co-founded by the late Ian Murdock of Debian Linux, [defines][5] what open source means (licenses that "allow software to be freely used, modified, and shared"), and formally approves and [tracks][6]licenses deemed truly "open."
+
+Apply one of those licenses to your code, and you're an open source programmer. Congratulations!
+
+### Community
+
+ ![Community--How to program](https://opensource.com/sites/default/files/minions.png "Community--How to program") 
+
+Ask any open source enthusiast and they'll tell you the most important thing about open software is the people. Without motivated contributors, software stagnates. Computers need users, bug reporters, designers, and programmers.
+
+If you want to join or cultivate the global open source community, you need to become a part of the community, even if you're not a people person. This usually encompasses subscribing to mailing lists, joining IRC channels, or hopping onto forums, and starting at the bottom of the totem pole. Any mature community has been around long enough to see prospective members come and go, so you have to understand that when you saunter in ready to change their world, before they all agree to your master plan, you have to prove that you're not going to disappear after three months when something sparkly on the other side of the Net catches your eye. Be ready for the long haul if you aspire to something big.
+
+If you're just around to lend a hand, then that's acceptable, too. I myself have submitted small patches to projects, and sometimes the project leads think these are good and other times they reject them. If the rejected patch is important to me, I maintain it for myself and clients, and otherwise I move forward.
+
+It's part of the process.
+
+Where do these communities exist? It depends on the project. Some projects have dedicated community managers who help bring everyone together in public spaces for everyone to see. Other projects form around forums, use mailing lists, or even issue trackers. Look for the communities, and you'll find them.
+
+Just as importantly, though, look at the code! They call it open "source" for a reason, so be sure to find the code and take a peek. Even if it's still above your level of full comprehension, it gives you an idea of how the software project organizes itself and possibly where they might need assistance. How is the code organized? Does the code have comments? Is it tidy with a consistent style? Review the documentation, particularly the README, LICENSE, or COPYING files.
+
+Don't under estimate the importance of following through on the promise of open code. It's the reason you're getting involved, so look at it critically from every angle to see what you can learn from it and how you might contribute.
+
+Finding the best community is a lot like dating, but specifically it's like dating in [Groundhog Day][7]. It takes time, and the first couple of tries might fall flat. The more you go through the process, the more you start to feel déjà vu. Eventually, though, you learn enough about yourself and your interests, you find the right combination of other people, and you settle in somewhere. Have patience, and let it happen naturally.
+
+### Actions > Words
+
+ ![Wingfoot--How to Program](https://opensource.com/sites/default/files/wingfoot.png "Wingfoot--How to Program") 
+
+Being an open source programmer is about the code (the "source" part of open source), and ideas are a dime a dozen. What speaks volumes is producing. You need to show you know what you're doing, willing to get your hands dirty, spend your time on the project, and can back up your ideas with something that compiles.
+
+To do that effectively, of course, you should do your homework on the project itself, including learning how a project prefers to receive submissions and which branches are the stable and development ones.
+
+To approach getting started:
+
+*   Get familiar with a project and its development culture, and be respectful of it.
+*   Write patches, bug fixes, or small, requested features, and submit them.
+*   Don't get discouraged if your work is rejected. You are not being rejected personally, your work was evaluated and the development team made a call.
+*   Don't get discouraged if your work is accepted, but changed beyond recognition.
+*   Rinse, repeat, and try new and bigger changes.
+
+ ![Leaderboard--How to program](https://opensource.com/sites/default/files/leaderboard.png "Leaderboard--How to program") 
+
+There is no leaderboard in open source. Some sites try to make it seem like they have such a thing, but there isn't one. Participate, contribute, add to the pool of ideas, add to the stash of commits, and you're doing it right.
+
+### Develop
+
+ ![Treasure Map--How to Program](https://opensource.com/sites/default/files/treasure-map.png "Treasure Map--How to Program") 
+
+Programming in any environment is always, ultimately, about personal development. Whether you're searching for new ways of solving problems, looking for new ways to optimize code, learning a new language, or learning how to deal with other people better, you never want to stop growing. The more you develop yourself, the more a project benefits.
+
+Growth, both personal and professional, is the final one on the list, but it actually persists through the entire process. Becoming an open source programmer isn't like getting a government job; it's a process. You learn, you share, you keep learning, you get distracted and write a [Game of Life][8] implementation, and you learn some more.
+
+This process is what open source is about: the freedom to develop, in every sense of the word. So go find your skill tree, choose your super powers, pay your dues, level up, and get involved.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/penguinmedallion200x200.png?itok=ROQSR50J)
+
+Seth Kenlon - Seth Kenlon is an independent multimedia artist, free culture advocate, and UNIX geek. He is one of the maintainers of the Slackware-based multimedia production project, http://slackermedia.ml
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/how-get-started-open-source-programmer
+
+作者：[Seth Kenlon][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/seth
+[1]:https://www.flickr.com/photos/zagrev/79470567/in/photolist-82iQc-pijuye-9CmY3Z-c1EJAf-4Y65Zt-dhLziB-51QVc-hjqkN-4rNTuC-5Mbvqi-5MfK13-7dh6AW-2fiSu7-48R7et-5sC5ck-qf1TE9-48R6qv-pXuSG9-KFBLJ-95jQ8U-jBR7-dhLpfV-5bCZVH-9vsPTT-bA2nvP-bn7cWw-d7j8q-ubap-pij32X-7WT6iw-dcZZm2-3knisv-4dgN2f-bc6V1-E9xar-EovvU-6T71Mg-pi5zwE-5SR26m-dPKXrn-HFyzb-3aJF9W-7Rvz19-zbewj-xMsv-7MFi3u-2mVokJ-nsVAx-7g5k-4jCbbP
+[2]:https://creativecommons.org/licenses/by-nc-sa/2.0/
+[3]:https://en.wikipedia.org/wiki/Turtles_all_the_way_down
+[4]:http://opensource.org/
+[5]:https://opensource.org/licenses
+[6]:https://opensource.org/licenses/category
+[7]:https://en.wikipedia.org/wiki/Groundhog_Day_(film)
+[8]:https://en.wikipedia.org/wiki/Conway's_Game_of_Life
diff --git a/sources/talk/20170110 What engineers and marketers can learn from each other.md b/sources/talk/20170110 What engineers and marketers can learn from each other.md
new file mode 100644
index 0000000000..f88aa0117a
--- /dev/null
+++ b/sources/talk/20170110 What engineers and marketers can learn from each other.md	
@@ -0,0 +1,105 @@
+# rusking translating
+
+What engineers and marketers can learn from each other
+============================================================
+
+### Marketers think engineering is all math; engineers think marketing is all fluff. They're both wrong.
+
+ ![What engineers and marketers can learn from each other](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/BIZ_fortunecookie3.png?itok=dlRX4vO9 "What engineers and marketers can learn from each other") 
+Image by : 
+
+opensource.com
+
+After many years of practicing marketing in the B2B tech world, I think I've heard just about every misconception that engineers seem to have about marketers. Here are some of the more common:
+
+*   "Marketing is a waste of money that we should be putting into actual product development."
+*   "Those marketers just throw stuff against the wall and hope it sticks. Where's the discipline?"
+*   "Does anyone actually read this stuff?"
+*   "The best thing a marketer can tell me is how to unsubscribe, unfollow, and unfriend."
+
+And here's my personal favorite:
+
+_"Marketing is all fluff."_
+
+That last one is simply incorrect—but more than that, It's actually a major impediment to innovation in our organizations today.
+
+Let me explain why.
+
+### Seeing my own reflection
+
+I think these comments from engineers bother me so much because I see a bit of my former self in them.
+
+You see, I was once as geeky as they come—and was proud of it. I hold a Bachelor's in electrical engineering from Rensselaer Polytechnic Institute, and began my professional career as an officer in the US Air Force during Desert Storm. There, I was in charge of developing and deploying a near real-time intelligence system that correlated several sources of data to create a picture of the battlefield.
+
+After I left the Air Force, I planned to pursue a doctorate from MIT. But my Colonel convinced me to take a look at their business school. "Are you really going to be in a lab?" he asked me. "Are you going to teach at a university? Jackie, you are gifted at orchestrating complex activities. I think you really need to look at MIT Sloan."
+
+So I took his advice, believing I could still enroll in a few tech courses at MIT. Taking a marketing course, however, would certainly have been a step too far—a total waste of time. I continued to bring my analytical skills to bear on any problem put in front of me.
+
+Soon after, I became a management consultant at The Boston Consulting Group. Throughout my six years there, I consistently heard the same feedback: "Jackie, you're not visionary enough. You're not thinking outside the box. You assume your analysis is going to point you to the answer."
+
+And of course, I agreed with them—because that's the way the world works, isn't it? What I realize now (and wish I'd discovered out far earlier) is that by taking this approach I was missing something pivotal: the open mind, the art, the emotion—the human and creative elements.
+
+All this became much more apparent when I joined Delta Air Lines soon after September 11, 2001, and was asked to help lead consumer marketing. Marketing _definitely_ wasn't my thing, but I was willing to help however they needed me to.
+
+But suddenly, my rulebook for achieving familiar results was turned upside down. Thousands of people (both inside and outside the airline) were involved in this problem. Emotions were running high. I was facing problems that required different kinds of solutions, answers I couldn't reach simply by crunching numbers.
+
+That's when I learned—and quickly, because we had much work to do if we were going to pull Delta back up to where it deserved to be—that marketing can be as much a strategic, problem-oriented and user-centered function as engineering is, even if these two camps don't immediately recognize it.
+
+### Two cultures
+
+That "great divide" between engineering and marketing is deep indeed—so entrenched that it resembles what C.P. Snow once called[ the "two cultures" problem][1]. Scientifically minded engineers and artistically minded marketers tend to speak different languages, and they're acculturated to believe they value divergent things.
+
+But the fact is that they're more similar than they might think.[ A recent study][2] from the University of Washington (co-sponsored by Microsoft, Google, and the National Science Foundation) identified "what makes a great software engineer," and (not surprisingly) the list of characteristics sounds like it could apply to great marketers, too. For example, the authors list traits like:
+
+*   Passion
+*   Open-mindedness
+*   Curiosity
+*   Cultivation of craft
+*   Ability to handle complexity
+
+And these are just a few! Of course, not every characteristic on the list applies to marketers—but the Venn diagram connecting these "two cultures" is tighter than I believe most of us think. _Both_ are striving to solve complex user and/or customer challenges. They just take a different approach to doing it.
+
+Reading this list got me thinking: _What if these two personalities understood each other just a little bit more? Would there be power in that?_
+
+You bet. I've seen it firsthand at Red Hat, where I'm surrounded by people I'd have quickly dismissed as "crazy creatives" during my early days. And I'd be willing to bet that a marketer has (at one time or another) looked at an engineer and thought, "Look at this data nerd. Can't see the forest beyond the trees."
+
+I now understand the power of having both perspectives in the same room. And in reality, engineers and marketers are _both_ working at the _intersection of customers, creativity, and analytics_. And if they could just learn to recognize the ways their personalities compliment each other, we could see tremendously positive results—results far more surprising and innovative than we'd see if we kept them isolated from one another.
+
+### Listening to the crazies (and the nerds)
+
+Case in point: _The Open Organization_.
+
+In my role at Red Hat I spent much of my day thinking about how to extend and amplify our brand—but never in a million years would I have thought to do it by asking our CEO to write a book. That idea came from a cross-functional team of those "crazy creatives," a group of people I rely on to help me imagine new and innovative solutions to branding challenges.
+
+When I heard the idea, I recognized it right away as a quintessentially Red Hat approach to our work: something that would be valuable to a community of practitioners, and something that helps spread the message of openness just a little farther. By prioritizing these two goals above all others, we'd reinforce Red Hat's position as a positive force in the open source world, a trusted expert ready to help customers navigate the turbulence of[ digital disruption][3].
+
+Here's the clincher: _That's exactly the same spirit guiding Red Hat engineers tackling problems of code._ The group of Red Hatters urging me to help make _The Open Organization_ a reality demonstrated one of the very same motivations as the programmers that make up our internal and external communities: a desire to share.
+
+In the end, bringing _The Open Organization_ to life required help from across the spectrum of skills—both the intensely analytic and the beautifully artistic. Everyone pitched in. The project only cemented my belief that engineers and marketers are more alike than different.
+
+But it also reinforced something else: The realization that openness shows no bias, no preference for a culture of engineering or a culture of marketing. The idea of a more open world can inspire them both equally, and the passion it ignites ripples across the artificial boundaries we draw around our groups.
+
+That hardly sounds like fluff to me.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/portrait_jackieyeaney_400x600.jpg?itok=zV4bnrzI)
+
+Jackie Yeaney - Chief Marketing Officer at Ellucian
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/open-organization/17/1/engineers-marketers-can-learn
+
+作者：[Jackie Yeaney][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/jackie-yeaney
+[1]:https://en.wikipedia.org/wiki/The_Two_Cultures#Implications_and_influence
+[2]:https://faculty.washington.edu/ajko/papers/Li2015GreatEngineers.pdf
+[3]:https://opensource.com/open-organization/16/7/future-belongs-open-leaders
diff --git a/sources/talk/20170111 How to choose your first programming language.md b/sources/talk/20170111 How to choose your first programming language.md
new file mode 100644
index 0000000000..43cfcd90db
--- /dev/null
+++ b/sources/talk/20170111 How to choose your first programming language.md	
@@ -0,0 +1,128 @@
+How to choose your first programming language
+============================================================[
+
+][1]
+ ![How to choose your first programming language](https://opensource.com/sites/default/files/styles/image-full-size/public/images/education/EDU_OSDC_IntroOS_520x292_FINAL.png?itok=va-tdc8j "How to choose your first programming language") 
+Image by : 
+
+opensource.com
+
+The reasons for learning to program are as a varied as the people who want to learn. You might have a program you want to make, or maybe you just want to jump in. So, before choosing your first programming language, ask yourself: Where do you want that program to run? What do you want that program to do?
+
+Your reasons for learning to code should inform your choice of a first language.
+
+_In this article, I use "code," "program," and "develop" interchangeably as verbs, while "code," "program," "application," and "app" interchangeably as nouns. This is to reflect language usage you may hear._
+
+### Know your device
+
+Where your programs will run is a defining factor in your choice of language.
+
+Desktop applications are the traditional software programs that run on a desktop or laptop computer. For these you'll be writing code that only runs on a single computer at a time. Mobile applications, known as apps, run on portable communications devices using iOS, Android, or other operating systems. Web applications are websites that function like applications.
+
+Web development is often broken into two subcategories, based on the web's client-server architecture:
+
+*   Front-end programming, which is writing code that runs in the web browser itself. This is the part that faces the user, or the "front end" of the program. It's sometimes called "client-side" programming, because the web browser is the client half of the web's client-server architecture. The web browser runs on your local computer or device.
+
+*   Back-end programming, which is also known as "server-side" programming, the code written runs on a server, which is a computer you don't have physical access to.
+
+### What to create
+
+Programming is a broad discipline and can be used in a variety of fields. Common examples include:
+
+*   data science,
+*   web development,
+*   game development, and
+*   work automation of various types.
+
+Now that we've looked at why and where you want to  program, let's look at two great languages for beginners.
+
+### Python
+
+[Python][2] is one of the most popular languages for first-time programmers, and that is not by accident. Python is a general-purpose language. This means it can be used for a wide range of programming tasks. There's almost _nothing_ you can't do with Python. This lets a wide range of beginners make practical use of the language. Additionally, Python has two key design features that make it great for new programmers: a clear, English-like [syntax][3] and an emphasis on code [readability][4].
+
+A language's syntax is essentially what you type to make the language perform. This can include words, special characters (like `;`, `$`, `%`, or `{}`), white space, or any combination. Python uses English for as much of this as possible, unlike other languages, which often use punctuation or special characters. As a result, Python reads much more like a natural, human language. This helps new programmers focus on solving problems, and they spend less time struggling with the specifics of the language itself.
+
+Combined with that clear syntax is a focus on readability. When writing code, you'll create logical "blocks" of code, sections of code that work together for some related purpose. In many languages, those blocks are marked (or delimited) by special characters. They may be enclosed in `{}` or some other character. The combination of block-delimiting characters and your ability to write your code in almost any fashion can decrease readability. Let's look at an example.
+
+Here's a small function, called "fun," which takes a number, `x` as its input. If `x`equals **0**, it runs another function called `no_fun` (which does something that's no fun). That function takes no input. Otherwise, it runs the function `big_fun`, using the same input, `x`.
+
+This function defined in the ["C" language][5] could be written like this:
+
+```
+void fun(int x)
+{
+    if (x == 0) {
+        no_fun();
+    } else {
+        big_fun(x);
+    }
+}
+```
+
+or, like this:
+
+```
+void fun(int x) { if (x == 0) {no_fun(); } else {big_fun(x); }}
+```
+
+Both are functionally equivalent and both will run. The `{}` and `;` tell us where different parts of the block are; however, one is _clearly_ more readable to a human. Contrast that with the same function in Python:
+
+```
+def fun(x):
+    if x == 0:
+        no_fun()
+    else:
+        big_fun(x)
+```
+
+In this case, there's only one option. If the code isn't structured this way, it won't work, so if you have code that works, you have code that's readable. Also, notice the difference in syntax. Other than `def`, the words in the Python code are English and would be clear to a broad audience. In the C language example `void` and `int` are less intuitive.
+
+Python also has an excellent ecosystem. This means two things. First, you have a large, active community of people using the language you can turn to when you need help and guidance. Second, it has a large number of preexisiting libraries, which are chunks of code that perform special functions. These range from advanced mathematical processing to graphics to computer vision to almost anything you can imagine.
+
+Python has two drawbacks to it being your first language. The first is that it can sometimes be tricky to install, especially on computers running Windows. (If you have a Mac or a Linux computer, Python is already installed.) Although this issue isn't insurmountable, and the situation is improving all the time, it can be a deterrent for some people. The second drawback is for people who specifically want to build websites. While there are projects written in Python (like [Django][6] and [Flask][7]) that let you build websites, there aren't many options for writing Python that will run in a web browser. It is primarily a back-end or server-side language.
+
+### JavaScript
+
+If you know your primary reason for learning to program is to build websites, [JavaScript][8] may be the best choice for you. JavaScript is _the_ language of the web. Besides being the default language of the web, JavaScript has a few advantages as a beginner language.
+
+First, there's nothing to install. You can open any text editor (like Notepad on Windows, but not a word processor like Microsoft Word) and start typing JavaScript. The code will run in your web browser. Most modern web browsers have a JavaScript engine built in, so your code will run on almost any computer and a lot of mobile devices. The fact that you can run your code immediately in a web browser provides a _very_ fast feedback loop, which is good for new coders. You can try something and see the results very quickly.
+
+While JavaScript started life as a front-end language, an environment called [Node.js][9] lets you write code that runs in a web browser or on a server. Now JavaScript can be used as a front-end or back-end language. This has led to an increase in its popularity. JavaScript also has a huge number of packages that provide added functionality to the core language, allowing it to be used as a general-purpose language, and not just as the language of web development. Like Python, JavaScript has a vibrant, active ecosystem.
+
+Despite these strengths, JavaScript is not without its drawbacks for new programmers. The [syntax of JavaScript][10] is not as clear or English-like as Python. It's much more like the C example above. It also doesn't have readability as a key design principle.
+
+### Making a choice
+
+It's hard to go wrong with either Python or JavaScript as your first language. The key factor is what you intend to do. Why are you learning to code? Your answer should influence your decision most heavily. If you're looking to make contributions to open source, you will find a _huge_ number of projects written in both languages. In addition, many projects that aren't primarily written in JavaScript still make use of it for their front-end component. As you're making a choice, don't forget about your local community. Do you have friends or co-workers who use either of these languages? For a new coder, having live support is very important.
+
+Good luck and happy coding.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/kojo_headshot_pro_square.jpg?itok=jv1kT8T0)
+
+Kojo Idrissa - I'm a new software developer (1 year) who changed careers from accounting and university teaching. I've been a fan of Open Source software since around the time the term was coined, but I didn't have a NEED to do much coding in my prior careers. Tech-wise, I focus on Python, automated testing, and learning Django. I hope to learn more JavaScript soon. Topic-wise, I like to focus on helping new people get started with programing or getting involved in contributing to Open Source projects. I also focus on inclusive culture in tech environments.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/choosing-your-first-programming-language
+
+作者：[Kojo Idrissa][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/transitionkojo
+[1]:https://opensource.com/article/17/1/choosing-your-first-programming-language?rate=fWoYXudAZ59IkAKZ8n5lQpsa4bErlSzDEo512Al6Onk
+[2]:https://www.python.org/about/
+[3]:https://en.wikipedia.org/wiki/Python_syntax_and_semantics
+[4]:https://en.wikipedia.org/wiki/Python_syntax_and_semantics#Indentation
+[5]:https://en.wikipedia.org/wiki/C_(programming_language
+[6]:https://www.djangoproject.com/
+[7]:http://flask.pocoo.org/
+[8]:https://en.wikipedia.org/wiki/JavaScript
+[9]:https://nodejs.org/en/
+[10]:https://en.wikipedia.org/wiki/JavaScript_syntax#Basics
diff --git a/sources/talk/20170113 Tips for non-native English speakers working on open source projects.md b/sources/talk/20170113 Tips for non-native English speakers working on open source projects.md
new file mode 100644
index 0000000000..3e98f70801
--- /dev/null
+++ b/sources/talk/20170113 Tips for non-native English speakers working on open source projects.md	
@@ -0,0 +1,89 @@
+Tips for non-native English speakers working on open source projects
+============================================================
+ ![Tips for non-native English speakers working on open source projects](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/world_hands_diversity.png?itok=LMT5xbxJ "Tips for non-native English speakers working on open source projects") 
+Image by : 
+
+opensource.com
+
+The primary language of most open source projects is English, but open source users and contributors span the globe. Non-native speakers face many communication and cultural challenges when participating in the ecosystem.
+
+In this article, we will share challenges, how to overcome them, and best practices for easing onboarding of non-native speakers, as non-native English speakers and contributors to OpenStack. We are based in Japan, Brazil, and China, and work daily with the huge OpenStack community that is spread around the world.
+
+The official language of OpenStack is English, which means we communicate daily as non-native speakers.
+
+### Challenges
+
+Non-native English speakers face specific communication challenges when starting out in open source communities: they are related to limited language skills and cultural disparity.
+
+### Language skills
+
+Let's focus on the specific language skills behind reading, writing, listening, and speaking.
+
+Reading: This is the easiest but also the most important skill. It is the easiest because if you can't understand what is written you have the opportunity to read it again, or as many times as needed. If you encounter an uncommon phrase, expression, or abbreviation, you can use a dictionary or translator. On the other hand, it is the most important skill because for most open source projects the main means of communication are mailing lists and IRC.
+
+Writing: English grammar is an issue especially for languages that structure sentences differently. This may pose a problem for communication in writing emails and communicating via IRC channels. For some, writing long and beautiful sentences is difficult, and the reliance on simpler sentences is prevalent because these are easy to write and convey understanding.
+
+Listening: This is more problematic than reading and writing for non-native speakers. Normally, conversation between native English speakers is very fast, which makes following the discussions for those still learning difficult and limits their participation in those discussions. Furthermore, trying to understand the variety of accents in a globally spread community adds to the complexity. Interestingly, American pronunciation is often easier to understand than others.
+
+Speaking: Speaking is more difficult than listening because the participant's vocabulary may a bit limited. Furthermore, English's phonemes and grammar are often very different from a non-native speaker's mother language, making an interaction even more difficult to understand.
+
+### Cultural differences
+
+Each culture has different norms when interacting with other people in the open source community. For example, the Japanese tend not to say yes or no clearly as a way to respect others and to avoid fighting each other. This is often very different from other cultures and may cause misunderstanding of what was expressed.
+
+In Chinese culture, people prefer to just say yes, instead of saying no or trying to negotiate. In a globally distributed community as OpenStack, this often leads to the lack of confidence when expressing opinions. Furthermore, Chinese people like to list the facts first and give the thesis at the end, and this can cause confusion for people from other cultures because it is not what they expect.
+
+A Brazilian, for instance, may find that discussions are driven in a similar way; however, some cultures are very short and direct in responses, which may sound a bit rude.
+
+### Overcoming obstacles
+
+Challenges related to language skills are easier to overcome than cultural ones. Cultural differences need to be respected, while English skills can always be improved.
+
+In order to brush up on your language skills, be in contact with the language as much as you can. Do not think about your limitations. Just do your best and you will improve eventually.
+
+Read as much as you can, because this will help you gather vocabulary. Communicating through chat and mailing lists daily helps, too. Some tools, such as real-time dictionaries and translators, are very useful with these platforms.
+
+Talking to others or yourself helps you become comfortable speaking out more frequently. Having one-on-one conversations to express your ideas is easier than discussing in larger groups.
+
+### Onboarding newcomers
+
+A few initiatives from both newcomers and native speakers may positively affect the onboarding process.
+
+### Newcomers
+
+Speak and write your opinion, and ask your questions; this participation is always a good opportunity to exercise your English. Do not be afraid.
+
+For meetings, make sure you prepare yourself in advance so you will be comfortable with the subject and more confident about the opinions you are expressing.
+
+Make friends who are English speakers and talk more to practice your English skills.
+
+Writing blogs and technical articles in English are also great ideas.
+
+### Tips for native English speakers
+
+Please speak slowly and use simple words and sentences. Don't make fun of non-native English speakers if you find something wrong about the English they used. Try to encourage newcomers to express their opinions, and make them comfortable enough to do so.
+
+_This article was co-written by Masayuki Igawa, Dong Ma, and Samuel de Medeiros Queiroz. Learn more in their talk at linux.conf.au 2017 ([#lca2017][1]) in Hobart: [Non-native English speakers in Open Source communities: A True Story.][2]_
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/myface_s.jpg?itok=-dy9_LQd)
+
+Masayuki Igawa - Masayuki Igawa is a software engineer for over 15 years on a wide range of software projects, and developing open source software related to Linux kernel and virtualization. He's been an active technical contributor to OpenStack since 2013. He is a core member of some OpenStack QA projects such as Tempest, subunit2sql, openstack-health and stackviz. He currently works for HPE's Upstream OpenStack team to make OpenStack better for everyone. He has previously been a speaker at OpenStack Summits,
+
+--------------------------------------------------------------------------------
+
+
+via: https://opensource.com/article/17/1/non-native-speakers-take-open-source-communities
+
+作者：[Masayuki Igawa][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/masayukig
+[1]:https://twitter.com/search?q=%23lca2017&src=typd
+[2]:https://linux.conf.au/schedule/presentation/70/
diff --git a/sources/talk/The history of Android/29 - The (updated) history of Android.md b/sources/talk/The history of Android/29 - The (updated) history of Android.md
deleted file mode 100644
index 5c7b2fdb6f..0000000000
--- a/sources/talk/The history of Android/29 - The (updated) history of Android.md	
+++ /dev/null
@@ -1,227 +0,0 @@
-alim0x translating
-
-The (updated) history of Android
-============================================================
-
-### Follow the endless iterations from Android 0.5 to Android 7 and beyond.
-
-
-Google Search was literally everywhere in Lollipop. A new "always-on voice recognition" feature allowed users to say "OK Google" at any time, from any screen, even when the display was off. The Google app was still Google's primary home screen, a feature which debuted in KitKat. The search bar was now present on the new recent apps screen, too.
-
-Google Now was still the left-most home screen page, but now a Material Design revamp gave it headers with big bold colors and redesigned typography.
-
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/play-store-1-150x150.jpg) 
-    ][1]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/play2-150x150.jpg) 
-    ][2]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/6-150x150.jpg) 
-    ][3]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/5-150x150.jpg) 
-    ][4]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/12-2-150x150.jpg) 
-    ][5]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/14-1-150x150.jpg) 
-    ][6]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/19-1-150x150.jpg) 
-    ][7]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/13-2-150x150.jpg) 
-    ][8]
-
-The Play Store followed a similar path to other Lollipop apps. There was a huge visual refresh with bold colors, new typography, and a fresh layout. It's rare that there's any additional functionality here, just a new coat of paint on everything.
-
-The Navigation panel for the Play Store could now actually be used for navigation, with entries for each section of the Play Store. Lollipop also typically did away with the overflow button in the action bar, instead deciding to go with a single action button (usually search) and dumping every extra option in the navigation bar. This gave users a single place to look for items instead of having to hunt through two different menus.
-
-Also new in Lollipop apps was the ability to make the status bar transparent. This allowed the action bar color to bleed right through the status bar, making the bar only slightly darker than the surrounding UI. Some interfaces even used a full-bleed hero image at the top of the screen, which would show through the status bar.
-
-[
- ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1-980x481.jpg) 
-][38]
-
-
-Google Calendar was completely re-written, gaining lots of new design touches and losing lots of features. You could no longer pinch zoom to adjust the time scale of views, month view was gone on phones, and week view regressed from a seven-day view to five days. Google would spend the next few versions re-adding some of these features after users complained. "Google Calendar" also doubled down on the "Google" by removing the ability to add third-party accounts directly in the app. Non-Google accounts would now need to be added via Gmail.
-
-It did look nice, though. In some views, the start of each month came with a header picture, just like a real paper calendar. Events with locations attached showed pictures from those locations. For instance, my "flight to San Francisco" displayed the Golden Gate Bridge. Google Calendar would also pull events out of Gmail and display them right on your calendar.
-
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/7-150x150.jpg) 
-    ][9]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/8-150x150.jpg) 
-    ][10]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/12-150x150.jpg) 
-    ][11]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/13-150x150.jpg) 
-    ][12]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/3-1-150x150.jpg) 
-    ][13]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/14-150x150.jpg) 
-    ][14]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/6-2-150x150.jpg) 
-    ][15]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/5-3-150x150.jpg) 
-    ][16]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/7-2-150x150.jpg) 
-    ][17]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/9-1-150x150.jpg) 
-    ][18]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/10-1-150x150.jpg) 
-    ][19]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/28-1-150x150.jpg) 
-    ][20]
-
-Other apps all fell under pretty much the same description: not much in the way of new functionality, but big redesigns swapped out the greys of KitKat with bold, bright colors. Hangouts gained the ability to receive Google Voice SMSes, and the clock got a background color that changes with the time of day.
-
-#### Job Scheduler whips the app ecosystem into shape
-
-Google decided to focus on battery savings with Lollipop in a project it called "Project Volta." Google started creating more battery tracking tools for itself and developers, starting with the "Battery Historian." This python script took all of Android's battery logging data and spun it into a readable, interactive graph. With its new diagnostic equipment, Google flagged background tasks as a big consumer of battery.
-
-At I/O 2014, the company noted that enabling airplane mode and turning off the screen allowed an Android phone to run in standby for a month. However, if users enabled everything and started using the device, they wouldn't get through a single day. The takeaway was that if you could just get everything to stop doing stuff, your battery would do a lot better.
-
-As such, the company created a new API called "JobScheduler," the new traffic cop for background tasks on Android. Before Job Scheduler, every single app was responsible for its background processing, which meant every app would individually wake up the processor and modem, check for connectivity, organize databases, download updates, and upload logs. Everything had its own individual timer, so your phone would be woken up a lot. With JobScheduler, background tasks get batched up from an unorganized free-for-all into an orderly background processing window.
-
-JobScheduler lets apps specify conditions that their task needs (general connectivity, Wi-Fi, plugged into a wall outlet, etc), and it will send an announcement when those conditions are met. It's like the difference between push e-mail and checking for e-mail every five minutes... but with task requirements. Google also started pushing a "lazier" approach to background tasks. If something can wait until the device is on Wi-Fi, plugged-in, and idle, it should wait until then. You can see the results of this today when, on Wi-Fi, you can plug in an Android phone and only _then_ will it start downloading app updates. You don't instantly need to download app updates; it's best to wait until the user has unlimited power and data.
-
-#### Device setup gets future-proofed
-
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/25-1-150x150.jpg) 
-    ][21]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/26-150x150.jpg) 
-    ][22]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup2-150x150.jpg) 
-    ][23]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup3-150x150.jpg) 
-    ][24]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup4-150x150.jpg) 
-    ][25]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup5-150x150.jpg) 
-    ][26]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup6-150x150.png) 
-    ][27]
-
-Setup was overhauled to not just confirm to the Material Design guidelines, but it was also "future-proofed" so that it can handle any new login and authentication schemes Google cooks up in the future. Remember, part of the entire reasoning for writing "The History of Android" is that older versions of Android don't work anymore. Over the years, Google has upgraded its authentication schemes to use better encryption and two-factor authentication, but adding these new login requirements breaks compatibility with older clients. Lots of Android features require access to Google's cloud infrastructure, so when you can't log in, things like Gmail for Android 1.0 just don't work.
-
-In Lollipop, setup works much like it did before for the first few screens. You get a "welcome to Android screen" and options to set up cellular and Wi-Fi connectivity. Immediately after this screen, things changed though. As soon as Lollipop hit the internet, it pinged Google's servers to "check for updates." These weren't updates to the OS or to apps, but updates to the setup process about to run. After Android downloaded the newest version of setup, _then_ it asked you to log in with your Google account.
-
-The benefit of this is evident when trying to log into Lollipop and Kitkat today. Thanks to the updatable setup flow, the "2014" Lollipop OS can handle 2016 improvements, like Google's new "[tap to sign in][39]" 2FA method. KitKat chokes, but luckily it has a "web-browser sign-in" that can handle 2FA.
-
-Lollipop setup even takes the extreme stance of putting your Google e-mail and password on separate pages. [Google hates passwords][40] and has come up with several [experimental ways][41] to log into Google without one. If your account is setup to not have a password, Lollipop can just skip the password page. If you have a 2FA setup that uses a code, setup can slip the appropriate "enter 2FA code" page into the setup flow. Every piece of signing in is on a single page, so the setup flow is modular. Pages can be added and removed as needed.
-
-Setup also gave users control over app restoration. Android was doing some kind of data restoration previously to this, but it was impossible to understand because it just picked one of your devices without any user input and started restoring things. A new screen in the setup flow let users see their collection of device profiles in the cloud and pick the appropriate one. You could also choose which apps to restore from that backup. This backup was apps, your home screen layout, and a few minor settings like Wi-Fi hotspots. It wasn't a full app data backup.
-
-#### Settings
-
-
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/29-1-150x150.jpg) 
-    ][28]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/settings-1-150x150.jpg) 
-    ][29]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/2014-11-11-16.45.47-150x150.png) 
-    ][30]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/battery-150x150.jpg) 
-    ][31]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/user1-150x150.jpg) 
-    ][32]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/users2-150x150.jpg) 
-    ][33]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/30-1-150x150.jpg) 
-    ][34]
-*   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/31-150x150.jpg) 
-    ][35]
-
-Setting swapped from a dark theme to a light one. Along with a new look, it got a handy search function. Every screen gave the user access to a magnifying glass, which let them more easily hunt down that elusive option.
-
-There were a few settings related to Project Volta. "Network Restrictions" allowed users to flag a Wi-Fi connection as metered, which would allow JobScheduler to avoid it for background processing. Also as part of Volta, a "Battery Saver" mode was added. This would limit background tasks and throttle down the CPU, which gave you a long lasting but very sluggish device.
-
-Multi-user support has been in Android tablets for a while, but Lollipop finally brought it down to Android phones. The settings screen added a new "users" page that let you add additional account or start up a "Guest" account. Guest accounts were temporary—they could be wiped out with a single tap. And unlike a normal account, it didn't try to download every app associated with your account, since it was destined to be wiped out soon.
-
---------------------------------------------------------------------------------
-
-作者简介：
-
-Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
-
---------------------------------------------------------------------------------
-
-via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/
-
-作者：[RON AMADEO][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: http://arstechnica.com/author/ronamadeo
-[1]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[2]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[3]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[4]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[5]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[6]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[7]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[8]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[9]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[10]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[11]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[12]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[13]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[14]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[15]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[16]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[17]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[18]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[19]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[20]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[21]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[22]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[23]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[24]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[25]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[26]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[27]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[28]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[29]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[30]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[31]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[32]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[33]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[34]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[35]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
-[36]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1.jpg
-[37]:http://arstechnica.com/author/ronamadeo/
-[38]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1.jpg
-[39]:http://arstechnica.com/gadgets/2016/06/googles-new-two-factor-authentication-system-tap-yes-to-log-in/
-[40]:https://www.theguardian.com/technology/2016/may/24/google-passwords-android
-[41]:http://www.androidpolice.com/2015/12/22/google-appears-to-be-testing-a-new-way-to-log-into-your-account-on-other-devices-with-just-your-phone-no-password-needed/
diff --git a/sources/talk/The history of Android/31 The (updated) history of Android.md b/sources/talk/The history of Android/31 The (updated) history of Android.md
new file mode 100644
index 0000000000..5c4bc9fd10
--- /dev/null
+++ b/sources/talk/The history of Android/31 The (updated) history of Android.md	
@@ -0,0 +1,230 @@
+alim0x translating
+
+### Android 6.0 Marshmallow
+
+In October 2015, Google brought Android 6.0 Marshmallow into the world. For the OS's launch, Google commissioned two new Nexus devices: the [Huawei Nexus 6P and LG Nexus 5X][39]. Rather than just the usual speed increase, the new phones also included a key piece of hardware: a fingerprint reader for Marshmallow's new fingerprint API. Marshmallow was also packing a crazy new search feature called "Google Now on Tap," user controlled app permissions, a new data backup system, and plenty of other refinements.
+
+#### The new Google App
+
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/32-1-150x150.jpg) 
+    ][3]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/app-drawer-150x150.jpg) 
+    ][4]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/2015-10-01-19.01.201-150x150.png) 
+    ][5]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/Untitled-3-150x150.gif) 
+    ][6]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/google-now-home-150x150.jpg) 
+    ][7]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/typing-150x150.jpg) 
+    ][8]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/serp-150x150.jpg) 
+    ][9]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/voice-150x150.jpg) 
+    ][10]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/icons-150x150.jpg) 
+    ][11]
+
+Marshmallow was the first version of Android after [Google's big logo redesign][40]. The OS was updated accordingly, mainly with a new Google app that added a colorful logo to the search widget, search page, and the app icon.
+
+Google reverted the app drawer from a paginated horizontal layout back to the single, vertically scrolling sheet. The earliest versions of Android all had vertically scrolling sheets until Google changed to a horizontal page system in Honeycomb. The scrolling single sheet made finding things in a large selection of apps much faster. A "quick scroll" feature, which let you drag on the scroll bar to bring up letter indexing, helped too. This new app drawer layout also carried over to the widget drawer. Given that the old system could easily grow to 15+ pages, this was a big improvement.
+
+The "suggested apps" bar at the top of Marshmallow's app drawer made finding apps faster, too.
+This bar changed from time to time and tried to surface the apps you needed when you needed them. It used an algorithm that took into account app usage, apps that are normally launched together, and time of day.
+
+#### Google Now on Tap—a feature that didn't quite work out
+
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/ontap-150x150.jpg) 
+    ][12]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/onta3p-150x150.jpg) 
+    ][13]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/now-on-tap-150x150.jpg) 
+    ][14]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/fail1-150x150.jpg) 
+    ][15]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/youtube-150x150.jpg) 
+    ][16]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/apps-150x150.jpg) 
+    ][17]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/fail2-150x150.jpg) 
+    ][18]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/hangouts-150x150.jpg) 
+    ][19]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/voice-context-150x150.jpg) 
+    ][20]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/wrongstephen-150x150.jpg) 
+    ][21]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/assist-api-980x576-150x150.jpg) 
+    ][22]
+
+One of Marshmallow's headline features was "Google Now on Tap." With Now on Tap, you could hold down the home button on any screen and Android would send the entire screen to Google for processing. Google would then try to figure out what the screen was about, and a special list of search results would pop up from the bottom of the screen.
+
+Results yielded by Now on Tap weren't the usual 10 blue links—though there was always a link to a Google Search. Now on Tap could also deep link into other apps using Google's App Indexing feature. The idea was you could call up Now on Tap for a YouTube music video and get a link to the Google Play or Amazon "buy" page. Now on Tapping (am I allowed to verb that?) a news article about an actor could link to his page inside the IMDb app.
+
+Rather than make this a proprietary feature, Google built a whole new "Assistant API" into Android. The user could pick an "Assist App" which would be granted scads of information upon long-pressing the home button. The Assist app would get all the text that was currently loaded by the app—not just what was immediately on screen—along with all the images and any special metadata the developer wanted to include. This API powered Google Now on Tap, and it also allowed third parties to make Now on Tap rivals if they wished.
+
+Google hyped Now on Tap during Marshmallow's initial presentation, but in practice, the feature wasn't very useful. Google Search is worthwhile because you're asking it an exact question—you type in whatever you want, and it scours the entire Internet looking for the answer or web page. Now on Tap made things infinitely harder because it didn't even know what question you were asking. You opened Now on Tap with a very specific intent, but you sent Google the very unspecific query of "everything on your screen." Google had to guess what your query was and then tried to deliver useful search results or actions based on that.
+
+Behind the scenes, Google was probably processing like crazy to brute-force out the result you wanted from an entire page of text and images. But more often than not, Now on Tap yielded what felt like a list of search results for every proper noun on the page. Sifting through the list of results for multiple queries was like being trapped in one of those Bing "[Search Overload][41]" commercials. The lack of any kind of query targeting made Now on Tap feel like you were asking Google to read your mind, and it never could. Google eventually patched in an "Assist" button to the text selection menu, giving Now on Tap some of the query targeting that it desperately needed.
+
+Calling Now on Tap anything other than a failure is hard. The shortcut to access Now on Tap—long pressing on the home button—basically made it a hidden, hard-to-discover feature that was easy to forget about. We speculate the feature had extremely low usage numbers. Even when users did discover Now on Tap, it failed to read your mind so often that, after a few attempts, most users probably gave up on it.
+
+With the launch of the Google Pixels in 2016, the company seemingly admitted defeat. It renamed Now on Tap "Screen Search" and demoted it in favor of the Google Assistant. The Assistant—Google's new voice command system—took over On Tap's home button gesture and related it to a second gesture once the voice system was activated. Google also seems to have learned from Now on Tap's poor discoverability. With the Assistant, Google added a set of animated colored dots to the home button that helped users discover and be reminded about the feature.
+
+#### Permissions
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/33-1-150x150.jpg) 
+    ][23]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/34-1-150x150.jpg) 
+    ][24]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/perm-150x150.jpg) 
+    ][25]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/denied-1-150x150.jpg) 
+    ][26]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/denied-2-150x150.jpg) 
+    ][27]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/apps-150x150.jpg) 
+    ][28]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/overlay-150x150.jpg) 
+    ][29]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/system-permisions-150x150.jpg) 
+    ][30]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/warning-150x150.jpg) 
+    ][31]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/Google_IO_2015_-_Android_M_Permissions_-_YouTube_-_Google_Chrome_2015-09-04_12-31-49-150x150.jpg) 
+    ][32]
+
+Android 6.0 finally introduced an app permissions system that gave users granular control over what data apps had access to.
+
+Apps no longer gave you a huge list of permissions at install. With Marshmallow, apps installed without asking for any permissions at all. When apps needed a permission—like access to your location, camera, microphone, or contact list—they asked at the exact time they needed it. During your usage of an app, an "Allow or Deny" dialog popped up anytime the app wanted a new permission. Some app setup flow tackled this by asking for a few key permissions at startup, and everything else popped up as the app needed it. This better communicated to the user what the permissions are for—this app needs camera access because you just tapped on the camera button.
+
+Besides the in-the-moment "Allow or Deny" dialogs, Marshmallow also added a permissions setting screen. This big list of checkboxes allowed data-conscious users to browse which apps have access to what permissions. They can browse not only by app, but also by permission. For instance, you could see every app that has access to the microphone.
+
+Google had been experimenting with app permissions for some time, and these screens were basically the rebirth of the hidden "[App Ops][42]" system that was accidentally introduced in Android 4.3 and quickly removed.
+
+While Google experimented in previous versions, the big difference with Marshmallow's permissions system was that it represented an orderly transition to a permission OS. Android 4.3's App Ops was never meant to be exposed to users, so developers didn't know about it. The result of denying an app a permission in 4.3 was often a weird error message or an outright crash. Marshmallow's system was opt-in for developers—the new permission system only applied to apps that were targeting the Marshmallow SDK, which Google used as a signal that the developer was ready for permission handling. The system also allowed for communication to users when a feature didn't work because of a denied permission. Apps were told when they were denied a permission, and they could instruct the user to turn the permission back on if you wanted to use a feature.
+
+#### The Fingerprint API
+
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/finger1-150x150.jpg) 
+    ][33]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/fingerlock-150x150.jpg) 
+    ][34]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/2015-10-16-17.19.36-150x150.png) 
+    ][35]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/fingerprintplaystore-150x150.jpg) 
+    ][36]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/confirm-150x150.jpg) 
+    ][37]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/2015-09-04_16-38-31-150x150.png) 
+    ][38]
+
+Before Marshmallow, few OEMs had come up with their own fingerprint solution in response to [Apple's Touch ID][43]. But with Marshmallow, Google finally came up with an ecosystem-wide API for fingerprint recognition. The new system included UI for registering fingerprints, a fingerprint-guarded lock screen, and APIs that allowed apps to protect content behind a fingerprint scan or lock-screen challenge.
+
+The Play Store was one of the first apps to support the API. Instead of having to enter your password to purchase an app, you could just use your fingerprint. The Nexus 5X and 6P were the first phones to support the fingerprint API with an actual hardware fingerprint reader on the back.
+
+Later the fingerprint API became one of the rare examples of the Android ecosystem actually cooperating and working together. Every phone with a fingerprint reader uses Google's API, and most banking and purchasing apps are pretty good about supporting it.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/
+
+作者：[RON AMADEO][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://arstechnica.com/author/ronamadeo
+[1]:https://www.youtube.com/watch?v=f17qe9vZ8RM
+[2]:https://www.youtube.com/watch?v=VOn7VrTRlA4&list=PLOU2XLYxmsIJDPXCTt5TLDu67271PruEk&index=11
+[3]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[4]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[5]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[6]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[7]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[8]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[9]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[10]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[11]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[12]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[13]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[14]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[15]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[16]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[17]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[18]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[19]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[20]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[21]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[22]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[23]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[24]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[25]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[26]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[27]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[28]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[29]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[30]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[31]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[32]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[33]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[34]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[35]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[36]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[37]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[38]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/31/#
+[39]:http://arstechnica.com/gadgets/2015/10/nexus-5x-and-nexus-6p-review-the-true-flagships-of-the-android-ecosystem/
+[40]:http://arstechnica.com/gadgets/2015/09/google-gets-a-new-logo/
+[41]:https://www.youtube.com/watch?v=9yfMVbaehOE
+[42]:http://www.androidpolice.com/2013/07/25/app-ops-android-4-3s-hidden-app-permission-manager-control-permissions-for-individual-apps/
+[43]:http://arstechnica.com/apple/2014/09/ios-8-thoroughly-reviewed/10/#h3
diff --git a/sources/talk/The history of Android/32 The (updated) history of Android.md b/sources/talk/The history of Android/32 The (updated) history of Android.md
new file mode 100644
index 0000000000..31d79144ee
--- /dev/null
+++ b/sources/talk/The history of Android/32 The (updated) history of Android.md	
@@ -0,0 +1,171 @@
+# Behind-the-scenes changes
+
+Marshmallow expanded on the power-saving JobScheduler APIs that were originally introduced in Lollipop. JobScheduler turned app background processing from a free-for-all that frequently woke up the device to an organized system. JobScheduler was basically a background-processing traffic cop.
+
+In Marshmallow, Google added a "Doze" mode to save even more power when a device is left alone. If a device was stationary, unplugged, and had its screen off, it would slowly drift into a low-power, disconnected mode that locked down background processing. After a period of time, network access was disabled. Wake locks—an app's request to keep your phone awake so it can do background processing—got ignored. System Alarms (not user-set alarm clock alarms) and the [JobScheduler][25] shut down, too.
+
+If you've ever put a device in airplane mode and noticed the battery lasts forever, Doze was like an automatic airplane mode that kicked in when you left your device alone—it really did boost battery life. It worked for phones that were left alone on a desk all day or all night, and it was great for tablets, which are often forgotten about on the coffee table.
+
+The only notification that could punch through Doze mode was a "high priority message" from Google Cloud Messaging. This was meant for texting services so, even if a device is dozing, messages still came through.
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/inactive-apps-150x150.jpg) 
+    ][1]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/battery-optimizations-150x150.jpg) 
+    ][2]
+
+"App Standby" was another power saving feature that more-or-less worked quietly in the background. The idea behind it was simple: if you stopped interacting with an app for a period of time, Android deemed it unimportant and took away its internet access and background processing privileges.
+
+For the purposes of App Standby, "interacting" with an app meant opening the app, starting a foreground service, or generating a notification. Any one of these actions would reset the Standby timer on an app. For every other edge case, Google added a cryptically-named "Battery Optimizations" screen in the settings. This let users whitelist apps to make them immune from app standby. As for developers, they had an option in Developer Settings called "Inactive apps" which let them manually put an app on standby for testing.
+
+App Standby basically auto-disabled apps you weren't using, which was a great way to fight battery drain from crapware or forgotten-about apps. Because it was completely silent and automatically happened in the background, it helped even novice users have a well-tuned device.
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/autobackup-150x150.jpg) 
+    ][3]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/backup2-150x150.jpg) 
+    ][4]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/BACKUP1-150x150.jpg) 
+    ][5]
+
+Google tried many app backup schemes over the years, and in Marshmallow it [took another swing][26]. Marshmallow's brute force app backup system aimed to dump the entire app data folder to the cloud. It was possible and technically worked, but app support for it was bad, even among Google apps. Setting up a new Android phone is still a huge hassle, with countless sign-ins and tutorial popups.
+
+In terms of interface, Marshmallow's backup system used the Google Drive app. In the settings of Google Drive, there's now a "Manage Backups" screen, which showed app data not only from the new system, but also every other app backup scheme Google has tried over the years.
+
+ ![Android's App Linking settings, basically a URL forwarding system for apps. ](https://cdn.arstechnica.net/wp-content/uploads/2016/10/app-linkingf-980x576-980x576.jpg) 
+
+
+Buried in the settings was a new "App linking" feature, which could "link" an app to a website. Before app linking, opening up a Google Maps URL on a fresh install usually popped up an "Open With" dialog box that wanted to know if it should open the URL in a browser or in the Google Maps app.
+
+This was a silly question, since of course you wanted to use the app instead of the website—that's why you had the app installed. App linking let website owners associate their app with their webpage. If users had the app installed, Android would suppress the "Open With" dialog and use that app instead. To activate app linking, developers just had to throw some JSON code on their website that Android would pick up.
+
+App linking was great for sites with an obvious app client, like Google Maps, Instagram, and Facebook. For sites with an API and multiple clients, like Twitter, the App Linking settings screen gave users control over the default app association for any URL. Out-of-the-box app linking covered 90 percent of use cases though, which cut down on the annoying pop ups on a new phone.
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/adopt1-150x150.jpg) 
+    ][6]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/setup-150x150.jpg) 
+    ][7]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/format1-150x150.jpg) 
+    ][8]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/move-data-150x150.jpg) 
+    ][9]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/downloads-150x150.jpg) 
+    ][10]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/removingisbad-150x150.jpg) 
+    ][11]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/explorer-150x150.jpg) 
+    ][12]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/sort-options-150x150.jpg) 
+    ][13]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/gridorlist-150x150.jpg) 
+    ][14]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/file-mange-150x150.jpg) 
+    ][15]
+
+Adoptable storage was one of Marshmallow's best features. It turned SD cards from a janky secondary storage pool into a perfect merged-storage solution. Slide in an SD card, format it, and you instantly had more storage in your device that you never had to think about again.
+
+Sliding in a SD card showed a setup notification, and users could choose to format the card as "portable" or "internal" storage. The "Internal" option was the new adoptable storage mode, and it paved over the card with an ext4 file system. The only downside? The card and the data were both "locked" to your phone. You couldn't pull the card out and plug it into anything without formatting it first. Google was going for a set-it-and-forget-it use case with internal storage.
+
+If you did yank the card out, Android did its best to deal with things. It popped up a message along the lines of "You'd better put that back or else!" along with an option to "forget" the card. Of course "forgetting" the card would result in all sorts of data loss, and it was not recommended.
+
+The sad part of adoptable storage is that devices that could actually use it didn't come for a long time. Neither Nexus device had an SD card, so for the review we rigged up a USB stick as our adoptable storage. OEMs initially resisted the feature, with [LG and Samsung][27] disabling it on their early 2016 flagships. Samsung stated that "We believe that our users want a microSD card to transfer files between their phone and other devices," which was not possible once the card was formatted to ext4.
+
+Google's implementation let users choose between portable and internal formatting options. But rather than give users that choice, OEMs completely took the internal storage feature away. Advanced users were unhappy about this, and of course the Android modding scene quickly re-enabled adoptable storage. On the Galaxy S7, modders actually defeated Samsung's SD card lockdown [a day before][28] the device was even officially released!
+
+#### Volume and Notifications
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/1-2-150x150.jpg) 
+    ][16]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-4-150x150.jpg) 
+    ][17]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/dnd1-150x150.jpg) 
+    ][18]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/2015-09-13-05.13.49-150x150.png) 
+    ][19]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/2015-09-08-19.58.51-150x150.png) 
+    ][20]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/dnd11-150x150.jpg) 
+    ][21]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/dnd4-150x150.jpg) 
+    ][22]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/3-3-150x150.jpg) 
+    ][23]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/2015-09-08-19.23.13-150x150.png) 
+    ][24]
+
+Google walked back the priority notification controls that were in the volume popup in favor of a simpler design. Hitting the volume key popped up a single slider for the current audio source, along with a drop down button that expanded the controls to show all three audio sliders: Notifications, media, and alarms. All the priority notification controls still existed—they just lived in a "do not disturb" quick-settings tile now.
+
+One of the most relieving additions to the notification controls gave users control over Heads-Up notifications—now renamed "Peek" notifications. This feature let notifications pop up over the top portion of the screen, just like on iOS. The idea was that the most important notifications should be elevated over your normal, everyday notifications.
+
+However, in Lollipop, when this feature was introduced, Google had the terrible idea of letting developers decide if their apps were "important" or not. Of course, every developer thinks its app is the most important thing in the world. So while the feature was originally envisioned for instant messages from your closest contacts, it ended up being hijacked by Facebook "Like" notifications. In Marshmallow, every app got a "treat as priority" checkbox in the notification settings, which gave users an easy ban hammer for unruly apps.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/
+
+作者：[RON AMADEO][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://arstechnica.com/author/ronamadeo
+[1]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[2]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[3]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[4]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[5]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[6]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[7]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[8]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[9]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[10]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[11]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[12]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[13]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[14]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[15]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[16]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[17]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[18]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[19]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[20]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[21]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[22]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[23]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[24]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/32/#
+[25]:http://arstechnica.com/gadgets/2014/11/android-5-0-lollipop-thoroughly-reviewed/6/#h2
+[26]:http://arstechnica.com/gadgets/2015/10/android-6-0-marshmallow-thoroughly-reviewed/6/#h2
+[27]:http://arstechnica.com/gadgets/2016/02/the-lg-g5-and-galaxy-s7-wont-support-android-6-0s-adoptable-storage/
+[28]:http://www.androidpolice.com/2016/03/10/modaco-manages-to-get-adoptable-sd-card-storage-working-on-the-galaxy-s7-and-galaxy-s7-edge-no-root-required/
diff --git a/sources/talk/The history of Android/33 The (updated) history of Android.md b/sources/talk/The history of Android/33 The (updated) history of Android.md
new file mode 100644
index 0000000000..055c64405c
--- /dev/null
+++ b/sources/talk/The history of Android/33 The (updated) history of Android.md	
@@ -0,0 +1,185 @@
+# Monthly security updates
+
+[
+ ![Check out that new "Android security patch level" field. ](https://cdn.arstechnica.net/wp-content/uploads/2016/10/settings-5-980x957.jpg) 
+][31]
+
+
+A few months before the release of Marshmallow, [vulnerabilities][32] in Android's "Stagefright" media server were disclosed to the public, which could allow for remote code execution on older versions of Android. Android took a beating in the press, with [a billion phones][33] affected by the newly discovered bugs.
+
+Google responded by starting a monthly Android security update program. Every month it would round up bugs, fix them, and push out new code to AOSP and Nexus devices. OEMs—who were already struggling with updates (possibly due to apathy)—were basically told to "deal with it" and keep up. Every other major operating system has frequent security updates—it's just the cost of being such a huge platform. To accommodate OEMs, Google give them access to the updates a full month ahead of time. After 30 days, security bulletins are posted and Google devices get the updates.
+
+The monthly update program started two months before the release of Marshmallow, but in this major OS update Google added an "Android Security Patch Level" field to the About Phone screen. Rather than use some arcane version number, this was just a date. This let anyone easily see how out of date their phone was, an acted as a nice way to shame slow OEMs.
+
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/text-150x150.jpg) 
+    ][2]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/extra-150x150.jpg) 
+    ][3]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/translate-150x150.jpg) 
+    ][4]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/chromecustomtab-150x150.jpg) 
+    ][5]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/09/CCT_Large-2-150x150.gif) 
+    ][6]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-5-150x150.jpg) 
+    ][7]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-1-150x150.jpg) 
+    ][8]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings2-150x150.jpg) 
+    ][9]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-3-150x150.jpg) 
+    ][10]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/nearby-150x150.jpg) 
+    ][11]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-6-150x150.jpg) 
+    ][12]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-7-150x150.jpg) 
+    ][13]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-8-150x150.jpg) 
+    ][14]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/settings-9-150x150.jpg) 
+    ][15]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/2015-10-03-18.21.17-150x150.png) 
+    ][16]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/2015-10-04-05.32.23-150x150.png) 
+    ][17]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/10/easter-egg-150x150.jpg) 
+    ][18]
+
+The text selection menu is now a floating toolbar that pops up right next to the text you're selecting. This wasn't just the regular "cut/copy/paste" commands, either. Apps could put special options on the toolbar, like the "add link" option in Google Docs.
+
+After the standard text commands, an ellipsis button would expose a second menu, and it was here that apps could add extra features to the text selection menu. Using a new "text processing" API, it was now super easy to ship text directly to another app. If you had Google Translate installed, a "translate" option would show up in this menu. Eventually Google Search added an "Assist" option to this menu for Google Now on Tap.
+
+Marshmallow added a hidden settings section called the "System UI Tuner." This section would turn into a catch-all for power user features and experimental items. To access this you had to pull down the notification panel and hold down on the "settings" button for several seconds. The settings gear would spin, and eventually you'd see a message indicating that the System UI Tuner was unlocked. Once it was turned on, you could find it as the bottom of the system settings next to Developer Options.
+
+In this first version of the System UI Tuner, users would add custom tiles to the Quick Settings panel, a feature that would later be refined into an API apps could use. For now the feature was very rough, basically allowing users to type a custom command into a text box. System status icons could be individually turned on and off, so if you really hated knowing you were connected to Wi-Fi, you could kill the icon. A popular power user addition was the option for embedding a percentage readout into the battery icon. There was also a "demo" mode for screenshots, which would replace the normal status bar with a fake, clean version.
+
+### Android 7.0 Nougat, Pixel Phones, and the future
+
+[Android 7.0 Nougat][34] and [the Pixel Phones][35] came out just a few months ago, and you can read our full reviews for both of them. Both still have a ton of features and implications that we have not seen come to fruition yet, so we'll save a deep "history" dive for when they are actually "history." 
+
+
+
+### FURTHER READING
+
+[Android 7.0 Nougat review—Do more on your gigantic smartphone][25]
+
+Nougat made serious changes to the [graphics and sensor pipeline][36] for Daydream VR, Google's upcoming smartphone-powered VR experience [we tried][37] but have yet to log any serious time with. A new "Seamless update" feature borrowed an update mechanism from Chrome OS, which uses dual system partitions to quietly update one partition in the background while you're still using the other one. Considering the Pixel phones are the only devices to launch with this and haven't gotten an update yet, we're not sure what that looks like, either.
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/08/2016-08-17-18.21.22-150x150.png) 
+    ][19]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/08/2016-08-17-18.20.59-150x150.png) 
+    ][20]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/08/Android-N_1-150x150.jpg) 
+    ][21]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/03/2016-03-20-19.26.55-150x150.png) 
+    ][22]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/08/pip-active-150x150.png) 
+    ][23]
+
+One of the most interesting additions to Nougat is a revamp of the app framework to allow for resizable apps. This allowed Google to implement split screen on phones and tablets, picture-in-picture on Android TV, and a mysterious floating windowed mode. We've been able to access the floating window mode with some software trickery, but we've yet to see Google use it in an actual product. Is it being aimed at desktop computing?
+
+Android and Chrome OS also continue to grow together. Android apps [can run][38] on some Chromebooks now, giving the "Web-only" OS the Play Store and a serious app ecosystem. Rumors continue to swirl that the future of Chrome OS and Android will come even closer together, with the name "[Andromeda][39]"—a portmanteau of "Android" and "Chrome"—being tossed around as the codename for a merged Chrome/Android OS.
+
+
+
+We have yet to see how the historical legacy of the Pixel phones will shake out. Google dove into the hardware pool with the launch of two new smartphone flagships, the Pixel and Pixel XL, only recently. Google had produced co-branded Nexus phones with partners before, but the Pixel line is a "Google" branded product. The company claims it is a full hardware OEM now, using HTC as a contract manufacturer similarly to the way Apple uses Foxconn.
+
+
+
+### FURTHER READING
+
+[Google Pixel review: The best Android phone, even if it is a little pricey][26]</aside>
+
+With its own hardware comes a change in how Google makes software. The company created the "Google Assistant" as the future of the "OK Google" voice command system. But rather than ship it out to every Android device, the Assistant is an exclusive Pixel feature. Google made some changes to the interface, with a custom "Pixel launcher" home screen app and a new System UI, both of which are Pixel exclusives. We'll have to wait to see what the balance of future features are between "Android" and "Pixel" going forward.
+
+
+
+### FURTHER READING
+
+[Chatting with Google’s Hiroshi Lockheimer about Pixel, Android OEMs, and more][27]</aside>
+
+With these changes, we're probably at the most uncertain point in Android's history. But ahead of the platform's recent October 2016 event, [Hiroshi Lockheimer][40], SVP of Android, Chrome OS, and Google Play, said he believed we'll all look back fondly on these latest Android developments. Lockheimer is essentially the current king of software at Google, and he thought the newest updates could be the most significant Android happening since the OS debuted eight years earlier. While he wouldn't elaborate much on this sentiment after the unveilings, the fact remains that this time next year we _might_ not even be talking about Android—it could be an Android/Chrome OS hybrid! So as has always been the case since 2008, the next chapter in Android's history looks to be nothing if not interesting.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/
+
+作者：[RON AMADEO][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://arstechnica.com/author/ronamadeo
+[1]:http://android-developers.blogspot.com/2015/09/chrome-custom-tabs-smooth-transition.html
+[2]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[3]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[4]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[5]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[6]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[7]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[8]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[9]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[10]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[11]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[12]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[13]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[14]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[15]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[16]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[17]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[18]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[19]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[20]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[21]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[22]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[23]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/33/#
+[24]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/settings-5.jpg
+[25]:http://arstechnica.com/gadgets/2016/08/android-7-0-nougat-review-do-more-on-your-gigantic-smartphone/
+[26]:http://arstechnica.com/gadgets/2016/10/google-pixel-review-bland-pricey-but-still-best-android-phone/
+[27]:http://arstechnica.com/gadgets/2016/10/chatting-with-googles-hiroshi-lockheimer-about-pixel-android-oems-and-more/
+[28]:http://arstechnica.com/gadgets/2016/08/android-7-0-nougat-review-do-more-on-your-gigantic-smartphone/
+[29]:http://arstechnica.com/gadgets/2016/10/google-pixel-review-bland-pricey-but-still-best-android-phone/
+[30]:http://arstechnica.com/gadgets/2016/10/chatting-with-googles-hiroshi-lockheimer-about-pixel-android-oems-and-more/
+[31]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/settings-5.jpg
+[32]:http://arstechnica.com/security/2015/07/950-million-android-phones-can-be-hijacked-by-malicious-text-messages/
+[33]:http://arstechnica.com/security/2015/10/a-billion-android-phones-are-vulnerable-to-new-stagefright-bugs/
+[34]:http://arstechnica.com/gadgets/2016/08/android-7-0-nougat-review-do-more-on-your-gigantic-smartphone/
+[35]:http://arstechnica.com/gadgets/2016/10/google-pixel-review-bland-pricey-but-still-best-android-phone/
+[36]:http://arstechnica.com/gadgets/2016/08/android-7-0-nougat-review-do-more-on-your-gigantic-smartphone/11/#h1
+[37]:http://arstechnica.com/gadgets/2016/10/daydream-vr-hands-on-googles-dumb-vr-headset-is-actually-very-clever/
+[38]:http://arstechnica.com/gadgets/2016/05/if-you-want-to-run-android-apps-on-chromebooks-youll-need-a-newer-model/
+[39]:http://arstechnica.com/gadgets/2016/09/android-chrome-andromeda-merged-os-reportedly-coming-to-the-pixel-3/
+[40]:http://arstechnica.com/gadgets/2016/10/chatting-with-googles-hiroshi-lockheimer-about-pixel-android-oems-and-more/
diff --git a/sources/tech/20120301 The Beginner’s Guide to Start Using Vim - part 1.md b/sources/tech/20120301 The Beginner’s Guide to Start Using Vim - part 1.md
new file mode 100644
index 0000000000..49df69b394
--- /dev/null
+++ b/sources/tech/20120301 The Beginner’s Guide to Start Using Vim - part 1.md	
@@ -0,0 +1,123 @@
+The Beginner’s Guide to Start Using Vim
+============================================================
+ ![](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2012/03/vim-beginner-guide-featured.jpg "The Beginner's Guide to Start Using Vims") 
+
+
+This article is part of the [VIM User Guide][12] series:
+
+*   The Beginner’s Guide to Start Using Vim
+*   [Vim Keyboard Shortcuts Cheatsheet][3]
+*   [5 Vim Tips and Tricks for Experienced Users][4]
+*   [3 Useful VIM Editor Tips and Tricks for Advanced Users][5]
+
+Choosing a text editor is a very important decision for a programmer. This is partly because of the plethora of variables: graphical/non-graphical interfaces, different shortcuts, language specializations, plugins, customizations, etc. My advice is not to try to search for the best one. Instead, choose the one that corresponds best to your habits and your tasks. If you want to work in a group, it’s generally best to select the same editor as your co-worker. That way, if you have a problem, you will be able to find some help.
+
+It is exactly for that reason that I started using Vim a few years ago. Traditionally, Vim is placed in conflict with the legendary Emacs. I confess that I know very little about Emacs, but what you have to know about these two text editors is that they can both be fully customized, and very confusing at first. This tutorial will not explain everything about Vim but will try to give you the basics to use it correctly in the first place, and then present a few tips that will (I hope) allow you to learn on your own.
+
+Vim comes from “VI iMproved”. Vi is a non-graphical text editor widely distributed in Unix systems. It comes by default with Linux. Vim is an enhancement of this original editor. However, unlke Vi, Vim is not installed by default on every distribution.
+
+### Installation
+
+To install Vim on Ubuntu, use the command:
+
+```
+sudo apt-get install vim
+```
+
+If you are already interested in some plugins, use the command:
+
+```
+sudo apt-cache search vim
+```
+
+This will give you a long list of packages related to Vim. Among them are some for various programming languages, addon managers, etc.
+
+For this tutorial, I will be using the latest version of Vim (7.3.154) on Ubuntu. You can use any other version though.
+
+### Warming Up
+
+Type the command `vim` in a terminal. You should see a nice welcome screen.
+
+ ![vim-welcome](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2012/02/vim-welcome.jpg "vim-welcome") 
+
+And if you’ve never used Vi or Vim before, it is very likely that you don’t even know how to exit… Yes, it’s true. **None of the shortcuts you normally use will work in Vim**.
+
+First of all, to use any menu-type function like save or exit, your command should begin with a colon (:). Saving is `:w` and quitting is `:q`. If you want to quit a file without saving, use the force quit command `:q!`. A cool thing with Vim is that you don’t have to type commands separately. In other words, if you want to save and then quit, you can directly use `:wq`.
+
+So for now, quit Vim and open it on a sample text file. Simply add the name of the text file that you want to edit after the command:
+
+```
+vim [text file name]
+```
+
+ ![vim-file](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2012/02/vim-file.jpg "vim-file") 
+
+By default, when you open a text file, you are in visual mode. It is quite specific to Vim and confusing at the beginning. Vim is composed mainly of two modes: visual and editing. The visual mode is for viewing a text and using some commands. To go into editing mode, just press `i` to insert and `a` to add some text. To go back into the visual mode and access all the menu-type functions, press the “Escape” key. The difference between insertion and addition is simply whether you want the text you type to appear before or after the cursor in visual mode. To understand this fully, you should really try it yourself. My advice is: add at the end of lines, and insert in other cases.
+
+To move the cursor within a text, whether you are in visual or editing mode, you can generally use the keyboard arrows. A real purist would tell you to use the keys _h_ for left, _j_for down, _k_ for up, and _l_ for right.
+
+Now that you are warmed up and know how to control Vim at a basic level, let’s go to the core.
+
+### A few basic commands
+
+Now that you master the transformation from visual to editing mode, here are a few commands that you can use in visual mode:
+
+*   _x_: to delete a character
+*   _u_: to undo an action (the equivalent of Ctrl+z)
+*   _dd_: to delete a line
+*   _dw_: to delete a word
+*   _yy_: to copy a line
+*   _yw_: to copy a word
+*   _p_: to paste the previously deleted or copied line or word
+*   _e _: to move to the next word (faster than just moving with the arrow keys)
+*   _r_: to replace a letter (press _r_, then the new letter)
+
+And of course, there are more, but this is enough for now. If you master all of them, you will already be very fluent with Vim.
+
+As a side note for those who always want more, you can type a number before any of these commands and the command will be executed that number of times. For example, _5x_ will delete five characters in a row, while _3p_ will paste three times.
+
+### Advanced Commands
+
+Finally, as a bonus and an appetizer for your own research, here are a few advanced and very useful commands:
+
+*   _/searched_word _: to search for a word within the text
+*   _:sp name_of_a_text_file_: will split the screen in half horizontally, showing the new text file in the other half. To shift the focus from the right to the left window, use the shortcut Ctrl+w
+
+ ![vim-sp](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2012/02/vim-sp.jpg "vim-sp") 
+
+*   _:vsp name_of_a_text_file_: same as before, but splits the screen vertically
+*   Ctrl+Shift+C and Ctrl+Shift+V: to copy and paste text in a terminal
+*   _:! name_of_a_command_: to launch a command external to Vim, directly into your shell. For example, `:! ls` will display the files within the directory you are currently working in, without quitting the editor
+
+ ![vim-ls](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2012/02/vim-ls.jpg "vim-ls") 
+
+### Conclusion
+
+I think you now have every tool you need to start using Vim. You can go even further by installing the various plugins, editing the _.vimrc_ file, or even using the interactive tutor by typing the command _vimtutor_.
+
+If you have any other commands that you would like to share about Vim, please let us know in the comments.
+
+--------------------------------------------------------------------------------
+
+via: https://www.maketecheasier.com/start-with-vim-linux/
+
+作者：[Himanshu Arora][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.maketecheasier.com/author/himanshu/
+[1]:https://www.maketecheasier.com/author/adrienbrochard/
+[2]:https://www.maketecheasier.com/start-with-vim-linux/#comments
+[3]:https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/
+[4]:https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/
+[5]:https://www.maketecheasier.com/vim-tips-tricks-advanced-users/
+[6]:https://www.maketecheasier.com/category/linux-tips/
+[7]:http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.maketecheasier.com%2Fstart-with-vim-linux%2F
+[8]:http://twitter.com/share?url=https%3A%2F%2Fwww.maketecheasier.com%2Fstart-with-vim-linux%2F&text=The+Beginner%26%238217%3Bs+Guide+to+Start+Using+Vim
+[9]:mailto:?subject=The%20Beginner%E2%80%99s%20Guide%20to%20Start%20Using%20Vim&body=https%3A%2F%2Fwww.maketecheasier.com%2Fstart-with-vim-linux%2F
+[10]:https://www.maketecheasier.com/turn-dropbox-into-a-blogging-tool-with-scriptogram/
+[11]:https://www.maketecheasier.com/4-sms-back-up-applications-to-keep-your-messages-safe-android/
+[12]:https://www.maketecheasier.com/series/vim-user-guide/
+[13]:https://support.google.com/adsense/troubleshooter/1631343
diff --git a/sources/tech/20131227 Vim Keyboard Shortcuts Cheatsheet - part2.md b/sources/tech/20131227 Vim Keyboard Shortcuts Cheatsheet - part2.md
new file mode 100644
index 0000000000..e54a763e6a
--- /dev/null
+++ b/sources/tech/20131227 Vim Keyboard Shortcuts Cheatsheet - part2.md	
@@ -0,0 +1,216 @@
+Vim Keyboard Shortcuts Cheatsheet
+============================================================
+ ![](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2013/12/vim-shortcut-cheatsheet-featured.jpg "Vim Keyboard Shortcuts Cheatsheets") 
+
+This article is part of the [VIM User Guide][12] series:
+
+*   [The Beginner’s Guide to Start Using Vim][3]
+*   Vim Keyboard Shortcuts Cheatsheet
+*   [5 Vim Tips and Tricks for Experienced Users][4]
+*   [3 Useful VIM Editor Tips and Tricks for Advanced Users][5]
+
+The Vim editor is a command-line based tool that’s an enhanced version of the venerable vi editor. Despite the abundance of graphical rich text editors, familiarity with Vim will help every Linux user — from an experienced system administrator to a newbie Raspberry Pi user.
+
+
+The light-weight editor is a very powerful tool. In the hands of an experienced operator, it can do wonders. Besides regular text editing functions, the editor also supports advanced features such as find & replace based on regular expressions and encoding conversion as well as programming features such as syntax highlighting and code folding.
+
+One important thing to note when using Vim, is that the function of a key depends on the “mode” the editor is in. For example, pressing the alphabet “j” will move the cursor down one line in the “command mode”. You’ll have to switch to the “insert mode” to make the keys input the character they represent.
+
+Here’s a cheatsheet to help you get the most out of Vim.
+
+
+
+
+### Main
+
+| Shortcut Keys | Function |
+| --- | --- |
+| Escape key | Gets out of the current mode into the “command mode”. All keys are bound of commands. |
+| i | “Insert mode” for inserting text. Keys behave as expected. |
+| : | “Last-line mode” where Vim expects you to enter a command such as to save the document. |
+
+
+
+### Navigation keys
+
+| Shortcut Keys | Function |
+| --- | --- |
+| h | moves the cursor one character to the left. |
+| j or Ctrl + J | moves the cursor down one line. |
+| k or Ctrl + P | moves the cursor up one line. |
+| l | moves the cursor one character to the right. |
+| 0 | moves the cursor to the beginning of the line. |
+| $ | moves the cursor to the end of the line. |
+| ^ | moves the cursor to the first non-empty character of the line |
+| w | move forward one word (next alphanumeric word) |
+| W | move forward one word (delimited by a white space) |
+| 5w | move forward five words |
+| b | move backward one word (previous alphanumeric word) |
+| B | move backward one word (delimited by a white space) |
+| 5b | move backward five words |
+| G | move to the end of the file |
+| gg | move to the beginning of the file. |
+
+
+
+### Navigate around the document
+
+| Shortcut Keys | Function |
+| --- | --- |
+| ( | jumps to the previous sentence |
+| ) | jumps to the next sentence |
+| { | jumps to the previous paragraph |
+| } | jumps to the next paragraph |
+| [[ | jumps to the previous section |
+| ]] | jumps to the next section |
+| [] | jump to the end of the previous section |
+| ][ | jump to the end of the next section |
+
+
+
+### Insert text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| a | Insert text after the cursor |
+| A | Insert text at the end of the line |
+| i | Insert text before the cursor |
+| o | Begin a new line below the cursor |
+| O | Begin a new line above the cursor |
+
+
+
+### Special inserts
+
+| Shortcut Keys | Function |
+| --- | --- |
+| :r [filename] | Insert the file [filename] below the cursor |
+| :r ![command] | Execute [command] and insert its output below the cursor |
+
+
+
+### Delete text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| x | delete character at cursor |
+| dw | delete a word. |
+| d0 | delete to the beginning of a line. |
+| d$ | delete to the end of a line. |
+| d) | delete to the end of sentence. |
+| dgg | delete to the beginning of the file. |
+| dG | delete to the end of the file. |
+| dd | delete line |
+| 3dd | delete three lines |
+
+### Simple replace text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| r{text} | Replace the character under the cursor with {text} |
+| R | Replace characters instead of inserting them |
+
+### Copy/Paste text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| yy | copy current line into storage buffer |
+| ["x]yy | Copy the current lines into register x |
+| p | paste storage buffer after current line |
+| P | paste storage buffer before current line |
+| ["x]p | paste from register x after current line |
+| ["x]P | paste from register x before current line |
+
+### Undo/Redo operation
+
+| Shortcut Keys | Function |
+| --- | --- |
+| u | undo the last operation. |
+| Ctrl+r | redo the last undo. |
+
+### Search and Replace keys
+
+| Shortcut Keys | Function |
+| --- | --- |
+| /search_text | search document for search_text going forward |
+| ?search_text | search document for search_text going backward |
+| n | move to the next instance of the result from the search |
+| N | move to the previous instance of the result |
+| :%s/original/replacement | Search for the first occurrence of the string “original” and replace it with “replacement” |
+| :%s/original/replacement/g | Search and replace all occurrences of the string “original” with “replacement” |
+| :%s/original/replacement/gc | Search for all occurrences of the string “original” but ask for confirmation before replacing them with “replacement” |
+
+### Bookmarks
+
+| Shortcut Keys | Function |
+| --- | --- |
+| m {a-z A-Z} | Set bookmark {a-z A-Z} at the current cursor position |
+| :marks | List all bookmarks |
+| `{a-z A-Z} | Jumps to the bookmark {a-z A-Z} |
+
+
+### Select text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| v | Enter visual mode per character |
+| V | Enter visual mode per line |
+| Esc | Exit visual mode |
+
+
+### Modify selected text
+
+| Shortcut Keys | Function |
+| --- | --- |
+| ~ | Switch case |
+| d | delete a word. |
+| c | change |
+| y | yank |
+| > | shift right |
+| < | shift left |
+| ! | filter through an external command |
+
+
+### Save and quit
+
+| Shortcut Keys | Function |
+| --- | --- |
+| :q | Quits Vim but fails when file has been changed |
+| :w | Save the file |
+| :w new_name | Save the file with the new_name filename |
+| :wq | Save the file and quit Vim. |
+| :q! | Quit Vim without saving the changes to the file. |
+| ZZ | Write file, if modified, and quit Vim |
+| ZQ | Same as :q! Quits Vim without writing changes |
+
+### Download VIM Keyboard Shortcuts Cheatsheet
+
+Can’t get enough of this? We have prepared a downloadable cheat sheet for you so you can access to it when you need it.
+
+[Download it here!][14]
+
+--------------------------------------------------------------------------------
+
+via: https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/
+
+作者：[Himanshu Arora][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.maketecheasier.com/author/himanshu/
+[1]:https://www.maketecheasier.com/author/mayank/
+[2]:https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/#comments
+[3]:https://www.maketecheasier.com/start-with-vim-linux/
+[4]:https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/
+[5]:https://www.maketecheasier.com/vim-tips-tricks-advanced-users/
+[6]:https://www.maketecheasier.com/category/linux-tips/
+[7]:http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-keyboard-shortcuts-cheatsheet%2F
+[8]:http://twitter.com/share?url=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-keyboard-shortcuts-cheatsheet%2F&text=Vim+Keyboard+Shortcuts+Cheatsheet
+[9]:mailto:?subject=Vim%20Keyboard%20Shortcuts%20Cheatsheet&body=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-keyboard-shortcuts-cheatsheet%2F
+[10]:https://www.maketecheasier.com/locate-system-image-tool-in-windows-81/
+[11]:https://www.maketecheasier.com/create-system-image-in-windows8/
+[12]:https://www.maketecheasier.com/series/vim-user-guide/
+[13]:https://support.google.com/adsense/troubleshooter/1631343
+[14]:http://www.maketecheasier.com/cheatsheet/vim-keyboard-shortcuts-cheatsheet/
diff --git a/sources/tech/20140812 5 Vim Tips and Tricks for Experienced Users - part3.md b/sources/tech/20140812 5 Vim Tips and Tricks for Experienced Users - part3.md
new file mode 100644
index 0000000000..1fa0889b14
--- /dev/null
+++ b/sources/tech/20140812 5 Vim Tips and Tricks for Experienced Users - part3.md	
@@ -0,0 +1,130 @@
+5 Vim Tips and Tricks for Experienced Users
+============================================================
+ ![](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2014/08/vim-tips-tricks-featured.jpg "5 Vim Tips and Tricks for Experienced Userss") 
+
+This article is part of the [VIM User Guide][12] series:
+
+*   [The Beginner’s Guide to Start Using Vim][3]
+*   [Vim Keyboard Shortcuts Cheatsheet][4]
+*   5 Vim Tips and Tricks for Experienced Users
+*   [3 Useful VIM Editor Tips and Tricks for Advanced Users][5]
+
+The Vim editor offers so many features that it’s very difficult to learn all of them. While, of course, spending more and more time on the command line editor always helps, there is no denying the fact that you learn new and productive things faster while interacting with fellow Vim users. Here are some Vim tips and tricks for you.
+
+
+**Note** – To create the examples here, I used Vim version 7.4.52.
+
+### 1\. Working with multiple files
+
+If you are a software developer or someone who uses Vim as their primary editor, chances are that you have to work with multiple files simultaneously. Following are some useful tips that you can use while working with multiple files.
+
+Instead of opening different files in different shell tabs, you can open multiple files in a single tab by passing their filenames as arguments to the vim command. For example:
+
+```
+vim file1 file2 file3
+```
+
+The first file (file1 in the example) will be the current file and read into the buffer.
+
+Once inside the editor, use the `:next` or `:n` command to move to the next file, and the `:prev` or `:N` command to return to the previous one. To directly switch to the first or the last file, use `:bf` and `:bl` commands, respectively. To open and start editing another file, use the `:e` command with the filename as argument (use the complete path in case the file is not present in the current directory).
+
+At any point if it is required to list down currently opened files, use the `:ls` command. See the screen shot shown below.
+
+ ![vim-ls](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2014/08/vim-ls.png "vim-ls") 
+
+Note that “%a” represents the file in the current active window, while “#” represents the file in the previous active window.
+
+### 2\. Save time with auto complete
+
+Want to save time and improve accuracy? Use abbreviations. They come in handy while writing long, complex words that recur frequently throughout the file. The Vim command for abbreviations is `ab`. For example, after you run the command
+
+```
+:ab asap as soon as possible
+```
+
+each occurrence of the word “asap” will be automatically replaced by “as soon as possible”, as you type.
+
+Similarly, you can also use abbreviations to correct common typing mistakes. For example, the command
+
+```
+:ab recieve receive
+```
+
+will automatically correct the spelling mistake as you type. If you want to prevent the expansion/correction from happening at a particular occurrence, just type “Ctrl + V” after the last character of the word and then press the space bar key.
+
+If you want to save the abbreviation you’ve created so that it is available to you the next time you use the Vim editor, add the complete `ab` command (without the initial colon) to “/etc/vim/vimrc” file. To remove a particular abbreviation, you can use the `una`command. For example, `:una asap`.
+
+### 3\. Split windows to easily copy/paste
+
+There are times when you want to copy a piece of code or a portion of text from one file to another. While the process is easy when working with GUI editors, it gets a bit tedious and time-consuming while working with a command line editor. Fortunately, Vim provides a way to minimize the time and effort required to do this.
+
+Open one of the two files and then split the Vim window to open the other file. This can be done by using the `split` command with the file name as argument. For example,
+
+```
+:split test.c
+```
+
+will split the window and open “test.c”.
+
+ ![vim-split](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2014/08/vim-split.png "vim-split") 
+
+Observe that the command split the Vim window horizontally. In case you want to split the window vertically, you can do so using the `vsplit` command. Once both the files are opened, copy the stuff from one file, press “Ctrl + w” to switch the control to another file, and paste.
+
+### 4\. Save a file you edited without the required permissions
+
+There are times when you realize that a file is read-only only after making a bunch of changes to it.
+
+ ![vim-sudo](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2014/08/vim-sudo.png "vim-sudo") 
+
+Although closing the file and reopening it with the required permissions is a way out, it’s a sheer waste of time if you’ve already made a lot of changes, as all of them will be lost during the process. Vim provides you a way to handle this situation by allowing you to change the file permissions from within the editor before you save it. The command for this is:
+
+```
+:w !sudo tee %
+```
+
+The command will ask you for the password, just like `sudo` does on the command line, and will then save the changes.
+
+**A related tip**: To quickly access the command prompt while editing a file in Vim, run the `:sh` command from within the editor. This will place you in an interactive shell. Once you are done, run the `exit` command to quickly return to your Vim session.
+
+### 5\. Preserve indentation during copy/paste
+
+Most of the experienced programmers work on Vim with auto indentation enabled. Although it’s a time-saving practice, it creates a problem while pasting an already indented code. For example, this is what happened when I pasted an already indented code into a file opened in Vim editor with auto indent on.
+
+ ![vim-indentation](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2014/08/vim-indentation.png "vim-indentation") 
+
+The solution to this problem is the `pastetoggle` option. Add the line
+
+```
+set pastetoggle=<F2>
+```
+
+to your vimrc file, and press F2 in insert mode just before pasting the code. This should preserve the original indentation. Note that you can replace F2 with any other key if it’s already mapped to some other functionality.
+
+### Conclusion
+
+The only way you can further improve your Vim editor skills is by using the command line editor for your day-to-day work. Just note down the actions that take time and then try to find out if there is an editor command that will do the actions more quickly.
+
+--------------------------------------------------------------------------------
+
+via: https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/
+
+作者：[Himanshu Arora][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.maketecheasier.com/author/himanshu/
+[1]:https://www.maketecheasier.com/author/himanshu/
+[2]:https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/#comments
+[3]:https://www.maketecheasier.com/start-with-vim-linux/
+[4]:https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/
+[5]:https://www.maketecheasier.com/vim-tips-tricks-advanced-users/
+[6]:https://www.maketecheasier.com/category/linux-tips/
+[7]:http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-for-experienced-users%2F
+[8]:http://twitter.com/share?url=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-for-experienced-users%2F&text=5+Vim+Tips+and+Tricks+for+Experienced+Users
+[9]:mailto:?subject=5%20Vim%20Tips%20and%20Tricks%20for%20Experienced%20Users&body=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-for-experienced-users%2F
+[10]:https://www.maketecheasier.com/enable-two-step-verification-apple-icloud-account/
+[11]:https://www.maketecheasier.com/mistakes-wordpress-user-should-avoid/
+[12]:https://www.maketecheasier.com/series/vim-user-guide/
+[13]:https://support.google.com/adsense/troubleshooter/1631343
diff --git a/sources/tech/20151227 Installing Obtaining and Making GTK Themes.md b/sources/tech/20151227 Installing Obtaining and Making GTK Themes.md
new file mode 100644
index 0000000000..554e17602d
--- /dev/null
+++ b/sources/tech/20151227 Installing Obtaining and Making GTK Themes.md	
@@ -0,0 +1,409 @@
+Installing, Obtaining, and Making GTK Themes
+----------------
+
+Many Linux desktops supporting themes. A theme is a particular appearance or "****" for the GUI. Users can change the theme to make the desktop look different. Usually, users also change the icons. However, the theme and icon-pack are two separate entities. Numerous people want to make their own theme, so here is an article about making GTK themes as well as various essential information.
+
+**NOTE:** This article primarily focuses on GTK3, but it will discuss a little about GTK2, Metacity, and others. Cursors and icons will not be discussed in this article.
+
+**Basic Concepts**
+The GIMP ToolKit (GTK) is a widget-toolkit used to create GUIs on a variety of systems (thus making GTK cross-platform). GTK ([http://www.gtk.org/][17]) is commonly and incorrectly thought to stand for "GNOME ToolKit", but is actually stands for "GIMP ToolKit" because it was first created to design an user interface for GIMP. GTK is an object-oriented toolkit written in C (GTK itself is not a language). GTK is entirely open-source under the LGPL license. GTK is a widely used toolkit for GUIs and many tools are available for GTK.
+
+Themes made for GTK will not work in Qt-based applications. A Qt-theme is needed to apply a theme to Qt applications.
+
+The themes use Cascading Style-Sheets (CSS) to generate the theme's appearance. This is the same CSS that web-developers use on web-pages. However, instead of HTML tags being referenced, GTK widgets are specified. It is important that theme developers learn CSS.
+
+**Theme Location**
+Themes may be stored in "~/.themes" or "/usr/share/themes". Themes that are in "~/.themes" are only accessible to the owner of that home folder. While themes in "/usr/share/themes" are global-themes that are accessible by all users. When a GTK application executes, it has a list of possible theme files that it checks in a specific order. If the theme file is not found, then it will try the next file on the list. Below is the list in the order that GTK3 applications try to use.
+$XDG_CONFIG_HOME/gtk-3.0/gtk.css (typically ~/.config/gtk-3.0/gtk.css)
+~/.themes/NAME/gtk-3.0/gtk.css
+$datadir/share/themes/NAME/gtk-3.0/gtk.css (typically /usr/share/themes/name/gtk-3.0/gtk.css)
+
+**NOTE:** "NAME" is a placeholder for the name of the current theme.
+
+If there are two themes with the same name, then the one in the user's home folder (~/.themes) will be used. Developers can take advantage of GTK's theme-seeking algorithm by testing new themes in their local home's theme directory.
+
+**Theme Engines**
+A "Theme engine" is a piece of software that changes the look of the GUI's widgets. The engine reads and uses the theme's files to know how the various widgets should be drawn. Some engines come with themes of their own. Each engine has its advantages and disadvantages, and some engines add special properties and features.
+
+Many theme-engines can be obtained from the default repositories. Debian-based Linux distros can execute "apt-get install gtk2-engines-murrine gtk2-engines-pixbuf gtk3-engines-unico" to install three different engines. Many engines are available for both GTK2 and GTK3\. Below is a small list of examples.
+
+*   gtk2-engines-aurora - Aurora GTK2 engine
+*   gtk2-engines-pixbuf - Pixbuf GTK2 engine
+*   gtk3-engines-oxygen - Engine port of the Oxygen widget style to GTK
+*   gtk3-engines-unico - Unico GTK3 engine
+*   gtk3-engines-xfce - GTK3 engine for Xfce
+
+**Creating GTK3 Themes**
+To create a GTK3 theme, developers can start with an empty file or they can use a pre-existing theme as a template. It may help beginners to start with a pre-existing theme. For instance, a theme can be copied to the user's home folder and then the developer can start editing the files.
+
+The general format for a GTK3 theme is to create a folder named after the theme. Then, create a sub-directory called "gtk-3.0" and create a file inside of it named "gtk.css". In the "gtk.css" file, use CSS code to control how the theme will look. Move the theme to ~/.themes for testing purposes. Use the newly created theme and make changes as necessary. If desired, developers can add additional components to the theme for GTK2, Openbox, Metacity, Unity, etc.
+
+To explain how to create themes, we will study the "Ambiance" theme, which is usually found at /usr/share/themes/Ambiance. This directory contains the below listed sub-directories and a file named "index.theme".
+
+*   gtk-2.0
+*   gtk-3.0
+*   metacity-1
+*   unity
+
+"**index.theme**" contains metadata (such as the theme's name) and some important settings (such as the button layout). Below is the "index.theme" file for "Ambiance".
+
+Code:
+```
+[Desktop Entry]
+Type=X-GNOME-Metatheme
+Name=Ambiance
+Comment=Ubuntu Ambiance theme
+Encoding=UTF-8
+
+[X-GNOME-Metatheme]
+GtkTheme=Ambiance
+MetacityTheme=Ambiance
+IconTheme=ubuntu-mono-dark
+CursorTheme=DMZ-White
+ButtonLayout=close,minimize,maximize:
+X-Ubuntu-UseOverlayScrollbars=true
+```
+
+The "**gtk-2.0**" directory contains files for GTK2 such as a "gtkrc" file and an "apps" directory that contains application-specific GTK settings. The "gtkrc" file is the main CSS-file for the GTK2 portion of the theme. Below are the contents of /usr/share/themes/Ambiance/gtk-2.0/apps/nautilus.rc
+
+Code:
+```
+# ==============================================================================
+# NAUTILUS SPECIFIC SETTINGS
+# ==============================================================================
+
+style "nautilus_info_pane" {
+   bg[NORMAL] = @bg_color
+}
+
+widget_class "*Nautilus*<GtkNotebook>*<GtkEventBox>" style "nautilus_info_pane"
+widget_class "*Nautilus*<GtkButton>" style "notebook_button"
+widget_class "*Nautilus*<GtkButton>*<GtkLabel>" style "notebook_button"
+```
+
+The "**gtk-3.0**" directory contains files for GTK3\. Instead of "gtkrc", GTK3 uses "gtk.css" as the main theme file. In the Ambiance theme, the file contains one line - '@import url("gtk-main.css");'. The "settings.ini" file contains important theme-wide settings. GTK3 themes use an "apps" directory for the same purpose as GTK2\. The "assets" directory contains images for radio buttons, check-boxes, etc. Below are the contents of /usr/share/themes/Ambiance/gtk-3.0/gtk-main.css
+
+Code:
+```
+/*default color scheme */
+@define-color bg_color #f2f1f0;
+@define-color fg_color #4c4c4c;
+@define-color base_color #ffffff;
+@define-color text_color #3C3C3C;
+@define-color selected_bg_color #f07746;
+@define-color selected_fg_color #ffffff;
+@define-color tooltip_bg_color #000000;
+@define-color tooltip_fg_color #ffffff;
+
+/* misc colors used by gtk+
+ *
+ * Gtk doesn't currently expand color variables for style properties. Thus,
+ * gtk-widgets.css uses literal color names, but includes a comment containing
+ * the name of the variable. Please remember to change values there as well
+ * when changing one of the variables below.
+ */
+@define-color info_fg_color rgb (181, 171, 156);
+@define-color info_bg_color rgb (252, 252, 189);
+@define-color warning_fg_color rgb (173, 120, 41);
+@define-color warning_bg_color rgb (250, 173, 61);
+@define-color question_fg_color rgb (97, 122, 214);
+@define-color question_bg_color rgb (138, 173, 212);
+@define-color error_fg_color rgb (235, 235, 235);
+@define-color error_bg_color rgb (223, 56, 44);
+@define-color link_color @selected_bg_color;
+@define-color success_color #4e9a06;
+@define-color error_color #df382c;
+
+/* theme common colors */
+@define-color button_bg_color shade (@bg_color, 1.02); /*shade (#cdcdcd, 1.08);*/
+@define-color notebook_button_bg_color shade (@bg_color, 1.02);
+@define-color button_insensitive_bg_color mix (@button_bg_color, @bg_color, 0.6);
+@define-color dark_bg_color #3c3b37;
+@define-color dark_fg_color #dfdbd2;
+
+@define-color backdrop_fg_color mix (@bg_color, @fg_color, 0.8);
+@define-color backdrop_text_color mix (@base_color, @text_color, 0.8);
+@define-color backdrop_dark_fg_color mix (@dark_bg_color, @dark_fg_color, 0.75);
+/*@define-color backdrop_dark_bg_color mix (@dark_bg_color, @dark_fg_color, 0.75);*/
+@define-color backdrop_selected_bg_color shade (@bg_color, 0.92);
+@define-color backdrop_selected_fg_color @fg_color;
+
+@define-color focus_color alpha (@selected_bg_color, 0.5);
+@define-color focus_bg_color alpha (@selected_bg_color, 0.1);
+
+@define-color shadow_color alpha(black, 0.5);
+
+@define-color osd_fg_color #eeeeec;
+@define-color osd_bg_color alpha(#202526, 0.7);
+@define-color osd_border_color alpha(black, 0.7);
+
+@import url("gtk-widgets-borders.css");
+@import url("gtk-widgets-assets.css");
+@import url("gtk-widgets.css");
+@import url("apps/geary.css");
+@import url("apps/unity.css");
+@import url("apps/baobab.css");
+@import url("apps/gedit.css");
+@import url("apps/nautilus.css");
+@import url("apps/gnome-panel.css");
+@import url("apps/gnome-terminal.css");
+@import url("apps/gnome-system-log.css");
+@import url("apps/unity-greeter.css");
+@import url("apps/glade.css");
+@import url("apps/california.css");
+@import url("apps/software-center.css");
+@import url("public-colors.css");
+```
+
+The "**metacity-1**" folder contains images that the Metacity window-manager uses for buttons (such as the "close window" button). This directory also contains a file named "metacity-theme-1.xml" that contain's the theme's metadata (like the developer's name) and styling. However, the Metacity portion of the theme uses XML rather than CSS.
+
+The "**unity**" directory contains SVG files that Unity uses for buttons. Besides the SVG files, there are no other files in this folder.
+
+Some themes may contain other directories. For instance, "Clearlooks-Phenix" has a folder named "**openbox-3**" and "**xfwm4**". The "openbox-3" folder only contains a "themerc" file that declares the settings and appearance (a sample is seen below). The "xfwm4" directory contains *.xpm files, *.png images (in the "png" folder), a "README" file, and a "themerc" file which contains settings (as seen below).
+/usr/share/themes/Clearlooks-Phenix/xfwm4/themerc
+
+Code:
+```
+# Clearlooks XFWM4 by Casey Kirsle
+
+show_app_icon=true
+active_text_color=#FFFFFF
+inactive_text_color=#939393
+title_shadow_active=frame
+title_shadow_inactive=false
+button_layout=O|HMC
+button_offset=2
+button_spacing=2
+full_width_title=true
+maximized_offset=0
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
+```
+
+/usr/share/themes/Clearlooks-Phenix/openbox-3/themerc
+
+Code:
+```
+!# Clearlooks-Evolving
+!# Clearlooks as it evolves in gnome-git...
+!# Last updated 09/03/10
+
+# Fonts
+# these are really halos, but who cares?
+
+*.font: shadow=n
+window.active.label.text.font:shadow=y:shadowtint=30:shadowoffset=1
+window.inactive.label.text.font:shadow=y:shadowtint=00:shadowoffset=0
+menu.items.font:shadow=y:shadowtint=0:shadowoffset=1
+
+!# general stuff
+
+border.width: 1
+padding.width: 3
+padding.height: 2
+window.handle.width: 3
+window.client.padding.width: 0
+menu.overlap: 2
+*.justify: center
+
+!# lets set our damn shadows here, eh?
+
+*.bg.highlight: 50
+*.bg.shadow:  05
+
+window.active.title.bg.highlight: 35
+window.active.title.bg.shadow:  05
+
+window.inactive.title.bg.highlight: 30
+window.inactive.title.bg.shadow:  05
+
+window.*.grip.bg.highlight: 50
+window.*.grip.bg.shadow:  30
+
+window.*.handle.bg.highlight: 50
+window.*.handle.bg.shadow:  30
+
+!# Menu settings
+
+menu.border.color: #aaaaaa
+menu.border.width: 1
+
+menu.title.bg: solid flat
+menu.title.bg.color: #E6E7E6
+menu.title.text.color: #111111
+
+menu.items.bg: Flat Solid
+menu.items.bg.color: #ffffff
+menu.items.text.color: #111111
+menu.items.disabled.text.color: #aaaaaa
+
+menu.items.active.bg: Flat Gradient splitvertical border
+
+menu.items.active.bg.color: #97b8e2
+menu.items.active.bg.color.splitTo: #a8c5e9
+
+menu.items.active.bg.colorTo: #91b3de
+menu.items.active.bg.colorTo.splitTo: #80a7d6
+menu.items.active.bg.border.color: #4b6e99
+menu.items.active.text.color: #ffffff
+
+menu.separator.width: 1
+menu.separator.padding.width: 0
+menu.separator.padding.height: 3
+menu.separator.color: #aaaaaa
+
+!# set handles here and only the once?
+
+window.*.handle.bg: Raised solid
+window.*.handle.bg.color: #eaebec
+
+window.*.grip.bg: Raised solid
+window.*.grip.bg.color: #eaebec
+
+!# Active
+
+window.*.border.color: #585a5d
+
+window.active.title.separator.color: #4e76a8
+
+*.title.bg: Raised Gradient splitvertical
+*.title.bg.color: #8CB0DC
+*.title.bg.color.splitTo: #99BAE3
+*.title.bg.colorTo: #86ABD9
+*.title.bg.colorTo.splitTo: #7AA1D1
+
+window.active.label.bg: Parentrelative
+window.active.label.text.color: #ffffff
+
+window.active.button.*.bg: Flat Gradient splitvertical Border
+
+window.active.button.*.bg.color: #92B4DF
+window.active.button.*.bg.color.splitTo: #B0CAEB
+window.active.button.*.bg.colorTo: #86ABD9
+window.active.button.*.bg.colorTo.splitTo: #769FD0
+
+window.active.button.*.bg.border.color: #49678B
+window.active.button.*.image.color: #F4F5F6
+
+window.active.button.hover.bg.color: #b5d3ef
+window.active.button.hover.bg.color.splitTo: #b5d3ef
+window.active.button.hover.bg.colorTo: #9cbae7
+window.active.button.hover.bg.colorTo.splitTo: #8caede
+window.active.button.hover.bg.border.color: #4A658C
+window.active.button.hover.image.color: #ffffff
+
+window.active.button.pressed.bg: Flat solid Border
+window.active.button.pressed.bg.color: #7aa1d2
+
+window.active.button.hover.bg.border.color: #4A658C
+
+!# inactive
+
+!#window.inactive.border.color: #7e8285
+window.inactive.title.separator.color: #96999d
+
+window.inactive.title.bg: Raised Gradient splitvertical
+window.inactive.title.bg.color: #E3E2E0
+window.inactive.title.bg.color.splitTo: #EBEAE9
+window.inactive.title.bg.colorTo: #DEDCDA
+window.inactive.title.bg.colorTo.splitTo: #D5D3D1
+
+window.inactive.label.bg: Parentrelative
+window.inactive.label.text.color: #70747d
+
+window.inactive.button.*.bg: Flat Gradient splitVertical Border
+window.inactive.button.*.bg.color: #ffffff
+window.inactive.button.*.bg.color.splitto: #ffffff
+window.inactive.button.*.bg.colorTo: #F9F8F8
+window.inactive.button.*.bg.colorTo.splitto: #E9E7E6
+window.inactive.button.*.bg.border.color: #928F8B
+window.inactive.button.*.image.color: #6D6C6C
+
+!# osd (pop ups and what not, dock?)
+
+osd.border.width: 1
+osd.border.color:  #aaaaaa
+
+osd.bg: flat border gradient splitvertical
+osd.bg.color: #F0EFEE
+osd.bg.color.splitto: #f5f5f4
+osd.bg.colorTo: #EAEBEC
+osd.bg.colorTo.splitto: #E7E5E4
+
+osd.bg.border.color: #ffffff
+
+osd.active.label.bg: parentrelative
+osd.active.label.bg.color: #efefef
+osd.active.label.bg.border.color: #9c9e9c
+osd.active.label.text.color: #444
+
+osd.inactive.label.bg: parentrelative
+osd.inactive.label.text.color: #70747d
+
+!# yeah whatever, this is fine anyhoo?
+osd.hilight.bg: flat vertical gradient
+osd.hilight.bg.color: #9ebde5
+osd.hilight.bg.colorTo: #749dcf
+osd.unhilight.bg: flat vertical gradient
+osd.unhilight.bg.color: #BABDB6
+osd.unhilight.bg.colorTo: #efefef
+```
+
+**Testing Themes**
+When creating themes, it may be helpful to test it and tweak the code to get the desired appearance. Such developers may want to use some type of "theme-previewer". Thankfully, some exist.
+
+*   GTK+ Change Theme - This program can change the GTK theme and allow developers to preview the theme. The program is composed of one window that contains many widgets, thus providing a complete preview for the theme. To install this program, type "apt-get install gtk-chtheme".
+*   GTK Theme Switch - This program allows users to easily change the user's theme. Be sure to have some applications open to view and test the theme. To install this program, type "apt-get install gtk-theme-switch" and type "gtk-theme-switch2" in a terminal to run it.
+*   LXappearance - This program can change themes, icons, and fonts.
+*   PyWF - This is a Python-based alternative to "The Widget Factory". PyWF can be obtained at [http://gtk-apps.org/content/show.php/PyTWF?content=102024][1]
+*   The Widget Factory - This is an old GTK-previewer. To install this program, type "apt-get install thewidgetfactory" and type "twf" in a terminal to run it.
+
+**Theme Downloads**
+
+*   Cinnamon - [http://gnome-look.org/index.php?xcontentmode=104][2]
+*   Compiz - [http://gnome-look.org/index.php?xcontentmode=102][3]
+*   GNOME Shell - [http://gnome-look.org/index.php?xcontentmode=191][4]
+*   GTK2 - [http://gnome-look.org/index.php?xcontentmode=100][5]
+*   GTK3 - [http://gnome-look.org/index.php?xcontentmode=167][6]
+*   KDE/Qt - [http://kde-look.org/index.php?xcontentmode=8x9x10x11x12x13x14x15x16][7]
+*   Linux Mint Themes - [http://linuxmint-art.org/index.php?xcontentmode=9x14x100][8]
+*   Metacity - [http://gnome-look.org/index.php?xcontentmode=101][9]
+*   Ubuntu Themes - [http://www.ubuntuthemes.org/][10]
+
+**Further Reading**
+
+*   Graphical User Interface (GUI) Reading Guide - [http://www.linux.org/threads/gui-reading-guide.6471/][11]
+*   GTK - [http://www.linux.org/threads/understanding-gtk.6291/][12]
+*   Introduction to Glade - [http://www.linux.org/threads/introduction-to-glade.7142/][13]
+*   Desktop Environment vs Window Managers - [http://www.linux.org/threads/desktop-environment-vs-window-managers.7802/][14]
+*   Official GTK+ 3 Reference Manual - [https://developer.gnome.org/gtk3/stable/][15]
+*   GtkCssProvider - [https://developer.gnome.org/gtk3/stable/GtkCssProvider.html][16]
+
+--------------------------------------------------------------------------------
+
+via: http://www.linux.org/threads/installing-obtaining-and-making-gtk-themes.8463/
+
+作者：[DevynCJohnson][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.linux.org/members/devyncjohnson.4843/
+[1]:http://gtk-apps.org/content/show.php/PyTWF?content=102024
+[2]:http://gnome-look.org/index.php?xcontentmode=104
+[3]:http://gnome-look.org/index.php?xcontentmode=102
+[4]:http://gnome-look.org/index.php?xcontentmode=191
+[5]:http://gnome-look.org/index.php?xcontentmode=100
+[6]:http://gnome-look.org/index.php?xcontentmode=167
+[7]:http://kde-look.org/index.php?xcontentmode=8x9x10x11x12x13x14x15x16
+[8]:http://linuxmint-art.org/index.php?xcontentmode=9x14x100
+[9]:http://gnome-look.org/index.php?xcontentmode=101
+[10]:http://www.ubuntuthemes.org/
+[11]:http://www.linux.org/threads/gui-reading-guide.6471/
+[12]:http://www.linux.org/threads/understanding-gtk.6291/
+[13]:http://www.linux.org/threads/introduction-to-glade.7142/
+[14]:http://www.linux.org/threads/desktop-environment-vs-window-managers.7802/
+[15]:https://developer.gnome.org/gtk3/stable/
+[16]:https://developer.gnome.org/gtk3/stable/GtkCssProvider.html
+[17]:http://www.gtk.org/
diff --git a/sources/tech/20160325 Network automation with Ansible.md b/sources/tech/20160325 Network automation with Ansible.md
new file mode 100644
index 0000000000..0f543a3c18
--- /dev/null
+++ b/sources/tech/20160325 Network automation with Ansible.md	
@@ -0,0 +1,995 @@
+Network automation with Ansible
+================
+
+### Network Automation
+
+As the IT industry transforms with technologies from server virtualization to public and private clouds with self-service capabilities, containerized applications, and Platform as a Service (PaaS) offerings, one of the areas that continues to lag behind is the network.
+
+Over the past 5+ years, the network industry has seen many new trends emerge, many of which are categorized as software-defined networking (SDN).
+
+###### Note
+
+SDN is a new approach to building, managing, operating, and deploying networks. The original definition for SDN was that there needed to be a physical separation of the control plane from the data (packet forwarding) plane, and the decoupled control plane must control several devices.
+
+Nowadays, many more technologies get put under the _SDN umbrella_, including controller-based networks, APIs on network devices, network automation, whitebox switches, policy networking, Network Functions Virtualization (NFV), and the list goes on.
+
+For purposes of this report, we refer to SDN solutions as solutions that include a network controller as part of the solution, and improve manageability of the network but don’t necessarily decouple the control plane from the data plane.
+
+One of these trends is the emergence of application programming interfaces (APIs) on network devices as a way to manage and operate these devices and truly offer machine to machine communication. APIs simplify the development process when it comes to automation and building network applications, providing more structure on how data is modeled. For example, when API-enabled devices return data in JSON/XML, it is structured and easier to work with as compared to CLI-only devices that return raw text that then needs to be manually parsed.
+
+Prior to APIs, the two primary mechanisms used to configure and manage network devices were the command-line interface (CLI) and Simple Network Management Protocol (SNMP). If we look at each of those, the CLI was meant as a human interface to the device, and SNMP wasn’t built to be a real-time programmatic interface for network devices.
+
+Luckily, as many vendors scramble to add APIs to devices, sometimes _just because_ it’s a check in the box on an RFP, there is actually a great byproduct—enabling network automation. Once a true API is exposed, the process for accessing data within the device, as well as managing the configuration, is greatly simplified, but as we’ll review in this report, automation is also possible using more traditional methods, such as CLI/SNMP.
+
+###### Note
+
+As network refreshes happen in the months and years to come, vendor APIs should no doubt be tested and used as key decision-making criteria for purchasing network equipment (virtual and physical). Users should want to know how data is modeled by the equipment, what type of transport is used by the API, if the vendor offers any libraries or integrations to automation tools, and if open standards/protocols are being used.
+
+Generally speaking, network automation, like most types of automation, equates to doing things faster. While doing more faster is nice, reducing the time for deployments and configuration changes isn’t always a problem that needs solving for many IT organizations.
+
+Including speed, we’ll now take a look at a few of the reasons that IT organizations of all shapes and sizes should look at gradually adopting network automation. You should note that the same principles apply to other types of automation as well.
+
+
+### Simplified Architectures
+
+Today, every network is a unique snowflake, and network engineers take pride in solving transport and application issues with one-off network changes that ultimately make the network not only harder to maintain and manage, but also harder to automate.
+
+Instead of thinking about network automation and management as a secondary or tertiary project, it needs to be included from the beginning as new architectures and designs are deployed. Which features work across vendors? Which extensions work across platforms? What type of API or automation tooling works when using particular network device platforms? When these questions get answered earlier on in the design process, the resulting architecture becomes simpler, repeatable, and easier to maintain _and_ automate, all with fewer vendor proprietary extensions enabled throughout the network.
+
+### Deterministic Outcomes
+
+In an enterprise organization, change review meetings take place to review upcoming changes on the network, the impact they have on external systems, and rollback plans. In a world where a human is touching the CLI to make those _upcoming changes_, the impact of typing the wrong command is catastrophic. Imagine a team with three, four, five, or 50 engineers. Every engineer may have his own way of making that particular _upcoming change_. And the ability to use a CLI or a GUI does not eliminate or reduce the chance of error during the control window for the change.
+
+Using proven and tested network automation helps achieve more predictable behavior and gives the executive team a better chance at achieving deterministic outcomes, moving one step closer to having the assurance that the task is going to get done right the first time without human error.
+
+
+### Business Agility
+
+It goes without saying that network automation offers speed and agility not only for deploying changes, but also for retrieving data from network devices as fast as the business demands. Since the advent of server virtualization, server and virtualization admins have had the ability to deploy new applications almost instantaneously. And the faster applications are deployed, the more questions are raised as to why it takes so long to configure a VLAN, route, FW ACL, or load-balancing policy.
+
+By understanding the most common workflows within an organization and _why_ network changes are really required, the process to deploy modern automation tooling such as Ansible becomes much simpler.
+
+This chapter introduced some of the high-level points on why you should consider network automation. In the next section, we take a look at what Ansible is and continue to dive into different types of network automation that are relevant to IT organizations of all sizes.
+
+
+### What Is Ansible?
+
+Ansible is one of the newer IT automation and configuration management platforms that exists in the open source world. It’s often compared to other tools such as Puppet, Chef, and SaltStack. Ansible emerged on the scene in 2012 as an open source project created by Michael DeHaan, who also created Cobbler and cocreated Func, both of which are very popular in the open source community. Less than 18 months after the Ansible open source project started, Ansible Inc. was formed and received $6 million in Series A funding. It became and is still the number one contributor to and supporter of the Ansible open source project. In October 2015, Red Hat acquired Ansible Inc.
+
+But, what exactly is Ansible?
+
+_Ansible is a super-simple automation platform that is agentless and extensible._
+
+Let’s dive into this statement in a bit more detail and look at the attributes of Ansible that have helped it gain a significant amount of traction within the industry.
+
+
+### Simple
+
+One of the most attractive attributes of Ansible is that you _DO NOT_ need any special coding skills in order to get started. All instructions, or tasks to be automated, are documented in a standard, human-readable data format that anyone can understand. It is not uncommon to have Ansible installed and automating tasks in under 30 minutes!
+
+For example, the following task from an Ansible playbook is used to ensure a VLAN exists on a Cisco Nexus switch:
+
+```
+- nxos_vlan: vlan_id=100 name=web_vlan
+```
+
+You can tell by looking at this almost exactly what it’s going to do without understanding or writing any code!
+
+###### Note
+
+The second half of this report covers the Ansible terminology (playbooks, plays, tasks, modules, etc.) in great detail. However, we have included a few brief examples in the meantime to convey key concepts when using Ansible for network automation.
+
+### Agentless
+
+If you look at other tools on the market, such as Puppet and Chef, you’ll learn that, by default, they require that each device you are automating have specialized software installed. This is _NOT_ the case with Ansible, and this is the major reason why Ansible is a great choice for networking automation.
+
+It’s well understood that IT automation tools, including Puppet, Chef, CFEngine, SaltStack, and Ansible, were initially built to manage and automate the configuration of Linux hosts to increase the pace at which applications are deployed. Because Linux systems were being automated, getting agents installed was never a technical hurdle to overcome. If anything, it just delayed the setup, since now _N_ number of hosts (the hosts you want to automate) needed to have software deployed on them.
+
+On top of that, when agents are used, there is additional complexity required for DNS and NTP configuration. These are services that most environments do have already, but when you need to get something up fairly quick or simply want to see what it can do from a test perspective, it could significantly delay the overall setup and installation process.
+
+Since this report is meant to cover Ansible for network automation, it’s worth pointing out that having Ansible as an agentless platform is even more compelling to network admins than to sysadmins. Why is this?
+
+It’s more compelling for network admins because as mentioned, Linux operating systems are open, and anything can be installed on them. For networking, this is definitely not the case, although it is gradually changing. If we take the most widely deployed network operating system, Cisco IOS, as just one example and ask the question, _"Can third-party software be installed on IOS based platforms?"_ it shouldn’t come as a surprise that the answer is _NO_.
+
+For the last 20+ years, nearly all network operating systems have been closed and vertically integrated with the underlying network hardware. Because it’s not so easy to load an agent on a network device (router, switch, load balancer, firewall, etc.) without vendor support, having an automation platform like Ansible that was built from the ground up to be agentless and extensible is just what the doctor ordered for the network industry. We can finally start eliminating manual interactions with the network with ease!
+
+### Extensible
+
+Ansible is also extremely extensible. As open source and code start to play a larger role in the network industry, having platforms that are extensible is a must. This means that if the vendor or community doesn’t provide a particular feature or function, the open source community, end user, customer, consultant, or anyone else can _extend_ Ansible to enable a given set of functionality. In the past, the network vendor or tool vendor was on the hook to provide the new plug-ins and integrations. Imagine using an automation platform like Ansible, and your network vendor of choice releases a new feature that you _really_ need automated. While the network vendor or Ansible could in theory release the new plug-in to automate that particular feature, the great thing is, anyone from your internal engineers to your value-added reseller (VARs) or consultant could now provide these integrations.
+
+It is a fact that Ansible is extremely extensible because as stated, Ansible was initially built to automate applications and systems. It is because of Ansible’s extensibility that Ansible integrations have been written for network vendors, including but not limited to Cisco, Arista, Juniper, F5, HP, A10, Cumulus, and Palo Alto Networks.
+
+
+### Why Ansible for Network Automation?
+
+We’ve taken a brief look at what Ansible is and also some of the benefits of network automation, but why should Ansible be used for network automation?
+
+In full transparency, many of the reasons already stated are what make Ansible such as great platform for automating application deployments. However, we’ll take this a step further now, getting even more focused on networking, and continue to outline a few other key points to be aware of.
+
+
+### Agentless
+
+The importance of an agentless architecture cannot be stressed enough when it comes to network automation, especially as it pertains to automating existing devices. If we take a look at all devices currently installed at various parts of the network, from the DMZ and campus, to the branch and data center, the lion’s share of devices do _NOT_ have a modern device API. While having an API makes things so much simpler from an automation perspective, an agentless platform like Ansible makes it possible to automate and manage those _legacy_ _(traditional)_ devices, for example, _CLI-based devices_, making it a tool that can be used in any network environment.
+
+###### Note
+
+If CLI-only devices are integrated with Ansible, the mechanisms as to how the devices are accessed for read-only and read-write operations occur through protocols such as telnet, SSH, and SNMP.
+
+As standalone network devices like routers, switches, and firewalls continue to add support for APIs, SDN solutions are also emerging. The one common theme with SDN solutions is that they all offer a single point of integration and policy management, usually in the form of an SDN controller. This is true for solutions such as Cisco ACI, VMware NSX, Big Switch Big Cloud Fabric, and Juniper Contrail, as well as many of the other SDN offerings from companies such as Nuage, Plexxi, Plumgrid, Midokura, and Viptela. This even includes open source controllers such as OpenDaylight.
+
+These solutions all simplify the management of networks, as they allow an administrator to start to migrate from box-by-box management to network-wide, single-system management. While this is a great step in the right direction, these solutions still don’t eliminate the risks for human error during change windows. For example, rather than configure _N_ switches, you may need to configure a single GUI that could take just as long in order to make the required configuration change—it may even be more complex, because after all, who prefers a GUI _over_ a CLI! Additionally, you may possibly have different types of SDN solutions deployed per application, network, region, or data center.
+
+The need to automate networks, for configuration management, monitoring, and data collection, does not go away as the industry begins migrating to controller-based network architectures.
+
+As most software-defined networks are deployed with a controller, nearly all controllers expose a modern REST API. And because Ansible has an agentless architecture, it makes it extremely simple to automate not only legacy devices that may not have an API, but also software-defined networking solutions via REST APIs, all without requiring any additional software (agents) on the endpoints. The net result is being able to automate any type of device using Ansible with or without an API.
+
+
+### Free and Open Source Software (FOSS)
+
+Being that Ansible is open source with all code publicly accessible on GitHub, it is absolutely free to get started using Ansible. It can literally be installed and providing value to network engineers in minutes. Ansible, the open source project, or Ansible Inc., do not require any meetings with sales reps before they hand over software either. That is stating the obvious, since it’s true for all open source projects, but being that the use of open source, community-driven software within the network industry is fairly new and gradually increasing, we wanted to explicitly make this point.
+
+It is also worth stating that Ansible, Inc. is indeed a company and needs to make money somehow, right? While Ansible is open source, it also has an enterprise product called Ansible Tower that adds features such as role-based access control (RBAC), reporting, web UI, REST APIs, multi-tenancy, and much more, which is usually a nice fit for enterprises looking to deploy Ansible. And the best part is that even Ansible Tower is _FREE_ for up to 10 devices—so, at least you can get a taste of Tower to see if it can benefit your organization without spending a dime and sitting in countless sales meetings.
+
+
+### Extensible
+
+We stated earlier that Ansible was primarily built as an automation platform for deploying Linux applications, although it has expanded to Windows since the early days. The point is that the Ansible open source project did not have the goal of automating network infrastructure. The truth is that the more the Ansible community understood how flexible and extensible the underlying Ansible architecture was, the easier it became to _extend_ Ansible for their automation needs, which included networking. Over the past two years, there have been a number of Ansible integrations developed, many by industry independents such as Matt Oswalt, Jason Edelman, Kirk Byers, Elisa Jasinska, David Barroso, Michael Ben-Ami, Patrick Ogenstad, and Gabriele Gerbino, as well as by leading networking network vendors such as Arista, Juniper, Cumulus, Cisco, F5, and Palo Alto Networks.
+
+
+### Integrating into Existing DevOps Workflows
+
+Ansible is used for application deployments within IT organizations. It’s used by operations teams that need to manage the deployment, monitoring, and management of various types of applications. By integrating Ansible with the network infrastructure, it expands what is possible when new applications are turned up or migrated. Rather than have to wait for a new top of rack (TOR) switch to be turned up, a VLAN to be added, or interface speed/duplex to be checked, all of these network-centric tasks can be automated and integrated into existing workflows that already exist within the IT organization.
+
+
+### Idempotency
+
+The term _idempotency_ (pronounced item-potency) is used often in the world of software development, especially when working with REST APIs, as well as in the world of _DevOps_ automation and configuration management frameworks, including Ansible. One of Ansible’s beliefs is that all Ansible modules (integrations) should be idempotent. Okay, so what does it mean for a module to be idempotent? After all, this is a new term for most network engineers.
+
+The answer is simple. Being idempotent allows the defined task to run one time or a thousand times without having an adverse effect on the target system, only ever making the change once. In other words, if a change is required to get the system into its desired state, the change is made; and if the device is already in its desired state, no change is made. This is unlike most traditional custom scripts and the copy and pasting of CLI commands into a terminal window. When the same command or script is executed repeatedly on the same system, errors are (sometimes) raised. Ever paste a command set into a router and get some type of error that invalidates the rest of your configuration? Was that fun?
+
+Another example is if you have a text file or a script that configures 10 VLANs, the same commands are then entered 10 times _EVERY_ time the script is run. If an idempotent Ansible module is used, the existing configuration is gathered first from the network device, and each new VLAN being configured is checked against the current configuration. Only if the new VLAN needs to be added (or changed—VLAN name, as an example) is a change or command actually pushed to the device.
+
+As the technologies become more complex, the value of idempotency only increases because with idempotency, you shouldn’t care about the _existing_ state of the network device being modified, only the _desired_ state that you are trying to achieve from a network configuration and policy perspective.
+
+
+### Network-Wide and Ad Hoc Changes
+
+One of the problems solved with configuration management tools is configuration drift (when a device’s desired configuration gradually drifts, or changes, over time due to manual change and/or having multiple disparate tools being used in an environment)—in fact, this is where tools like Puppet and Chef got started. Agents _phone home_ to the head-end server, validate its configuration, and if a change is required, the change is made. The approach is simple enough. What if an outage occurs and you need to troubleshoot though? You usually bypass the management system, go direct to a device, find the fix, and quickly leave for the day, right? Sure enough, at the next time interval when the agent phones back home, the change made to fix the problem is overwritten (based on how the _master/head-end server_ is configured). One-off changes should always be limited in highly automated environments, but tools that still allow for them are greatly valuable. As you guessed, one of these tools is Ansible.
+
+Because Ansible is agentless, there is not a default push or pull to prevent configuration drift. The tasks to automate are defined in what is called an Ansible playbook. When using Ansible, it is up to the user to run the playbook. If the playbook is to be executed at a given time interval and you’re not using Ansible Tower, you will definitely know how often the tasks are run; if you are just using the native Ansible command line from a terminal prompt, the playbook is run once and only once.
+
+Running a playbook once by default is attractive for network engineers. It is added peace of mind that changes made manually on the device are not going to be automatically overwritten. Additionally, the scope of devices that a playbook is executed against is easily changed when needed such that even if a single change needs to automate only a single device, Ansible can still be used. The _scope_ of devices is determined by what is called an Ansible inventory file; the inventory could have one device or a thousand devices.
+
+The following shows a sample inventory file with two groups defined and a total of six network devices:
+
+```
+[core-switches]
+dc-core-1
+dc-core-2
+
+[leaf-switches]
+leaf1
+leaf2
+leaf3
+leaf4
+```
+
+To automate all hosts, a snippet from your play definition in a playbook looks like this:
+
+```
+hosts: all
+```
+
+And to automate just one leaf switch, it looks like this:
+
+```
+hosts: leaf1
+```
+
+And just the core switches:
+
+```
+hosts: core-switches
+```
+
+###### Note
+
+As stated previously, playbooks, plays, and inventories are covered in more detail later on this report.
+
+Being able to easily automate one device or _N_ devices makes Ansible a great choice for making those one-off changes when they are required. It’s also great for those changes that are network-wide: possibly for shutting down all interfaces of a given type, configuring interface descriptions, or adding VLANs to wiring closets across an enterprise campus network.
+
+### Network Task Automation with Ansible
+
+This report is gradually getting more technical in two areas. The first area is around the details and architecture of Ansible, and the second area is about exactly what types of tasks can be automated from a network perspective with Ansible. The latter is what we’ll take a look at in this chapter.
+
+Automation is commonly equated with speed, and considering that some network tasks don’t require speed, it’s easy to see why some IT teams don’t see the value in automation. VLAN configuration is a great example because you may be thinking, "How _fast_ does a VLAN really need to get created? Just how many VLANs are being added on a daily basis? Do _I_ really need automation?”
+
+In this section, we are going to focus on several other tasks where automation makes sense such as device provisioning, data collection, reporting, and compliance. But remember, as we stated earlier, automation is much more than speed and agility as it’s offering you, your team, and your business more predictable and more deterministic outcomes.
+
+### Device Provisioning
+
+One of the easiest and fastest ways to get started using Ansible for network automation is creating device configuration files that are used for initial device provisioning and pushing them to network devices.
+
+If we take this process and break it down into two steps, the first step is creating the configuration file, and the second is pushing the configuration onto the device.
+
+First, we need to decouple the _inputs_ from the underlying vendor proprietary syntax (CLI) of the config file. This means we’ll have separate files with values for the configuration parameters such as VLANs, domain information, interfaces, routing, and everything else, and then, of course, a configuration template file(s). For this example, this is our standard golden template that’s used for all devices getting deployed. Ansible helps bridge the gap between rendering the inputs and values with the configuration template. In less than a few seconds, Ansible can generate hundreds of configuration files predictably and reliably.
+
+Let’s take a quick look at an example of taking a current configuration and decomposing it into a template and separate variables (inputs) file.
+
+Here is an example of a configuration file snippet:
+
+```
+hostname leaf1
+ip domain-name ntc.com
+!
+vlan 10
+   name web
+!
+vlan 20
+   name app
+!
+vlan 30
+   name db
+!
+vlan 40
+   name test
+!
+vlan 50
+   name misc
+```
+
+If we extract the input values, this file is transformed into a template.
+
+###### Note
+
+Ansible uses the Python-based Jinja2 templating language, thus the template called _leaf.j2_ is a Jinja2 template.
+
+Note that in the following example the _double curly braces_ denote a variable.
+
+The resulting template looks like this and is given the filename _leaf.j2_:
+
+```
+!
+hostname {{ inventory_hostname }}
+ip domain-name {{ domain_name }}
+!
+!
+{% for vlan in vlans %}
+vlan {{ vlan.id }}
+  name {{ vlan.name }}
+{% endfor %}
+!
+```
+
+Since the double curly braces denote variables, and we see those values are not in the template, they need to be stored somewhere. They get stored in a variables file. A matching variables file for the previously shown template looks like this:
+
+```
+---
+hostname: leaf1
+domain_name: ntc.com
+vlans:
+  - { id: 10, name: web }
+  - { id: 20, name: app }
+  - { id: 30, name: db }
+  - { id: 40, name: test }
+  - { id: 50, name: misc }
+```
+
+This means if the team that controls VLANs wants to add a VLAN to the network devices, no problem. Have them change it in the variables file and regenerate a new config file using the Ansible module called `template`. This whole process is idempotent too; only if there is a change to the template or values being entered will a new configuration file be generated.
+
+Once the configuration is generated, it needs to be _pushed_ to the network device. One such method to push configuration files to network devices is using the open source Ansible module called `napalm_install_config`.
+
+The next example is a sample playbook to _build and push_ a configuration to network devices. Again, this playbook uses the `template` module to build the configuration files and the `napalm_install_config` to push them and activate them as the new running configurations on the devices.
+
+Even though every line isn’t reviewed in the example, you can still make out what is actually happening.
+
+###### Note
+
+The following playbook introduces new concepts such as the built-in variable `inventory_hostname`. These concepts are covered in [Ansible Terminology and Getting Started][1].
+
+```
+---
+
+  - name: BUILD AND PUSH NETWORK CONFIGURATION FILES
+    hosts: leaves
+    connection: local
+    gather_facts: no
+
+    tasks:
+      - name: BUILD CONFIGS
+      template:
+        src=templates/leaf.j2
+        dest=configs/{{inventory_hostname }}.conf
+
+      - name: PUSH CONFIGS
+        napalm_install_config:
+          hostname={{ inventory_hostname }}
+          username={{ un }}
+          password={{ pwd }}
+          dev_os={{ os }}
+          config_file=configs/{{ inventory_hostname }}.conf
+          commit_changes=1
+          replace_config=0
+```
+
+This two-step process is the simplest way to get started with network automation using Ansible. You simply template your configs, build config files, and push them to the network device—otherwise known as the _BUILD and PUSH_ method.
+
+###### Note
+
+Another example like this is reviewed in much more detail in [Ansible Network Integrations][2].
+
+
+### Data Collection and Monitoring
+
+Monitoring tools typically use SNMP—these tools poll certain management information bases (MIBs) and return data to the monitoring tool. Based on the data being returned, it may be more or less than you actually need. What if interface stats are being polled? You are likely getting back every counter that is displayed in a _show interface_ command. What if you only need _interface resets_ and wish to see these resets correlated to the interfaces that have CDP/LLDP neighbors on them? Of course, this is possible with current technology; it could be you are running multiple show commands and parsing the output manually, or you’re using an SNMP-based tool but going between tabs in the GUI trying to find the data you actually need. How does Ansible help with this?
+
+Being that Ansible is totally open and extensible, it’s possible to collect and monitor the exact counters or values needed. This may require some up-front custom work but is totally worth it in the end, because the data being gathered is what you need, not what the vendor is providing you. Ansible also provides intuitive ways to perform certain tasks conditionally, which means based on data being returned, you can perform subsequent tasks, which may be to collect more data or to make a configuration change.
+
+Network devices have _A LOT_ of static and ephemeral data buried inside, and Ansible helps extract the bits you need.
+
+You can even use Ansible modules that use SNMP behind the scenes, such as a module called `snmp_device_version`. This is another open source module that exists within the community:
+
+```
+  - name: GET SNMP DATA
+    snmp_device_version:
+      host=spine
+      community=public
+      version=2c
+```
+
+Running the preceding task returns great information about a device and adds some level of discovery capabilities to Ansible. For example, that task returns the following data:
+
+```
+{"ansible_facts": {"ansible_device_os": "nxos", "ansible_device_vendor": "cisco", "ansible_device_version": "7.0(3)I2(1)"}, "changed": false}
+```
+
+You can now determine what type of device something is without knowing up front. All you need to know is the read-only community string of the device.
+
+
+### Migrations
+
+Migrating from one platform to the next is never an easy task. This may be from the same vendor or from different vendors. Vendors may offer a script or a tool to help with migrations. Ansible can be used to build out configuration templates for all types of network devices and operating systems in such a way that you could generate a configuration file for all vendors given a defined and common set of inputs (common data model). Of course, if there are vendor proprietary extensions, they’ll need to be accounted for, too. Having this type of flexibility helps with not only migrations, but also disaster recovery (DR), as it’s very common to have different switch models in the production and DR data centers, maybe even different vendors.
+
+
+### Configuration Management
+
+As stated, configuration management is the most common type of automation. What Ansible allows you to do fairly easily is create _roles_ to streamline the consumption of task-based automation. From a high level, a role is a logical grouping of reusable tasks that are automated against a particular group of devices. Another way to think about roles is to think about workflows. First and foremost, workflows and processes need to be understood before automation is going to start adding value. It’s always important to start small and expand from there.
+
+For example, a set of tasks that automate the configuration of routers and switches is very common and is a great place to start. But where do the IP addresses come from that are configured on network devices? Maybe an IP address management solution? Once the IP addresses are allocated for a given function and deployed, does DNS need to be updated too? Do DHCP scopes need to be created?
+
+Can you see how the workflow can start small and gradually expand across different IT systems? As the workflow continues to expand, so would the role.
+
+
+### Compliance
+
+As with many forms of automation, making configuration changes with any type of automation tool is seen as a risk. While making manual changes could arguably be riskier, as you’ve read and may have experienced firsthand, Ansible has capabilities to automate data collection, monitoring, and configuration building, which are all "read-only" and "low risk" actions. One _low risk_ use case that can use the data being gathered is configuration compliance checks and configuration validation. Does the deployed configuration meet security requirements? Are the required networks configured? Is protocol XYZ disabled? Since each module, or integration, with Ansible returns data, it is quite simple to _assert_ that something is _TRUE_ or _FALSE_. And again, based on _it_ being _TRUE_ or _FALSE_, it’s up to you to determine what happens next—maybe it just gets logged, or maybe a complex operation is performed.
+
+### Reporting
+
+We now understand that Ansible can also be used to collect data and perform compliance checks. The data being returned and collected from the device by way of Ansible is up for grabs in terms of what you want to do with it. Maybe the data being returned becomes inputs to other tasks, or maybe you just want to create reports. Being that reports are generated from templates combined with the actual important data to be inserted into the template, the process to create and use reporting templates is the same process used to create configuration templates.
+
+From a reporting perspective, these templates may be flat text files, markdown files that are viewed on GitHub, HTML files that get dynamically placed on a web server, and the list goes on. The user has the power to create the exact type of report she wishes, inserting the exact data she needs to be part of that report.
+
+It is powerful to create reports not only for executive management, but also for the ops engineers, since there are usually different metrics both teams need.
+
+
+### How Ansible Works
+
+After looking at what Ansible can offer from a network automation perspective, we’ll now take a look at how Ansible works. You will learn about the overall communication flow from an Ansible control host to the nodes that are being automated. First, we review how Ansible works _out of the box_, and we then take a look at how Ansible, and more specifically Ansible _modules_, work when network devices are being automated.
+
+### Out of the Box
+
+By now, you should understand that Ansible is an automation platform. In fact, it is a lightweight automation platform that is installed on a single server or on every administrator’s laptop within an organization. You decide. Ansible is easily installed using utilities such as pip, apt, and yum on Linux-based machines.
+
+###### Note
+
+The machine that Ansible is installed on is referred to as the _control host_ through the remainder of this report.
+
+The control host will perform all automation tasks that are defined in an Ansible playbook (don’t worry; we’ll cover playbooks and other Ansible terms soon enough). The important piece for now is to understand that a playbook is simply a set of automation tasks and instructions that gets executed on a given number of hosts.
+
+When a playbook is created, you also need to define which hosts you want to automate. The mapping between the playbook and the hosts to automate happens by using what is known as an Ansible inventory file. This was already shown in an earlier example, but here is another sample inventory file showing two groups: `cisco`and `arista`:
+
+```
+[cisco]
+nyc1.acme.com
+nyc2.acme.com
+
+[arista]
+sfo1.acme.com
+sfo2.acme.com
+```
+
+###### Note
+
+You can also use IP addresses within the inventory file, instead of hostnames. For these examples, the hostnames were resolvable via DNS.
+
+As you can see, the Ansible inventory file is a text file that lists hosts and groups of hosts. You then reference a specific host or a group from within the playbook, thus dictating which hosts get automated for a given play and playbook. This is shown in the following two examples.
+
+The first example shows what it looks like if you wanted to automate all hosts within the `cisco` group, and the second example shows how to automate just the _nyc1.acme.com_ host:
+
+```
+---
+
+  - name: TEST PLAYBOOK
+    hosts: cisco
+
+    tasks:
+      - TASKS YOU WANT TO AUTOMATE
+```
+
+```
+---
+
+  - name: TEST PLAYBOOK
+    hosts: nyc1.acme.com
+
+    tasks:
+      - TASKS YOU WANT TO AUTOMATE
+```
+
+Now that the basics of inventory files are understood, we can take a look at how Ansible (the control host) communicates with devices _out of the box_ and how tasks are automated on Linux endpoints. This is an important concept to understand, as this is usually different when network devices are being automated.
+
+There are two main requirements for Ansible to work out of the box to automate Linux-based systems. These requirements are SSH and Python.
+
+First, the endpoints must support SSH for transport, since Ansible uses SSH to connect to each target node. Because Ansible supports a pluggable connection architecture, there are also various plug-ins available for different types of SSH implementations.
+
+The second requirement is how Ansible gets around the need to require an _agent_ to preexist on the target node. While Ansible does not require a software agent, it does require an onboard Python execution engine. This execution engine is used to execute Python code that is transmitted from the Ansible control host to the target node being automated.
+
+If we elaborate on this out of the box workflow, it is broken down as follows:
+
+1.  When an Ansible play is executed, the control host connects to the Linux-based target node using SSH.
+
+2.  For each task, that is, Ansible module being executed within the play, Python code is transmitted over SSH and executed directly on the remote system.
+
+3.  Each Ansible module upon execution on the remote system returns JSON data to the control host. This data includes information such as if the configuration changed, if the task passed/failed, and other module-specific data.
+
+4.  The JSON data returned back to Ansible can then be used to generate reports using templates or as inputs to subsequent modules.
+
+5.  Repeat step 3 for each task that exists within the play.
+
+6.  Repeat step 1 for each play within the playbook.
+
+Shouldn’t this mean that network devices should work out of the box with Ansible because they also support SSH? It is true that network devices do support SSH, but it is the first requirement combined with the second one that limits the functionality possible for network devices.
+
+To start, most network devices do not support Python, so it makes using the default Ansible connection mechanism process a non-starter. That said, over the past few years, vendors have added Python support on several different device platforms. However, most of these platforms still lack the integration needed to allow Ansible to get direct access to a Linux shell over SSH with the proper permissions to copy over the required code, create temp directories and files, and execute the code on box. While all the parts are there for Ansible to work natively with SSH/Python _and_ Linux-based network devices, it still requires network vendors to open their systems more than they already have.
+
+###### Note
+
+It is worth noting that Arista does offer native integration because it is able to drop SSH users directly into a Linux shell with access to a Python execution engine, which in turn does allow Ansible to use its default connection mechanism. Because we called out Arista, we need to also highlight Cumulus as working with Ansible’s default connection mechanism, too. This is because Cumulus Linux is native Linux, and there isn’t a need to use a vendor API for the automation of the Cumulus Linux OS.
+
+### Ansible Network Integrations
+
+The previous section covered the way Ansible works by default. We looked at how Ansible sets up a connection to a device at the beginning of a _play_, executes tasks by copying Python code to the devices, executes the code, and then returns results back to the Ansible control host.
+
+In this section, we’ll take a look at what this process is when automating network devices with Ansible. As already covered, Ansible has a pluggable connection architecture. For _most_ network integrations, the `connection` parameter is set to `local`. The most common place to make the connection type local is within the playbook, as shown in the following example:
+
+```
+---
+
+  - name: TEST PLAYBOOK
+    hosts: cisco
+    connection: local
+
+    tasks:
+      - TASKS YOU WANT TO AUTOMATE
+```
+
+Notice how within the play definition, this example added the `connection` parameter as compared to the examples in the previous section.
+
+This tells Ansible not to connect to the target device via SSH and to just connect to the local machine running the playbook. Basically, this delegates the connection responsibility to the actual Ansible modules being used within the _tasks_ section of the playbook. Delegating power for each type of module allows the modules to connect to the device in whatever fashion necessary; this could be NETCONF for Juniper and HP Comware7, eAPI for Arista, NX-API for Cisco Nexus, or even SNMP for traditional/legacy-based systems that don’t have a programmatic API.
+
+###### Note
+
+Network integrations in Ansible come in the form of Ansible modules. While we continue to whet your appetite using terminology such as playbooks, plays, tasks, and modules to convey key concepts, each of these terms are finally covered in greater detail in [Ansible Terminology and Getting Started][3] and [Hands-on Look at Using Ansible for Network Automation][4].
+
+Let’s take a look at another sample playbook:
+
+```
+---
+
+  - name: TEST PLAYBOOK
+    hosts: cisco
+    connection: local
+
+    tasks:
+      - nxos_vlan: vlan_id=10 name=WEB_VLAN
+```
+
+If you notice, this playbook now includes a task, and this task uses the `nxos_vlan` module. The `nxos_vlan` module is just a Python file, and it is in this file where the connection to the Cisco NX-OS device is made using NX-API. However, the connection could have been set up using any other device API, and this is how vendors and users like us are able to build our own integrations. Integrations (modules) are typically done on a per-feature basis, although as you’ve already seen with modules like `napalm_install_config`, they can be used to _push_ a full configuration file, too.
+
+One of the major differences is that with the default connection mechanism, Ansible launches a persistent SSH connection to the device, and this connection persists for a given play. When the connection setup and teardown occurs within the module, as with many network modules that use `connection=local`, Ansible is logging in/out of the device on _every_ task versus this happening on the play level.
+
+And in traditional Ansible fashion, each network module returns JSON data. The only difference is the massaging of this data is happening locally on the Ansible control host versus on the target node. The data returned back to the playbook varies per vendor and type of module, but as an example, many of the Cisco NX-OS modules return back existing state, proposed state, and end state, as well as the commands (if any) that are being sent to the device.
+
+As you get started using Ansible for network automation, it is important to remember that setting the connection parameter to local is taking Ansible out of the connection setup/teardown process and leaving that up to the module. This is why modules supported for different types of vendor platforms will have different ways of communicating with the devices.
+
+
+### Ansible Terminology and Getting Started
+
+This chapter walks through many of the terms and key concepts that have been gradually introduced already in this report. These are terms such as _inventory file_, _playbook_, _play_, _tasks_, and _modules_. We also review a few other concepts that are helpful to be aware of when getting started with Ansible for network automation.
+
+Please reference the following sample inventory file and playbook throughout this section, as they are continuously used in the examples that follow to convey what each Ansible term means.
+
+_Sample inventory_:
+
+```
+# sample inventory file
+# filename inventory
+
+[all:vars]
+user=admin
+pwd=admin
+
+[tor]
+rack1-tor1   vendor=nxos
+rack1-tor2   vendor=nxos
+rack2-tor1   vendor=arista
+rack2-tor2   vendor=arista
+
+[core]
+core1
+core2
+```
+
+_Sample playbook_:
+
+```
+---
+# sample playbook
+# filename site.yml
+
+  - name: PLAY 1 - Top of Rack (TOR) Switches
+    hosts: tor
+    connection: local
+
+    tasks:
+      - name: ENSURE VLAN 10 EXISTS ON CISCO TOR SWITCHES
+        nxos_vlan:
+          vlan_id=10
+          name=WEB_VLAN
+          host={{ inventory_hostname }}
+          username=admin
+          password=admin
+        when: vendor == "nxos"
+
+      - name: ENSURE VLAN 10 EXISTS ON ARISTA TOR SWITCHES
+        eos_vlan:
+          vlanid=10
+          name=WEB_VLAN
+          host={{ inventory_hostname }}
+          username={{ user }}
+          password={{ pwd }}
+        when: vendor == "arista"
+
+  - name: PLAY 2 - Core (TOR) Switches
+    hosts: core
+    connection: local
+
+    tasks:
+      - name: ENSURE VLANS EXIST IN CORE
+        nxos_vlan:
+          vlan_id={{ item }}
+          host={{ inventory_hostname }}
+          username={{ user }}
+          password={{ pwd }}
+        with_items:
+          - 10
+          - 20
+          - 30
+          - 40
+          - 50
+```
+
+### Inventory File
+
+Using an inventory file, such as the preceding one, enables us to automate tasks for specific hosts and groups of hosts by referencing the proper host/group using the `hosts` parameter that exists at the top section of each play.
+
+It is also possible to store variables within an inventory file. This is shown in the example. If the variable is on the same line as a host, it is a host-specific variable. If the variables are defined within brackets such as `[all:vars]`, it means that the variables are in scope for the group `all`, which is a default group that includes _all_ hosts in the inventory file.
+
+###### Note
+
+Inventory files are the quickest way to get started with Ansible, but should you already have a source of truth for network devices such as a network management tool or CMDB, it is possible to create and use a dynamic inventory script rather than a static inventory file.
+
+### Playbook
+
+The playbook is the top-level object that is executed to automate network devices. In our example, this is the file _site.yml_, as depicted in the preceding example. A playbook uses YAML to define the set of tasks to automate, and each playbook is comprised of one or more plays. This is analogous to a football playbook. Like in football, teams have playbooks made up of plays, and Ansible playbooks are made up of plays, too.
+
+###### Note
+
+YAML is a data format that is supported by all programming languages. YAML is itself a superset of JSON, and it’s quite easy to recognize YAML files, as they always start with three dashes (hyphens), `---`.
+
+
+### Play
+
+One or more plays can exist within an Ansible playbook. In the preceding example, there are two plays within the playbook. Each starts with a _header_ section where play-specific parameters are defined.
+
+The two plays from that example have the following parameters defined:
+
+`name`
+
+The text `PLAY 1 - Top of Rack (TOR) Switches` is arbitrary and is displayed when the playbook runs to improve readability during playbook execution and reporting. This is an optional parameter.
+
+`hosts`
+
+As covered previously, this is the host or group of hosts that are automated in this particular play. This is a required parameter.
+
+`connection`
+
+As covered previously, this is the type of connection mechanism used for the play. This is an optional parameter, but is commonly set to `local` for network automation plays.
+
+
+
+Each play is comprised of one or more tasks.
+
+
+
+### Tasks
+
+Tasks represent what is automated in a declarative manner without worrying about the underlying syntax or "how" the operation is performed.
+
+In our example, the first play has two tasks. Each task ensures VLAN 10 exists. The first task does this for Cisco Nexus devices, and the second task does this for Arista devices:
+
+```
+tasks:
+  - name: ENSURE VLAN 10 EXISTS ON CISCO TOR SWITCHES
+    nxos_vlan:
+      vlan_id=10
+      name=WEB_VLAN
+      host={{ inventory_hostname }}
+      username=admin
+      password=admin
+    when: vendor == "nxos"
+```
+
+Tasks can also use the `name` parameter just like plays can. As with plays, the text is arbitrary and is displayed when the playbook runs to improve readability during playbook execution and reporting. It is an optional parameter for each task.
+
+The next line in the example task starts with `nxos_vlan`. This tell us that this task will execute the Ansible module called `nxos_vlan`.
+
+We’ll now dig deeper into modules.
+
+
+
+### Modules
+
+It is critical to understand modules within Ansible. While any programming language can be used to write Ansible modules as long as they return JSON key-value pairs, they are almost always written in Python. In our example, we see two modules being executed: `nxos_vlan` and `eos_vlan`. The modules are both Python files; and in fact, while you can’t tell from looking at the playbook, the real filenames are _eos_vlan.py_ and _nxos_vlan.py_, respectively.
+
+Let’s look at the first task in the first play from the preceding example:
+
+```
+  - name: ENSURE VLAN 10 EXISTS ON CISCO TOR SWITCHES
+    nxos_vlan:
+      vlan_id=10
+      name=WEB_VLAN
+      host={{ inventory_hostname }}
+      username=admin
+      password=admin
+    when: vendor == "nxos"
+```
+
+This task executes `nxos_vlan`, which is a module that automates VLAN configuration. In order to use modules, including this one, you need to specify the desired state or configuration policy you want the device to have. This example states: VLAN 10 should be configured with the name `WEB_VLAN`, and it should exist on each switch being automated. We can see this easily with the `vlan_id`and `name` parameters. There are three other parameters being passed into the module as well. They are `host`, `username`, and `password`:
+
+`host`
+
+This is the hostname (or IP address) of the device being automated. Since the hosts we want to automate are already defined in the inventory file, we can use the built-in Ansible variable `inventory_hostname`. This variable is equal to what is in the inventory file. For example, on the first iteration, the host in the inventory file is `rack1-tor1`, and on the second iteration, it is `rack1-tor2`. These names are passed into the module and then within the module, a DNS lookup occurs on each name to resolve it to an IP address. Then the communication begins with the device.
+
+`username`
+
+Username used to log in to the switch.
+
+
+`password`
+
+Password used to log in to the switch.
+
+
+The last piece to cover here is the use of the `when` statement. This is how Ansible performs conditional tasks within a play. As we know, there are multiple devices and types of devices that exist within the `tor` group for this play. Using `when` offers an option to be more selective based on any criteria. Here we are only automating Cisco devices because we are using the `nxos_vlan` module in this task, while in the next task, we are automating only the Arista devices because the `eos_vlan` module is used.
+
+###### Note
+
+This isn’t the only way to differentiate between devices. This is being shown to illustrate the use of `when` and that variables can be defined within the inventory file.
+
+Defining variables in an inventory file is great for getting started, but as you continue to use Ansible, you’ll want to use YAML-based variables files to help with scale, versioning, and minimizing change to a given file. This will also simplify and improve readability for the inventory file and each variables file used. An example of a variables file was given earlier when the build/push method of device provisioning was covered.
+
+Here are a few other points to understand about the tasks in the last example:
+
+*   Play 1 task 1 shows the `username` and `password` hardcoded as parameters being passed into the specific module (`nxos_vlan`).
+
+*   Play 1 task 1 and play 2 passed variables into the module instead of hardcoding them. This masks the `username` and `password`parameters, but it’s worth noting that these variables are being pulled from the inventory file (for this example).
+
+*   Play 1 uses a _horizontal_ key=value syntax for the parameters being passed into the modules, while play 2 uses the vertical key=value syntax. Both work just fine. You can also use vertical YAML syntax with "key: value" syntax.
+
+*   The last task also introduces how to use a _loop_ within Ansible. This is by using `with_items` and is analogous to a for loop. That particular task is looping through five VLANs to ensure they all exist on the switch. Note: it’s also possible to store these VLANs in an external YAML variables file as well. Also note that the alternative to not using `with_items` would be to have one task per VLAN—and that just wouldn’t scale!
+
+
+### Hands-on Look at Using Ansible for Network Automation
+
+In the previous chapter, a general overview of Ansible terminology was provided. This covered many of the specific Ansible terms, such as playbooks, plays, tasks, modules, and inventory files. This section will continue to provide working examples of using Ansible for network automation, but will provide more detail on working with modules to automate a few different types of devices. Examples will include automating devices from multiple vendors, including Cisco, Arista, Cumulus, and Juniper.
+
+The examples in this section assume the following:
+
+*   Ansible is installed.
+
+*   The proper APIs are enabled on the devices (NX-API, eAPI, NETCONF).
+
+*   Users exist with the proper permissions on the system to make changes via the API.
+
+*   All Ansible modules exist on the system and are in the library path.
+
+###### Note
+
+Setting the module and library path can be done within the _ansible.cfg_ file. You can also use the `-M` flag from the command line to change it when executing a playbook.
+
+The inventory used for the examples in this section is shown in the following section (with passwords removed and IP addresses changed). In this example, some hostnames are not FQDNs as they were in the previous examples.
+
+
+### Inventory File
+
+```
+[cumulus]
+cvx  ansible_ssh_host=1.2.3.4 ansible_ssh_pass=PASSWORD
+
+[arista]
+veos1
+
+[cisco]
+nx1  hostip=5.6.7.8 un=USERNAME pwd=PASSWORD
+
+[juniper]
+vsrx hostip=9.10.11.12 un=USERNAME pwd=PASSWORD
+```
+
+###### Note
+
+Just in case you’re wondering at this point, Ansible does support functionality that allows you to store passwords in encrypted files. If you want to learn more about this feature, check out [Ansible Vault][5] in the docs on the Ansible website.
+
+This inventory file has four groups defined with a single host in each group. Let’s review each section in a little more detail:
+
+Cumulus
+
+The host `cvx` is a Cumulus Linux (CL) switch, and it is the only device in the `cumulus` group. Remember that CL is native Linux, so this means the default connection mechanism (SSH) is used to connect to and automate the CL switch. Because `cvx` is not defined in DNS or _/etc/hosts_, we’ll let Ansible know not to use the hostname defined in the inventory file, but rather the name/IP defined for `ansible_ssh_host`. The username to log in to the CL switch is defined in the playbook, but you can see that the password is being defined in the inventory file using the `ansible_ssh_pass` variable.
+
+Arista
+
+The host called `veos1` is an Arista switch running EOS. It is the only host that exists within the `arista` group. As you can see for Arista, there are no other parameters defined within the inventory file. This is because Arista uses a special configuration file for their devices. This file is called _.eapi.conf_ and for our example, it is stored in the home directory. Here is the conf file being used for this example to function properly:
+
+```
+[connection:veos1]
+host: 2.4.3.4
+username: unadmin
+password: pwadmin
+```
+
+This file contains all required information for Ansible (and the Arista Python library called _pyeapi_) to connect to the device using just the information as defined in the conf file.
+
+Cisco
+
+Just like with Cumulus and Arista, there is only one host (`nx1`) that exists within the `cisco` group. This is an NX-OS-based Cisco Nexus switch. Notice how there are three variables defined for `nx1`. They include `un` and `pwd`, which are accessed in the playbook and passed into the Cisco modules in order to connect to the device. In addition, there is a parameter called `hostip`. This is required because `nx1` is also not defined in DNS or configured in the _/etc/hosts_ file.
+
+
+###### Note
+
+We could have named this parameter anything. If automating a native Linux device, `ansible_ssh_host` is used just like we saw with the Cumulus example (if the name as defined in the inventory is not resolvable). In this example, we could have still used `ansible_ssh_host`, but it is not a requirement, since we’ll be passing this variable as a parameter into Cisco modules, whereas `ansible_ssh_host` is automatically checked when using the default SSH connection mechanism.
+
+Juniper
+
+As with the previous three groups and hosts, there is a single host `vsrx` that is located within the `juniper` group. The setup within the inventory file is identical to that of Cisco’s as both are used the same exact way within the playbook.
+
+
+### Playbook
+
+The next playbook has four different plays. Each play is built to automate a specific group of devices based on vendor type. Note that this is only one way to perform these tasks within a single playbook. There are other ways in which we could have used conditionals (`when` statement) or created Ansible roles (which is not covered in this report).
+
+Here is the example playbook:
+
+```
+---
+
+  - name: PLAY 1 - CISCO NXOS
+    hosts: cisco
+    connection: local
+
+    tasks:
+      - name: ENSURE VLAN 100 exists on Cisco Nexus switches
+        nxos_vlan:
+          vlan_id=100
+          name=web_vlan
+          host={{ hostip }}
+          username={{ un }}
+          password={{ pwd }}
+
+  - name: PLAY 2 - ARISTA EOS
+    hosts: arista
+    connection: local
+
+    tasks:
+      - name: ENSURE VLAN 100 exists on Arista switches
+        eos_vlan:
+          vlanid=100
+          name=web_vlan
+          connection={{ inventory_hostname }}
+
+  - name: PLAY 3 - CUMULUS
+    remote_user: cumulus
+    sudo: true
+    hosts: cumulus
+
+    tasks:
+      - name: ENSURE 100.10.10.1 is configured on swp1
+        cl_interface: name=swp1  ipv4=100.10.10.1/24
+
+      - name: restart networking without disruption
+        shell: ifreload -a
+
+  - name: PLAY 4 - JUNIPER SRX changes
+    hosts: juniper
+    connection: local
+
+    tasks:
+    - name: INSTALL JUNOS CONFIG
+      junos_install_config:
+        host={{ hostip }}
+        file=srx_demo.conf
+        user={{ un }}
+        passwd={{ pwd }}
+        logfile=deploysite.log
+        overwrite=yes
+        diffs_file=junpr.diff
+```
+
+You will notice the first two plays are very similar to what we already covered in the original Cisco and Arista example. The only difference is that each group being automated (`cisco` and `arista`) is defined in its own play, and this is in contrast to using the `when`conditional that was used earlier.
+
+There is no right way or wrong way to do this. It all depends on what information is known up front and what fits your environment and use cases best, but our intent is to show a few ways to do the same thing.
+
+The third play automates the configuration of interface `swp1` that exists on the Cumulus Linux switch. The first task within this play ensures that `swp1` is a Layer 3 interface and is configured with the IP address 100.10.10.1\. Because Cumulus Linux is native Linux, the networking service needs to be restarted for the changes to take effect. This could have also been done using Ansible handlers (out of the scope of this report). There is also an Ansible core module called `service` that could have been used, but that would disrupt networking on the switch; using `ifreload` restarts networking non-disruptively.
+
+Up until now in this section, we looked at Ansible modules focused on specific tasks such as configuring interfaces and VLANs. The fourth play uses another option. We’ll look at a module that _pushes_ a full configuration file and immediately activates it as the new running configuration. This is what we showed previously using `napalm_install_config`, but this example uses a Juniper-specific module called `junos_install_config`.
+
+This module `junos_install_config` accepts several parameters, as seen in the example. By now, you should understand what `user`, `passwd`, and `host` are used for. The other parameters are defined as follows:
+
+`file`
+
+This is the config file that is copied from the Ansible control host to the Juniper device.
+
+`logfile`
+
+This is optional, but if specified, it is used to store messages generated while executing the module.
+
+`overwrite`
+
+When set to yes/true, the complete configuration is replaced with the file being sent (default is false).
+
+`diffs_file`
+
+This is optional, but if specified, will store the diffs generated when applying the configuration. An example of the diff generated when just changing the hostname but still sending a complete config file is shown next:
+
+```
+# filename: junpr.diff
+[edit system]
+-  host-name vsrx;
++  host-name vsrx-demo;
+```
+
+
+That covers the detailed overview of the playbook. Let’s take a look at what happens when the playbook is executed:
+
+###### Note
+
+Note: the `-i` flag is used to specify the inventory file to use. The `ANSIBLE_HOSTS`environment variable can also be set rather than using the flag each time a playbook is executed.
+
+```
+ntc@ntc:~/ansible/multivendor$ ansible-playbook -i inventory demo.yml
+
+PLAY [PLAY 1 - CISCO NXOS] *************************************************
+
+TASK: [ENSURE VLAN 100 exists on Cisco Nexus switches] *********************
+changed: [nx1]
+
+PLAY [PLAY 2 - ARISTA EOS] *************************************************
+
+TASK: [ENSURE VLAN 100 exists on Arista switches] **************************
+changed: [veos1]
+
+PLAY [PLAY 3 - CUMULUS] ****************************************************
+
+GATHERING FACTS ************************************************************
+ok: [cvx]
+
+TASK: [ENSURE 100.10.10.1 is configured on swp1] ***************************
+changed: [cvx]
+
+TASK: [restart networking without disruption] ******************************
+changed: [cvx]
+
+PLAY [PLAY 4 - JUNIPER SRX changes] ****************************************
+
+TASK: [INSTALL JUNOS CONFIG] ***********************************************
+changed: [vsrx]
+
+PLAY RECAP ***************************************************************
+           to retry, use: --limit @/home/ansible/demo.retry
+
+cvx                        : ok=3    changed=2    unreachable=0    failed=0
+nx1                        : ok=1    changed=1    unreachable=0    failed=0
+veos1                      : ok=1    changed=1    unreachable=0    failed=0
+vsrx                       : ok=1    changed=1    unreachable=0    failed=0
+```
+
+You can see that each task completes successfully; and if you are on the terminal, you’ll see that each changed task was displayed with an amber color.
+
+Let’s run this playbook again. By running it again, we can verify that all of the modules are _idempotent_; and when doing this, we see that NO changes are made to the devices and everything is green:
+
+```
+PLAY [PLAY 1 - CISCO NXOS] ***************************************************
+
+TASK: [ENSURE VLAN 100 exists on Cisco Nexus switches] ***********************
+ok: [nx1]
+
+PLAY [PLAY 2 - ARISTA EOS] ***************************************************
+
+TASK: [ENSURE VLAN 100 exists on Arista switches] ****************************
+ok: [veos1]
+
+PLAY [PLAY 3 - CUMULUS] ******************************************************
+
+GATHERING FACTS **************************************************************
+ok: [cvx]
+
+TASK: [ENSURE 100.10.10.1 is configured on swp1] *****************************
+ok: [cvx]
+
+TASK: [restart networking without disruption] ********************************
+skipping: [cvx]
+
+PLAY [PLAY 4 - JUNIPER SRX changes] ******************************************
+
+TASK: [INSTALL JUNOS CONFIG] *************************************************
+ok: [vsrx]
+
+PLAY RECAP ***************************************************************
+cvx                        : ok=2    changed=0    unreachable=0    failed=0
+nx1                        : ok=1    changed=0    unreachable=0    failed=0
+veos1                      : ok=1    changed=0    unreachable=0    failed=0
+vsrx                       : ok=1    changed=0    unreachable=0    failed=0
+```
+
+Notice how there were 0 changes, but they still returned "ok" for each task. This verifies, as expected, that each of the modules in this playbook are idempotent.
+
+
+### Summary
+
+Ansible is a super-simple automation platform that is agentless and extensible. The network community continues to rally around Ansible as a platform that can be used for network automation tasks that range from configuration management to data collection and reporting. You can push full configuration files with Ansible, configure specific network resources with idempotent modules such as interfaces or VLANs, or simply just automate the collection of information such as neighbors, serial numbers, uptime, and interface stats, and customize reports as you need them.
+
+Because of its architecture, Ansible proves to be a great tool available here and now that helps bridge the gap from _legacy CLI/SNMP_ network device automation to modern _API-driven_ automation.
+
+Ansible’s ease of use and agentless architecture accounts for the platform’s increasing following within the networking community. Again, this makes it possible to automate devices without APIs (CLI/SNMP); devices that have modern APIs, including standalone switches, routers, and Layer 4-7 service appliances; and even those software-defined networking (SDN) controllers that offer RESTful APIs.
+
+There is no device left behind when using Ansible for network automation.
+
+
+-----------
+
+作者简介：
+
+ ![](https://d3tdunqjn7n0wj.cloudfront.net/360x360/jason-edelman-crop-5b2672f569f553a3de3a121d0179efcb.jpg) 
+
+Jason Edelman, CCIE 15394 & VCDX-NV 167, is a born and bred network engineer from the great state of New Jersey. He was the typical “lover of the CLI” or “router jockey.” At some point several years ago, he made the decision to focus more on software, development practices, and how they are converging with network engineering. Jason currently runs a boutique consulting firm, Network to Code, helping vendors and end users take advantage of new tools and technologies to reduce their operational inefficiencies. Jason has a Bachelor’s...
+
+
+--------------------------------------------------------------------------------
+
+via: https://www.oreilly.com/learning/network-automation-with-ansible
+
+作者：[Jason Edelman][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.oreilly.com/people/ee4fd-jason-edelman
+[1]:https://www.oreilly.com/learning/network-automation-with-ansible#ansible_terminology_and_getting_started
+[2]:https://www.oreilly.com/learning/network-automation-with-ansible#ansible_network_integrations
+[3]:https://www.oreilly.com/learning/network-automation-with-ansible#ansible_terminology_and_getting_started
+[4]:https://www.oreilly.com/learning/network-automation-with-ansible#handson_look_at_using_ansible_for_network_automation
+[5]:http://docs.ansible.com/ansible/playbooks_vault.html
+[6]:https://www.oreilly.com/people/ee4fd-jason-edelman
+[7]:https://www.oreilly.com/people/ee4fd-jason-edelman
diff --git a/sources/tech/20160602 Building a data science portfolio - Storytelling with data.md b/sources/tech/20160602 Building a data science portfolio - Storytelling with data.md
index ae5e5b1eec..625b08efdc 100644
--- a/sources/tech/20160602 Building a data science portfolio - Storytelling with data.md	
+++ b/sources/tech/20160602 Building a data science portfolio - Storytelling with data.md	
@@ -1,3 +1,5 @@
+Translated by Yoo-4x
+
 Building a data science portfolio: Storytelling with data
 ========
 
diff --git a/sources/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md b/sources/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md
deleted file mode 100644
index 84a6d82d02..0000000000
--- a/sources/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md	
+++ /dev/null
@@ -1,233 +0,0 @@
-ivo-wang translating
-Setting Up Real-Time Monitoring with ‘Ganglia’ for Grids and Clusters of Linux Servers
-===========
-
-
-Ever since system administrators have been in charge of managing servers and groups of machines, tools like monitoring applications have been their best friends. You will probably be familiar with tools like [Nagios][11], [Zabbix][10], [Icinga][9], and Centreon. While those are the heavyweights of monitoring, setting them up and fully taking advantage of their features may be somewhat difficult for new users.
-
-In this article we will introduce you to Ganglia, a monitoring system that is easily scalable and allows to view a wide variety of system metrics of Linux servers and clusters (plus graphs) in real time.
-
-[![Install Gangila Monitoring in Linux](http://www.tecmint.com/wp-content/uploads/2016/06/Install-Gangila-Monitoring-in-Linux.png)][8]
-
-Install Gangila Monitoring in Linux
-
-Ganglia lets you set up grids (locations) and clusters (groups of servers) for better organization.
-
-Thus, you can create a grid composed of all the machines in a remote environment, and then group those machines into smaller sets based on other criteria.
-
-In addition, Ganglia’s web interface is optimized for mobile devices, and also allows you to export data en `.csv`and `.json` formats.
-
-Our test environment will consist of a central CentOS 7 server (IP address 192.168.0.29) where we will install Ganglia, and an Ubuntu 14.04 machine (192.168.0.32), the box that we want to monitor through Ganglia’s web interface.
-
-Throughout this guide we will refer to the CentOS 7 system as the master node, and to the Ubuntu box as the monitored machine.
-
-### Installing and Configuring Ganglia
-
-To install the monitoring utilities in the the master node, follow these steps:
-
-#### 1. Enable the [EPEL repository][7] and then install Ganglia and related utilities from there:
-  ```
-# yum update && yum install epel-release
-# yum install ganglia rrdtool ganglia-gmetad ganglia-gmond ganglia-web
-  ```
-
-The packages installed in the step above along with ganglia, the application itself, perform the following functions:
-
-  1.  `rrdtool`, the Round-Robin Database, is a tool that’s used to store and display the variation of data over time using graphs.
-  2.  `ganglia-gmetad` is the daemon that collects monitoring data from the hosts that you want to monitor. In those hosts and in the master node it is also necessary to install ganglia-gmond (the monitoring daemon itself):
-  3.  `ganglia-web` provides the web frontend where we will view the historical graphs and data about the monitored systems.
-
-#### 2. Set up authentication for the Ganglia web interface (/usr/share/ganglia). We will use basic authentication as provided by Apache.
-
-  If you want to explore more advanced security mechanisms, refer to the [Authorization and Authentication][6]section of the Apache docs.
-
-  To accomplish this goal, create a username and assign a password to access a resource protected by Apache. In this example, we will create a username called `adminganglia` and assign a password of our choosing, which will be stored in /etc/httpd/auth.basic (feel free to choose another directory and / or file name – as long as Apache has read permissions on those resources, you will be fine):
-
-  ```
-# htpasswd -c /etc/httpd/auth.basic adminganglia
-
-  ```
-
-  Enter the password for adminganglia twice before proceeding.
-
-#### 3. Modify /etc/httpd/conf.d/ganglia.conf as follows:
-
-  ```
-Alias /ganglia /usr/share/ganglia
-<Location /ganglia>
-AuthType basic
-AuthName "Ganglia web UI"
-AuthBasicProvider file
-AuthUserFile "/etc/httpd/auth.basic"
-Require user adminganglia
-</Location>
-
-  ```
-
-#### 4. Edit /etc/ganglia/gmetad.conf:
-
-  First, use the gridname directive followed by a descriptive name for the grid you’re setting up:
-
-  ```
-gridname "Home office"
-
-  ```
-
-  Then, use data_source followed by a descriptive name for the cluster (group of servers), a polling interval in seconds and the IP address of the master and monitored nodes:
-
-  ```
-data_source "Labs" 60 192.168.0.29:8649 # Master node
-data_source "Labs" 60 192.168.0.32 # Monitored node
-
-  ```
-
-#### 5. Edit /etc/ganglia/gmond.conf.
-
-  a) Make sure the cluster block looks as follows:
-
-  ```
-cluster {
-name = "Labs" # The name in the data_source directive in gmetad.conf
-owner = "unspecified"
-latlong = "unspecified"
-url = "unspecified"
-}
-
-  ```
-
-  b) In the udp_send_chanel block, comment out the mcast_join directive:
-
-  ```
-udp_send_channel   {
-#mcast_join = 239.2.11.71
-host = localhost
-port = 8649
-ttl = 1
-}
-
-  ```
-
-  c) Finally, comment out the mcast_join and bind directives in the udp_recv_channel block:
-
-  ```
-udp_recv_channel {
-#mcast_join = 239.2.11.71 ## comment out
-port = 8649
-#bind = 239.2.11.71 ## comment out
-}
-  ```
-
-  Save the changes and exit.
-
-#### 6. Open port 8649/udp and allow PHP scripts (run via Apache) to connect to the network using the necessary SELinux boolean:
-
-  ```
-# firewall-cmd --add-port=8649/udp
-# firewall-cmd --add-port=8649/udp --permanent
-# setsebool -P httpd_can_network_connect 1
-
-  ```
-
-#### 7. Restart Apache, gmetad, and gmond. Also, make sure they are enabled to start on boot:
-
-  ```
-# systemctl restart httpd gmetad gmond
-# systemctl enable httpd gmetad httpd
-
-  ```
-
-  At this point, you should be able to open the Ganglia web interface at `http://192.168.0.29/ganglia` and login with the credentials from #Step 2.
-
-  [![Gangila Web Interface](http://www.tecmint.com/wp-content/uploads/2016/06/Gangila-Web-Interface.png)][5]
-
-  Gangila Web Interface
-
-#### 8. In the Ubuntu host, we will only install ganglia-monitor, the equivalent of ganglia-gmond in CentOS:
-
-```
-$ sudo aptitude update && aptitude install ganglia-monitor
-
-```
-
-#### 9. Edit the /etc/ganglia/gmond.conf file in the monitored box. This should be identical to the same file in the master node except that the commented out lines in the cluster, udp_send_channel, and udp_recv_channelshould be enabled:
-
-```
-cluster {
-name = "Labs" # The name in the data_source directive in gmetad.conf
-owner = "unspecified"
-latlong = "unspecified"
-url = "unspecified"
-}
-udp_send_channel   {
-mcast_join = 239.2.11.71
-host = localhost
-port = 8649
-ttl = 1
-}
-udp_recv_channel {
-mcast_join = 239.2.11.71 ## comment out
-port = 8649
-bind = 239.2.11.71 ## comment out
-}
-
-```
-
-Then, restart the service:
-
-```
-$ sudo service ganglia-monitor restart
-
-```
-
-#### 10. Refresh the web interface and you should be able to view the statistics and graphs for both hosts inside the Home office grid / Labs cluster (use the dropdown menu next to to Home office grid to choose a cluster, Labsin our case):
-
-[![Ganglia Home Office Grid Report](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Home-Office-Grid-Report.png)][4]
-
-Ganglia Home Office Grid Report
-
-Using the menu tabs (highlighted above) you can access lots of interesting information about each server individually and in groups. You can even compare the stats of all the servers in a cluster side by side using the Compare Hosts tab.
-
-Simply choose a group of servers using a regular expression and you will be able to see a quick comparison of how they are performing:
-
-[![Ganglia Host Server Information](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Server-Information.png)][3]
-
-Ganglia Host Server Information
-
-One of the features I personally find most appealing is the mobile-friendly summary, which you can access using the Mobile tab. Choose the cluster you’re interested in and then the individual host:
-
-[![Ganglia Mobile Friendly Summary View](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Mobile-View.png)][2]
-
-Ganglia Mobile Friendly Summary View
-
-### Summary
-
-In this article we have introduced Ganglia, a powerful and scalable monitoring solution for grids and clusters of servers. Feel free to install, explore, and play around with Ganglia as much as you like (by the way, you can even try out Ganglia in a demo provided in the project’s [official website][1].
-
-While you’re at it, you will also discover that several well-known companies both in the IT world or not use Ganglia. There are plenty of good reasons for that besides the ones we have shared in this article, with easiness of use and graphs along with stats (it’s nice to put a face to the name, isn’t it?) probably being at the top.
-
-But don’t just take our word for it, try it out yourself and don’t hesitate to drop us a line using the comment form below if you have any questions.
-
---------------------------------------------------------------------------------
-
-via: http://www.tecmint.com/install-configure-ganglia-monitoring-centos-linux/
-
-作者：[Gabriel Cánepa][a]
-
-译者：[译者ID](https://github.com/译者ID)
-
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: http://www.tecmint.com/author/gacanepa/
-[1]:http://ganglia.info/
-[2]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Mobile-View.png
-[3]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Server-Information.png
-[4]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Home-Office-Grid-Report.png
-[5]:http://www.tecmint.com/wp-content/uploads/2016/06/Gangila-Web-Interface.png
-[6]:http://httpd.apache.org/docs/current/howto/auth.html
-[7]:http://www.tecmint.com/how-to-enable-epel-repository-for-rhel-centos-6-5/
-[8]:http://www.tecmint.com/wp-content/uploads/2016/06/Install-Gangila-Monitoring-in-Linux.png
-[9]:http://www.tecmint.com/install-icinga-in-centos-7/
-[10]:http://www.tecmint.com/install-and-configure-zabbix-monitoring-on-debian-centos-rhel/
-[11]:http://www.tecmint.com/install-nagios-in-linux/
diff --git a/sources/tech/20160823 Getting Started with HTTP2 - Part 1.md b/sources/tech/20160823 Getting Started with HTTP2 - Part 1.md
deleted file mode 100644
index 93210a56c8..0000000000
--- a/sources/tech/20160823 Getting Started with HTTP2 - Part 1.md	
+++ /dev/null
@@ -1,65 +0,0 @@
-hkurj translating
-
-Getting Started with HTTP/2: Part 1
-============================================================
- ![](https://static.viget.com/_284x284_crop_center-center/http2-pizza.png?mtime=20160822160641) 
-
-Using pizza to show how HTTP/2 beats HTTP/1.1 when your orders get too big.
-
-_HTTP/2 has some really amazing changes to the way web sites and applications can be built. A year and a half after becoming published, almost [10% of websites support HTTP/2][4]. It has definitely had notable adoption, but the conversation should be pushed further for front-end developers on best practices when using HTTP/2\. This is a multi-part blog post to give front-end developers a guide on how to switch over to HTTP/2. _
-
-_This post covers how HTTP/2 is an improvement to HTTP/1.1 and what that may look like to front-end developers._
-
-### Remind me what HTTP is again...
-
-Hyper Text Transfer Protocol, better known as HTTP, is the protocol that determines how content is transferred over the web. When HTTP/1.1 was standardized in 1999, the web was a very different place than it is today. Tables were king. Styles were usually done inline at the element level, or if the webmaster was more refined, they would put it in a `<style>` tag in the head. JavaScript, if used, was also placed on the document and full sites were generally no larger than a handful of pages.
-
-HTTP/1.1 assumed that this was going to last for a while, so it did not put too much focus on allowing for many assets to be loaded with a site, since that wasn't really a thing developers needed. Therefore it had an extremely simple way of handling assets - you ask for an asset and the server looks for it and either returns what you asked for or it tells you the asset could not be found. This is called "head-of-line blocking" and it is fairly efficient, but when you have mulitple assets, this process happens for every asset in succession. This means that before you can even ask for your second asset, the server has to find your first one and load it or tell you it could not be found.
-
-### The Growth of the Large-Scale Site
-
-In the years that followed 1999, sites became much more complex, with the rise of php and other dynamic languages like Rails. CSS files grew much larger with the shift to responsive development, and thusly CSS compilers like Sass popped up to create a simpler working environment. JavaScript also became a much bigger player on the web, allowing for developers to make complex applications that were once only the work of C++ developers. Images also became much more defined, with the rise of Retina and HD monitors. With these changes, file sizes grew exponentially, so waiting for a few bytes worth of assets to load became kilobytes, even megabytes in some cases. And when you have several hundred kilobytes to load before you can even start loading something else on the page, you just have to optimistically assume that your users have fast internet.
-
-Think of HTTP/1.1 as a quaint, order-at-the-counter neighborhood pizza place. You can show up by yourself and order a Sprite and 2 slices of Angry Hawaiian and be on your way in 3 minutes. They can handle that easily, in fact it's the business model they thrive on - just quick drop-ins with simple orders.
-
- ![](https://static.viget.com/_300xAUTO_crop_center-center/http2-pizzaorder1.png?mtime=20160823122331) 
-
-However, once you decide to host the little league season awards ceremony at the same pizza place things get more complicated. With everyone ordering different things, it gets disorganized quickly and the wait times go up.
-
- ![](https://static.viget.com/_300xAUTO_crop_center-center/http2-pizzaorder2.png?mtime=20160823130750) 
-
-### Where HTTP/2 Comes into Play
-
-The major promise of HTTP/2 for a front-end developer is multiplexing. Multiplexing means that asset requests can happen at the same time and the server can then go find those assets. There's no wait time between requests because they all happen at once.
-
-Using the same metaphor, HTTP/2 allows for the pizza place to set the party to its own area in the restaurant, send out a waiter to take orders and bring everything out as it becomes ready. There's no need to wait 30 minutes for your Sprite while everyone else's pizzas cook, so that comes out as one of the first items. This method makes it much easier to manage lots of orders and prevents people from waiting too long to start getting their orders.
-
-The big change multiplexing seems to bring to web development is a change in the way we prepare files to be loaded. A really helpful method for getting around the HTTP/1.1 bottleneck of asset loading is through concatenating and minifying files to be loaded at once. All task runners do this either by default or with very little configuration. Often times too, developers will place their images in sprite sheets, which also cut down on the amount of requests to a server.
-
-### Improvements over HTTP/1.1
-
-Concatenating files was a really smart way to handle the problems of HTTP/1.1's request limits, but the major problem with concatenating your files is that it requires users to download all the assets for the entire site upon first visit. The browser will cache all the assets once they load, which is good and speeds up every following page the user visits, but having a heavy load upfront [is bad for bounce rates][5]. Also they are probably loading assets for pages they won't even visit. Expecting a user to visit every single page to see every style and interact with every script is unrealistic. Furthermore, in places like Canada and Europe and pretty much every US mobile provider, there is a monthly bandwidth cap. Not that loading 54 extra kilobytes of content is going to push someone over the edge for their monthly data allowance, but let's assume that the user wants to reserve those extra bytes for Taylor Swift reaction gifs.
-
-With HTTP/2 and multiplexing, you can run some of the most efficient sites but it will require some rethinking, and even undoing, of previous best practices. Again, my intent is to speed up the conversation on HTTP/2 so we can discover these new best practices with the new tools we have.
-
-In my next post [I'll explore some of the best ways to handle a site built on HTTP/2][6].
-
-
---------------------------------------------------------------------------------
-
-via: https://www.viget.com/articles/getting-started-with-http-2-part-1?imm_mid=0eb24a&cmp=em-web-na-na-newsltr_20161130
-
-作者：[Ben][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.viget.com/about/team/btinsley
-[1]:https://twitter.com/home?status=Using%20pizza%20to%20show%20how%20HTTP%2F2%20beats%20HTTP%2F1.1%20when%20your%20orders%20get%20too%20big.%20https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
-[2]:https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
-[3]:http://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-1
-[4]:https://w3techs.com/technologies/details/ce-http2/all/all
-[5]:https://blog.kissmetrics.com/speed-is-a-killer/
-[6]:https://www.viget.com/articles/getting-started-with-http-2-part-2
-[7]:https://www.viget.com/about/team/btinsley
diff --git a/sources/tech/20160929 Getting Started with HTTP2 - Part 2.md b/sources/tech/20160929 Getting Started with HTTP2 - Part 2.md
deleted file mode 100644
index 6a98fc0056..0000000000
--- a/sources/tech/20160929 Getting Started with HTTP2 - Part 2.md	
+++ /dev/null
@@ -1,184 +0,0 @@
-It's translated by GitFuture now.
-
-Getting Started with HTTP/2: Part 2
-============================================================
- ![](https://static.viget.com/_284x284_crop_center-center/ben-t-http-blog-thumb-01_360.png?mtime=20160928234634) 
-
-Firmly planting a flag in the sand for HTTP/2 best practices for front end development.
-
-
-If you have been keeping up with the talk of HTTP/2, you have probably attempted it or at least thought of how incorporate it into your projects. While there are a lot of hypotheses on how to its features can change your workflow and improve speed and efficiency on the web, best practices still haven't quite been pinned down yet. What I want to cover in this post are some HTTP/2 best practices I have discovered on a recent project.
-
-If you aren't quite sure what HTTP/2 is or why it offers to improve your work, [check out my first post for a bit of background][4]. 
-
-One note though: before we can get going, I need to mention that while your browser probably supports HTTP/2, your server probably doesn't. Check in with your hosting service to see if they offer HTTP/2 compatibility. Otherwise, you may be able to spin up your own server. This post does not cover how to do that unfortunately, but you can always check out the [http2 github][5] for some tools to get going in that direction.
-
-### 🙏 [Rubs Hands Together]
-
-A good way to start is to first organize your files. Take a look at the file tree below for a starting point to organize your stylesheets:
-
-```
-`/styles
-|── /setup
-|     /* variables, mixins and functions */
-|── /global
-|     /* reusable components that could be within any component or section */
-|── /components
-|     /* specific components and sections */
-|── setup.scss // index for setup styles
-|── global.scss // index for global styles`
-```
-
-This breaks out your styles into three main categories: Setup, Global and Components. I will get into what each of these directories offer to your project next.
-
-### Setting Up
-
-The Setup level directory will hold all of your variables, functions, mixins and any other definition that another file will need to compile properly. To make this directory fully reusable, it's a good idea to import the contents of this directory into `setup.scss` so that it looks something like this:
-
-```
-`/* setup.scss */
-
-/* variables */
-@import "setup/variables/colors";
-
-/* mixins */
-@import "setup/mixins/color";
-
-/* functions */
-@import "setup/functions/color";
-
-... etc`
-```
-
-Now that we have a quick reference to any definition on the site, we should be sure to include it at the top of any style file we create from here on out.
-
-### Going Global
-
-Your next directory, Global, should contain components that can be reused across the site within multiple sections, or on every single page. Things like buttons, text and heading styles as well as your browser resets should go here. I do not recommend putting your header or footer styles in here because on some projects, the header is absent or different on certain pages. Furthermore, the footer is always the last element on the page, so it should not be a huge priority to load the styles for it before the user has loaded anything else on the site.
-
-Keeping in mind that your Global styles probably won't work without the things we defined in the Setup directory, your Global file should look something like this:
-
-```
-`/* global.scss */
-
-/* application definitions */
-@import "setup";
-
-/* global styles */
-@import "global/reset";
-@import "global/buttons";
-@import "global/typography";
-@import "global/grid";
-
-... etc`
-```
-
-Note that the first thing to import is the Setup styles. This way, any following file that uses something defined in that will have a reference to pull from.
-
-Since the Global styles will be needed on every page of the site, we can load them in the typical way, using a `<link>` in the `<head>`. What you will have will be a very light CSS file, or theoretically light, depending on how much global style you need.
-
-### Finally, Your Components
-
-Notice that I did not include an index file for the Components directory in the file tree above. This is really where HTTP/2 comes into play. Up until now, we have been following standard practices for typical site build out, maintaining a fairly lean infrastructure and opting to globalize only the most necessary styles. Components act as their own index files.
-
-Most developers have their own way of organizing their components, so I am not going to bother going into strategies here. However, all of your components should look something like this:
-
-```
-`/* header.scss */
-
-/* application definitions */
-@import "../setup";
-
-header {
-  // styles
-}
-
-... etc`
-```
-
-This way, again, you have those Setup styles there to make sure that everything is defined during compilation. You don't have to concatenate, minify or really do anything to these files other than compile them, and probably place them in an /assets directory, easy to find for your templates.
-
-Now that our stylesheets are ready to go, building out the site should be simple.
-
-### Building Out the Components
-
-You probably have your own templating language of choice depending on the projects you are on, be it Twig, Rails, Jade or Handlebars. I think the best way to think about your components is that if it has its own template file, it should have a corresponding style with the same name. This way your project has a nice 1:1 ratio across your templates and styles and you know where which file everything is in because they are named accordingly.
-
-Now that that is out of the way, taking advantage of HTTP/2's multiplexing is really simple, so let's build a template:
-
-```
-`{# header.html #}
-
-{# compiled header styles #}
-<link href="assets/components/header.css" rel="stylesheet" media="all">
-
-<header>
-  <h1>This Awesome HTTP/2 Site</h1>
-  ... etc`
-```
-
-And that is pretty much it! You probably have a less heavy-handed way of linking to assets within your templates, but this shows you that all you need to do is link to that one small header style in the template file before you start your markup. This allows your site to only load the specific assets to the components on any given page, and furthermore, prioritizing the components from the top of your page to the bottom.
-
-### Mixing It All Together
-
-Now that all the components have a structure, the browser will render them something like this:
-
-```
-`<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" media="all" href="/assets/global.css">
-  </head>
-  <body>
-
-    <link rel="stylesheet" media="all" href="/assets/components/header.css">
-    <header>
-      ... etc
-    </header>
-
-    <link rel="stylesheet" media="all" href="/assets/components/title.css">
-    <section class="title">
-      ... etc
-    </section>
-
-    <link rel="stylesheet" media="all" href="/assets/components/image-component.css">
-    <section class="image-component">
-      ... etc
-    </section>
-
-    <link rel="stylesheet" media="all" href="/assets/components/text-component.css">
-    <section class="text-component">
-      ... etc
-    </section>
-
-    <link rel="stylesheet" media="all" href="/assets/components/footer.css">
-    <footer>
-      ... etc
-    </footer>
-
-  </body>
-</html>`
-```
-
-This is an upper level approach, but you will probably have finer-tuned components on your project. For example, you may have a `<nav>` component within the header that has its own stylesheet to load. Feel free to go as deep as you want with your components in a way that makes sense - HTTP/2 will not penalize you with those extra requests!
-
-### Conclusion
-
-This is just a basic look at how to build a project with HTTP/2 in mind on the front end, but this only scratches the surface. Perhaps you noticed a method I used that can be improved upon. Please bring it up in the comments! As stated in my first post, HTTP/2 is probably going to undo some of the standards we have held since HTTP/1, so it will take some serious thinking and experimenting to move into a fully efficient world of HTTP/2 development.
-
---------------------------------------------------------------------------------
-
-via: https://www.viget.com/articles/getting-started-with-http-2-part-2
-
-作者：[Ben][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.viget.com/about/team/btinsley
-[1]:https://twitter.com/home?status=Firmly%20planting%20a%20flag%20in%20the%20sand%20for%20HTTP%2F2%20best%20practices%20for%20front%20end%20development.%20https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
-[2]:https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
-[3]:http://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fwww.viget.com%2Farticles%2Fgetting-started-with-http-2-part-2
-[4]:https://www.viget.com/articles/getting-started-with-http-2-part-1
-[5]:https://github.com/http2/http2-spec/wiki/Tools
diff --git a/sources/tech/20161018 Suspend to Idle.md b/sources/tech/20161018 Suspend to Idle.md
deleted file mode 100644
index 266dd8e7b1..0000000000
--- a/sources/tech/20161018 Suspend to Idle.md	
+++ /dev/null
@@ -1,147 +0,0 @@
-# Suspend to Idle
-
-### Introduction
-
-The Linux kernel supports a variety of sleep states.  These states provide power savings by placing the various parts of the system into low power modes.  The four sleep states are suspend to idle, power-on standby (standby), suspend to ram, and suspend to disk.  These are also referred to sometimes by their ACPI state: S0, S1, S3, and S4, respectively.  Suspend to idle is purely software driven and involves keeping the CPUs in their deepest idle state as much as possible.  Power-on standby involves placing devices in low power states and powering off all non-boot CPUs.  Suspend to ram takes this further by powering off all CPUs and putting the memory into self-refresh.  Lastly, suspend to disk gets the greatest power savings through powering off as much of the system as possible, including the memory.  The contents of memory are written to disk, and on resume this is read back into memory.
-
-This blog post focuses on the implementation of suspend to idle.  As described above, suspend to idle is a software implemented sleep state.  The system goes through a normal platform suspend where it freezes the user space and puts peripherals into low-power states.  However, instead of powering off and hotplugging out CPUs, the system is quiesced and forced into an idle cpu state.  With peripherals in low power mode, no IRQs should occur, aside from wake related irqs.  These wake irqs could be timers set to wake the system (RTC, generic timers, etc), or other sources like power buttons, USB, and other peripherals.
-
-During freeze, a special cpuidle function is called as processors enter idle.  This enter_freeze() function can be as simple as calling the cpuidle enter() function, or can be much more complex.  The complexity of the function is dependent on the SoCs requirements and methods for placing the SoC into lower power modes.
-
-### Prerequisites
-
-### Platform suspend_ops
-
-Typically, to support S2I, a system must implement a platform_suspend_ops and provide at least minimal suspend support.  This meant filling in at least the valid() function in the platform_suspend_ops.  If suspend-to-idle and suspend-to-ram was to be supported, the suspend_valid_only_mem would be used for the valid function.
-
-Recently, however, automatic support for S2I was added to the kernel.  Sudeep Holla proposed a change that would provide S2I support on systems without requiring the implementation of platform_suspend_ops.  This patch set was accepted and will be part of the 4.9 release.  The patch can be found at:  [https://lkml.org/lkml/2016/8/19/474][1]
-
-With suspend_ops defined, the system will report the valid platform suspend states when the /sys/power/state is read.
-
-```
-# cat /sys/power/state
-```
-
-freeze mem_
-
-This example shows that both S0 (suspend to idle) and S3 (suspend to ram) are supported on this platform.  With Sudeep’s change, only freeze will show up for platforms which do not implement platform_suspend_ops.
-
-### Wake IRQ support
-
-Once the system is placed into a sleep state, the system must receive wake events which will resume the system.  These wake events are generated from devices on the system.  It is important to make sure that device drivers utilize wake irqs and configure themselves to generate wake events upon receiving wake irqs.  If wake devices are not identified properly, the system will take the interrupt and then go back to sleep and will not resume.
-
-Once devices implement proper wake API usage, they can be used to generate wake events.  Make sure DT files also specify wake sources properly.  An example of configuring a wakeup-source is the following (arch/arm/boot/dst/am335x-evm.dts):
-
-```
-    gpio_keys: volume_keys@0 {__
-               compatible = “gpio-keys”;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               autorepeat;
-
-               switch@9 {
-                       label = “volume-up”;
-                       linux,code = <115>;
-                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       wakeup-source;
-               };
-
-               switch@10 {
-                       label = “volume-down”;
-                       linux,code = <114>;
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
-                       wakeup-source;
-               };
-       };
-```
-
-As you can see, two gpio keys are defined to be wakeup-sources.  Either of these keys, when pressed, would generate a wake event during suspend.
-
-An alternative to DT configuration is if the device driver itself configures wake support in the code using the typical wakeup facilities.
-
-### Implementation
-
-### Freeze function
-
-Systems should define a enter_freeze() function in their cpuidle driver if they want to take full advantage of suspend to idle.  The enter_freeze() function uses a slightly different function prototype than the enter() function.  As such, you can’t just specify the enter() for both enter and enter_freeze.  At a minimum, it will directly call the enter() function.  If no enter_freeze() is specified, the suspend will occur, but the extra things that would have occurred if enter_freeze() was present, like tick_freeze() and stop_critical_timings(), will not occur.  This results in timer IRQs waking up the system.  This will not result in a resume, as the system will go back into suspend after handling the IRQ.
-
-During suspend, minimal interrupts should occur (ideally none).
-
-The picture below shows a plot of power usage vs time.  The two spikes on the graph are the suspend and the resume.  The small periodic spikes before and after the suspend are the system exiting idle to do bookkeeping operations, scheduling tasks, and handling timers.  It takes a certain period of time for the system to go back into the deeper idle state due to latency.
-
- ![blog-picture-one](http://www.linaro.org/wp-content/uploads/2016/10/blog-picture-one-1024x767.png) 
-Power Usage Time Progression
-
-The ftrace capture shown below displays the activity on the 4 CPUs before, during, and after the suspend/resume operation.  As you can see, during the suspend, no IPIs or IRQs are handled.  
-
- ![blog-picture-2](http://www.linaro.org/wp-content/uploads/2016/10/blog-picture-2-1024x577.png) 
-
-Ftrace capture of Suspend/Resume
-
-### Idle State Support
-
-You must determine which idle states support freeze.  During freeze, the power code will determine the deepest idle state that supports freeze.  This is done by iterating through the idle states and looking for which states have defined enter_freeze().  The cpuidle driver or SoC specific suspend code must determine which idle states should implement freeze and it must configure them by specifying the freeze function for all applicable idle states for each cpu.
-
-As an example, the Qualcomm platform will set the enter_freeze function during the suspend init function in the platform suspend code.  This is done after the cpuidle driver is initialized so that all structures are defined and in place.
-
-### Driver support for Suspend/Resume
-
-You may encounter buggy drivers during your first successful suspend operation.  Many drivers have not had robust testing of suspend/resume paths.  You may even find that suspend may not have much to do because pm_runtime has already done everything you would have done in the suspend.  Because the user space is frozen, the devices should already be idled and pm_runtime disabled.
-
-### Testing
-
-Testing for suspend to idle can be done either manually, or through using something that does an auto suspend (script/process/etc), auto sleep or through something like Android where if a wakelock is not held the system continuously tried to suspend.  If done manually, the following will place the system in freeze:
-
-```
-/ # echo freeze > /sys/power/state
-[  142.580832] PM: Syncing filesystems … done.
-[  142.583977] Freezing user space processes … (elapsed 0.001 seconds) done.
-[  142.591164] Double checking all user space processes after OOM killer disable… (elapsed 0.000 seconds)
-[  142.600444] Freezing remaining freezable tasks … (elapsed 0.001 seconds) done._
-_[  142.608073] Suspending console(s) (use no_console_suspend to debug)
-[  142.708787] mmc1: Reset 0x1 never completed.
-[  142.710608] msm_otg 78d9000.phy: USB in low power mode
-[  142.711379] PM: suspend of devices complete after 102.883 msecs
-[  142.712162] PM: late suspend of devices complete after 0.773 msecs
-[  142.712607] PM: noirq suspend of devices complete after 0.438 msecs
-< system suspended >
-….
-< wake irq triggered >
-[  147.700522] PM: noirq resume of devices complete after 0.216 msecs
-[  147.701004] PM: early resume of devices complete after 0.353 msecs
-[  147.701636] msm_otg 78d9000.phy: USB exited from low power mode
-[  147.704492] PM: resume of devices complete after 3.479 msecs
-[  147.835599] Restarting tasks … done.
-/ #
-```
-
-In the above example, it should be noted that the MMC driver was responsible for 100ms of that 102.883ms.  Some device drivers will still have work to do when suspending.  This may be flushing of data out to disk or other tasks which take some time.
-
-If the system has freeze defined, it will try to suspend the system.  If it does not have freeze capabilities, you will see the following:
-
-```
-/ # echo freeze > /sys/power/state 
-sh: write error: Invalid argument
-/ #
-```
-
-### Future Developments
-
-There are two areas where work is currently being done on Suspend to Idle on ARM platforms.  The first area was mentioned earlier in the platform_suspend_ops prerequisite section.  The work to always allow for the freeze state was accepted and will be part of the 4.9 kernel.  The other area that is being worked on is the freeze_function support.
-
-The freeze_function implementation is currently required if you want the best response/performance.  However, since most SoCs will use the ARM cpuidle driver, it makes sense for the ARM cpuidle driver to implement its own generic freeze_function.  And in fact, ARM is working to add this generic support.  A SoC vendor should only have to implement specialized freeze_functions if they implement their own cpuidle driver or require additional provisioning before entering their deepest freezable idle state.
-
---------------------------------------------------------------------------------
-
-via: http://www.linaro.org/blog/suspend-to-idle/
-
-作者：[Andy Gross][a]
-
-译者：[译者ID](https://github.com/译者ID)
-
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.linaro.org/author/andygross/
-[1]:https://lkml.org/lkml/2016/8/19/474
diff --git a/sources/tech/20161028 Inkscape: Adding some colour.md b/sources/tech/20161028 Inkscape: Adding some colour.md
deleted file mode 100644
index bc8d432524..0000000000
--- a/sources/tech/20161028 Inkscape: Adding some colour.md	
+++ /dev/null
@@ -1,51 +0,0 @@
-translating---geekpi
-
-### [Inkscape: Adding some colour][1]
-
- ![inkscape-addingcolour](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/inkscape-addingcolour-945x400.png) 
-
-In our previous Inkscape article, [we covered the absolute basics of getting started with Inkscape][2] — installing, and how to create basic shapes and manipulate them. We also covered changing the colour of inkscape objects using the Palette. While the Palette is great for quickly changing the colour of your objects from a pre-defined list, most times you will need more control over the colours of your objects. This is where we use one of the most important dialogs in Inkscape — the Fill and Stroke dialog.
-
-**A quick note about the animations in this post: **some of the colours in the animations appear banded. This is just an artifact of the way the animations are created. When you try this out on Inkscape you will see nice smooth gradients of colour.
-
-### Using the Fill / Stroke dialog
-
-To open the Fill and Stroke dialog in Inkscape, choose `Object` > `Fill and Stroke` from the main menu. Once opened, the main three tabs of this dialog allow you to inspect and change the Fill colour, Stroke colour, and Stroke style of the currently selected object.
-
- ![open-fillstroke](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/open-fillstroke.gif) 
-
-In Inkscape, the Fill is the main colour given to the body of an object. The stroke of the object is an optional outline of your object. The stroke of an object also has additional styles — configurable in the Stroke style tab — allowing you to change the thickness of the stroke, create a dotted outline, or add rounded corners to you stroke. In this next animation, I change the fill colour of the star, and then change the stroke colour, and tweak the thickness of the stroke:
-
- ![using-fillstroke](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/using-fillstroke.gif) 
-
-### Adding and Editing a gradient
-
-A gradient can also be the Fill (or the stroke) of an object. To quickly set a gradient fill from the Fill and Stroke dialog, first choose the Fill tab, then pick the linear gradient option:
-
- ![create-gradient](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/create-gradient.gif) 
-
-To edit our gradient further, we need to use the specialised Gradient Tool. Choose the Gradient tool from the toolbar, and some additional gradient editing handles will appear on your selected shape. **Moving the handles** around will change the positioning of the gradient. If you **click on an individual handle**, you can also change the colour of that handle in the Fill and Stroke dialog. To **add an additional stop in your gradient**, double click on the line connecting the handles, and a new handle will appear.
-
- ![editing-gradient](https://cdn.fedoramagazine.org/wp-content/uploads/2016/10/editing-gradient.gif) 
-
-* * *
-
-That covers the basics of adding some more colour and gradients to your Inkscape drawings. The** Fill and Stroke dialog**also has many other options to explore, like pattern fills, different gradient styles, and many different stroke styles. Also check out the additional options in the **Tools control bar** for the **Gradient Tool** to see how you can tweak gradients in different ways too.
-
------------------------
-
-作者简介：Ryan is a designer that works on stuff for Fedora. He uses Fedora Workstation as his primary desktop, along with the best tools from the Libre Graphics world, notably, the vector graphics editor, Inkscape.
-
---------------------------------------------------------------------------------
-
-via: https://fedoramagazine.org/inkscape-adding-colour/
-
-作者：[Ryan Lerch][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: http://ryanlerch.id.fedoraproject.org/
-[1]:https://fedoramagazine.org/inkscape-adding-colour/
-[2]:https://fedoramagazine.org/getting-started-inkscape-fedora/
diff --git a/sources/tech/20161103 Perl and the birth of the dynamic web.md b/sources/tech/20161103 Perl and the birth of the dynamic web.md
deleted file mode 100644
index e69126e365..0000000000
--- a/sources/tech/20161103 Perl and the birth of the dynamic web.md	
+++ /dev/null
@@ -1,90 +0,0 @@
-# Perl and the birth of the dynamic web
-
->The fascinating story of Perl's role in the dynamic web spans newsgroups and mailing lists, computer science labs, and continents.
-
- ![Perl and the birth of the dynamic web](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/osdc-lead-web-internet.png?itok=hq81pSDs "Perl and the birth of the dynamic web") 
->Image by : [Internet Archive Book Images][30], modified by Opensource.com. [CC BY-SA 4.0][29].
-
-The web's early history is generally remembered as a few seminal events: the day Tim Berners-Lee [announced][28] the WWW-project on Usenet, the document with which [CERN released the project's code][27] into the public domain, and of course [the first version of the NCSA Mosaic browser][26] in January 1993\. Although these individual moments were certainly crucial, the period is far richer and reveals that technological development is not a set of discrete events, but rather a range of interconnected stories.
-
-One such story is how exactly the web became _dynamic_, which is to say, how we got web servers to do more than serve static HTML documents. This is a story that spans [newsgroups][25] and mailing lists, computer science labs, and continents—its focus is not so much one person as one programming language: Perl.
-
-### CGI scripts and infoware
-
-In the mid- to late-1990s, Perl and the dynamic web were nearly synonymous. As a relatively easy-to-learn interpreted language with powerful text-processing features, Perl made it easy to write scripts to connect a website to a database, handle form data sent by users, and of course create those unmistakeable icons of the '90s web, hit counters and guestbooks.
-
-Such website features came in the form of CGI scripts, named for the Common Gateway Interface, [first implemented][24] by Rob McCool in the NCSA HTTPD server in November 1993\. CGI was designed to allow for drop-in functionality, and within a few years one could easily find archives of pre-cooked scripts written in Perl. An infamous case was [Matt's Scripts Archive][23], a popular source that unintentionally carried security flaws and inspired members of the Perl community to create a professional alternative called [Not Matt's Scripts][22].
-
-At the same time that amateur and professional programmers took up Perl to create dynamic websites and applications, Tim O'Reilly [coined the term "infoware"][21] to describe how the web and Perl were part of a sea of change in the computing industry. With innovations by Yahoo! and Amazon in mind, O'Reilly wrote: "Traditional software embeds small amounts of information in a lot of software; infoware embeds small amounts of software in a lot of information." Perl was the perfect small-but-powerful tool—the Swiss Army Chainsaw—that powered informational media from large web directories to early platforms for user-generated content.
-
-### Forks in the road
-
-Although Perl's relationship to CGI is well-documented, the links between the programming language and the rise of the dynamic web go deeper. In the brief period between the appearance of [the first website][20] (just before Christmas 1990) and McCool's work on CGI in 1993, much of what defined the web in the 1990s and beyond—from forms to bitmaps and tables—was up in the air. Although Berners-Lee was often deferred to in these early years, different people saw different potential uses for the web, and pushed it in various directions. On the one hand, this resulted in famous disputes, such as questions of [how closely HTML should follow SGML][19], or [whether to implement an image tag][18]. On the other hand, change was a slower process without any straightforward cause. The latter best describes how the dynamic web developed.
-
-In one sense, the first gateways can be traced to 1991 and 1992, when Berners-Lee and a handful of other computer scientists and hypertext enthusiasts [wrote servers][17] that connected to specific resources, such as particular CERN applications, general applications such as Oracle databases, and [wide area information servers (WAIS)][16]. (WAIS was the late 1980s precursor to the web developed by, among others, [Brewster Kahle][15], a digital librarian and founder of the [Internet Archive][14].) In this way, a gateway was a custom web server designed to do one thing: connect with another network, database, or application. Any dynamic feature meant running another daemon on a different port (read, for example, Berners-Lee's description of [how to add a search function][13] to a website). Berners-Lee intended the web to be a universal interface to diverse information systems, and encouraged a proliferation of single-purpose servers. He also [noted][12] that Perl was "a powerful (if otherwise incomprehensible) language with which to hack together" one.
-
-However, another sense of "gateway" suggested not a custom machine but a script, a low-threshold add-on that wouldn't require a different server. The first of this kind was arguably Jim Davis's [Gateway to the U Mich Geography server][11], released to the WWW-talk mailing list in November 1992\. Davis's script, written in Perl, was a kind of proto-Web API, pulling in data from another server based on formatted user queries. Highlighting how these two notions of gateway differed, Berners-Lee [responded][10] to Davis requesting that he and the author of the Michigan server "come to some arrangement," as it would make more sense "from the network point of view" to only have one server providing this information. Berners-Lee, as might be expected of the person who invented the web, preferred an orderly information resource. Such drop-in gateways and scripts that pulled data in from other servers meant a potential qualitative shift in what the web could be, extending but also subtly transforming Berners-Lee's original vision.
-
-### Going Wayback to the Perl HTTPD
-
-An important step between Davis's geography gateway and the standardization of such low-threshold web scripting through CGI was the [Perl HTTPD][9], a web server written entirely in Perl by grad student Marc Van Heyningen at Indiana University in Bloomington in early 1993\. Among [the design principles][8] Van Heyningen laid out was easy extensibility—beyond the fact that using Perl meant no compiling was necessary, the server included "a feature to restart the server when new features are added to the code with zero downtime," making it "trivial" to add new functionality.
-
-The Perl HTTPD stood in contrast to the idea that servers should have a single, dedicated purpose. Instead, it hinted at an incremental, permanently beta approach to software products that would eventually be considered common sense in web work. Van Heyningen [later wrote][7] that his reason for building a server from scratch was there was no easy way to create "virtual documents" (i.e., dynamically generated pages) with the CERN server, and joked that the easiest way to do this was to use "the language of the gods." Among the scripts he added early on was a web interface to Sun's man pages as well as a [a Finger Gateway][6] (an early protocol for sharing information about a computer system or user).
-
-Although the Indiana University server used by Van Heyningen was primarily used to connect to existing information resources, Van Heyningen and fellow students also saw the potential for personal publishing. One of its more popular pages from 1993-1994 [published][5] documents, photographs, and news stories around a famous Canadian court case for which national media had been gagged.
-
-The Perl HTTPD wasn't necessarily built to last. Today, Van Heyningen remembers it as a "hacked up prototype." Its original purpose was to demonstrate the web's usefulness to senior staff who had chosen Gopher to be the university's network interface. Van Heyningen's argument-in-code included an appeal to his professors' vanity in the form of [a web-based, searchable index of their publications][4]. In other words, a key innovation in server technology was created to win an argument, and in that sense the code did all that was asked of it.
-
-Despite the servers's temporary nature, the ideas that accompanied the Perl HTTPD would stick around. Van Heyningen began to receive requests for the code and shared it online, with a note that one would need to know some Perl (or someone who did) to port the server to other systems. Soon after, Austin-based programmer Tony Sanders created a portable version called [Plexus][3]. Sanders's web server was a fully fledged product that cemented the kind of easy extensibility that the Perl HTTPD suggested, while adding a number of new features such as image decoding. Plexus in turn [directly inspired][2]Rob McCool to create an "htbin" for scripts on the NCSA HTTPD server, and soon after that the implementation of the Common Gateway Interface.
-
-Alongside this historical legacy, the Perl HTTPD is also preserved in a more tangible form—thanks to the wonderful Internet Archive (the Wayback Machine), you can still [download the tarball][1] today.
-
-### Future histories
-
-For all the tech world's talk of disruption, technological change is in fact a contradictory process. Existing technologies are the basis for thinking about new ones. Archaic forms of programming inspire new ways of doing things today. Something as innovative as the web was very much an extension of older technologies—not least, Perl.
-
-To go beyond simple timelines of seminal events, perhaps web historians could take a cue from Perl. Part of the challenge is material. Much of what must be done involves wrangling structure from the messy data that's available, gluing together such diverse sources as mailing lists, archived websites, and piles of books and magazines. And part of the challenge is conceptual—to see that web history is much more than the release dates of new technologies, that it encompasses personal memory, human emotion, and social processes as much as it does protocols and Initial Public Offerings, and that it is not one history but many. Or as the Perl credo goes, "There's More Than One Way To Do It."
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/life/16/11/perl-and-birth-dynamic-web
-
-作者：[Michael Stevenson][a]
-
-译者：[译者ID](https://github.com/译者ID)
-
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://opensource.com/users/mstevenson
-[1]:https://web.archive.org/web/20011126190051/http://www.cs.indiana.edu/perl-server/httpd.pl.tar.Z
-[2]:http://1997.webhistory.org/www.lists/www-talk.1993q4/0516.html
-[3]:https://web.archive.org/web/19990421192342/http://www.earth.com/server/doc/plexus.html
-[4]:https://web.archive.org/web/19990428030253/http://www.cs.indiana.edu:800/cstr/search
-[5]:https://web.archive.org/web/19970720205155/http://www.cs.indiana.edu/canada/karla.html
-[6]:https://web.archive.org/web/19990429014629/http://www.cs.indiana.edu:800/finger/gateway
-[7]:https://web.archive.org/web/19980122184328/http://www.cs.indiana.edu/perl-server/history.html
-[8]:https://web.archive.org/web/19970720025822/http://www.cs.indiana.edu/perl-server/intro.html
-[9]:https://web.archive.org/web/19970720025822/http://www.cs.indiana.edu/perl-server/code.html
-[10]:https://lists.w3.org/Archives/Public/www-talk/1992NovDec/0069.html
-[11]:https://lists.w3.org/Archives/Public/www-talk/1992NovDec/0060.html
-[12]:http://info.cern.ch/hypertext/WWW/Provider/ShellScript.html
-[13]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0109.html
-[14]:https://archive.org/index.php
-[15]:http://brewster.kahle.org/about/
-[16]:https://en.wikipedia.org/wiki/Wide_area_information_server
-[17]:http://info.cern.ch/hypertext/WWW/Daemon/Overview.html
-[18]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0182.html
-[19]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0096.html
-[20]:http://info.cern.ch/hypertext/WWW/TheProject.html
-[21]:https://web.archive.org/web/20000815230603/http://www.edventure.com/release1/1198.html
-[22]:http://nms-cgi.sourceforge.net/
-[23]:https://web.archive.org/web/19980709151514/http://scriptarchive.com/
-[24]:http://1997.webhistory.org/www.lists/www-talk.1993q4/0518.html
-[25]:https://en.wikipedia.org/wiki/Usenet_newsgroup
-[26]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0099.html
-[27]:https://tenyears-www.web.cern.ch/tenyears-www/
-[28]:https://groups.google.com/forum/#!msg/alt.hypertext/eCTkkOoWTAY/bJGhZyooXzkJ
-[29]:https://creativecommons.org/licenses/by-sa/4.0/
-[30]:https://www.flickr.com/photos/internetarchivebookimages/14591826409/in/photolist-oeqVBX-xezHCD-otJDtG-whb6Qz-tohe9q-tCxH8y-xq4VfN-otJFfh-xEmn3b-tERUdv-oucUgd-wKDyLy-owgebW-xd6Wew-xGEvuT-toqHkP-oegBCj-xtDdzN-tF19ip-xGFbWP-xcQMJq-wxrrkN-tEYczi-tEYvCn-tohQuy-tEzFwN-xHikPT-oetG8V-toiGvh-wKEgAu-xut1qp-toh7PG-xezovR-oegRMa-wKN2eg-oegSRp-sJ29GF-oeqXLV-oeJTBY-ovLF3X-oeh2iJ-xcQBWs-oepQoy-ow4xoo-xknjyD-ovunVZ-togQaj-tEytff-xEkSLS-xtD8G1
diff --git a/sources/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md b/sources/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md
deleted file mode 100644
index 49eb8f536b..0000000000
--- a/sources/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md	
+++ /dev/null
@@ -1,109 +0,0 @@
-CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE
-============================================================
-
-[
- ![Best Linux distributions for cloud computing](https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg) 
-][6]
-
-_Brief: We list some _Cloud centric_ Linux distributions that might be termed as real Linux alternatives to Chrome OS._
-
-The world is moving to cloud-based services and we all know the kind of love that Chrome OS got. Well, it does deserve respect. It’s super fast, light, power-efficient, minimalistic, beautifully designed and utilizes the full potential of cloud that technology permits today.
-
-Although [Chrome OS][7] is exclusively available only for Google’s hardware, there are other means to experience the potential of cloud computing right on your laptop or desktop.
-
-As I have repeatedly said, there is always something for everybody in the Linux domain, be it [Linux distributions that look like Windows][8] or Mac OS. Linux is all about sharing, love and some really bleeding edge computing experience. Let’s crack this list right away!
-
-### 1\. CUB LINUX
-
- ![Cub Linux Desktop](https://itsfoss.com/wp-content/uploads/2016/10/cub1.jpg) 
-
-It is not Chrome OS. But the above image is featuring the desktop of [Cub Linux][9]. Say what?
-
-Cub Linux is no news for Linux users. But if you already did not know, Cub Linux is the web focused Linux distro that is inspired from mainstream Chrome OS. It is also the open source brother of Chrome OS from mother Linux.
-
-Chrome OS has the Chrome Browser as it’s primary component. Not so long ago, a project by name [Chromixium OS][10] was started to recreate Chrome OS like experience by using the Chromium Browser in place of Chrome Browser. Due to some legal issues, the name was later changed to Cub Linux (Chromium+Ubuntu).
-
- ![cub2](https://itsfoss.com/wp-content/uploads/2016/10/cub2.jpg) 
-
-Well, history apart, as the name hints, Cub Linux is based on Ubuntu, features the lightweight Openbox Desktop Environment. The Desktop is customized to give a Chrome OS impression and looks really neat.
-
-In the apps department, you can install the web applications from the Chrome web store and all the Ubuntu software. Yup, with all the snappy apps of the Chrome OS, You’ll still get the Ubuntu goodies.
-
-As far as the performance is concerned, the operating system is super fast thanks to its Openbox Desktop Environment. Based on Ubuntu Linux, the stability of Cub Linux is unquestionable. The desktop itself is a treat to the eyes with all its smooth animations and beautiful UI.
-
-[Suggested Read[Year 2013 For Linux] 2 Linux Distributions Discontinued][11]
-
-I suggest Cub Linux to anybody who spends most their times on a browser and do some home tasks now and then. Well, a browser is all you need and a browser is exactly what you’ll get.
-
-### 2\. PEPPERMINT OS
-
-A good number of people look towards Linux because they want a no-BS computing experience. Some people do not really like the hassle of an anti-virus, a defragmenter, a cleaner etcetera as they want an operating system and not a baby. And I must say Peppermint OS is really good at being no-BS. [Peppermint OS][12] developers have put a good amount of effort in understanding the user requirements and needs.
-
- ![pep1](https://itsfoss.com/wp-content/uploads/2016/11/pep1.jpg) 
-
-There is a very small number of selected software included by default. The traditional ideology of including a couple apps from every software category is ditched here for good. The power to customize the computer as per needs has been given to the user. By the way, do we really need to install so many applications when we can get web alternatives for almost all the applications?
-
-Ice
-
-Ice is a utile little tool that converts your favorite and most used websites into desktop applications that you can directly launch from your desktop or the menu. It’s what we call a site-specific browser.
-
- ![pep4](https://itsfoss.com/wp-content/uploads/2016/11/pep4.jpg) 
-
-Love facebook? Why not make a facebook web app on your desktop for quick launch? While there are people complaining about a decent Google drive application for Linux, Ice allows you to access Drive with just a click. Not just Drive, the functionality of Ice is limited only by your imagination.
-
-Peppermint OS 7 is based on Ubuntu 16.04\. It not only provides a smooth, rock solid performance but also a very swift response. A heavily customizes LXDE will be your home screen. And the customization I’m speaking about is driven to achieve both a snappy performance as well as visual appeal.
-
-Peppermint OS hits more of a middle ground in the cloud-native operating system types. Although the skeleton of the OS is designed to support the speedy cloudy apps, the native Ubuntu application play well too. If you are someone like me who wants an OS that is balanced in online-offline capabilities, [Peppermint OS is for you][13].
-
-[Suggested ReadPennsylvania High School Distributes 1,700 Ubuntu Laptops to Students][14]
-
-### 3.APRICITY OS
-
-[Apricity OS][15] stole the show for being one of the top aesthetically pleasing Linux distros out there. It’s just gorgeous. It’s like the Mona Lisa of the Linux domain. But, there’s more to it than just the looks.
-
- ![ap2](https://itsfoss.com/wp-content/uploads/2016/11/ap2.jpg) 
-
-The prime reason [Apricity OS][16] makes this list is because of its simplicity. While OS desktop design is getting chaotic and congested with elements (and I’m not talking only about non-Linux operating systems), Apricity de-clutters everything and simplifies the very basic human-desktop interaction. Gnome desktop environment is customized beautifully here. They made it really simpler.
-
-The pre-installed software list is really small. Almost all Linux distros have the same pre-installed software. But Apricity OS has a completely new set of software. Chrome instead of Firefox. I was really waiting for this.  I mean why not give us what’s rocking out there?
-
-Apricity OS also features the Ice tool that we discussed in the last segment. But instead of Firefox, Chrome browser is used in website-desktop integration. Apricity OS has Numix Circle icons by default and everytime you add a popular webapp, there will be a beautiful icon placed on your Dock.
-
- ![](https://itsfoss.com/wp-content/uploads/2016/11/ap1.jpg) 
-
-See what I mean?
-
-Apricity OS is based on Arch Linux. (So anybody looking for a quick start with Arch, and a beautiful at that one, download that Apricity ISO [here][17]) Apricity fully upholds the Arch principle of freedom of choice. Within just 10 minutes on the Ice, and you’ll have all your favorite webapps set up.
-
-Gorgeous backgrounds, minimalistic desktop and a great functionality. These make Apricity OS a really great choice for setting up an amazing cloud-centric system. It’ll take 5 mins for Apricity OS to make you fall in love with it. I mean it.
-
-There you have it, people. Cloud-centric Linux distros for online dwellers. Do give us your take on the webapp-native app topic. Don’t forget to share.
-
---------------------------------------------------------------------------------
-
-via: https://itsfoss.com/cloud-focused-linux-distros/
-
-作者：[Aquil Roshan ][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://itsfoss.com/author/aquil/
-[1]:https://itsfoss.com/author/aquil/
-[2]:https://itsfoss.com/cloud-focused-linux-distros/#comments
-[3]:https://twitter.com/share?original_referer=https%3A%2F%2Fitsfoss.com%2F&source=tweetbutton&text=Cloud+Focused+Linux+Distros+For+People+Who+Breathe+Online&url=https%3A%2F%2Fitsfoss.com%2Fcloud-focused-linux-distros%2F&via=%40itsfoss
-[4]:https://www.linkedin.com/cws/share?url=https://itsfoss.com/cloud-focused-linux-distros/
-[5]:http://pinterest.com/pin/create/button/?url=https://itsfoss.com/cloud-focused-linux-distros/&description=Cloud+Focused+Linux+Distros+For+People+Who+Breathe+Online&media=https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg
-[6]:https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg
-[7]:https://en.wikipedia.org/wiki/Chrome_OS
-[8]:https://itsfoss.com/windows-like-linux-distributions/
-[9]:https://cublinux.com/
-[10]:https://itsfoss.com/chromixiumos-released/
-[11]:https://itsfoss.com/year-2013-linux-2-linux-distributions-discontinued/
-[12]:https://peppermintos.com/
-[13]:https://peppermintos.com/
-[14]:https://itsfoss.com/pennsylvania-high-school-ubuntu/
-[15]:https://apricityos.com/
-[16]:https://itsfoss.com/apricity-os/
-[17]:https://apricityos.com/
diff --git a/sources/tech/20161111 Can Linux containers save IoT from a security meltdown.md b/sources/tech/20161111 Can Linux containers save IoT from a security meltdown.md
deleted file mode 100644
index edbf669aae..0000000000
--- a/sources/tech/20161111 Can Linux containers save IoT from a security meltdown.md	
+++ /dev/null
@@ -1,174 +0,0 @@
-Translating by firstadream
-
-### [Can Linux containers save IoT from a security meltdown?][28]
-
- ![](http://hackerboards.com/files/internet_of_things_wikimedia1-thm.jpg) 
-In this final IoT series post, Canonical and Resin.io champion Linux container technology as a solution to IoT security and interoperability challenges.
-
-| 
- ![](http://hackerboards.com/files/samsung_artik710-thm.jpg) 
-
-**Artik 7** |
-
-Despite growing security threats, the Internet of Things hype shows no sign of abating. Feeling the FoMo, companies are busily rearranging their roadmaps for IoT. The transition to IoT runs even deeper and broader than the mobile revolution. Everything gets swallowed in the IoT maw, including smartphones, which are often our windows on the IoT world, and sometimes our hubs or sensor endpoints.
-
-New IoT focused processors and embedded boards continue to reshape the tech landscape. Since our [Linux and Open Source Hardware for IoT][5] story in September, we’ve seen [Intel Atom E3900][6] “Apollo Lake” SoCs aimed at IoT gateways, as well as [new Samsung Artik modules][7], including a Linux-driven, 64-bit Artik 7 COM for gateways and an RTOS-ready, Cortex-M4 Artik 0\. ARM announced [Cortex-M23 and Cortex-M33][8] cores for IoT endpoints featuring ARMv8-M and TrustZone security.
-
-Security is a selling point for these products, and for good reason. The Mirai botnet that recently attacked the Dyn service and blacked out much of the U.S. Internet for a day brought Linux-based IoT into the forefront — and not in a good way. Just as IoT devices can be turned to the dark side via DDoS, the devices and their owners can also be the victimized directly by malicious attacks.
-
-| 
- ![](http://hackerboards.com/files/arm_cortexm33m23-thm.jpg) 
-
-**Cortex-M33 and -M23** |
-
-The Dyn attack reinforced the view that IoT will more confidently move forward in more controlled and protected industrial environments rather than the home. It’s not that consumer [IoT security technology][9] is unavailable, but unless products are designed for security from scratch, as are many of the solutions in our [smart home hub story][10], security adds cost and complexity.
-
-In this final, future-looking segment of our IoT series, we look at two Linux-based, Docker-oriented container technologies that are being proposed as solutions to IoT security. Containers might also help solve the ongoing issues of development complexity and barriers to interoperability that we explored in our story on [IoT frameworks][11].
-
-We spoke with Canonical’s Oliver Ries, VP Engineering Ubuntu Client Platform about his company’s Ubuntu Core and its Docker-friendly, container-like Snaps package management technology. We also interviewed Resin.io CEO and co-founder Alexandros Marinos about his company’s new Docker-based ResinOS for IoT.
-
-**Ubuntu Core Snaps to**
-
-Canonical’s IoT-oriented [Snappy Ubuntu Core][12] version of Ubuntu is built around a container-like snap package management mechanism, and offers app store support. The snaps technology was recently [released on its own][13] for other Linux distributions. On November 3, Canonical released [Ubuntu Core 16][14], which improves white label app store and update control services.
-
-<center>
-[
- ![](http://hackerboards.com/files/canonical_ubuntucore16_diagram-sm.jpg) 
-][15]
-**Classic Ubuntu (left) architecture vs. Ubuntu Core 16**
-(click image to enlarge)
-</center>
-
-The snap mechanism offers automatic updates, and helps block unauthorized updates. Using transactional systems management, snaps ensure that updates either deploy as intended or not at all. In Ubuntu Core, security is further strengthened with AppArmor, and the fact that all application files are kept in separate silos, and are read-only.
-
-| 
- ![](http://hackerboards.com/files/limesdr-thm.jpg) 
-
-**LimeSDR** |
-
-Ubuntu Core, which was part of our recent [survey of open source IoT OSes][16], now runs on Gumstix boards, Erle Robotics drones, Dell Edge Gateways, the [Nextcloud Box][17], LimeSDR, the Mycroft home hub, Intel’s Joule, and SBCs compliant with Linaro’s 96Boards spec. Canonical is also collaborating with the Linaro IoT and Embedded (LITE) Segment Group on its [96Boards IoT Edition][18]Initially, 96Boards IE is focused on Zephyr-driven Cortex-M4 boards like Seeed’s [BLE Carbon][19], but it will expand to gateway boards that can run Ubuntu Core.
-
-“Ubuntu Core and snaps have relevance from edge to gateway to the cloud,” says Canonical’s Ries. “The ability to run snap packages on any major distribution, including Ubuntu Server and Ubuntu for Cloud, allows us to provide a coherent experience. Snaps can be upgraded in a failsafe manner using transactional updates, which is important in an IoT world moving to continuous updates for security, bug fixes, or new features.”
-
-| 
- ![](http://hackerboards.com/files/nextcloud_box3-thm.jpg) 
-
-**Nextcloud Box** |
-
-Security and reliability are key points of emphasis, says Ries. “Snaps can run completely isolated from one another and from the OS, making it possible for two applications to securely run on a single gateway,” he says. “Snaps are read-only and authenticated, guaranteeing the integrity of the code.”
-
-Ries also touts the technology for reducing development time. “Snap packages allow a developer to deliver the same binary package to any platform that supports it, thereby cutting down on development and testing costs, deployment time, and update speed,” says Ries. “With snap packages, the developer is in full control of the lifecycle, and can update immediately. Snap packages provide all required dependencies, so developers can choose which components they use.”
-
-**ResinOS: Docker for IoT**
-
-Resin.io, which makes the commercial IoT framework of the same name, recently spun off the framework’s Yocto Linux based [ResinOS 2.0][20]” target=”new”>ResinOS 2.0 as an open source project. Whereas Ubuntu Core runs Docker container engines within snap packages, ResinOS runs Docker on the host. The minimalist ResinOS abstracts the complexity of working with Yocto code, enabling developers to quickly deploy Docker containers.
-
-<center>
-[
- ![](http://hackerboards.com/files/resinio_resinos_arch-sm.jpg) 
-][21]
-**ResinOS 2.0 architecture**
-(click image to enlarge)
-</center>
-
-Like the Linux-based CoreOS, ResinOS integrates systemd control services and a networking stack, enabling secure rollouts of updated applications over a heterogeneous network. However, it’s designed to run on resource constrained devices such as ARM hacker boards, whereas CoreOS and other Docker-oriented OSes like the Red Hat based Project Atomic are currently x86 only and prefer a resource-rich server platform. ResinOS can run on 20 Linux devices and counting, including the Raspberry Pi, BeagleBone, and Odroid-C1.
-
-“We believe that Linux containers are even more important for embedded than for the cloud,” says Resin.io’s Marinos. “In the cloud, containers represent an optimization over previous processes, but in embedded they represent the long-delayed arrival of generic virtualization.”
-
-| 
- ![](http://hackerboards.com/files/beaglebone-hand-thm.jpg) 
-
-**BeagleBone
-Black** |
-
-When applied to IoT, full enterprise virtual machines have performance issues and restrictions on direct hardware access, says Marinos. Mobile VMs like OSGi and Android’s Dalvik can been used for IoT, but they require Java among other limitations.
-
-Using Docker may seem natural for enterprise developers, but how do you convince embedded hackers to move to an entirely new paradigm? “Rather than transferring practices from the cloud wholesale, ResinOS is optimized for embedded,” answers Marinos. In addition, he says, containers are better than typical IoT technologies at containing failure. “If there’s a software defect, the host OS can remain functional and even connected. To recover, you can either restart the container or push an update. The ability to update a device without rebooting it further removes failure opportunities.”
-
-According to Marinos, other benefits accrue from better alignment with the cloud, such as access to a broader set of developers. Containers provide “a uniform paradigm across data center and edge, and a way to easily transfer technology, workflows, infrastructure, and even applications to the edge,” he adds.
-
-The inherent security benefits in containers are being augmented with other technologies, says Marinos. “As the Docker community pushes to implement signed images and attestation, these naturally transfer to ResinOS,” he says. “Similar benefits accrue when the Linux kernel is hardened to improve container security, or gains the ability to better manage resources consumed by a container.”
-
-Containers also fit in well with open source IoT frameworks, says Marinos. “Linux containers are easy to use in combination with an almost endless variety of protocols, applications, languages and libraries,” says Marinos. “Resin.io has participated in the AllSeen Alliance, and we have worked with partners who use IoTivity and Thread.”
-
-**Future IoT: Smarter Gateways and Endpoints**
-
-Marinos and Canonical’s Ries agree on several future trends in IoT. First, the original conception of IoT, in which MCU-based endpoints communicate directly with the cloud for processing, is quickly being replaced with a fog computing architecture. That calls for more intelligent gateways that do a lot more than aggregate data and translate between ZigBee and WiFi.
-
-Second, gateways and smart edge devices are increasingly running multiple apps. Third, many of these devices will provide onboard analytics, which we’re seeing in the latest [smart home hubs][22]. Finally, rich media will soon become part of the IoT mix.
-
-<center>
-[
- ![](http://hackerboards.com/files/eurotech_reliagate2026-sm.jpg) 
-][23] [
- ![](http://hackerboards.com/files/advantech_ubc221-sm.jpg) 
-][24]
-**Some recent IoT gateways: Eurotech’s [ReliaGate 20-26][1] and Advantech’s [UBC-221][2]**
-(click images to enlarge)
-</center>
-
-“Intelligent gateways are taking over a lot of the processing and control functions that were originally envisioned for the cloud,” says Marinos. “Accordingly, we’re seeing an increased push for containerization, so feature- and security-related improvements can be deployed with a cloud-like workflow. The decentralization is driven by factors such as the mobile data crunch, an evolving legal framework, and various physical limitations.”
-
-Platforms like Ubuntu Core are enabling an “explosion of software becoming available for gateways,” says Canonical’s Ries. “The ability to run multiple applications on a single device is appealing both for users annoyed with the multitude of single-function devices, and for device owners, who can now generate ongoing software revenues.”
-
-<center>
-[
- ![](http://hackerboards.com/files/myomega_mynxg-sm.jpg) 
-][25] [
- ![](http://hackerboards.com/files/technexion_ls1021aiot_front-sm.jpg) 
-][26]
-**Two more IoT gateways: [MyOmega MYNXG IC2 Controller (left) and TechNexion’s ][3][LS1021A-IoT Gateway][4]**
-(click images to enlarge)
-</center>
-
-It’s not only gateways — endpoints are getting smarter, too. “Reading a lot of IoT coverage, you get the impression that all endpoints run on microcontrollers,” says Marinos. “But we were surprised by the large amount of Linux endpoints out there like digital signage, drones, and industrial machinery, that perform tasks rather than operate as an intermediary. We call this the shadow IoT.”
-
-Canonical’s Ries agrees that a single-minded focus on minimalist technology misses out on the emerging IoT landscape. “The notion of ‘lightweight’ is very short lived in an industry that’s developing as fast as IoT,” says Ries. “Today’s premium consumer hardware will be powering endpoints in a matter of months.”
-
-While much of the IoT world will remain lightweight and “headless,” with sensors like accelerometers and temperature sensors communicating in whisper thin data streams, many of the newer IoT applications use rich media. “Media input/output is simply another type of peripheral,” says Marinos. “There’s always the issue of multiple containers competing for a limited resource, but it’s not much different than with sensor or Bluetooth antenna access.”
-
-Ries sees a trend of “increasing smartness at the edge” in both industrial and home gateways. “We are seeing a large uptick in AI, machine learning, computer vision, and context awareness,” says Ries. “Why run face detection software in the cloud and incur delays and bandwidth and computing costs, when the same software could run at the edge?”
-
-As we explored in our [opening story][27] of this IoT series, there are IoT issues related to security such as loss of privacy and the tradeoffs from living in a surveillance culture. There are also questions about the wisdom of relinquishing one’s decisions to AI agents that may be controlled by someone else. These won’t be fully solved by containers, snaps, or any other technology.
-
-Perhaps we’d be happier if Alexa handled the details of our lives while we sweat the big stuff, and maybe there’s a way to balance privacy and utility. For now, we’re still exploring, and that’s all for the good.
-
---------------------------------------------------------------------------------
-
-via: http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
-
-作者：[Eric Brown][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
-[1]:http://hackerboards.com/atom-based-gateway-taps-new-open-source-iot-cloud-platform/
-[2]:http://hackerboards.com/compact-iot-gateway-runs-yocto-linux-on-quark/
-[3]:http://hackerboards.com/wireless-crazed-customizable-iot-gateway-uses-arm-or-x86-coms/
-[4]:http://hackerboards.com/iot-gateway-runs-linux-on-qoriq-accepts-arduino-shields/
-[5]:http://hackerboards.com/linux-and-open-source-hardware-for-building-iot-devices/
-[6]:http://hackerboards.com/intel-launches-14nm-atom-e3900-and-spins-an-automotive-version/
-[7]:http://hackerboards.com/samsung-adds-first-64-bit-and-cortex-m4-based-artik-modules/
-[8]:http://hackerboards.com/new-cortex-m-chips-add-armv8-and-trustzone/
-[9]:http://hackerboards.com/exploring-security-challenges-in-linux-based-iot-devices/
-[10]:http://hackerboards.com/linux-based-smart-home-hubs-advance-into-ai/
-[11]:http://hackerboards.com/open-source-projects-for-the-internet-of-things-from-a-to-z/
-[12]:http://hackerboards.com/lightweight-snappy-ubuntu-core-os-targets-iot/
-[13]:http://hackerboards.com/canonical-pushes-snap-as-a-universal-linux-package-format/
-[14]:http://hackerboards.com/ubuntu-core-16-gets-smaller-goes-all-snaps/
-[15]:http://hackerboards.com/files/canonical_ubuntucore16_diagram.jpg
-[16]:http://hackerboards.com/open-source-oses-for-the-internet-of-things/
-[17]:http://hackerboards.com/private-cloud-server-and-iot-gateway-runs-ubuntu-snappy-on-rpi/
-[18]:http://hackerboards.com/linaro-beams-lite-at-internet-of-things-devices/
-[19]:http://hackerboards.com/96boards-goes-cortex-m4-with-iot-edition-and-carbon-sbc/
-[20]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/%3Ca%20href=
-[21]:http://hackerboards.com/files/resinio_resinos_arch.jpg
-[22]:http://hackerboards.com/linux-based-smart-home-hubs-advance-into-ai/
-[23]:http://hackerboards.com/files/eurotech_reliagate2026.jpg
-[24]:http://hackerboards.com/files/advantech_ubc221.jpg
-[25]:http://hackerboards.com/files/myomega_mynxg.jpg
-[26]:http://hackerboards.com/files/technexion_ls1021aiot_front.jpg
-[27]:http://hackerboards.com/an-open-source-perspective-on-the-internet-of-things-part-1/
-[28]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
diff --git a/sources/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md b/sources/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md
deleted file mode 100644
index a0ab5dd8c3..0000000000
--- a/sources/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md	
+++ /dev/null
@@ -1,177 +0,0 @@
-  Vic020
-
-Build, Deploy and Manage Custom Apps with IBM Bluemix
-============================================================
-
-
- ![IBM Blue mix logo](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/IBM-Blue-mix-logo.jpg?resize=300%2C266) 
-
-_IBM’s Bluemix affords developers an opportunity to build, deploy and manage custom apps. Bluemix is built on Cloud Foundry. It supports a number of programming languages as well as OpenWhisk, which allows developers to call any function without the need for resource management._
-
-Bluemix is an open standards, cloud-based platform implemented by IBM. It has an open architecture which enables organisations to create, develop and manage their applications on the cloud. It is based on Cloud Foundry and hence can be considered as a Platform as a Service (PaaS). With Bluemix, developers need not worry about cloud configurations, but can concentrate on their applications. Cloud configurations will be done automatically by Bluemix.
-
-Bluemix also provides a dashboard, with which developers can create, manage and view services and applications, while monitoring resource usage also.
-It supports the following programming languages:
-
-*   Java
-*   Python
-*   Ruby on Rails
-*   PHP
-*   Node.js
-
-It also supports OpenWhisk (Function as a Service), which is also an IBM product that allows developers to call any function without requiring any resource management.
-
-![Figure 1 An Overview of IBM Bluemix](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-1-An-Overview-of-IBM-Bluemix.jpg?resize=296%2C307) 
-
-Figure 1: An Overview of IBM Bluemix
-
-![Figure 2 The IBM Bluemix architecture](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-2-The-IBM-Bluemix-architecture.jpg?resize=350%2C239)
-
-Figure 2: The IBM Bluemix architecture
-
-![Figure 3 Creating an organisation in IBM Bluemix](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-3-Creating-an-organisation-in-IBM-Bluemix.jpg?resize=350%2C280) 
-
-Figure 3: Creating an organisation in IBM Bluemix
-
-**How IBM Bluemix works**
-Bluemix is built on top of IBM’s SoftLayer IaaS (Infrastructure as a Service). It uses Cloud Foundry as an open source PaaS. It starts by pushing code through Cloud Foundry, which plays the role of combining the code and suitable runtime environment based on the programming language in which the application is written. IBM services, third party services or community built services can be used for different functionalities. Secure connectors can be used to connect to on-premise systems and the cloud.
-
-![Figure 4 Setting up Space in IBM Bluemix](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-4-Setting-up-Space-in-IBM-Bluemix.jpg?resize=350%2C267) 
-
-Figure 4: Setting up Space in IBM Bluemix
-
-![Figure 5 The app template](http://i2.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-5-The-app-template.jpg?resize=350%2C135) 
-
-Figure 5: The app template
-
-![Figure 6 IBM Bluemix supported programming languages](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-6-IBM-Bluemix-supported-programming-languages.jpg?resize=350%2C173) 
-
-Figure 6: IBM Bluemix supported programming languages
-
-**Creating an app in Bluemix**
-In this article, we will create a sample ‘Hello World’ application in IBM Bluemix by using the Liberty for Java starter pack, in just a few simple steps.
-
-1\. Go to [_https://console.ng.bluemix.net/registration/_][2].
-
-2\. Confirm the Bluemix account.
-
-3\. Click on the confirmation link in the mail to complete the sign up process.
-
-4\. Give your email ID and click on _Continue_ to log in.
-
-5\. Enter the password and click on _Log in._
-
-6. _Set up_ and _Environment_ share resources in specific regions.
-
-7\. Create Space to manage access and roll-back in Bluemix. We can map Spaces to development stages such as dev, test, uat, pre-prod and prod.
-
- ![Figure 7 Naming the app](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-7-Naming-the-app.jpg?resize=350%2C133) 
-
-Figure 7: Naming the app
-
-![Figure 8 Knowing when the app is ready](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-8-Knowing-when-the-app-is-ready.jpg?resize=350%2C170) 
-
-Figure 8: Knowing when the app is ready
-
-![Figure 9 The IBM Bluemix Java App](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-9-The-IBM-Bluemix-Java-App.jpg?resize=350%2C151) 
-
-Figure 9: The IBM Bluemix Java App
-
-8\. Once this initial configuration is completed, click on_ I’m ready_. _Good to Go_!
-
-9\. Verify the IBM Bluemix dashboard after successfully logging in, specifically sections such as Cloud Foundry Apps where 2GB is available and Virtual Server where 0 instances are available, as of now.
-
-10\. Click on _Create app_. Choose the template for app creation. In our case, we will go for a Web app.
-
-11\. How do you get started? Click on Liberty for Java, and then verify the description.
-
-12\. Click on _Continue_.
-
-13\. What do you want to name your new app? For this article, let’s use osfy-bluemix-tutorial and click on _Finish_.
-
-14\. It will take some time to create resources and to host an application on Bluemix.
-
-15\. In a few minutes, your app will be up and running. Note the URL of the application.
-
-16\. Visit the application’s URL _http://osfy-bluemix-tutorial.au-syd.mybluemix.net/_. Bingo, our first Java application is up and running on IBM Bluemix.
-
-17\. To verify the source code, click on _Files_ and navigate to different files and folders in the portal.
-
-18\. The _Logs_ section provides all the activity logs, starting from the application’s creation.
-
-19\. The _Environment Variables_ section provides details on all the environment variables of VCAP_Services as well as those that are user defined.
-
-20\. To verify the application’s consumption of resources, go to the Liberty for Java section.
-
-21\. The _Overview_ section of each application contains details regarding resources, the application’s health, and activity logs, by default.
-
-22\. Open Eclipse, go to the Help menu and click on _Eclipse Marketplace_.
-
-23\. Find _IBM Eclipse tools_ for _Bluemix_ and click on _Install_.
-
-24\. Confirm the selected features and install them in Eclipse.
-
-25\. Download the application starter code. Import it into Eclipse by clicking on _File Menu_, select _Import Existing Projects_ into _Workspace_ and start modifying the existing code.
-
-![Figure 10 The Java app source files](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-10-The-Java-app-source-files.jpg?resize=350%2C173) 
-
-Figure 10: The Java app source files
-
-![Figure 11 The Java app logs](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-11-The-Java-app-logs.jpg?resize=350%2C133) 
-
-Figure 11: The Java app logs
-
-![Figure 12 Java app -- Liberty for Java](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-12-Java-app-Liberty-for-Java.jpg?resize=350%2C169) 
-
-Figure 12: Java app — Liberty for Java
-
-**[
-][1]Why IBM Bluemix?**
-Here are some compelling reasons to use IBM Bluemix:
-
-*   Supports multiple languages and platforms
-*   Free trial
-
-    1\. Minimal registration process
-    
-    2\. No credit card required
-    
-    3\. 30-days trial period – with quotas of 2GB of runtime, 20 services, 500 routes
-    
-    4\. Unlimited access to standard support
-    
-    5\. No production use limitations
-    
-*   Pay only for the use of each runtime and service
-*   Quick set-up – hence faster time to market
-*   Continuous delivery of new features
-*   Secure integration with on-premise resources
-*   Use cases
-
-    1\. Web applications and mobile back-ends
-    
-    2\. APIs and on-premise integration
-    
-*   DevOps services are available as SaaS on the cloud and support continuous delivery of:
-
-    1\. Web IDE
-    
-    2\. SCM
-    
-    3\. Agile planning
-    
-    4\. Delivery pipeline service
-
---------------------------------------------------------------------------------
-
-via: http://opensourceforu.com/2016/11/build-deploy-manage-custom-apps-ibm-bluemix/
-
-作者：[MITESH_SONI][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://opensourceforu.com/author/mitesh_soni/
-[1]:http://opensourceforu.com/wp-content/uploads/2016/10/Figure-7-Naming-the-app.jpg
-[2]:https://console.ng.bluemix.net/registration/
diff --git a/sources/tech/20161126 Building Vim from source.md b/sources/tech/20161126 Building Vim from source.md
deleted file mode 100644
index cd3cf38e48..0000000000
--- a/sources/tech/20161126 Building Vim from source.md	
+++ /dev/null
@@ -1,142 +0,0 @@
-翻译中-byzky001
-Compiling Vim from source is actually not that difficult.
-Here's what you should do:
-
-1. First, install all the prerequisite libraries, including Git.
-   For a Debian-like Linux distribution like Ubuntu,
-   that would be the following:
-
-    ```sh
-    sudo apt-get install libncurses5-dev libgnome2-dev libgnomeui-dev \
-        libgtk2.0-dev libatk1.0-dev libbonoboui2-dev \
-        libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev \
-        python3-dev ruby-dev lua5.1 lua5.1-dev libperl-dev git
-    ```
-
-    On Ubuntu 16.04, `liblua5.1-dev` is the lua dev package name not `lua5.1-dev`.
-
-   (If you know what languages you'll be using, feel free to leave out
-   packages you won't need, e.g. Python2 `python-dev` or Ruby `ruby-dev`.
-   This principle heavily applies to the whole page.)
-
-    For Fedora 20, that would be the following:
-
-    ```sh
-    sudo yum install -y ruby ruby-devel lua lua-devel luajit \
-        luajit-devel ctags git python python-devel \
-        python3 python3-devel tcl-devel \
-        perl perl-devel perl-ExtUtils-ParseXS \
-        perl-ExtUtils-XSpp perl-ExtUtils-CBuilder \
-        perl-ExtUtils-Embed
-    ```
-
-    This step is needed to rectify an issue with how Fedora 20 installs XSubPP:
-
-    ```sh
-    # symlink xsubpp (perl) from /usr/bin to the perl dir
-    sudo ln -s /usr/bin/xsubpp /usr/share/perl5/ExtUtils/xsubpp 
-    ```
-
-2. Remove vim if you have it already.
-
-    ```sh
-    sudo apt-get remove vim vim-runtime gvim
-    ```
-
-    On Ubuntu 12.04.2 you probably have to remove these packages as well:
-
-    ```sh
-    sudo apt-get remove vim-tiny vim-common vim-gui-common vim-nox
-    ```
-
-3. Once everything is installed, getting the source is easy.
-
-   Note: If you are using Python, your config directory might have
-   a machine-specific name (e.g. `config-3.5m-x86_64-linux-gnu`).
-   Check in /usr/lib/python[2/3/3.5] to find yours, and change
-   the `python-config-dir` and/or `python3-config-dir` arguments accordingly.
-
-    Add/remove the flags below to fit your setup. For example, you can leave out
-    `enable-luainterp` if you don't plan on writing any Lua.
-
-   Also, if you're not using vim 8.0,
-   make sure to set the VIMRUNTIMEDIR variable correctly below
-   (for instance, with vim 8.0a, use /usr/share/vim/vim80a).
-   Keep in mind that some vim installations are located directly
-   inside /usr/share/vim; adjust to fit your system:
-
-    ```sh
-    cd ~
-    git clone https://github.com/vim/vim.git
-    cd vim
-    ./configure --with-features=huge \
-                --enable-multibyte \
-                --enable-rubyinterp=yes \
-                --enable-pythoninterp=yes \
-                --with-python-config-dir=/usr/lib/python2.7/config \
-                --enable-python3interp=yes \
-                --with-python3-config-dir=/usr/lib/python3.5/config \
-                --enable-perlinterp=yes \
-                --enable-luainterp=yes \
-                --enable-gui=gtk2 --enable-cscope --prefix=/usr
-    make VIMRUNTIMEDIR=/usr/share/vim/vim80
-    ```
-    On Ubuntu 16.04, Python support was not working due to enabling both Python2 and Python3. Read [answer by chirinosky](http://stackoverflow.com/questions/23023783/vim-compiled-with-python-support-but-cant-see-sys-version) for workaround.
-
-    If you want to be able to easily uninstall vim use `checkinstall`.
-
-    ```sh
-    sudo apt-get install checkinstall
-    cd ~/vim
-    sudo checkinstall
-    ```
-
-    Otherwise, you can use `make` to install.
-
-    ```sh
-    cd ~/vim
-    sudo make install
-    ```
-
-    Set vim as your default editor with `update-alternatives`.
-
-    ```sh
-    sudo update-alternatives --install /usr/bin/editor editor /usr/bin/vim 1
-    sudo update-alternatives --set editor /usr/bin/vim
-    sudo update-alternatives --install /usr/bin/vi vi /usr/bin/vim 1
-    sudo update-alternatives --set vi /usr/bin/vim
-    ```
-
-4. Double check that you are in fact running the new Vim binary by looking at
-   the output of `vim --version`.
-
-    **If you don't get gvim working (on ubuntu 12.04.1 LTS), try changing
-    `--enable-gui=gtk2` to `--enable-gui=gnome2`**
-
-    If you have problems, double check that you `configure`d using the correct Python config
-    directory, as noted at the beginning of Step 3.
-
-    These `configure` and `make` calls assume a Debian-like distro where Vim's
-    runtime files directory is placed in `/usr/share/vim/vim80/`,
-    which is not Vim's default. Same thing goes for `--prefix=/usr` in the 
-    `configure` call. Those values may need to be different with a Linux 
-    distro that is not based on Debian. In such a case, try to remove the 
-    `--prefix` variable in the `configure` call and the `VIMRUNTIMEDIR` in the
-    `make` call (in other words, go with the defaults).
-
-    If you get stuck, here's some [other useful information on building Vim]
-    (http://vim.wikia.com/wiki/Building_Vim).
-    
---------------------------------------------------------------------------------
-
-via: https://www.dataquest.io/blog/data-science-portfolio-project/
-
-作者：[Val Markovic][a]
-
-译者：[译者ID](https://github.com/译者ID)
-
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:   https://github.com/Valloric
diff --git a/sources/tech/20161128 Managing devices in Linux.md b/sources/tech/20161128 Managing devices in Linux.md
deleted file mode 100644
index 09a5e7508d..0000000000
--- a/sources/tech/20161128 Managing devices in Linux.md	
+++ /dev/null
@@ -1,173 +0,0 @@
-erlinux translate...
-
-Managing devices in Linux
-============================================================
-
->Explore how the /dev directory gives you direct access to your devices in Linux.
-
- ![Managing devices in Linux](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/OSDC_Penguin_Image_520x292_12324207_0714_mm_v1a.png?itok=WfAkwbFy "Managing devices in Linux") 
-
->Image by :Opensource.com
-
-There are many interesting features of the Linux directory structure. This month I cover some fascinating aspects of the /dev directory. Before you proceed any further with this article, I suggest that, if you have not already done so, you read my earlier articles, _[Everything is a file][1]_, and _[An introduction to Linux filesystems][2]_, both of which introduce some interesting Linux filesystem concepts. Go ahead—I will wait.
-
-Great! Welcome back. Now we can proceed with a more detailed exploration of the /dev directory.
-
-### Device files
-
-Device files are also known as [device ][3][special files][4]. Device files are employed to provide the operating system and users an interface to the devices that they represent. All Linux device files are located in the /dev directory, which is an integral part of the root (/) filesystem because these device files must be available to the operating system during the boot process.
-
-One of the most important things to remember about these device files is that they are most definitely not device drivers. They are more accurately described as portals to the device drivers. Data is passed from an application or the operating system to the device file which then passes it to the device driver which then sends it to the physical device. The reverse data path is also used, from the physical device through the device driver, the device file, and then to an application or another device.
-
-Let's look at the data flow of a typical command to visualize this.
-
- ![dboth-dev-dir_0.png](https://opensource.com/sites/default/files/images/life-uploads/dboth-dev-dir_0.png) 
-
-Figure 1: Simple data flow for a typical command.</center>
-
-In Figure 1, above, a simplified data flow is shown for a common command. Issuing the **cat /etc/resolv.conf** command from a GUI terminal emulator such as Konsole or xterm causes the resolv.conf file to be read from the disk with the disk device driver handling the device specific functions such as locating the file on the hard drive and reading it. The data is passed through the device file and then from the command to the device file and device driver for pseudo-terminal 6 where it is displayed in the terminal session.
-
-Of course, the output of the **cat** command could have been redirected to a file in the following manner, **cat /etc/resolv.conf > /etc/resolv.bak** in order to create a backup of the file. In that case, the data flow on the left side of Figure 1 would remain the same while the data flow on the right would be through the /dev/sda2 device file, the hard drive device driver and then onto the hard drive itself.
-
-These device files make it very easy to use standard streams (STD/IO) and redirection to access any and every device on a Linux or Unix computer. Simply directing a data stream to a device file sends the data to that device.
-
-### Classification
-
-Device files can be classified in at least two ways. The first and most commonly used classification is that of the data stream commonly associated with the device. For example, tty (teletype) and serial devices are considered to be character based because the data stream is transferred and handled one character or byte at a time. Block type devices such as hard drives transfer data in blocks, typically a multiple of 256 bytes.
-
-If you have not already, go ahead and as a non-root user in a terminal session, change the present working directory (PWD) to /dev and display a long listing. This shows a list of device files with their file permissions and their major and minor identification numbers. For example, the following device files are just a few of the ones in the /dev/directory on my Fedora 24 workstation. They represent disk and tty type devices. Notice the leftmost character of each line in the output. The ones that have a "b" are block type devices and the ones that begin with "c" are character devices.
-
-```
-brw-rw----   1 root disk        8,   0 Nov  7 07:06 sda 
-brw-rw----   1 root disk        8,   1 Nov  7 07:06 sda1 
-brw-rw----   1 root disk        8,  16 Nov  7 07:06 sdb 
-brw-rw----   1 root disk        8,  17 Nov  7 07:06 sdb1 
-brw-rw----   1 root disk        8,  18 Nov  7 07:06 sdb2
-crw--w----   1 root tty         4,   0 Nov  7 07:06 tty0 
-crw--w----   1 root tty         4,   1 Nov  7 07:07 tty1 
-crw--w----   1 root tty         4,  10 Nov  7 07:06 tty10 
-crw--w----   1 root tty         4,  11 Nov  7 07:06 tty11
-```
-
-The more detailed and explicit way to identify device files is using the device major and minor numbers. The disk devices have a major number of 8 which designates them as SCSI block devices. Note that all PATA and SATA hard drives have been managed by the SCSI subsystem because the old ATA subsystem was many years ago deemed as not maintainable due to the poor quality of its code. As a result, hard drives that would previously have been designated as "hd[a-z]" are now referred to as "sd[a-z]".
-
-You can probably infer the pattern of disk drive minor numbers in the small sample shown above. Minor numbers 0, 16, 32 and so on up through 240 are the whole disk numbers. So major/minor 8/16 represents the whole disk /dev/sdb and 8/17 is the device file for the first partition, /dev/sdb1\. Numbers 8/34 would be /dev/sdc2.
-
-The tty device files in the list above are numbered a bit more simply from tty0 through tty63.
-
-The [Linux Allocated Devices][5] file at Kernel.org is the official registry of device types and major and minor number allocations. It can help you understand the major/minor numbers for all currently defined devices.
-
-### Fun with device files
-
-Let's take a few minutes now and perform a couple fun experiments that will illustrate the power and flexibility of the Linux device files. Most Linux distributions have multiple virtual consoles, 1 through 7, that can be used to login to a local console session with a shell interface. These can be accessed using the key combinations Ctrl-Alt-F1 for console 1, Ctrl-Alt-F2 for console 2, and so on.
-
-Press Ctrl-Alt-F2 to switch to console 2\. On some distributions, the login information includes the tty device associated with this console, but many do not. It should be tty2 because you are in console 2.
-
-Log in as a non-root user. Then you can use the who am i command—yes, just like that, with spaces—to determine which tty device is connected to this console.
-
-Before we actually perform this experiment, look at a listing of the tty2 and tty3 devices in /dev.
-
-```
-ls -l /dev/tty[23]
-```
-
-There will be a large number of tty devices defined but we do not care about most of them, just the tty2 and tty3 devices. As device files, there is nothing special about them; they are simply character type devices. We will use these devices for this experiment. The tty2 device is attached to virtual console 2 and the tty3 device is attached to virtual console 3.
-
-Press Ctrl-Alt-F3 to switch to console 3\. Log in again as the same non-root user. Now enter the following command on console 3.
-
-```
-echo "Hello world" > /dev/tty2
-```
-
-Press Ctrl-Alt-F2 to return to console 2\. The string "Hello world" (without quotes) is displayed in console 2.
-
-This experiment can also be performed with terminal emulators on the GUI desktop. Terminal sessions on the desktop use pseudo terminal devices in the /dev tree, such as /dev/pts/1\. Open two terminal sessions using Konsole or Xterm. Determine which pseudo-terminals they are connected to and use one to send a message to the other.
-
-Now continue the experiment by using the cat command to display the /etc/fstab file on a different terminal.
-
-Another interesting experiment is to print a file directly to the printer using the cat command. Assuming that your printer device is /dev/usb/lp0, and that your printer can print PDF files directly, the following command will print the PDF file test.pdf on your printer.
-
-```
-cat test.pdf > /dev/usb/lp0
-```
-
-The /dev directory contains some very interesting device files that are portals to hardware that one does not normally think of as a device like a hard drive or display. For one example, system memory—RAM—is not something that is normally considered as a "device," yet /dev/mem is the portal through which direct access to memory can be achieved. The following example had some interesting results.
-
-```
-dd if=/dev/mem bs=2048 count=100
-```
-
-The **dd** command above provides a bit more control than simply using the **cat**command to dump all of a system's memory. It provides the ability to specify how much data is read from /dev/mem and would also allow me to specify the point at which to start reading data from memory. Although some memory was read, the kernel responded with the following error that I found in /var/log/messages.
-
-```
-Nov 14 14:37:31 david kernel: usercopy: kernel memory exposure attempt detected from ffff9f78c0010000 (dma-kmalloc-512) (2048 bytes)
-```
-
-What this error means is that the kernel is doing its job by protecting memory that belongs to other processes which is exactly how it should work. So, although you can use /dev/mem to display data stored in RAM memory, access to most memory space is protected and will result in errors. Only that virtual memory which is assigned by the kernel memory manager to the BASH shell running the **dd** command should be accessible without causing an error. Sorry, but you cannot snoop in memory that does not belong to you unless you find a vulnerability to exploit.
-
-There are some other very interesting device files in /dev. The device files null, zero, random and urandom are not associated with any physical devices.
-
-For example, the null device /dev/null can be used as a target for the redirection of output from shell commands or programs so that they are not displayed on the terminal. I frequently use this in my BASH scripts to prevent users from being presented with output that might be confusing to them. The /dev/null device can be used to produce a string of null characters. Use the **dd** command as shown below to view some output from the /dev/null device file.
-
-```
-# dd if=/dev/null  bs=512 count=500 | od -c     
-0+0 records in
-0+0 records out
-0 bytes copied, 1.5885e-05 s, 0.0 kB/s
-0000000
-```
-
-Note that there is really no visible output because null characters are nothing. Note the byte count.
-
-The /dev/random and /dev/urandom devices are also very interesting. As their names imply, they both produce random output—not just numbers but any and all byte combinations. The /dev/urandom device produces deterministic random output and is very fast. That means the output is determined by an algorithm and uses a seed string as a starting point. As a result it is possible, although very difficult, for a hacker to reproduce the output if the original seed is known. Use the command **cat /dev/urandom** to view typical output. You can use Ctrl-c to break out.
-
-The /dev/random device file produces non-deterministic random output but it produces output more slowly. This output is not determined by an algorithm that is dependent upon the previous number, but is generated in response to keystrokes and mouse movements. This method makes it far more difficult to duplicate a specific series of random numbers. Use the **cat **command to view some of the output from the /dev/random device file. Try moving the mouse to see how it affects the output.
-
-As its name implies, the /dev/zero device file produces an unending string of zeroes as output. Note that these are Octal zeroes and not the ASCII character zero (0). Use the **dd** command as shown below to view some output from the /dev/zero device file.
-
-```
-# dd if=/dev/zero  bs=512 count=500 | od -c
-0000000  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0  \0
-*
-500+0 records in
-500+0 records out
-256000 bytes (256 kB, 250 KiB) copied, 0.00126996 s, 202 MB/s
-0764000
-```
-
-Note that the byte count for this command is non-zero.
-
-### Creating device files
-
-In the past, the device files in /dev were all created at installation time, resulting in a directory full of almost every possible device file, even though most would never be used. In the unlikely event that a new device file was needed or one was accidentally deleted and needed to be re-created, the **mknod** program was available to manually create device files. All you had to know was the device major and minor numbers.
-
-CentOS and RHEL 6 and 7, as well as all versions of Fedora going back to at least as far Fedora 15, use the newer method of creating the device files. All device files are created at boot time. This functionality is possible because the udev device manager detects addition and removal of devices as they occur. This allows for true dynamic plug-n-play functionality while the host is up and running. It also performs the same task at boot time by detecting all devices installed on the system very early in the boot process. [Linux.com][6] has a good [description of udev][7].
-
-Going back to your listing of the files in /dev, notice the date and time on the files. All of them were created during the last boot. You can verify this using the **uptime**or **last** commands. In my device listing above, all of those files were created at 7:06 AM on November 7, which is the last time I booted the system.
-
-Of course, the **mknod** command is still available, but the new **MAKEDEV** (yes, in all uppercase—which in my opinion is contrary to the Linux philosophy of using all lowercase command names) command provides an easier interface for creating device files, should the need arise. The MAKEDEV command is not installed by default in current versions of Fedora or CentOS 7; it is installed in CentOS 6\. You can use YUM or DNF to install the MAKEDEV package.
-
-### Conclusion
-
-Interestingly enough, it had been a long time since I needed to create a device file. However, just recently I had an interesting situation where one of the device files I typically use was not created and I did have to create it. I have not had any problem with that device since. So a situation caused by a missing device file can still happen and knowing how to deal with it can be important.
-
-I have not covered many of the myriad different types of device files that you might encounter. That information is available in plenty of detail in the resources cited. I hope I have given you some basic understanding of how these files function and the tools to allow you to explore more on your own.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/16/11/managing-devices-linux
-
-作者：[David Both][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://opensource.com/users/dboth
-[1]:https://opensource.com/life/15/9/everything-is-a-file
-[2]:https://opensource.com/life/16/10/introduction-linux-filesystems
-[3]:https://en.wikipedia.org/wiki/Device_file
-[4]:https://en.wikipedia.org/wiki/Device_file
-[5]:https://www.kernel.org/doc/Documentation/devices.txt
-[6]:https://www.linux.com/
-[7]:https://www.linux.com/news/udev-introduction-device-management-modern-linux-system
diff --git a/sources/tech/20161201 Using the NTP time synchronization.md b/sources/tech/20161201 Using the NTP time synchronization.md
deleted file mode 100644
index 833ce1afe4..0000000000
--- a/sources/tech/20161201 Using the NTP time synchronization.md	
+++ /dev/null
@@ -1,144 +0,0 @@
-GHLandy Translating
-
-使用 NTP 进行时间同步
-============================================================
-
-NTP 是通过网络来同步时间的一种 TCP/IP 协议。通常客户端向服务器请求当前的时间，并根据结果来设置其时钟。
-
-Behind this simple description, there is a lot of complexity - there are tiers of NTP servers, with the tier one NTP servers connected to atomic clocks, and tier two and three servers spreading the load of actually handling requests across the Internet. Also the client software is a lot more complex than you might think - it has to factor out communication delays, and adjust the time in a way that does not upset all the other processes that run on the server. But luckily all that complexity is hidden from you!
-
-Ubuntu uses ntpdate and ntpd.
-
-*   [timedatectl][4]
-*   [timesyncd][5]
-*   [ntpdate][6]
-*   [timeservers][7]
-*   [ntpd][8]
-*   [安装][9]
-*   [配置][10]
-*   [View status][11]
-*   [PPS Support][12]
-*   [参考资料][13]
-
-### timedatectl
-
-In recent Ubuntu releases timedatectl replaces ntpdate. By default timedatectl syncs the time once on boot and later on uses socket activation to recheck once network connections become active.
-
-If ntpdate / ntp is installed timedatectl steps back to let you keep your old setup. That shall ensure that no two time syncing services are fighting and also to retain any kind of old behaviour/config that you had through an upgrade. But it also implies that on an upgrade from a former release ntp/ntpdate might still be installed and therefore renders the new systemd based services disabled.
-
-### timesyncd
-
-In recent Ubuntu releases timesyncd replaces the client portion of ntpd. By default timesyncd regularly checks and keeps the time in sync. It also stores time updates locally, so that after reboots monotonically advances if applicable.
-
-The current status of time and time configuration via timedatectl and timesyncd can be checked with timedatectl status.
-
-```
-timedatectl status
-      Local time: Fri 2016-04-29 06:32:57 UTC
-  Universal time: Fri 2016-04-29 06:32:57 UTC
-        RTC time: Fri 2016-04-29 07:44:02
-       Time zone: Etc/UTC (UTC, +0000)
- Network time on: yes
-NTP synchronized: no
- RTC in local TZ: no
-```
-
-If NTP is installed and replaces the activity of timedatectl the line "NTP synchronized" is set to yes.
-
-The nameserver to fetch time for timedatectl and timesyncd from can be specified in /etc/systemd/timesyncd.conf and with flexible additional config files in /etc/systemd/timesyncd.conf.d/.
-
-### ntpdate
-
-ntpdate is considered deprecated in favour of timedatectl and thereby no more installed by default. If installed it will run once at boot time to set up your time according to Ubuntu's NTP server. Later on anytime a new interface comes up it retries to update the time - while doing so it will try to slowly drift time as long as the delta it has to cover isn't too big. That behaviour can be controlled with the -B/-b switches.
-
-```
-ntpdate ntp.ubuntu.com
-```
-
-### timeservers
-
-By default the systemd based tools request time information at ntp.ubuntu.com. In classic ntpd based service uses the pool of [0-3].ubuntu.pool.ntp.org Of the pool number 2.ubuntu.pool.ntp.org as well as ntp.ubuntu.com also support ipv6 if needed. If one needs to force ipv6 there also is ipv6.ntp.ubuntu.com which is not configured by default.
-
-### ntpd
-
-The ntp daemon ntpd calculates the drift of your system clock and continuously adjusts it, so there are no large corrections that could lead to inconsistent logs for instance. The cost is a little processing power and memory, but for a modern server this is negligible.
-
-### 安装
-
-To install ntpd, from a terminal prompt enter:
-
-```
-sudo apt install ntp
-```
-
-### 配置
-
-Edit /etc/ntp.conf to add/remove server lines. By default these servers are configured:
-
-```
-# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
-# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
-# more information.
-server 0.ubuntu.pool.ntp.org
-server 1.ubuntu.pool.ntp.org
-server 2.ubuntu.pool.ntp.org
-server 3.ubuntu.pool.ntp.org
-```
-
-After changing the config file you have to reload the ntpd:
-
-```
-sudo systemctl reload ntp.service
-```
-
-### View status
-
-Use ntpq to see more info:
-
-```
-# sudo ntpq -p
-     remote           refid      st t when poll reach   delay   offset  jitter
-==============================================================================
-+stratum2-2.NTP. 129.70.130.70    2 u    5   64  377   68.461  -44.274 110.334
-+ntp2.m-online.n 212.18.1.106     2 u    5   64  377   54.629  -27.318  78.882
-*145.253.66.170  .DCFa.           1 u   10   64  377   83.607  -30.159  68.343
-+stratum2-3.NTP. 129.70.130.70    2 u    5   64  357   68.795  -68.168 104.612
-+europium.canoni 193.79.237.14    2 u   63   64  337   81.534  -67.968  92.792
-```
-
-### PPS Support
-
-Since 16.04 ntp supports PPS discipline which can be used to augment ntp with local timesources for better accuracy. For more details on configuration see the external pps ressource listed below.
-
-### 参考资料
-
-*   See the [Ubuntu Time][1] wiki page for more information.
-
-*   [ntp.org, home of the Network Time Protocol project][2]
-
-*   [ntp.org faq on configuring PPS][3]
-
---------------------------------------------------------------------------------
-
-via: https://help.ubuntu.com/lts/serverguide/NTP.html
-
-作者：[Ubuntu][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://help.ubuntu.com/lts/serverguide/NTP.html
-[1]:https://help.ubuntu.com/community/UbuntuTime
-[2]:http://www.ntp.org/
-[3]:http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#S-CONFIG-ADV-PPS
-[4]:https://help.ubuntu.com/lts/serverguide/NTP.html#timedatectl
-[5]:https://help.ubuntu.com/lts/serverguide/NTP.html#timesyncd
-[6]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntpdate
-[7]:https://help.ubuntu.com/lts/serverguide/NTP.html#timeservers
-[8]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntpd
-[9]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntp-installation
-[10]:https://help.ubuntu.com/lts/serverguide/NTP.html#timeservers-conf
-[11]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntp-status
-[12]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntp-pps
-[13]:https://help.ubuntu.com/lts/serverguide/NTP.html#ntp-references
diff --git a/sources/tech/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md b/sources/tech/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md
deleted file mode 100644
index cf1b14118d..0000000000
--- a/sources/tech/20161205 Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3.md	
+++ /dev/null
@@ -1,362 +0,0 @@
-Rusking translating
-
-Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3
-============================================================
-
-In this part of the [Samba4 AD DC infrastructure series][8] we will talk on how join a Windows 10 machine into a Samba4 realm and how to administer the domain from a Windows 10 workstation.
-
-Once a Windows 10 system has been joined to Samba4 AD DC we can create, remove or disable domain users and groups, we can create new Organizational Units, we can create, edit and manage domain policy or we can manage Samba4 domain DNS service.
-
-All of the above functions and other complex tasks concerning domain administration can be achieved via any modern Windows platform with the help of RSAT – Microsoft Remote Server Administration Tools.
-
-#### Requirements
-
-1.  [Create an AD Infrastructure with Samba4 on Ubuntu 16.04 – Part 1][1]
-2.  [Manage Samba4 AD Infrastructure from Linux Command Line – Part 2][2]
-3.  [Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4][3]
-
-### Step 1: Configure Domain Time Synchronization
-
-1. Before starting to administer Samba4 ADDC from Windows 10 with the help of RSAT tools, we need to know and take care of a crucial piece of service required for an Active Directory and this service refers to [accurate time synchronization][9].
-
-Time synchronization can be offered by NTP daemon in most of the Linux distributions. The default maximum time period discrepancy an AD can support is about 5 minutes.
-
-If the divergence time period is greater than 5 minutes you should start experience various errors, most important concerning AD users, joined machines or share access.
-
-To install Network Time Protocol daemon and NTP client utility in Ubuntu, execute the below command.
-
-```
-$ sudo apt-get install ntp ntpdate
-```
-[
- ![Install NTP on Ubuntu](http://www.tecmint.com/wp-content/uploads/2016/12/Install-NTP-on-Ubuntu.png) 
-][10]
-
-Install NTP on Ubuntu
-
-2. Next, open and edit NTP configuration file and replace the default NTP pool server list with a new list of NTP servers which are geographically located near your current physical equipment location.
-
-The list of NTP servers can be obtained by visiting official NTP Pool Project webpage [http://www.pool.ntp.org/en/][11].
-
-```
-$ sudo nano /etc/ntp.conf
-```
-
-Comment the default server list by adding a `#` in front of each pool line and add the below pool lines with your proper NTP servers as illustrated on the below screenshot.
-
-```
-pool 0.ro.pool.ntp.org iburst
-pool 1.ro.pool.ntp.org iburst
-pool 2.ro.pool.ntp.org iburst
-# Use Ubuntu's ntp server as a fallback.
-pool 3.ro.pool.ntp.org
-```
-[
- ![Configure NTP Server in Ubuntu](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-NTP-Server-in-Ubuntu.png) 
-][12]
-
-Configure NTP Server in Ubuntu
-
-3. Now, don’t close the file yet. Move to the top at the file and add the below line after the driftfile statement. This setup allows the clients to query the server using AD signed NTP requests.
-
-```
-ntpsigndsocket /var/lib/samba/ntp_signd/
-```
-[
- ![Sync AD with NTP](http://www.tecmint.com/wp-content/uploads/2016/12/Sync-AD-with-NTP.png) 
-][13]
-
-Sync AD with NTP
-
-4. Finally, move to the bottom of the file and add the below line, as illustrated on the below screenshot, which will allow network clients only to query the time on the server.
-
-```
-restrict default kod nomodify notrap nopeer mssntp
-```
-[
- ![Query Clients to NTP Server](http://www.tecmint.com/wp-content/uploads/2016/12/Query-Client-to-NTP-Server.png) 
-][14]
-
-Query Clients to NTP Server
-
-5. When finished, save and close the NTP configuration file and grant NTP service with the proper permissions in order to read the ntp_signed directory.
-
-This is the system path where Samba NTP socket is located. Afterwards, restart NTP daemon to apply changes and verify if NTP has open sockets in your system network table using [netstat command][15]combined with [grep filter][16].
-
-```
-$ sudo chown root:ntp /var/lib/samba/ntp_signd/
-$ sudo chmod 750 /var/lib/samba/ntp_signd/
-$ sudo systemctl restart ntp
-$ sudo netstat –tulpn | grep ntp
-```
-[
- ![Grant Permission to NTP](http://www.tecmint.com/wp-content/uploads/2016/12/Grant-Permission-to-NTP.png) 
-][17]
-
-Grant Permission to NTP
-
-Use the ntpq command line utility to monitor NTP daemon along with the `-p` flag in order to print a summary of peers state.
-
-```
-$ ntpq -p
-```
-[
- ![Monitor NTP Server Pool](http://www.tecmint.com/wp-content/uploads/2016/12/Monitor-NTP-Server-Pool.png) 
-][18]
-
-Monitor NTP Server Pool
-
-### Step 2: Troubleshoot NTP Time Issues
-
-6. Sometimes the NTP daemon gets stuck in calculations while trying to synchronize time with an upstream ntp server peer, resulting the following error messages when manually trying to force time synchronization by running ntpdate utility on a client side:
-
-```
-# ntpdate -qu adc1
-ntpdate[4472]: no server suitable for synchronization found
-```
-[
- ![NTP Time Synchronization Error](http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Time-Synchronization-Error.png) 
-][19]
-
-NTP Time Synchronization Error
-
-when using ntpdate command with `-d` flag.
-
-```
-# ntpdate -d adc1.tecmint.lan
-Server dropped: Leap not in sync
-```
-[
- ![NTP Server Dropped Leap Not in Sync](http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Server-Dropped-Leap-Not-Sync.png) 
-][20]
-
-NTP Server Dropped Leap Not in Sync
-
-7. To circumvent this issue, use the following trick to solve the problem: On the server, stop the NTP service and use the ntpdate client utility to manually force time synchronization with an external peer using the `-b` flag as shown below:
-
-```
-# systemctl stop ntp.service
-# ntpdate -b 2.ro.pool.ntp.org  [your_ntp_peer]
-# systemctl start ntp.service
-# systemctl status ntp.service
-```
-[
- ![Force NTP Time Synchronization](http://www.tecmint.com/wp-content/uploads/2016/12/Force-NTP-Time-Synchronization.png) 
-][21]
-
-Force NTP Time Synchronization
-
-8. After the time has been accurately synchronized, start the NTP daemon on the server and verify from the client side if the service is ready to serve time for local clients by issuing the following command:
-
-```
-# ntpdate -du adc1.tecmint.lan    [your_adc_server]
-```
-[
- ![Verify NTP Time Synchronization](http://www.tecmint.com/wp-content/uploads/2016/12/Verify-NTP-Time-Synchronization.png) 
-][22]
-
-Verify NTP Time Synchronization
-
-By now, NTP server should work as expected.
-
-### Step 3: Join Windows 10 into Realm
-
-9. As we saw in our previous tutorial, [Samba4 Active Directory can be managed from command line using samba-tool][23] utility interface which can be accessed directly from server’s VTY console or remotely connected through SSH.
-
-Other, more intuitively and flexible alternative, would be to manage our Samba4 AD Domain Controller via Microsoft Remote Server Administration Tools (RSAT) from a Windows workstation integrated into the domain. These tools are available in almost all modern Windows systems.
-
-The process of joining Windows 10 or older versions of Microsoft OS into Samba4 AD DC is very simple. First, make sure that your Windows 10 workstation has the correct Samba4 DNS IP address configured in order to query the proper realm resolver.
-
-Open Control panel -> Network and Internet -> Network and Sharing Center -> Ethernet card -> Properties -> IPv4 -> Properties -> Use the following DNS server addresses and manually place Samba4 AD IP Address to the network interface as illustrated in the below screenshots.
-
-[
- ![join Windows to Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-to-Samba4-AD.png) 
-][24]
-
-join Windows to Samba4 AD
-
-[
- ![Add DNS and Samba4 AD IP Address](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-and-Samba4-AD-IP-Address.png) 
-][25]
-
-Add DNS and Samba4 AD IP Address
-
-Here, 192.168.1.254 is the IP Address of Samba4 AD Domain Controller responsible for DNS resolution. Replace the IP Address accordingly.
-
-10. Next, apply the network settings by hitting on OK button, open a Command Prompt and issue a pingagainst the generic domain name and Samba4 host FQDN in order to test if the realm is reachable through DNS resolution.
-
-```
-ping tecmint.lan
-ping adc1.tecmint.lan
-```
-[
- ![Check Network Connectivity Between Windows and Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Check-Samba4-AD-from-Windows.png) 
-][26]
-
-Check Network Connectivity Between Windows and Samba4 AD
-
-11. If the resolver correctly responds to Windows client DNS queries, then, you need to assure that the time is accurately synchronized with the realm.
-
-Open Control Panel -> Clock, Language and Region -> Set Time and Date -> Internet Time tab -> Change Settings and write your domain name on Synchronize with and Internet time server field.
-
-Hit on Update Now button to force time synchronization with the realm and hit OK to close the window.
-
-[
- ![Synchronize Time with Internet Server](http://www.tecmint.com/wp-content/uploads/2016/12/Synchronize-Time-with-Internet-Server.png) 
-][27]
-
-Synchronize Time with Internet Server
-
-12. Finally, join the domain by opening System Properties -> Change -> Member of Domain, write your domain name, hit OK, enter your domain administrative account credentials and hit OK again.
-
-A new pop-up window should open informing you’re a member of the domain. Hit OK to close the pop-up window and reboot the machine in order to apply domain changes.
-
-The below screenshot will illustrate these steps.
-
-[
- ![Join Windows Domain to Samba4 AD](http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-Domain-to-Samba4-AD.png) 
-][28]
-
-Join Windows Domain to Samba4 AD
-
-[
- ![Enter Domain Administration Login](http://www.tecmint.com/wp-content/uploads/2016/12/Enter-Domain-Administration-Login.png) 
-][29]
-
-Enter Domain Administration Login
-
-[
- ![Domain Joined to Samba4 AD Confirmation](http://www.tecmint.com/wp-content/uploads/2016/12/Domain-Joined-to-Samba4-AD.png) 
-][30]
-
-Domain Joined to Samba4 AD Confirmation
-
-[
- ![Restart Windows Server for Changes](http://www.tecmint.com/wp-content/uploads/2016/12/Restart-Windows-Server-for-Changes.png) 
-][31]
-
-Restart Windows Server for Changes
-
-13. After restart, hit on Other user and logon to Windows with a Samba4 domain account with administrative privileges and you should be ready to move to the next step.
-
-[
- ![Login to Windows Using Samba4 AD Account](http://www.tecmint.com/wp-content/uploads/2016/12/Login-to-Windows-Using-Samba4-AD-Account.png) 
-][32]
-
-Login to Windows Using Samba4 AD Account
-
-#### Step 4: Administer Samba4 AD DC with RSAT
-
-14. Microsoft Remote Server Administration Tools (RSAT), which will be further used to administer Samba4 Active Directory, can be downloaded from the following links, depending on your Windows version:
-
-1.  Windows 10: [https://www.microsoft.com/en-us/download/details.aspx?id=45520][4]
-2.  Windows 8.1: [http://www.microsoft.com/en-us/download/details.aspx?id=39296][5]
-3.  Windows 8: [http://www.microsoft.com/en-us/download/details.aspx?id=28972][6]
-4.  Windows 7: [http://www.microsoft.com/en-us/download/details.aspx?id=7887][7]
-
-Once the update standalone installer package for Windows 10 has been downloaded on your system, run the installer, wait for the installation to finish and restart the machine to apply all updates.
-
-After reboot, open Control Panel -> Programs (Uninstall a Program) -> Turn Windows features on or offand check all Remote Server Administration Tools.
-
-Click OK to start the installation and after the installation process finishes, restart the system.
-
-[
- ![Administer Samba4 AD from Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Administer-Samba4-AD-from-Windows.png) 
-][33]
-
-Administer Samba4 AD from Windows
-
-15. To access RSAT tools go to Control Panel -> System and Security -> Administrative Tools.
-
-The tools can also be found in the Administrative tools menu from start menu. Alternatively, you can open Windows MMC and add Snap-ins using the File -> Add/Remove Snap-in menu.
-
-[
- ![Access Remote Server Administration Tools](http://www.tecmint.com/wp-content/uploads/2016/12/Access-Remote-Server-Administration-Tools.png) 
-][34]
-
-Access Remote Server Administration Tools
-
-The most used tools, such as AD UC, DNS and Group Policy Management can be launched directly from Desktop by creating shortcuts using Send to feature from menu.
-
-16. You can verify RSAT functionality by opening AD UC and list domain Computers (newly joined windows machine should appear in the list), create a new Organizational Unit or a new user or group.
-
-Verify if the users or groups had been properly created by issuing wbinfo command from Samba4 server side.
-
-[
- ![Active Directory Users and Computers](http://www.tecmint.com/wp-content/uploads/2016/12/Active-Directory-Users-and-Computers.png) 
-][35]
-
-Active Directory Users and Computers
-
-[
- ![Create Organizational Units and New Users](http://www.tecmint.com/wp-content/uploads/2016/12/Create-Organizational-Unit-and-Users.png) 
-][36]
-
-Create Organizational Units and New Users
-
-[
- ![Confirm Samba4 AD Users](http://www.tecmint.com/wp-content/uploads/2016/12/Confirm-Samba4-AD-Users.png) 
-][37]
-
-Confirm Samba4 AD Users
-
-That’s it! On the next part of this topic we will cover other important aspects of a Samba4 Active Directory which can be administered via RSAT, such as, how to manage DNS server, add DNS records and create a reverse DNS lookup zone, how to manage and apply domain policy and how to create an interactive logon banner for your domain users.
-
-------
-
-作者简介：I'am a computer addicted guy, a fan of open source and linux based system software, have about 4 years experience with Linux distributions desktop, servers and bash scripting.
-
-
---------------------------------------------------------------------------------
-
-via: http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
-
-作者：[Matei Cezar ][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/cezarmatei/
-[1]:http://www.tecmint.com/install-samba4-active-directory-ubuntu/
-[2]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/
-[3]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/
-[4]:https://www.microsoft.com/en-us/download/details.aspx?id=45520
-[5]:http://www.microsoft.com/en-us/download/details.aspx?id=39296
-[6]:http://www.microsoft.com/en-us/download/details.aspx?id=28972
-[7]:http://www.microsoft.com/en-us/download/details.aspx?id=7887
-[8]:http://www.tecmint.com/category/samba4-active-directory/
-[9]:http://www.tecmint.com/how-to-synchronize-time-with-ntp-server-in-ubuntu-linux-mint-xubuntu-debian/
-[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Install-NTP-on-Ubuntu.png
-[11]:http://www.pool.ntp.org/en/
-[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-NTP-Server-in-Ubuntu.png
-[13]:http://www.tecmint.com/wp-content/uploads/2016/12/Sync-AD-with-NTP.png
-[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Query-Client-to-NTP-Server.png
-[15]:http://www.tecmint.com/20-netstat-commands-for-linux-network-management/
-[16]:http://www.tecmint.com/12-practical-examples-of-linux-grep-command/
-[17]:http://www.tecmint.com/wp-content/uploads/2016/12/Grant-Permission-to-NTP.png
-[18]:http://www.tecmint.com/wp-content/uploads/2016/12/Monitor-NTP-Server-Pool.png
-[19]:http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Time-Synchronization-Error.png
-[20]:http://www.tecmint.com/wp-content/uploads/2016/12/NTP-Server-Dropped-Leap-Not-Sync.png
-[21]:http://www.tecmint.com/wp-content/uploads/2016/12/Force-NTP-Time-Synchronization.png
-[22]:http://www.tecmint.com/wp-content/uploads/2016/12/Verify-NTP-Time-Synchronization.png
-[23]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/
-[24]:http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-to-Samba4-AD.png
-[25]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-and-Samba4-AD-IP-Address.png
-[26]:http://www.tecmint.com/wp-content/uploads/2016/12/Check-Samba4-AD-from-Windows.png
-[27]:http://www.tecmint.com/wp-content/uploads/2016/12/Synchronize-Time-with-Internet-Server.png
-[28]:http://www.tecmint.com/wp-content/uploads/2016/12/Join-Windows-Domain-to-Samba4-AD.png
-[29]:http://www.tecmint.com/wp-content/uploads/2016/12/Enter-Domain-Administration-Login.png
-[30]:http://www.tecmint.com/wp-content/uploads/2016/12/Domain-Joined-to-Samba4-AD.png
-[31]:http://www.tecmint.com/wp-content/uploads/2016/12/Restart-Windows-Server-for-Changes.png
-[32]:http://www.tecmint.com/wp-content/uploads/2016/12/Login-to-Windows-Using-Samba4-AD-Account.png
-[33]:http://www.tecmint.com/wp-content/uploads/2016/12/Administer-Samba4-AD-from-Windows.png
-[34]:http://www.tecmint.com/wp-content/uploads/2016/12/Access-Remote-Server-Administration-Tools.png
-[35]:http://www.tecmint.com/wp-content/uploads/2016/12/Active-Directory-Users-and-Computers.png
-[36]:http://www.tecmint.com/wp-content/uploads/2016/12/Create-Organizational-Unit-and-Users.png
-[37]:http://www.tecmint.com/wp-content/uploads/2016/12/Confirm-Samba4-AD-Users.png
-[38]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
-[39]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
-[40]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
-[41]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#
-[42]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/#comments
diff --git a/sources/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md b/sources/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md
deleted file mode 100644
index 85ea330a5d..0000000000
--- a/sources/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md	
+++ /dev/null
@@ -1,222 +0,0 @@
-Rusking translating
-
-Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4
-============================================================
-
-Continuing the previous tutorial on [how to administer Samba4 from Windows 10 via RSAT][4], in this part we’ll see how to remotely manage our Samba AD Domain controller DNS server from Microsoft DNS Manager, how to create DNS records, how to create a Reverse Lookup Zone and how to create a domain policy via Group Policy Management tool.
-
-#### Requirements
-
-1.  [Create an AD Infrastructure with Samba4 on Ubuntu 16.04 – Part 1][1]
-2.  [Manage Samba4 AD Infrastructure from Linux Command Line – Part 2][2]
-3.  [Manage Samba4 Active Directory Infrastructure from Windows10 via RSAT – Part 3][3]
-
-### Step 1: Manage Samba DNS Server
-
-Samba4 AD DC uses an internal DNS resolver module which is created during the initial domain provision (if BIND9 DLZ module is not specifically used).
-
-Samba4 internal DNS module supports the basic features needed for an AD Domain Controller. The domain DNS server can be managed in two ways, directly from command line through samba-tool interface or remotely from a Microsoft workstation which is part of the domain via RSAT DNS Manager.
-
-Here, we’ll cover the second method because it’s more intuitive and not so prone to errors.
-
-1. To administer the DNS service for your domain controller via RSAT, go to your Windows machine, open Control Panel -> System and Security -> Administrative Tools and run DNS Manager utility.
-
-Once the tool opens, it will ask you on what DNS running server you want to connect. Choose The following computer, type your domain name in the field (or IP Address or FQDN can be used as well), check the box that says ‘Connect to the specified computer now’ and hit OK to open your Samba DNSservice.
-
-[
- ![Connect Samba4 DNS on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Connect-Samba4-DNS-on-Windows.png) 
-][5]
-
-Connect Samba4 DNS on Windows
-
-2. In order to add a DNS record (as an example we will add an `A` record that will point to our LAN gateway), navigate to domain Forward Lookup Zone, right click on the right plane and choose New Host(`A` or `AAA`).
-
-[
- ![Add DNS A Record on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-A-Record.png) 
-][6]
-
-Add DNS A Record on Windows
-
-3. On the New host opened window, type the name and the IP Address of your DNS resource. The FQDNwill be automatically written for you by DNS utility. When finished, hit the Add Host button and a pop-up window will inform you that your DNS A record has been successfully created.
-
-Make sure you add DNS A records only for those resources in your network [configured with static IP Addresses][7]. Don’t add DNS A records for hosts which are configured to acquire network configurations from a DHCP server or their IP Addresses change often.
-
-[
- ![Configure Samba Host on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Host-on-Windows.png) 
-][8]
-
-Configure Samba Host on Windows
-
-To update a DNS record just double click on it and write your modifications. To delete the record right click on the record and choose delete from the menu.
-
-In the same way you can add other types of DNS records for your domain, such as CNAME (also known as DNS alias record) MX records (very useful for mail servers) or other type of records (SPF, TXT, SRVetc).
-
-### Step 2: Create a Reverse Lookup Zone
-
-By default, Samba4 Ad DC doesn’t automatically add a reverse lookup zone and PTR records for your domain because these types of records are not crucial for a domain controller to function correctly.
-
-Instead, a DNS reverse zone and its PTR records are crucial for the functionality of some important network services, such as an e-mail service because these type of records can be used to verify the identity of clients requesting a service.
-
-Practically, PTR records are just the opposite of standard DNS records. The clients know the IP address of a resource and queries the DNS server to find out their registered DNS name.
-
-4. In order to a create a reverse lookup zone for Samba AD DC, open DNS Manager, right click on Reverse Lookup Zone from the left plane and choose New Zone from the menu.
-
-[
- ![Create Reverse Lookup DNS Zone](http://www.tecmint.com/wp-content/uploads/2016/12/Create-Reverse-Lookup-DNS-Zone.png) 
-][9]
-
-Create Reverse Lookup DNS Zone
-
-5. Next, hit Next button and choose Primary zone from Zone Type Wizard.
-
-[
- ![Select DNS Zone Type](http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-Zone-Type.png) 
-][10]
-
-Select DNS Zone Type
-
-6. Next, choose To all DNS servers running on domain controllers in this domain from the AD Zone Replication Scope, chose IPv4 Reverse Lookup Zone and hit Next to continue.
-
-[
- ![Select DNS for Samba Domain Controller](http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-for-Samba-Domain-Controller.png) 
-][11]
-
-Select DNS for Samba Domain Controller
-
-[
- ![Add Reverse Lookup Zone Name](http://www.tecmint.com/wp-content/uploads/2016/12/Add-Reverse-Lookup-Zone-Name.png) 
-][12]
-
-Add Reverse Lookup Zone Name
-
-7. Next, type the IP network address for your LAN in Network ID filed and hit Next to continue.
-
-All PTR records added in this zone for your resources will point back only to 192.168.1.0/24 network portion. If you want to create a PTR record for a server that does not reside in this network segment (for example mail server which is located in 10.0.0.0/24 network), then you’ll need to create a new reverse lookup zone for that network segment as well.
-
-[
- ![Add IP Address of Reverse Lookup DNS Zone](http://www.tecmint.com/wp-content/uploads/2016/12/Add-IP-Address-of-Reverse-DNS-Zone.png) 
-][13]
-
-Add IP Address of Reverse Lookup DNS Zone
-
-8. On the next screen choose to Allow only secure dynamic updates, hit next to continue and, finally hit on finish to complete zone creation.
-
-[
- ![Enable Secure Dynamic Updates](http://www.tecmint.com/wp-content/uploads/2016/12/Enable-Secure-Dynamic-Updates.png) 
-][14]
-
-Enable Secure Dynamic Updates
-
-[
- ![New DNS Zone Summary](http://www.tecmint.com/wp-content/uploads/2016/12/New-DNS-Zone-Summary.png) 
-][15]
-
-New DNS Zone Summary
-
-9. At this point you have a valid DNS reverse lookup zone configured for your domain. In order to add a PTR record in this zone, right click on the right plane and choose to create a PTR record for a network resource.
-
-In this case we’ve created a pointer for our gateway. In order to test if the record was properly added and works as expected from client’s point of view, open a Command Prompt and issue a nslookup query against the name of the resource and another query for its IP Address.
-
-Both queries should return the correct answer for your DNS resource.
-
-```
-nslookup gate.tecmint.lan
-nslookup 192.168.1.1
-ping gate
-```
-[
- ![Add DNS PTR Record and Query PTR](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-PTR-Record-and-Query.png) 
-][16]
-
-Add DNS PTR Record and Query PTR
-
-### Step 3: Domain Group Policy Management
-
-10. An important aspect of a domain controller is its ability to control system resources and security from a single central point. This type of task can be easily achieved in a domain controller with the help of Domain Group Policy.
-
-Unfortunately, the only way to edit or manage group policy in a samba domain controller is through RSAT GPM console provided by Microsoft.
-
-In the below example we’ll see how simple can be to manipulate group policy for our samba domain in order to create an interactive logon banner for our domain users.
-
-In order to access group policy console, go to Control Panel -> System and Security -> Administrative Tools and open Group Policy Management console.
-
-Expand the fields for your domain and right click on Default Domain Policy. Choose Edit from the menu and a new windows should appear.
-
-[
- ![Manage Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Manage-Samba-Domain-Group-Policy.png) 
-][17]
-
-Manage Samba Domain Group Policy
-
-11. On Group Policy Management Editor window go to Computer Configuration -> Policies -> Windows Settings -> Security settings -> Local Policies -> Security Options and a new options list should appear in the right plane.
-
-In the right plane search and edit with your custom settings following two entries presented on the below screenshot.
-
-[
- ![Configure Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Domain-Group-Policy.png) 
-][18]
-
-Configure Samba Domain Group Policy
-
-12. After finishing editing the two entries, close all windows, open an elevated Command prompt and force group policy to apply on your machine by issuing the below command:
-
-```
-gpupdate /force
-```
-[
- ![Update Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Update-Samba-Domain-Group-Policy.png) 
-][19]
-
-Update Samba Domain Group Policy
-
-13. Finally, reboot your computer and you’ll see the logon banner in action when you’ll try to perform logon.
-
-[
- ![Samba4 AD Domain Controller Logon Banner](http://www.tecmint.com/wp-content/uploads/2016/12/Samba4-Domain-Controller-User-Login.png) 
-][20]
-
-Samba4 AD Domain Controller Logon Banner
-
-That’s all! Group Policy is a very complex and sensitive subject and should be treated with maximum care by system admins. Also, be aware that group policy settings won’t apply in any way to Linux systems integrated into the realm.
-
-------
-
-作者简介：I'am a computer addicted guy, a fan of open source and linux based system software, have about 4 years experience with Linux distributions desktop, servers and bash scripting.
-
-
---------------------------------------------------------------------------------
-
-via: http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/
-
-作者：[Matei Cezar ][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/cezarmatei/
-[1]:http://www.tecmint.com/install-samba4-active-directory-ubuntu/
-[2]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/
-[3]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
-[4]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
-[5]:http://www.tecmint.com/wp-content/uploads/2016/12/Connect-Samba4-DNS-on-Windows.png
-[6]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-A-Record.png
-[7]:http://www.tecmint.com/set-add-static-ip-address-in-linux/
-[8]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Host-on-Windows.png
-[9]:http://www.tecmint.com/wp-content/uploads/2016/12/Create-Reverse-Lookup-DNS-Zone.png
-[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-Zone-Type.png
-[11]:http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-for-Samba-Domain-Controller.png
-[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-Reverse-Lookup-Zone-Name.png
-[13]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-IP-Address-of-Reverse-DNS-Zone.png
-[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Enable-Secure-Dynamic-Updates.png
-[15]:http://www.tecmint.com/wp-content/uploads/2016/12/New-DNS-Zone-Summary.png
-[16]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-PTR-Record-and-Query.png
-[17]:http://www.tecmint.com/wp-content/uploads/2016/12/Manage-Samba-Domain-Group-Policy.png
-[18]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Domain-Group-Policy.png
-[19]:http://www.tecmint.com/wp-content/uploads/2016/12/Update-Samba-Domain-Group-Policy.png
-[20]:http://www.tecmint.com/wp-content/uploads/2016/12/Samba4-Domain-Controller-User-Login.png
-[21]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
-[22]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
-[23]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
-[24]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
-[25]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#comments
diff --git a/sources/tech/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md b/sources/tech/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md
deleted file mode 100644
index fb385a925f..0000000000
--- a/sources/tech/20161213 9 Open SourceCommercial Software for Data Center Infrastructure Management.md	
+++ /dev/null
@@ -1,192 +0,0 @@
-translating by beyondworld
-
-9 Open Source/Commercial Software for Data Center Infrastructure Management
-============================================================
-
-When a company grows its demand in computing resources grows as well. It works as for regular companies as for providers, including those renting out dedicated servers. When the total number of racks exceed 10 you’ll start facing issues.
-
-How to inventory servers and spares? How to maintain a data center in a good health, locating and fixing potential threats on time. How to find the rack with broken equipment? How to prepare physical machines to work? Carrying out these tasks manually will take too much time otherwise will require having a huge team of administrators in your IT-department.
-
-
-However there is a better solution – using a special software that automates Data Center management. Let’s have a review of the tools for running a DC that we have on a market today.
-
-### 1\. Opendcim
-
-Currently it’s the one and the only free software in its class. It has an open source-code and designed to be an alternative to commercial DCIM solutions. Allows to keep inventory, draw a DC map and monitor temperature and power consumption.
-
-On the other hand, it doesn’t support remote power-off, server rebooting, and OS installation functionality. Nevertheless, it is widely used in non-commercial organizations all around the globe.
-
-Thanks to its open source code, [Opendcims][2] should work fine for the companies having their own developers.
-
-[
- ![openDCIM](http://www.tecmint.com/wp-content/uploads/2016/12/openDCIM.png) 
-][3]
-
-openDCIM
-
-### 2\. NOC-PS
-
-A commercial system, designed for provisioning physical and virtual machines. Has a wide functionality for advance preparation of equipment: OS and other software installation and setting up network configurations, there is WHMCS and Blesta integrations. However, it won’t be your best choice if you need to have a DC map at hand and see the racks location.
-
-[NOC-PS][4] will cost you a 100€ per year for every 100 dedicated servers bundle. Suits for small-to-middle scale companies.
-
-[
- ![NOC-PS](http://www.tecmint.com/wp-content/uploads/2016/12/NOC-PS.png) 
-][5]
-
-NOC-PS
-
-### 3\. DCImanager
-
-[DCImanager][6] is a proprietary class solution developed, as announced, considering the needs of DC engineers and hosting providers. Has an integration with popular billing software like WHMCS, Hostbill, BILLmanager.
-
-Main features are: server provisioning, OS installation from templates, sensors monitoring, traffic and power consumption reports, VLAN management. In addition to said above, Enterprise edition allows you to build a DC map and keep servers and spares inventorying.
-
-
-You can try a free license for up to 5 physical servers while a yearly license costs 120€ for 100 dedicated machines.
-
-Depending on edition, can be a good fit for both SMBs and large-scale enterprises.
-
-[
- ![DCImanager](http://www.tecmint.com/wp-content/uploads/2016/12/DCImanager.png) 
-][8]
-
-DCImanager
-
-### 4\. EasyDCIM
-
-[EasyDCIM][9] is a paid software mainly oriented on server provisioning. Brings OS and other software installation features and facilitates DC navigation allowing to draw a scheme of racks.
-
-Meanwhile the product itself doesn’t include IPs and DNS management, control over the switches. These and other features become available after additional modules installation, both free and paid (including WHMCS integration).
-
-100 server license starts from $999 per year. Due to the pricing EasyDCIM may be a bit expensive for small companies, while middle and large companies can give it a try.
-
-[
- ![EasyDCIM](http://www.tecmint.com/wp-content/uploads/2016/12/EasyDCIM.png) 
-][10]
-
-EasyDCIM
-
-### 5\. Ansible Tower
-
-[Ansible Tower][11] is a Enterprise level computing infrastructure management tool from RedHat. The main idea of this solution was the possibility of a centralized deployment as for servers as for the different user devices.
-
-Thanks to that Ansible Tower can perform almost any possible program operation with integrated software and has an amazing statistics collecting module. On the dark side we have the lack of integration with popular billing systems and pricing.
-
-$5000 per year for 100 devices. Will work for large and gigantic companies..
-
-[
- ![Ansible Tower](http://www.tecmint.com/wp-content/uploads/2016/12/Ansible_Tower.png) 
-][12]
-
-Ansible Tower
-
-### 6\. Puppet Enterprise
-
-Developed on a commercial basis and considered as an accessorial software for IT-departments. Designed for OS and other software installation on servers and user devices both at the initial deployment and a further exploitation stages.
-
-Unfortunately, inventorying and the more advanced interaction schemes between devices (cable connection, protocols and other) is still under development.
-
-[Puppet Enterprise][13] has a free and fully-functional version for 10 computers. A yearly license cost is $120 per device.
-
-Can work for big corporations.
-
-[
- ![Puppet Enterprise](http://www.tecmint.com/wp-content/uploads/2016/12/Puppet-Enterprise.png) 
-][14]
-
-Puppet Enterprise
-
-### 7\. Device 42
-
-Mostly designed for a Data Center monitoring. Has a great tools for inventorying, builds hardware/software dependence map automatically. DC map drawn by [Device 42][15] reflects temperature, spare space and other parameters of a rack as in graphics as marking the racks with specific colour. However software installation and billing integration aren’t supported.
-
-100 servers license will cost $1499 per year. Probably can be a good shot for middle-to-large companies.
-
-[
- ![Device42](http://www.tecmint.com/wp-content/uploads/2016/12/Device42.png) 
-][16]
-
-Device42
-
-### 8\. CenterOS
-
-It’s an operating system for a Data Center management with a main focus on equipment inventorying. Besides creating a DC map, schemes of racks and connections a well-thought integrated system of server statuses facilitates managing the internal technical works.
-
-Another great feature allows to find and reach out to a right person related with a certain piece of equipment within a few clicks (it may be an owner, technician, or manufacturer), what can be truly handful in case of any emergencies.
-
-**Suggested Read:** [8 Open Source/Commercial Billing Platforms for Hosting Providers][17]
-
-The source code for [Centeros][18] is closed and pricing is available only upon request.
-
-A mystery about the pricing complicates determining a target audience of the product, however it’s possible to make an assumption that Centeros is designed mostly for larger companies.
-
-[
- ![CenterOS](http://www.tecmint.com/wp-content/uploads/2016/12/CenterOS.png) 
-][19]
-
-CenterOS
-
-### 9\. LinMin
-
-It’s an instrument for preparing a physical equipment for a further usager. Uses PXE install the chosen OS and deploys the requested set of additional software afterwards.
-
-Unlike most of its analogs, [LinMin][20] has a well-developed backup system for hard drives, that speeds up an after-crush recovery and facilitates the mass deployments of the servers with a same configuration.
-
-Price starts from $1999/year for 100 servers. Middle-to-large companies can keep LinMin in mind.
-
-[
- ![LinMin](http://www.tecmint.com/wp-content/uploads/2016/12/LinMin.jpg) 
-][21]
-
-LinMin
-
-Now let’s summarize everything. I would say that most of the products for automating operations with a high volume of infrastructure, that we have on a market today, can be divided in two categories.
-
-The first is mainly designed for preparing an equipment for a further exploitation while the second manages inventorying. It’s not so easy to find a universal solution that will contain all the necessary features so you can give up on the many tools with a narrow functionality provided by an equipment manufacturer.
-
-However now you have a list of such solutions and you are welcome to check it yourself. It’s worth to notice that an open source products is on the list as well, so if you have a good developer, it’s possible to customize it for your specific needs.
-
-I hope that my review will help you to find a right software for your case and make your life easier. Long life to your servers!
-
-
------------------------------------
-
-作者简介：
-
-![](http://1.gravatar.com/avatar/ae5edcc20865ae20859fb566c796b97a?s=128&d=blank&r=g)
-
-I'm a technical evangelist at hosting software developing company from Siberia, Russia. I'm curious and like to expand my knowledge whether from new Linux software tools or to Hosting Industry trends, possibilities, journey and opportunities.
-
---------------------------------------------------------------------------------
-
-via: http://www.tecmint.com/data-center-server-management-tools/
-
-作者：[ Nikita Nesmiyanov][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/nesmiyanov/
-[1]:http://www.tecmint.com/web-control-panels-to-manage-linux-servers/
-[2]:http://opendcim.org/
-[3]:http://www.tecmint.com/wp-content/uploads/2016/12/openDCIM.png
-[4]:http://noc-ps.com/
-[5]:http://www.tecmint.com/wp-content/uploads/2016/12/NOC-PS.png
-[6]:https://www.ispsystem.com/software/dcimanager
-[7]:http://www.tecmint.com/opensource-commercial-control-panels-manage-virtual-machines/
-[8]:http://www.tecmint.com/wp-content/uploads/2016/12/DCImanager.png
-[9]:https://www.easydcim.com/
-[10]:http://www.tecmint.com/wp-content/uploads/2016/12/EasyDCIM.png
-[11]:https://www.ansible.com/
-[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Ansible_Tower.png
-[13]:https://puppet.com/
-[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Puppet-Enterprise.png
-[15]:http://www.device42.com/
-[16]:http://www.tecmint.com/wp-content/uploads/2016/12/Device42.png
-[17]:http://www.tecmint.com/open-source-commercial-billing-software-system-web-hosting/
-[18]:http://www.centeros.com/
-[19]:http://www.tecmint.com/wp-content/uploads/2016/12/CenterOS.png
-[20]:http://www.linmin.com/
-[21]:http://www.tecmint.com/wp-content/uploads/2016/12/LinMin.jpg
diff --git a/sources/tech/20161214 The Cost of Native Mobile App Development is Too Damn High.md b/sources/tech/20161214 The Cost of Native Mobile App Development is Too Damn High.md
new file mode 100644
index 0000000000..62f07f6b22
--- /dev/null
+++ b/sources/tech/20161214 The Cost of Native Mobile App Development is Too Damn High.md	
@@ -0,0 +1,225 @@
+The Cost of Native Mobile App Development is Too Damn High!
+============================================================
+
+### A value proposition
+
+_A tipping point has been reached._ With the exception of a few unique use cases, it no longer makes sense to build and maintain your mobile applications using native frameworks and native development teams.
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*4nyeufIIgw9B7nMSr5Sybg.jpeg) 
+
+Average cost of employing iOS, Android, and JavaScript developers in the United States ([http://www.indeed.com/salary][1], [http://www.payscale.com/research/US/Skill=JavaScript/Salary][2])
+
+The cost of native mobile application development has been spiraling out of control for the past few years. It has become increasingly difficult for new startups without substantial funding to create native apps, MVPs and prototypes. Existing companies, who need to hold on to talent in order to iterate on existing applications or build new applications, are [fighting][6] [tooth][7]and [nail][8] [with companies from all around the world][9] and will do whatever it takes to retain the best of the best.
+
+ ![](https://cdn-images-1.medium.com/max/800/1*imThyh2e45RW1np0xXIE4Q.png) 
+
+Cost of developing an MVP early 2015, Native vs Hybrid ([Comomentum.com][3])
+
+### So what does this mean for all of us?
+
+If you are a huge company or you are flush with cash, the old thinking was that as long as you threw enough money at native application development, you did not have anything to worry about. This is no longer the case.
+
+Facebook, the last company in the world who you would think of as behind in the war for talent (because they aren’t), was facing problems with their native app that money could not fix. The application had gotten so large and complex that [they were seeing compilation times of up to 15 minutes for their mobile app][10]. This means that even testing minor user interface changes, like moving something around by a couple of points, could take hours (or even days).
+
+In addition to the long compilation times, any time they needed to test a small change to their mobile, app it needed to be implemented and tested in two completely different environments (iOS and Android) with teams working with different languages and frameworks, muddying the waters even more.
+
+Facebook’s solution to this problem is [React Native][11].
+
+### What about ditching Mobile Apps for Web only?
+
+[Some people think mobile apps are doomed.][12] While I really enjoy and respect [Eric Elliott][13] and his work, let’s take a look at some recent data and discuss some opposing viewpoints:
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*s0O7X2PgIqP5_zselxQdqQ.png) 
+
+Time spent in mobile apps (April 2016, [smartinsights.com][4])
+
+> 90% of Time on Mobile is Spent in Apps
+
+There are 2.5 billion people on mobile phones in the world right now. [That number is going to be 5 billion sooner than we think.][14] _It is absolutely insane to think that leaving 4.5 billion people out of your business or application makes sense__ in most scenarios._
+
+The old argument was that native mobile application development was too expensive for most companies. While this was true, the cost of web development is also on the rise, with [the average salary of a JavaScript developer in the US being in the range of $97,000.00][15].
+
+With the increased complexity and skyrocketing demand for high quality web development, the average price for a JavaScript developer is inching towards that of a Native developer. Arguing that web development is cheaper is no longer a valid argument.
+
+### What about Hybrid?
+
+Hybrid apps are HTML5 apps that are wrapped inside of a native container and provide access to native platform features. Cordova and PhoneGap are prime examples.
+
+_If you’re looking to build an MVP, prototype, or are not worried about the user experience mimicking that of a native app, then a hybrid app may work for you, keeping in mind the entire project will need to be rewritten if you do end up wanting to go native._
+
+There are many innovative things going on in this space, my favorite being the [Ionic Framework][16]. Hybrid is getting better and better, but it is still not as fluid or natural feeling as Native.
+
+For many companies, including most serious startups as well as medium and large sized companies, hybrid apps may not deliver the quality that they want and that their customers demand, leaving the feeling unpolished and less professional.
+
+[While I have read and heard that of the top 100 apps on the app store, zero of them are hybrid,][17] I have not been able to back up this claim with evidence, but I would not doubt if the number were between zero and 5, and this is for a reason.
+
+> [Our Biggest Mistake Was Betting Too Much On HTML5 ][18]— Mark Zuckerberg
+
+### The solution
+
+If you’ve been keeping up with the mobile development landscape you have undoubtedly heard of projects such as [NativeScript][19] and [React Native][20].
+
+These projects allow you to build native quality mobile applications with JavaScript and use the same fundamental UI building blocks as regular iOS and Android apps.
+
+With React Native you can have a single engineer or team of engineers specialize in cross platform mobile app development, [native desktop development][21], and even web development [using the existing codebase][22] or [the underlying technology][23], shipping your applications to the App Store, the Play Store, and the Web for a fraction of the traditional cost without losing out on the benefits of native performance and quality.
+
+It is not unheard of for React Native apps to reuse up to 90% of their code across platforms, though the range is usually between 80% and 90%.
+
+If your team is using React Native, it eliminates the divide between teams resulting in more consistency in both the UI and the APIs being built, speeding up the development time.
+
+There is no need for compilation with React Native, as the app updates instantly when saving, also speeding up development time.
+
+React Native also allows you to use tools such as [Code Push][24] and [AppHub][25] to remotely update your JavaScript code. This means that you can push updates, features, and bug fixes instantly to your users, bypassing the labor of bundling, submitting, and having your app accepted to the App and Google play stores, a process that can take between 2 and 7 days (the App Store being the main pain point in this process). This is something that is not possible with native apps, though is possible with hybrid apps.
+
+If innovation in this space continues as it has been since it’s release, in the future you will even be able to build for platforms such as the [Apple Watch ][26], [Apple TV][27], and [Tizen][28] to name a few.
+
+> NativeScript is still fairly new as the framework powering it, Angular 2, [was just released out of beta a few months ago,][29] but it too has a promising future as long as Angular2 holds on to a decent share of the market.
+
+What you may not know is that some of the most innovative and largest technology companies in the world are betting big on these types of technologies, specifically [React Native.][30]
+
+I have also spoken to and am working with multiple enterprise and fortune 500 companies currently making the switch to React Native.
+
+### Notably Using React Native in Production
+
+Along with the below examples, [here is a list of notable apps using React Native.][31]
+
+### Facebook
+
+ ![](https://cdn-images-1.medium.com/max/800/1*36atCP-kVNoYrit2RMR-8g.jpeg) 
+
+React Native Apps by Facebook
+
+Facebook is now using React Native for both [Ads Manager][32] and [Facebook Groups,][33] and [will be implementing the framework to power it’s news feed.][34]
+
+Facebook also spends a lot of money creating and maintaining open source projects such as React Native, and t[hey and their open source developers have done a fantastic job lately by creating a lot of awesome projects ][35]that people like me and businesses all around the world benefit greatly from using on a daily basis.
+
+### Instagram
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*MQ0ezjRsUW3A5I0ahryHPg.jpeg) 
+
+Instagram
+
+React Native has been implemented in parts of the Instagram mobile app.
+
+### Airbnb
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*JS3R_cfLsDFCmAZJmtVEvg.jpeg) 
+
+Airbnb
+
+Much of Airbnb is being rewritten in React Native (via [Leland Richardson][36])
+
+
+
+
+Over 90% of the Airbnb Trips Platform is written in React Native (via [spikebrehm][37])
+
+
+
+### Vogue
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*V9JMA2L3lXcO1nczCN3gcA.jpeg) 
+
+Vogue Top 10 apps of 2016
+
+Vogue stands out not only because it was also written in React Native, but [because it was ranked as one of the 10 Best Apps of the Year, according to Apple][38].
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*vPDVV-vwvjfL3MsHpOO8rQ.jpeg) 
+
+Microsoft
+
+Microsoft is betting heavily on React Native.
+
+They have already release multiple open source tools, including [Code Push][39], [React Native VS Code,][40] and [React Native Windows][41], in the shift towards helping developers in the React Native space.
+
+Their thoughts behind this are that if people are already building their apps using React Native for iOS and Android, and they can reuse up to 90% of their code, then s_hipping to Windows costs them little extra relative to the cost && time already spent building the app in the first place._
+
+Microsoft has contributed extensively to the React Native ecosystem and have done an excellent job in the Open Source space over the past few years.
+
+### Conclusion
+
+React Native and similar technologies are the next step and a paradigm shift in how we will build mobile UIS and mobile applications.
+
+Companies
+
+If your company is looking to cut costs and speed up development time without compromising on quality or performance, React Native is ready for prime time and will benefit your bottom line.
+
+Developers
+
+If you are a developer and want to enter into an rapidly evolving space with substantial future up side, I would highly recommend looking at adding React Native to your list of things to learn.
+
+If you know JavaScript, you can hit the ground running very quickly, and I would recommend first trying it out using [Exponent][5] and seeing what you think. Exponent allows developers to easily build, test ,and deploy cross platform React Native apps on both Windows and macOS.
+
+If you are already a native Developer, you will benefit especially because you will be able to competently dig into the native side of things when needed, something that is not needed often but when needed is a highly valuable skill to have on a team.
+
+I have spent a lot of my time learning and teaching others about React Native because I am extremely excited about it and it is just plain fun to create apps using the framework.
+
+Thanks for reading.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://cdn-images-1.medium.com/fit/c/60/60/1*uindYEb0zBpZTRV4suSkfg.jpeg)
+
+Software Developer Specializing in Teaching and Building React Native
+
+--------------------------------------------------------------------------------
+
+via: https://hackernoon.com/the-cost-of-native-mobile-app-development-is-too-damn-high-4d258025033a
+
+作者：[Nader Dabit][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://hackernoon.com/@dabit3
+[1]:http://www.indeed.com/salary
+[2]:http://www.payscale.com/research/US/Skill=JavaScript/Salary
+[3]:http://www.comentum.com/mobile-app-development-cost.html
+[4]:http://www.smartinsights.com/mobile-marketing/mobile-marketing-analytics/mobile-marketing-statistics/attachment/percent-time-spent-on-mobile-apps-2016/
+[5]:https://medium.com/u/df61a4267d7a
+[6]:http://www.bizjournals.com/charlotte/how-to/human-resources/2016/12/employers-offer-premium-wages-skilled-workers.html
+[7]:https://www.cnet.com/news/silicon-valley-talent-wars-engineers-come-get-your-250k-salary/
+[8]:http://www.nytimes.com/2015/08/19/technology/unicorns-hunt-for-talent-among-silicon-valleys-giants.html
+[9]:http://blogs.wsj.com/cio/2016/09/30/tech-talent-war-moves-to-africa/
+[10]:https://devchat.tv/react-native-radio/08-bridging-react-native-components-with-tadeu-zagallo
+[11]:https://facebook.github.io/react-native/
+[12]:https://medium.com/javascript-scene/native-apps-are-doomed-ac397148a2c0#.w06yd23ej
+[13]:https://medium.com/u/c359511de780
+[14]:http://ben-evans.com/benedictevans/2016/12/8/mobile-is-eating-the-world
+[15]:http://www.indeed.com/salary?q1=javascript+developer&l1=united+states&tm=1
+[16]:https://ionicframework.com/
+[17]:https://medium.com/lunabee-studio/why-hybrid-apps-are-crap-6f827a42f549#.lakqptjw6
+[18]:https://techcrunch.com/2012/09/11/mark-zuckerberg-our-biggest-mistake-with-mobile-was-betting-too-much-on-html5/
+[19]:https://www.nativescript.org/
+[20]:https://facebook.github.io/react-native/
+[21]:https://github.com/ptmt/react-native-macos
+[22]:https://github.com/necolas/react-native-web
+[23]:https://facebook.github.io/react/
+[24]:http://microsoft.github.io/code-push/
+[25]:https://apphub.io/
+[26]:https://github.com/elliottsj/apple-watch-uikit
+[27]:https://github.com/douglowder/react-native-appletv
+[28]:https://www.tizen.org/blogs/srsaul/2016/samsung-committed-bringing-react-native-tizen
+[29]:http://angularjs.blogspot.com/2016/09/angular2-final.html
+[30]:https://facebook.github.io/react-native/
+[31]:https://facebook.github.io/react-native/showcase.html
+[32]:https://play.google.com/store/apps/details?id=com.facebook.adsmanager
+[33]:https://itunes.apple.com/us/app/facebook-groups/id931735837?mt=8
+[34]:https://devchat.tv/react-native-radio/40-navigation-in-react-native-with-eric-vicenti
+[35]:https://code.facebook.com/projects/
+[36]:https://medium.com/u/41a8b1601c59
+[37]:https://medium.com/u/71a78c1b069b
+[38]:http://www.highsnobiety.com/2016/12/08/iphone-apps-best-of-the-year-2016/
+[39]:http://microsoft.github.io/code-push/
+[40]:https://github.com/Microsoft/vscode-react-native
+[41]:https://github.com/ReactWindows/react-native-windows
+[42]:https://twitter.com/dabit3
+[43]:http://reactnative.training/
diff --git a/sources/tech/20161216 The truth about traditional JavaScript benchmarks.md b/sources/tech/20161216 The truth about traditional JavaScript benchmarks.md
new file mode 100644
index 0000000000..afe1882c98
--- /dev/null
+++ b/sources/tech/20161216 The truth about traditional JavaScript benchmarks.md	
@@ -0,0 +1,727 @@
+OneNewLife translating
+
+The truth about traditional JavaScript benchmarks
+============================================================
+
+
+It is probably fair to say that [JavaScript][22] is _the most important technology_ these days when it comes to software engineering. To many of us who have been into programming languages, compilers and virtual machines for some time, this still comes a bit as a surprise, as JavaScript is neither very elegant from the language designers point of view, nor very optimizable from the compiler engineers point of view, nor does it have a great standard library. Depending on who you talk to, you can enumerate shortcomings of JavaScript for weeks and still find another odd thing you didn’t know about. Despite what seem to be obvious obstacles, JavaScript is at the core of not only the web today, but it’s also becoming the dominant technology on the server-/cloud-side (via [Node.js][23]), and even finding its way into the IoT space.
+
+That raises the question, why is JavaScript so popular/successful? There is no one great answer to this I’d be aware of. There are many good reasons to use JavaScript today, probably most importantly the great ecosystem that was built around it, and the huge amount of resources available today. But all of this is actually a consequence to some extent. Why did JavaScript became popular in the first place? Well, it was the lingua franca of the web for ages, you might say. But that was the case for a long time, and people hated JavaScript with passion. Looking back in time, it seems the first JavaScript popularity boosts happened in the second half of the last decade. Unsurprisingly this was the time when JavaScript engines accomplished huge speed-ups on various different workloads, which probably changed the way that many people looked at JavaScript.
+
+Back in the days, these speed-ups were measured with what is now called _traditional JavaScript benchmarks_, starting with Apple’s [SunSpider benchmark][24], the mother of all JavaScript micro-benchmarks, followed by Mozilla’s [Kraken benchmark][25] and Google’s V8 benchmark. Later the V8 benchmark was superseded by the[Octane benchmark][26] and Apple released its new [JetStream benchmark][27]. These traditional JavaScript benchmarks drove amazing efforts to bring a level of performance to JavaScript that noone would have expected at the beginning of the century. Speed-ups up to a factor of 1000 were reported, and all of a sudden using `<script>` within a website was no longer a dance with the devil, and doing work client-side was not only possible, but even encouraged.
+
+[
+ ![Measuring performance, A simplified history of benchmarking JS](http://benediktmeurer.de/images/2016/sethcds-20161216.png)
+][28]
+
+
+Now in 2016, all (relevant) JavaScript engines reached a level of performance that is incredible and web apps are as snappy as native apps (or can be as snappy as native apps). The engines ship with sophisticated optimizing compilers, that generate short sequences of highly optimized machine code by speculating on the type/shape that hit certain operations (i.e. property access, binary operations, comparisons, calls, etc.) based on feedback collected about types/shapes seen in the past. Most of these optimizations were driven by micro-benchmarks like SunSpider or Kraken, and static test suites like Octane and JetStream. Thanks to JavaScript-based technologies like [asm.js][29] and [Emscripten][30] it is even possible to compile large C++ applications to JavaScript and run them in your web browser, without having to download or install anything, for example you can play [AngryBots][31] on the web out-of-the-box, whereas in the past gaming on the web required special plugins like Adobe Flash or Chrome’s PNaCl.
+
+The vast majority of these accomplishments were due to the presence of these micro-benchmarks and static performance test suites, and the vital competition that resulted from having these traditional JavaScript benchmarks. You can say what you want about SunSpider, but it’s clear that without SunSpider, JavaScript performance would likely not be where it is today. Okay, so much for the praise… now on to the flip side of the coin: Any kind of static performance test - be it a micro-benchmark or a large application macro-benchmark - is doomed to become irrelevant over time! Why? Because the benchmark can only teach you so much before you start gaming it. Once you get above (or below) a certain threshold, the general applicability of optimizations that benefit a particular benchmark will decrease exponentially. For example we built Octane as a proxy for performance of real world web applications, and it probably did a fairly good job at that for quite some time, but nowadays the distribution of time in Octane vs. real world is quite different, so optimizing for Octane beyond where it is currently, is likely not going to yield any significant improvements in the real world (neither general web nor Node.js workloads).
+
+[
+ ![Distribution of time in benchmarks vs. real world](http://benediktmeurer.de/images/2016/verwaestblinkon-20161216.png)
+][32]
+
+
+Since it became more and more obvious that all the traditional benchmarks for measuring JavaScript performance, including the most recent versions of JetStream and Octane, might have outlived their usefulness, we started investigating new ways to measure real-world performance beginning of the year, and added a lot of new profiling and tracing hooks to V8 and Chrome. We especially added mechanisms to see where exactly we spend time when browsing the web, i.e. whether it’s script execution, garbage collection, compilation, etc., and the results of these investigations were highly interesting and surprising. As you can see from the slide above, running Octane spends more than 70% of the time executing JavaScript and collecting garbage, while browsing the web you always spend less than 30% of the time actually executing JavaScript, and never more than 5% collecting garbage. Instead a significant amount of time goes to parsing and compiling, which is not reflected in Octane. So spending a lot of time to optimize JavaScript execution will boost your score on Octane, but won’t have any positive impact on loading [youtube.com][33]. In fact, spending more time on optimizing JavaScript execution might even hurt your real-world performance since the compiler takes more time, or you need to track additional feedback, thus eventually adding more time to the Compile, IC and Runtime buckets.
+
+[
+ ![Speedometer](http://benediktmeurer.de/images/2016/speedometer-20161216.png)
+][34]
+
+There’s another set of benchmarks, which try to measure overall browser performance, including JavaScript **and** DOM performance, with the most recent addition being the [Speedometer benchmark][35]. The benchmark tries to capture real world performance more realistically by running a simple [TodoMVC][36] application implemented with different popular web frameworks (it’s a bit outdated now, but a new version is in the makings). The various tests are included in the slide above next to octane (angular, ember, react, vanilla, flight and backbone), and as you can see these seem to be a better proxy for real world performance at this point in time. Note however that this data is already six months old at the time of this writing and things might have changed as we optimized more real world patterns (for example we are refactoring the IC system to reduce overhead significantly, and the [parser is being redesigned][37]). Also note that while this looks like it’s only relevant in the browser space, we have very strong evidence that traditional peak performance benchmarks are also not a good proxy for real world Node.js application performance.
+
+[
+ ![Speedometer vs. Octane](http://benediktmeurer.de/images/2016/verwaestblinkon2-20161216.png)
+][38]
+
+
+All of this is probably already known to a wider audience, so I’ll use the rest of this post to highlight a few concrete examples, why I think it’s not only useful, but crucial for the health of the JavaScript community to stop paying attention to static peak performance benchmarks above a certain threshold. So let me run you through a couple of example how JavaScript engines can and do game benchmarks.
+
+### The notorious SunSpider examples
+
+A blog post on traditional JavaScript benchmarks wouldn’t be complete without pointing out the obvious SunSpider problems. So let’s start with the prime example of performance test that has limited applicability in real world: The [`bitops-bitwise-and.js`][39] performance test.
+
+[
+ ![bitops-bitwise-and.js](http://benediktmeurer.de/images/2016/bitops-bitwise-and-20161216.png)
+][40]
+
+There are a couple of algorithms that need fast bitwise and, especially in the area of code transpiled from C/C++ to JavaScript, so it does indeed make some sense to be able to perform this operation quickly. However real world web pages will probably not care whether an engine can execute bitwise and in a loop 2x faster than another engine. But staring at this code for another couple of seconds, you’ll probably notice that `bitwiseAndValue` will be `0` after the first loop iteration and will remain `0` for the next 599999 iterations. So once you get this to good performance, i.e. anything below 5ms on decent hardware, you can start gaming this benchmark by trying to recognize that only the first iteration of the loop is necessary, while the remaining iterations are a waste of time (i.e. dead code after [loop peeling][41]). This needs some machinery in JavaScript to perform this transformation, i.e. you need to check that `bitwiseAndValue` is either a regular property of the global object or not present before you execute the script, there must be no interceptor on the global object or it’s prototypes, etc., but if you really want to win this benchmark, and you are willing to go all in, then you can execute this test in less than 1ms. However this optimization would be limited to this special case, and slight modifications of the test would probably no longer trigger it.
+
+Ok, so that [`bitops-bitwise-and.js`][42] test was definitely the worst example of a micro-benchmark. Let’s move on to something more real worldish in SunSpider, the [`string-tagcloud.js`][43] test, which essentially runs a very early version of the `json.js` polyfill. The test arguably looks a lot more reasonable that the bitwise and test, but looking at the profile of the benchmark for some time immediately reveals that a lot of time is spent on a single `eval` expression (up to 20% of the overall execution time for parsing and compiling plus up to 10% for actually executing the compiled code):
+
+[
+ ![string-tagcloud.js](http://benediktmeurer.de/images/2016/string-tagcloud-20161216.png)
+][44]
+
+Looking closer reveals that this `eval` is executed exactly once, and is passed a JSONish string, that contains an array of 2501 objects with `tag` and `popularity` fields:
+
+```
+([
+  {
+    "tag": "titillation",
+    "popularity": 4294967296
+  },
+  {
+    "tag": "foamless",
+    "popularity": 1257718401
+  },
+  {
+    "tag": "snarler",
+    "popularity": 613166183
+  },
+  {
+    "tag": "multangularness",
+    "popularity": 368304452
+  },
+  {
+    "tag": "Fesapo unventurous",
+    "popularity": 248026512
+  },
+  {
+    "tag": "esthesioblast",
+    "popularity": 179556755
+  },
+  {
+    "tag": "echeneidoid",
+    "popularity": 136641578
+  },
+  {
+    "tag": "embryoctony",
+    "popularity": 107852576
+  },
+  ...
+])
+```
+
+Obviously parsing these object literals, generating native code for it and then executing that code, comes at a high cost. It would be a lot cheaper to just parse the input string as JSON and generate an appropriate object graph. So one trick to speed up this benchmark is to mock with `eval` and try to always interpret the data as JSON first and only fallback to real parse, compile, execute if the attempt to read JSON failed (some additional magic is required to skip the parenthesis, though). Back in 2007, this wouldn’t even be a bad hack, since there was no [`JSON.parse`][45], but in 2017 this is just technical debt in the JavaScript engine and potentially slows down legit uses of `eval`. In fact updating the benchmark to modern JavaScript
+
+```
+--- string-tagcloud.js.ORIG     2016-12-14 09:00:52.869887104 +0100
++++ string-tagcloud.js  2016-12-14 09:01:01.033944051 +0100
+@@ -198,7 +198,7 @@
+                     replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(:?[eE][+\-]?\d+)?/g, ']').
+                     replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+-                j = eval('(' + this + ')');
++                j = JSON.parse(this);
+
+                 return typeof filter === 'function' ? walk('', j) : j;
+             }
+```
+
+yields an immediate performance boost, dropping runtime from 36ms to 26ms for V8 LKGR as of today, a 30% improvement!
+
+```
+$ node string-tagcloud.js.ORIG
+Time (string-tagcloud): 36 ms.
+$ node string-tagcloud.js
+Time (string-tagcloud): 26 ms.
+$ node -v
+v8.0.0-pre
+$
+```
+
+This is a common problem with static benchmarks and performance test suites. Today noone would seriously use `eval` to parse JSON data (also for obvious security reaons, not only for the performance issues), but rather stick to [`JSON.parse`][46] for all code written in the last five years. In fact using `eval` to parse JSON would probably be considered a bug in production code today! So the engine writers effort of focusing on performance of newly written code is not reflected in this ancient benchmark, instead it would be beneficial to make `eval`unnecessarily ~~smart~~complex to win on `string-tagcloud.js`.
+
+Ok, so let’s look at yet another example: the [`3d-cube.js`][47]. This benchmark does a lot of matrix operations, where even the smartest compiler can’t do a lot about it, but just has to execute it. Essentially the benchmark spends a lot of time executing the `Loop` function and functions called by it.
+
+[
+ ![3d-cube.js](http://benediktmeurer.de/images/2016/3d-cube-loop-20161216.png)
+][48]
+
+One interesting observation here is that the `RotateX`, `RotateY` and `RotateZ` functions are always called with the same constant parameter `Phi`.
+
+[
+ ![3d-cube.js](http://benediktmeurer.de/images/2016/3d-cube-rotate-20161216.png)
+][49]
+
+This means that we basically always compute the same values for [`Math.sin`][50] and [`Math.cos`][51], 204 times each. There are only three different inputs,
+
+*   0.017453292519943295,
+*   0.05235987755982989, and
+*   0.08726646259971647
+
+obviously. So, one thing you could do here to avoid recomputing the same sine and cosine values all the time is to cache the previously computed values, and in fact, that’s what V8 used to do in the past, and other engines like SpiderMonkey still do. We removed the so-called _transcendental cache_ from V8 because the overhead of the cache was noticable in actual workloads where you don’t always compute the same values in a row, which is unsurprisingly very common in the wild. We took serious hits on the SunSpider benchmark when we removed this benchmark specific optimizations back in 2013 and 2014, but we totally believe that it doesn’t make sense to optimize for a benchmark while at the same time penalizing the real world use case in such a way.
+
+[
+ ![3d-cube benchmark](http://benediktmeurer.de/images/2016/3d-cube-awfy-20161216.png)
+][52]
+
+
+Obviously a better way to deal with the constant sine/cosine inputs is a sane inlining heuristic that tries to balance inlining and take into account different factors like prefer inlining at call sites where constant folding can be beneficial, like in case of the `RotateX`, `RotateY`, and `RotateZ` call sites. But this was not really possible with the Crankshaft compiler for various reasons. With Ignition and TurboFan, this becomes a sensible option, and we are already working on better [inlining heuristics][53].
+
+### Garbage collection considered harmful
+
+Besides these very test specific issues, there’s another fundamental problem with the SunSpider benchmark: The overall execution time. V8 on decent Intel hardware runs the whole benchmark in roughly 200ms currently (with the default configuration). A minor GC can take anything between 1ms and 25ms currently (depending on live objects in new space and old space fragmentation), while a major GC pause can easily take 30ms (not even taking into account the overhead from incremental marking), that’s more than 10% of the overall execution time of the whole SunSpider suite! So any engine that doesn’t want to risk a 10-20% slowdown due to a GC cycle has to somehow ensure it doesn’t trigger GC while running SunSpider.
+
+[
+ ![driver-TEMPLATE.html](http://benediktmeurer.de/images/2016/sunspider-driver-20161216.png)
+][54]
+
+There are different tricks to accomplish this, none of which has any positive impact in real world as far as I can tell. V8 uses a rather simple trick: Since every SunSpider test is run in a new `<iframe>`, which corresponds to a new _native context_ in V8 speak, we just detect rapid `<iframe>` creation and disposal (all SunSpider tests take less than 50ms each), and in that case perform a garbage collection between the disposal and creation, to ensure that we never trigger a GC while actually running a test. This trick works pretty well, and in 99.9% of the cases doesn’t clash with real uses; except every now and then, it can hit you hard if for whatever reason you do something that makes you look like you are the SunSpider test driver to V8, then you can get hit hard by forced GCs, and that can have a negative effect on your application. So rule of thumb: **Don’t let your application look like SunSpider!**
+
+I could go on with more SunSpider examples here, but I don’t think that’d be very useful. By now it should be clear that optimizing further for SunSpider above the threshold of good performance will not reflect any benefits in real world. In fact the world would probably benefit a lot from not having SunSpider any more, as engines could drop weird hacks that are only useful for SunSpider and can even hurt real world use cases. Unfortunately SunSpider is still being used heavily by the (tech) press to compare what they think is browser performance, or even worse compare phones! So there’s a certain natural interest from phone makers and also from Android in general to have Chrome look somewhat decent on SunSpider (and other nowadays meaningless benchmarks FWIW). The phone makers generate money by selling phones, so getting good reviews is crucial for the success of the phone division or even the whole company, and some of them even went as far as shipping old versions of V8 in their phones that had a higher score on SunSpider, exposing their users to all kinds of unpatched security holes that had long been fixed, and shielding their users from any real world performance benefits that come with more recent V8 versions!
+
+[
+ ![Galaxy S7 and S7 Edge review: Samsung's finest get more polished](http://benediktmeurer.de/images/2016/engadget-20161216.png)
+][55]
+
+
+If we as the JavaScript community really want to be serious about real world performance in JavaScript land, we need to make the tech press stop using traditional JavaScript benchmarks to compare browsers or phones. I see that there’s a benefit in being able to just run a benchmark in each browser and compare the number that comes out of it, but then please, please use a benchmark that has something in common with what is relevant today, i.e. real world web pages; if you feel the need to compare two phones via a browser benchmark, please at least consider using [Speedometer][56].
+
+### Cuteness break!
+
+
+ ![](http://images-cdn.9gag.com/photo/avZd9NX_700b.jpg)
+
+
+I always loved this in [Myles Borins][57]’ talks, so I had to shamelessly steal his idea. So now that we recovered from the SunSpider rant, let’s go on to check the other classic benchmarks…
+
+### The not so obvious Kraken case
+
+The Kraken benchmark was [released by Mozilla in September 2010][58], and it was said to contain snippets/kernels of real world applications, and be less of a micro-benchmark compared to SunSpider. I don’t want to spend too much time on Kraken, because I think it wasn’t as influential on JavaScript performance as SunSpider and Octane, so I’ll highlight one particular example from the [`audio-oscillator.js`][59] test.
+
+[
+ ![audio-oscillator.js](http://benediktmeurer.de/images/2016/audio-oscillator-20161216.png)
+][60]
+
+So the test invokes the `calcOsc` function 500 times. `calcOsc` first calls `generate` on the global `sine``Oscillator`, then creates a new `Oscillator`, calls `generate` on that and adds it to the global `sine` oscillator. Without going into detail why the test is doing this, let’s have a look at the `generate` method on the `Oscillator` prototype.
+
+[
+ ![audio-oscillator-data.js](http://benediktmeurer.de/images/2016/audio-oscillator-generate-20161216.png)
+][61]
+
+Looking at the code, you’d expect this to be dominated by the array accesses or the multiplications or the[`Math.round`][62] calls in the loop, but surprisingly what’s completely dominating the runtime of `Oscillator.prototype.generate` is the `offset % this.waveTableLength` expression. Running this benchmark in a profiler on any Intel machine reveals that more than 20% of the ticks are attributed to the `idiv`instruction that we generate for the modulus. One interesting observation however is that the `waveTableLength` field of the `Oscillator` instances always contains the same value 2048, as it’s only assigned once in the `Oscillator` constructor.
+
+[
+ ![audio-oscillator-data.js](http://benediktmeurer.de/images/2016/audio-oscillator-constructor-20161216.png)
+][63]
+
+If we know that the right hand side of an integer modulus operation is a power of two, we can generate [way better code][64] obviously and completely avoid the `idiv` instruction on Intel. So what we needed was a way to get the information that `this.waveTableLength` is always 2048 from the `Oscillator` constructor to the modulus operation in `Oscillator.prototype.generate`. One obvious way would be to try to rely on inlining of everything into the `calcOsc` function and let load/store elimination do the constant propagation for us, but this would not work for the `sine` oscillator, which is allocated outside the `calcOsc` function.
+
+So what we did instead is add support for tracking certain constant values as right-hand side feedback for the modulus operator. This does make some sense in V8, since we track type feedback for binary operations like `+`, `*` and `%` on uses, which means the operator tracks the types of inputs it has seen and the types of outputs that were produced (see the slides from the round table talk on [Fast arithmetic for dynamic languages][65]recently for some details). Hooking this up with fullcodegen and Crankshaft was even fairly easy back then, the `BinaryOpIC` for `MOD` can also track known power of two right hand sides. In fact running the default configuration of V8 (with Crankshaft and fullcodegen)
+
+```
+$ ~/Projects/v8/out/Release/d8 --trace-ic audio-oscillator.js
+[...SNIP...]
+[BinaryOpIC(MOD:None*None->None) => (MOD:Smi*2048->Smi) @ ~Oscillator.generate+598 at audio-oscillator.js:697]
+[...SNIP...]
+$
+```
+
+shows that the `BinaryOpIC` is picking up the proper constant feedback for the right hand side of the modulus, and properly tracks that the left hand side was always a small integer (a `Smi` in V8 speak), and we also always produced a small integer result. Looking at the generated code using `--print-opt-code --code-comments` quickly reveals that Crankshaft utilizes the feedback to generate an efficient code sequence for the integer modulus in `Oscillator.prototype.generate`:
+
+```
+[...SNIP...]
+                  ;;; <@80,#84> load-named-field
+0x133a0bdacc4a   330  8b4343         movl rax,[rbx+0x43]
+                  ;;; <@83,#86> compare-numeric-and-branch
+0x133a0bdacc4d   333  3d00080000     cmp rax,0x800
+0x133a0bdacc52   338  0f85ff000000   jnz 599  (0x133a0bdacd57)
+[...SNIP...]
+                  ;;; <@90,#94> mod-by-power-of-2-i
+0x133a0bdacc5b   347  4585db         testl r11,r11
+0x133a0bdacc5e   350  790f           jns 367  (0x133a0bdacc6f)
+0x133a0bdacc60   352  41f7db         negl r11
+0x133a0bdacc63   355  4181e3ff070000 andl r11,0x7ff
+0x133a0bdacc6a   362  41f7db         negl r11
+0x133a0bdacc6d   365  eb07           jmp 374  (0x133a0bdacc76)
+0x133a0bdacc6f   367  4181e3ff070000 andl r11,0x7ff
+[...SNIP...]
+                  ;;; <@127,#88> deoptimize
+0x133a0bdacd57   599  e81273cdff     call 0x133a0ba8406e
+[...SNIP...]
+```
+
+So you see we load the value of `this.waveTableLength` (`rbx` holds the `this` reference), check that it’s still 2048 (hexadecimal 0x800), and if so just perform a bitwise and with the proper bitmask 0x7ff (`r11` contains the value of the loop induction variable `i`) instead of using the `idiv` instruction (paying proper attention to preserve the sign of the left hand side).
+
+### The over-specialization issue
+
+So this trick is pretty damn cool, but as with many benchmark focused tricks, it has one major drawback: It’s over-specialized! As soon as the right hand side ever changes, all optimized code will have to be deoptimized (as the assumption that the right hand is always a certain power of two no longer holds) and any further optimization attempts will have to use `idiv` again, as the `BinaryOpIC` will most likely report feedback in the form `Smi*Smi->Smi` then. For example, let’s assume we instantiate another `Oscillator`, set a different`waveTableLength` on it, and call `generate` for the oscillator, then we’d lose 20% performance even though the actually interesting `Oscillator`s are not affected (i.e. the engine does non-local penalization here).
+
+```
+--- audio-oscillator.js.ORIG    2016-12-15 22:01:43.897033156 +0100
++++ audio-oscillator.js 2016-12-15 22:02:26.397326067 +0100
+@@ -1931,6 +1931,10 @@
+ var frequency = 344.53;
+ var sine = new Oscillator(Oscillator.Sine, frequency, 1, bufferSize, sampleRate);
+
++var unused = new Oscillator(Oscillator.Sine, frequency, 1, bufferSize, sampleRate);
++unused.waveTableLength = 1024;
++unused.generate();
++
+ var calcOsc = function() {
+   sine.generate();
+```
+
+Comparing the execution times of the original `audio-oscillator.js` and the version that contains an additional unused `Oscillator` instance with a modified `waveTableLength` shows the expected results:
+
+```
+$ ~/Projects/v8/out/Release/d8 audio-oscillator.js.ORIG
+Time (audio-oscillator-once): 64 ms.
+$ ~/Projects/v8/out/Release/d8 audio-oscillator.js
+Time (audio-oscillator-once): 81 ms.
+$
+```
+
+This is an example for a pretty terrible performance cliff: Let’s say a developer writes code for a library and does careful tweaking and optimizations using certain sample input values, and the performance is decent. Now a user starts using that library reading through the performance notes, but somehow falls off the performance cliff, because she/he is using the library in a slightly different way, i.e. somehow polluting type feedback for a certain `BinaryOpIC`, and is hit by a 20% slowdown (compared to the measurements of the library author) that neither the library author nor the user can explain, and that seems rather arbitrary.
+
+Now this is not uncommon in JavaScript land, and unfortunately quite a couple of these cliffs are just unavoidable, because they are due to the fact that JavaScript performance is based on optimistic assumptions and speculation. We have been spending **a lot** of time and energy trying to come up with ways to avoid these performance cliffs, and still provide (nearly) the same performance. As it turns out it makes a lot of sense to avoid `idiv` whenever possible, even if you don’t necessarily know that the right hand side is always a power of two (via dynamic feedback), so what TurboFan does is different from Crankshaft, in that it always checks at runtime whether the input is a power of two, so general case for signed integer modulus, with optimization for (unknown) power of two right hand side looks like this (in pseudo code):
+
+```
+if 0 < rhs then
+  msk = rhs - 1
+  if rhs & msk != 0 then
+    lhs % rhs
+  else
+    if lhs < 0 then
+      -(-lhs & msk)
+    else
+      lhs & msk
+else
+  if rhs < -1 then
+    lhs % rhs
+  else
+    zero
+```
+
+And that leads to a lot more consistent and predictable performance (with TurboFan):
+
+```
+$ ~/Projects/v8/out/Release/d8 --turbo audio-oscillator.js.ORIG
+Time (audio-oscillator-once): 69 ms.
+$ ~/Projects/v8/out/Release/d8 --turbo audio-oscillator.js
+Time (audio-oscillator-once): 69 ms.
+$
+```
+
+The problem with benchmarks and over-specialization is that the benchmark can give you hints where to look and what to do, but it doesn’t tell you how far you have to go and doesn’t protect the optimization properly. For example, all JavaScript engines use benchmarks as a way to guard against performance regressions, but running Kraken for example wouldn’t protect the general approach that we have in TurboFan, i.e. we could _degrade_ the modulus optimization in TurboFan to the over-specialized version of Crankshaft and the benchmark wouldn’t tell us that we regressed, because from the point of view of the benchmark it’s fine! Now you could extend the benchmark, maybe in the same way that I did above, and try to cover everything with benchmarks, which is what engine implementors do to a certain extent, but that approach doesn’t scale arbitrarily. Even though benchmarks are convenient and easy to use for communication and competition, you’ll also need to leave space for common sense, otherwise over-specialization will dominate everything and you’ll have a really, really fine line of acceptable performance and big performance cliffs.
+
+There are various other issues with the Kraken tests, but let’s move on the probably most influential JavaScript benchmark of the last five years… the Octane benchmark.
+
+### A closer look at Octane
+
+The [Octane benchmark][66] is the successor of the V8 benchmark and was initially [announced by Google in mid 2012][67] and the current version Octane 2.0 was [announced in late 2013][68]. This version contains 15 individual tests, where for two of them - Splay and Mandreel - we measure both the throughput and the latency. These tests range from [Microsofts TypeScript compiler][69] compiling itself, to raw [asm.js][70] performance being measured by the zlib test, to a performance test for the RegExp engine, to a ray tracer, to a full 2D physics engine, etc. See the [description][71] for a detailed overview of the individual benchmark line items. All these line items were carefully chosen to reflect a certain aspect of JavaScript performance that we considered important in 2012 or expected to become important in the near future.
+
+To a large extent Octane was super successful in achieving its goals of taking JavaScript performance to the next level, it resulted in a healthy competition in 2012 and 2013 where great performance achievements were driven by Octane. But it’s almost 2017 now, and the world looks fairly different than in 2012, really, really different actually. Besides the usual and often cited criticism that most items in Octane are essentially outdated (i.e. ancient versions of TypeScript, zlib being compiled via an ancient version of [Emscripten][72], Mandreel not even being available anymore, etc.), something way more important affects Octanes usefulness:
+
+We saw big web frameworks winning the race on the web, especially heavy frameworks like [Ember][73] and [AngularJS][74], that use patterns of JavaScript execution, which are not reflected at all by Octane and are often hurt by (our) Octane specific optimizations. We also saw JavaScript winning on the server and tooling front, which means there are large scale JavaScript applications that now often run for weeks if not years, which also not captured by Octane. As stated in the beginning we have hard data that suggests that the execution and memory profile of Octane is completely different than what we see on the web daily.
+
+So, let’s look into some concrete examples of benchmark gaming that is happening today with Octane, where optimizations are no longer reflected in real world. Note that even though this might sound a bit negative in retrospect, it’s definitely not meant that way! As I said a couple of times already, Octane is an important chapter in the JavaScript performance story, and it played a very important role. All the optimizations that went into JavaScript engines driven by Octane in the past were added on good faith that Octane is a good proxy for real world performance! _Every age has its benchmark, and for every benchmark there comes a time when you have to let go!_
+
+That being said, let’s get this show on the road and start by looking at the Box2D test, which is based on[Box2DWeb][75], a popular 2D physics engine originally written by Erin Catto, ported to JavaScript. Overall does a lot of floating point math and drove a lot of good optimizations in JavaScript engines, however as it turns out it contains a bug that can be exploited to game the benchmark a bit (blame it on me, I spotted the bug and added the exploit in this case). There’s a function `D.prototype.UpdatePairs` in the benchmark that looks like this (deminified):
+
+```
+D.prototype.UpdatePairs = function(b) {
+    var e = this;
+    var f = e.m_pairCount = 0,
+        m;
+    for (f = 0; f < e.m_moveBuffer.length; ++f) {
+        m = e.m_moveBuffer[f];
+        var r = e.m_tree.GetFatAABB(m);
+        e.m_tree.Query(function(t) {
+                if (t == m) return true;
+                if (e.m_pairCount == e.m_pairBuffer.length) e.m_pairBuffer[e.m_pairCount] = new O;
+                var x = e.m_pairBuffer[e.m_pairCount];
+                x.proxyA = t < m ? t : m;
+                x.proxyB = t >= m ? t : m;
+                ++e.m_pairCount;
+                return true
+            },
+            r)
+    }
+    for (f = e.m_moveBuffer.length = 0; f < e.m_pairCount;) {
+        r = e.m_pairBuffer[f];
+        var s = e.m_tree.GetUserData(r.proxyA),
+            v = e.m_tree.GetUserData(r.proxyB);
+        b(s, v);
+        for (++f; f < e.m_pairCount;) {
+            s = e.m_pairBuffer[f];
+            if (s.proxyA != r.proxyA || s.proxyB != r.proxyB) break;
+            ++f
+        }
+    }
+};
+```
+
+Some profiling shows that a lot of time is spent in the innocent looking inner function passed to `e.m_tree.Query` in the first loop:
+
+```
+function(t) {
+    if (t == m) return true;
+    if (e.m_pairCount == e.m_pairBuffer.length) e.m_pairBuffer[e.m_pairCount] = new O;
+    var x = e.m_pairBuffer[e.m_pairCount];
+    x.proxyA = t < m ? t : m;
+    x.proxyB = t >= m ? t : m;
+    ++e.m_pairCount;
+    return true
+}
+```
+
+More precisely the time is not spent in this function itself, but rather operations and builtin library functions triggered by this. As it turned out we spent 4-7% of the overall execution time of the benchmark calling into the [`Compare` runtime function][76], which implements the general case for the [abstract relational comparison][77].
+
+
+ ![Box2D compare profile](http://benediktmeurer.de/images/2016/box2d-compare-20161216.png)
+
+
+Almost all the calls to the runtime function came from the [`CompareICStub`][78], which is used for the two relational comparisons in the inner function:
+
+```
+x.proxyA = t < m ? t : m;
+x.proxyB = t >= m ? t : m;
+```
+
+So these two innocent looking lines of code are responsible for 99% of the time spent in this function! How come? Well, as with so many things in JavaScript, the [abstract relational comparison][79] is not necessarily intuitive to use properly. In this function both `t` and `m` are always instances of `L`, which is a central class in this application, but doesn’t override either any of `Symbol.toPrimitive`, `"toString"`, `"valueOf"` or `Symbol.toStringTag` properties, that are relevant for the abstract relation comparison. So what happens if you write `t < m` is this:
+
+1.  Calls [ToPrimitive][12](`t`, `hint Number`).
+2.  Runs [OrdinaryToPrimitive][13](`t`, `"number"`) since there’s no `Symbol.toPrimitive`.
+3.  Executes `t.valueOf()`, which yields `t` itself since it calls the default [`Object.prototype.valueOf`][14].
+4.  Continues with `t.toString()`, which yields `"[object Object]"`, since the default[`Object.prototype.toString`][15] is being used and no [`Symbol.toStringTag`][16] was found for `L`.
+5.  Calls [ToPrimitive][17](`m`, `hint Number`).
+6.  Runs [OrdinaryToPrimitive][18](`m`, `"number"`) since there’s no `Symbol.toPrimitive`.
+7.  Executes `m.valueOf()`, which yields `m` itself since it calls the default [`Object.prototype.valueOf`][19].
+8.  Continues with `m.toString()`, which yields `"[object Object]"`, since the default[`Object.prototype.toString`][20] is being used and no [`Symbol.toStringTag`][21] was found for `L`.
+9.  Does the comparison `"[object Object]" < "[object Object]"` which yields `false`.
+
+Same for `t >= m`, which always produces `true` then. So the bug here is that using abstract relational comparison this way just doesn’t make sense. And the way to exploit it is to have the compiler constant-fold it, i.e. similar to applying this patch to the benchmark:
+
+```
+--- octane-box2d.js.ORIG        2016-12-16 07:28:58.442977631 +0100
++++ octane-box2d.js     2016-12-16 07:29:05.615028272 +0100
+@@ -2021,8 +2021,8 @@
+                     if (t == m) return true;
+                     if (e.m_pairCount == e.m_pairBuffer.length) e.m_pairBuffer[e.m_pairCount] = new O;
+                     var x = e.m_pairBuffer[e.m_pairCount];
+-                    x.proxyA = t < m ? t : m;
+-                    x.proxyB = t >= m ? t : m;
++                    x.proxyA = m;
++                    x.proxyB = t;
+                     ++e.m_pairCount;
+                     return true
+                 },
+```
+
+Because doing so results in a serious speed-up of 13% by not having to do the comparison, and all the propery lookups and builtin function calls triggered by it.
+
+```
+$ ~/Projects/v8/out/Release/d8 octane-box2d.js.ORIG
+Score (Box2D): 48063
+$ ~/Projects/v8/out/Release/d8 octane-box2d.js
+Score (Box2D): 55359
+$
+```
+
+So how did we do that? As it turned out we already had a mechanism for tracking the shape of objects that are being compared in the `CompareIC`, the so-called _known receiver_ map tracking (where _map_ is V8 speak for object shape+prototype), but that was limited to abstract and strict equality comparisons. But I could easily extend the tracking to also collect the feedback for abstract relational comparison:
+
+```
+$ ~/Projects/v8/out/Release/d8 --trace-ic octane-box2d.js
+[...SNIP...]
+[CompareIC in ~+557 at octane-box2d.js:2024 ((UNINITIALIZED+UNINITIALIZED=UNINITIALIZED)->(RECEIVER+RECEIVER=KNOWN_RECEIVER))#LT @ 0x1d5a860493a1]
+[CompareIC in ~+649 at octane-box2d.js:2025 ((UNINITIALIZED+UNINITIALIZED=UNINITIALIZED)->(RECEIVER+RECEIVER=KNOWN_RECEIVER))#GTE @ 0x1d5a860496e1]
+[...SNIP...]
+$
+```
+
+Here the `CompareIC` used in the baseline code tells us that for the LT (less than) and the GTE (greather than or equal) comparisons in the function we’re looking at, it had only seen `RECEIVER`s so far (which is V8 speak for JavaScript objects), and all these receivers had the same map `0x1d5a860493a1`, which corresponds to the map of `L` instances. So in optimized code, we can constant-fold these operations to `false` and `true`respectively as long as we know that both sides of the comparison are instances with the map `0x1d5a860493a1` and noone messed with `L`s prototype chain, i.e. the `Symbol.toPrimitive`, `"valueOf"` and `"toString"` methods are the default ones, and noone installed a `Symbol.toStringTag` accessor property. The rest of the story is _black voodoo magic_ in Crankshaft, with a lot of cursing and initially forgetting to check `Symbol.toStringTag` properly:
+
+[
+ ![Hydrogen voodoo magic](http://benediktmeurer.de/images/2016/hydrogen-compare-20161216.png)
+][80]
+
+And in the end there was a rather huge performance boost on this particular benchmark:
+
+ ![Box2D boost](http://benediktmeurer.de/images/2016/awfy-box2d-20161216.png)
+
+
+To my defense, back then I was not convinced that this particular behavior would always point to a bug in the original code, so I was even expecting that code in the wild might hit this case fairly often, also because I was assuming that JavaScript developers wouldn’t always care about these kinds of potential bugs. However, I was so wrong, and here I stand corrected! I have to admit that this particular optimization is purely a benchmark thing, and will not help any real code (unless the code is written to benefit from this optimization, but then you could as well write `true` or `false` directly in your code instead of using an always-constant relational comparison). You might wonder why we slightly regressed soon after my patch. That was the period where we threw the whole team at implementing ES2015, which was really a dance with the devil to get all the new stuff in (ES2015 is a monster!) without seriously regressing the traditional benchmarks.
+
+Enough said about Box2D, let’s have a look at the Mandreel benchmark. Mandreel was a compiler for compiling C/C++ code to JavaScript, it didn’t use the [asm.js][81] subset of JavaScript that is being used by the more recent [Emscripten][82] compiler, and has been deprecated (and more or less disappeared from the internet) since roughly three years now. Nevertheless, Octane still has a version of the [Bullet physics engine][83] compiled via [Mandreel][84]. An interesting test here is the MandreelLatency test, which instruments the Mandreel benchmark with frequent time measurement checkpoints. The idea here was that since Mandreel stresses the VM’s compiler, this test provides an indication of the latency introduced by the compiler, and long pauses between measurement checkpoints lower the final score. In theory that sounds very reasonable, and it does indeed make some sense. However as usual vendors figured out ways to cheat on this benchmark.
+
+[
+ ![Mozilla bug 1162272](http://benediktmeurer.de/images/2016/bugzilla-mandreel-20161216.png)
+][85]
+
+Mandreel contains a huge initialization function `global_init` that takes an incredible amount of time just parsing this function, and generating baseline code for it. Since engines usually parse various functions in scripts multiple times, one so-called pre-parse step to discover functions inside the script, and then as the function is invoked for the first time a full parse step to actually generate baseline code (or bytecode) for the function. This is called [_lazy parsing_][86] in V8 speak. V8 has some heuristics in place to detect functions that are invoked immediately where pre-parsing is actually a waste of time, but that’s not clear for the `global_init`function in the Mandreel benchmark, thus we’d would have an incredible long pause for pre-parsing + parsing + compiling the big function. So we [added an additional heuristic][87] that would also avoids the pre-parsing for this `global_init` function.
+
+[
+ ![MandreelLatency benchmark](http://benediktmeurer.de/images/2016/awfy-mandreel-20161216.png)
+][88]
+
+So we saw an almost 200% improvement just by detecting `global_init` and avoiding the expensive pre-parse step. We are somewhat certain that this should not negatively impact real world use cases, but there’s no guarantee that this won’t bite you on large functions where pre-parsing would be beneficial (because they aren’t immediately executed).
+
+So let’s look into another slightly less controversial benchmark: the [`splay.js`][89] test, which is meant to be a data manipulation benchmark that deals with splay trees and exercises the automatic memory management subsystem (aka the garbage collector). It comes bundled with a latency test that instruments the Splay code with frequent measurement checkpoints, where a long pause between checkpoints is an indication of high latency in the garbage collector. This test measures the frequency of latency pauses, classifies them into buckets and penalizes frequent long pauses with a low score. Sounds great! No GC pauses, no jank. So much for the theory. Let’s have a look at the benchmark, here’s what’s at the core of the whole splay tree business:
+
+[
+ ![splay.js](http://benediktmeurer.de/images/2016/splay-insertnode-20161216.png)
+][90]
+
+This is the core of the splay tree construction, and despite what you might think looking at the full benchmark, this is more or less all that matters for the SplayLatency score. How come? Actually what the benchmark does is to construct huge splay trees, so that the majority of nodes survive, thus making it to old space. With a generational garbage collector like the one in V8 this is super expensive if a program violates the [generational hypothesis][91] leading to extreme pause times for essentially evacuating everything from new space to old space. Running V8 in the old configuration clearly shows this problem:
+
+```
+$ out/Release/d8 --trace-gc --noallocation_site_pretenuring octane-splay.js
+[20872:0x7f26f24c70d0]       10 ms: Scavenge 2.7 (6.0) -> 2.7 (7.0) MB, 1.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       12 ms: Scavenge 2.7 (7.0) -> 2.7 (8.0) MB, 1.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       14 ms: Scavenge 3.7 (8.0) -> 3.6 (10.0) MB, 0.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       18 ms: Scavenge 4.8 (10.5) -> 4.7 (11.0) MB, 2.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       22 ms: Scavenge 5.7 (11.0) -> 5.6 (16.0) MB, 2.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       28 ms: Scavenge 8.7 (16.0) -> 8.6 (17.0) MB, 4.3 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       35 ms: Scavenge 9.6 (17.0) -> 9.6 (28.0) MB, 6.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       49 ms: Scavenge 16.6 (28.5) -> 16.4 (29.0) MB, 8.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       65 ms: Scavenge 17.5 (29.0) -> 17.5 (52.0) MB, 15.3 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]       93 ms: Scavenge 32.3 (52.5) -> 32.0 (53.5) MB, 17.6 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      126 ms: Scavenge 33.4 (53.5) -> 33.3 (68.0) MB, 31.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      151 ms: Scavenge 47.9 (68.0) -> 47.6 (69.5) MB, 15.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      183 ms: Scavenge 49.2 (69.5) -> 49.2 (84.0) MB, 30.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      210 ms: Scavenge 63.5 (84.0) -> 62.4 (85.0) MB, 14.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      241 ms: Scavenge 64.7 (85.0) -> 64.6 (99.0) MB, 28.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      268 ms: Scavenge 78.2 (99.0) -> 77.6 (101.0) MB, 16.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      298 ms: Scavenge 80.4 (101.0) -> 80.3 (114.5) MB, 28.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      324 ms: Scavenge 93.5 (114.5) -> 92.9 (117.0) MB, 16.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      354 ms: Scavenge 96.2 (117.0) -> 96.0 (130.0) MB, 27.6 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      383 ms: Scavenge 108.8 (130.0) -> 108.2 (133.0) MB, 16.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      413 ms: Scavenge 111.9 (133.0) -> 111.7 (145.5) MB, 27.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      440 ms: Scavenge 124.1 (145.5) -> 123.5 (149.0) MB, 17.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      473 ms: Scavenge 127.6 (149.0) -> 127.4 (161.0) MB, 29.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      502 ms: Scavenge 139.4 (161.0) -> 138.8 (165.0) MB, 18.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      534 ms: Scavenge 143.3 (165.0) -> 143.1 (176.5) MB, 28.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      561 ms: Scavenge 154.7 (176.5) -> 154.2 (181.0) MB, 19.0 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      594 ms: Scavenge 158.9 (181.0) -> 158.7 (192.0) MB, 29.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      622 ms: Scavenge 170.0 (192.5) -> 169.5 (197.0) MB, 19.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      655 ms: Scavenge 174.6 (197.0) -> 174.3 (208.0) MB, 28.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      683 ms: Scavenge 185.4 (208.0) -> 184.9 (212.5) MB, 19.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      715 ms: Scavenge 190.2 (213.0) -> 190.0 (223.5) MB, 27.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      743 ms: Scavenge 200.7 (223.5) -> 200.3 (228.5) MB, 19.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      774 ms: Scavenge 205.8 (228.5) -> 205.6 (239.0) MB, 27.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      802 ms: Scavenge 216.1 (239.0) -> 215.7 (244.5) MB, 19.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      833 ms: Scavenge 221.4 (244.5) -> 221.2 (254.5) MB, 26.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      861 ms: Scavenge 231.5 (255.0) -> 231.1 (260.5) MB, 19.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      892 ms: Scavenge 237.0 (260.5) -> 236.7 (270.5) MB, 26.3 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      920 ms: Scavenge 246.9 (270.5) -> 246.5 (276.0) MB, 20.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      951 ms: Scavenge 252.6 (276.0) -> 252.3 (286.0) MB, 25.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]      979 ms: Scavenge 262.3 (286.0) -> 261.9 (292.0) MB, 20.3 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1014 ms: Scavenge 268.2 (292.0) -> 267.9 (301.5) MB, 29.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1046 ms: Scavenge 277.7 (302.0) -> 277.3 (308.0) MB, 22.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1077 ms: Scavenge 283.8 (308.0) -> 283.5 (317.5) MB, 25.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1105 ms: Scavenge 293.1 (317.5) -> 292.7 (323.5) MB, 20.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1135 ms: Scavenge 299.3 (323.5) -> 299.0 (333.0) MB, 24.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1164 ms: Scavenge 308.6 (333.0) -> 308.1 (339.5) MB, 20.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1194 ms: Scavenge 314.9 (339.5) -> 314.6 (349.0) MB, 25.0 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1222 ms: Scavenge 324.0 (349.0) -> 323.6 (355.5) MB, 21.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1253 ms: Scavenge 330.4 (355.5) -> 330.1 (364.5) MB, 25.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1282 ms: Scavenge 339.4 (364.5) -> 339.0 (371.0) MB, 22.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1315 ms: Scavenge 346.0 (371.0) -> 345.6 (380.0) MB, 25.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1413 ms: Mark-sweep 349.9 (380.0) -> 54.2 (305.0) MB, 5.8 / 0.0 ms  (+ 87.5 ms in 73 steps since start of marking, biggest step 8.2 ms, walltime since start of marking 131 ms) finalize incremental marking via stack guard GC in old space requested
+[20872:0x7f26f24c70d0]     1457 ms: Scavenge 65.8 (305.0) -> 65.1 (305.0) MB, 31.0 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1489 ms: Scavenge 69.9 (305.0) -> 69.7 (305.0) MB, 27.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1523 ms: Scavenge 80.9 (305.0) -> 80.4 (305.0) MB, 22.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1553 ms: Scavenge 85.5 (305.0) -> 85.3 (305.0) MB, 24.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1581 ms: Scavenge 96.3 (305.0) -> 95.7 (305.0) MB, 18.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1616 ms: Scavenge 101.1 (305.0) -> 100.9 (305.0) MB, 29.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1648 ms: Scavenge 111.6 (305.0) -> 111.1 (305.0) MB, 22.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1678 ms: Scavenge 116.7 (305.0) -> 116.5 (305.0) MB, 25.0 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1709 ms: Scavenge 127.0 (305.0) -> 126.5 (305.0) MB, 20.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1738 ms: Scavenge 132.3 (305.0) -> 132.1 (305.0) MB, 23.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1767 ms: Scavenge 142.4 (305.0) -> 141.9 (305.0) MB, 19.6 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1796 ms: Scavenge 147.9 (305.0) -> 147.7 (305.0) MB, 23.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1825 ms: Scavenge 157.8 (305.0) -> 157.3 (305.0) MB, 19.9 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1853 ms: Scavenge 163.5 (305.0) -> 163.2 (305.0) MB, 22.2 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1881 ms: Scavenge 173.2 (305.0) -> 172.7 (305.0) MB, 19.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1910 ms: Scavenge 179.1 (305.0) -> 178.8 (305.0) MB, 23.0 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1944 ms: Scavenge 188.6 (305.0) -> 188.1 (305.0) MB, 25.1 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     1979 ms: Scavenge 194.7 (305.0) -> 194.4 (305.0) MB, 28.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     2011 ms: Scavenge 204.0 (305.0) -> 203.6 (305.0) MB, 23.4 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     2041 ms: Scavenge 210.2 (305.0) -> 209.9 (305.0) MB, 23.8 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     2074 ms: Scavenge 219.4 (305.0) -> 219.0 (305.0) MB, 24.5 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     2105 ms: Scavenge 225.8 (305.0) -> 225.4 (305.0) MB, 24.7 / 0.0 ms  allocation failure
+[20872:0x7f26f24c70d0]     2138 ms: Scavenge 234.8 (305.0) -> 234.4 (305.0) MB, 23.1 / 0.0 ms  allocation failure
+[...SNIP...]
+$
+```
+
+So the key observation here is that allocating the splay tree nodes in old space directly would avoid essentially all the overhead of copying objects around and reduce the number of minor GC cycles to the bare minimum (thereby reducing the pauses caused by the GC). So we came up with a mechanism called [_Allocation Site Pretenuring_][92] that would try to dynamically gather feedback at allocation sites when run in baseline code to decide whether a certain percent of the objects allocated here survives, and if so instrument the optimized code to allocate objects in old space directly - i.e. _pretenure the objects_.
+
+```
+$ out/Release/d8 --trace-gc octane-splay.js
+[20885:0x7ff4d7c220a0]        8 ms: Scavenge 2.7 (6.0) -> 2.6 (7.0) MB, 1.2 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       10 ms: Scavenge 2.7 (7.0) -> 2.7 (8.0) MB, 1.6 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       11 ms: Scavenge 3.6 (8.0) -> 3.6 (10.0) MB, 0.9 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       17 ms: Scavenge 4.8 (10.5) -> 4.7 (11.0) MB, 2.9 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       20 ms: Scavenge 5.6 (11.0) -> 5.6 (16.0) MB, 2.8 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       26 ms: Scavenge 8.7 (16.0) -> 8.6 (17.0) MB, 4.5 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       34 ms: Scavenge 9.6 (17.0) -> 9.5 (28.0) MB, 6.8 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       48 ms: Scavenge 16.6 (28.5) -> 16.4 (29.0) MB, 8.6 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       64 ms: Scavenge 17.5 (29.0) -> 17.5 (52.0) MB, 15.2 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]       96 ms: Scavenge 32.3 (52.5) -> 32.0 (53.5) MB, 19.6 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]      153 ms: Scavenge 61.3 (81.5) -> 57.4 (93.5) MB, 27.9 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]      432 ms: Scavenge 339.3 (364.5) -> 326.6 (364.5) MB, 12.7 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]      666 ms: Scavenge 563.7 (592.5) -> 553.3 (595.5) MB, 20.5 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]      825 ms: Mark-sweep 603.9 (644.0) -> 96.0 (528.0) MB, 4.0 / 0.0 ms  (+ 92.5 ms in 51 steps since start of marking, biggest step 4.6 ms, walltime since start of marking 160 ms) finalize incremental marking via stack guard GC in old space requested
+[20885:0x7ff4d7c220a0]     1068 ms: Scavenge 374.8 (528.0) -> 362.6 (528.0) MB, 19.1 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]     1304 ms: Mark-sweep 460.1 (528.0) -> 102.5 (444.5) MB, 10.3 / 0.0 ms  (+ 117.1 ms in 59 steps since start of marking, biggest step 7.3 ms, walltime since start of marking 200 ms) finalize incremental marking via stack guard GC in old space requested
+[20885:0x7ff4d7c220a0]     1587 ms: Scavenge 374.2 (444.5) -> 361.6 (444.5) MB, 13.6 / 0.0 ms  allocation failure
+[20885:0x7ff4d7c220a0]     1828 ms: Mark-sweep 485.2 (520.0) -> 101.5 (519.5) MB, 3.4 / 0.0 ms  (+ 102.8 ms in 58 steps since start of marking, biggest step 4.5 ms, walltime since start of marking 183 ms) finalize incremental marking via stack guard GC in old space requested
+[20885:0x7ff4d7c220a0]     2028 ms: Scavenge 371.4 (519.5) -> 358.5 (519.5) MB, 12.1 / 0.0 ms  allocation failure
+[...SNIP...]
+$
+```
+
+And indeed that essentially fixed the problem for the SplayLatency benchmark completely and boosted our score by over 250%!
+
+[
+ ![SplayLatency benchmark](http://benediktmeurer.de/images/2016/awfy-splay-20161216.png)
+][93]
+
+As mentioned in the [SIGPLAN paper][94] we had good reasons to believe that allocation site pretenuring might be a win for real world applications, and were really looking forward to seeing improvements and extending the mechanism to cover more than just object and array literals. But it didn’t take [long][95] [to][96] [realize][97] that allocation site pretenuring can have a pretty serious negative impact on real world application performance. We actually got a lot of negative press, including a shit storm from Ember.js developers and users, not only because of allocation site pretenuring, but that was big part of the story.
+
+The fundamental problem with allocation site pretenuring as we learned are factories, which are very common in applications today (mostly because of frameworks, but also for other reasons), and assuming that your object factory is initially used to create the long living objects that form your object model and the views, which transitions the allocation site in your factory method(s) to _tenured_ state, and everything allocated from the factory immediately goes to old space. Now after the initial setup is done, your application starts doing stuff, and as part of that, allocates temporary objects from the factory, that now start polluting old space, eventually leading to expensive major garbage collection cycles, and other negative side effects like triggering incremental marking way too early.
+
+So we started to reconsider the benchmark driven effort and started looking for real world driven solutions instead, which resulted in an effort called [Orinoco][98] with the goal to incrementally improve the garbage collector; part of that effort is a project called _unified heap_, which will try to avoid copying objects if almost everything in a page survives. I.e. on a high level: If new space is full of live objects, just mark all new space pages as belonging to old space now, and create a fresh new space from empty pages. This might not yield the same score on the SplayLatency benchmark, but it’s a lot better for real world use cases and it automatically adapts to the concrete use case. We are also considering _concurrent marking_ to offload the marking work to a separate thread and thus further reducing the negative impact of incremental marking on both latency and throughput.
+
+### Cuteness break!
+
+ ![](https://pbs.twimg.com/profile_images/491838225300717568/sy5AWvt1.jpeg)
+
+Breathe.
+
+Ok, I think that should be sufficient to underline the point. I could go on pointing to even more examples where Octane driven improvements turned out to be a bad idea later, and maybe I’ll do that another day. But let’s stop right here for today…
+
+### Conclusion
+
+I hope it should be clear by now why benchmarks are generally a good idea, but are only useful to a certain level, and once you cross the line of _useful competition_, you’ll start wasting the time of your engineers or even start hurting your real world performance! If we are serious about performance for the web, we need to start judging browser by real world performance and not their ability to game four year old benchmarks. We need to start educating the (tech) press, or failing that, at least ignore them.
+
+[
+ ![Browser benchmark battle October 2016: Chrome vs. Firefox vs. Edge](http://benediktmeurer.de/images/2016/venturebeat-20161216.png)
+][99]
+
+Noone is afraid of competition, but gaming potentially broken benchmarks is not really useful investment of engineering time. We can do a lot more, and take JavaScript to the next level. Let’s work on meaningful performance tests that can drive competition on areas of interest for the end user and the developer. Additionally let’s also drive meaningful improvements for server and tooling side code running in Node.js (either on V8 or ChakraCore)!
+
+
+ ![](http://benediktmeurer.de/images/2016/measure-20161216.jpg)
+
+
+One closing comment: Don’t use traditional JavaScript benchmarks to compare phones. It’s really the most useless thing you can do, as the JavaScript performance often depends a lot on the software and not necessarily on the hardware, and Chrome ships a new version every six weeks, so whatever you measure in March maybe irrelevant already in April. And if there’s no way to avoid running something in a browser that assigns a number to a phone, then at least use a recent full browser benchmark that has at least something to do with what people will do with their browsers, i.e. consider [Speedometer benchmark][100].
+
+Thank you!
+
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://benediktmeurer.de/images/me.jpg)
+
+I am Benedikt Meurer, a software engineer living in Ottobrunn, a municipality southeast of Munich, Bavaria, Germany. I received my diploma in applied computer science with electrical engineering from the Universität Siegen in 2007, and since then I have been working as a research associate at the Lehrstuhl für Compilerbau und Softwareanalyse (and the Lehrstuhl für Mikrosystementwurf in 2007/2008) for five years. In 2013 I joined Google to work on the V8 JavaScript Engine in the Munich office, where I am currently working as tech lead for the JavaScript execution optimization team.
+
+--------------------------------------------------------------------------------
+
+via: http://benediktmeurer.de/2016/12/16/the-truth-about-traditional-javascript-benchmarks
+
+作者：[Benedikt Meurer][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://benediktmeurer.de/
+[1]:https://www.youtube.com/watch?v=PvZdTZ1Nl5o
+[2]:https://twitter.com/s3ththompson
+[3]:https://youtu.be/xCx4uC7mn6Y
+[4]:https://twitter.com/tverwaes
+[5]:https://youtu.be/xCx4uC7mn6Y
+[6]:https://twitter.com/tverwaes
+[7]:https://arewefastyet.com/#machine=12&view=single&suite=ss&subtest=cube&start=1343350217&end=1415382608
+[8]:https://www.engadget.com/2016/03/08/galaxy-s7-and-s7-edge-review/
+[9]:https://arewefastyet.com/#machine=29&view=single&suite=octane&subtest=MandreelLatency&start=1415924086&end=1446461709
+[10]:https://arewefastyet.com/#machine=12&view=single&suite=octane&subtest=SplayLatency&start=1384889558&end=1415405874
+[11]:http://venturebeat.com/2016/10/25/browser-benchmark-battle-october-2016-chrome-vs-firefox-vs-edge/3
+[12]:https://tc39.github.io/ecma262/#sec-toprimitive
+[13]:https://tc39.github.io/ecma262/#sec-ordinarytoprimitive
+[14]:https://tc39.github.io/ecma262/#sec-object.prototype.valueof
+[15]:https://tc39.github.io/ecma262/#sec-object.prototype.toString
+[16]:https://tc39.github.io/ecma262/#sec-symbol.tostringtag
+[17]:https://tc39.github.io/ecma262/#sec-toprimitive
+[18]:https://tc39.github.io/ecma262/#sec-ordinarytoprimitive
+[19]:https://tc39.github.io/ecma262/#sec-object.prototype.valueof
+[20]:https://tc39.github.io/ecma262/#sec-object.prototype.toString
+[21]:https://tc39.github.io/ecma262/#sec-symbol.tostringtag
+[22]:https://en.wikipedia.org/wiki/JavaScript
+[23]:https://nodejs.org/
+[24]:https://webkit.org/perf/sunspider/sunspider.html
+[25]:http://krakenbenchmark.mozilla.org/
+[26]:https://developers.google.com/octane
+[27]:http://browserbench.org/JetStream
+[28]:https://www.youtube.com/watch?v=PvZdTZ1Nl5o
+[29]:http://asmjs.org/
+[30]:https://github.com/kripken/emscripten
+[31]:http://beta.unity3d.com/jonas/AngryBots
+[32]:https://youtu.be/xCx4uC7mn6Y
+[33]:http://youtube.com/
+[34]:http://browserbench.org/Speedometer
+[35]:http://browserbench.org/Speedometer
+[36]:http://todomvc.com/
+[37]:https://twitter.com/bmeurer/status/806927160300556288
+[38]:https://youtu.be/xCx4uC7mn6Y
+[39]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/bitops-bitwise-and.js
+[40]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/bitops-bitwise-and.js
+[41]:https://en.wikipedia.org/wiki/Loop_splitting
+[42]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/bitops-bitwise-and.js
+[43]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/string-tagcloud.js
+[44]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/string-tagcloud.js#L199
+[45]:https://tc39.github.io/ecma262/#sec-json.parse
+[46]:https://tc39.github.io/ecma262/#sec-json.parse
+[47]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/3d-cube.js
+[48]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/3d-cube.js#L239
+[49]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/tests/sunspider-1.0.2/3d-cube.js#L151
+[50]:https://tc39.github.io/ecma262/#sec-math.sin
+[51]:https://tc39.github.io/ecma262/#sec-math.cos
+[52]:https://arewefastyet.com/#machine=12&view=single&suite=ss&subtest=cube&start=1343350217&end=1415382608
+[53]:https://docs.google.com/document/d/1VoYBhpDhJC4VlqMXCKvae-8IGuheBGxy32EOgC2LnT8
+[54]:https://github.com/WebKit/webkit/blob/master/PerformanceTests/SunSpider/resources/driver-TEMPLATE.html#L70
+[55]:https://www.engadget.com/2016/03/08/galaxy-s7-and-s7-edge-review/
+[56]:http://browserbench.org/Speedometer
+[57]:https://twitter.com/thealphanerd
+[58]:https://blog.mozilla.org/blog/2010/09/14/release-the-kraken-2
+[59]:https://github.com/h4writer/arewefastyet/blob/master/benchmarks/kraken/tests/kraken-1.1/audio-oscillator.js
+[60]:https://github.com/h4writer/arewefastyet/blob/master/benchmarks/kraken/tests/kraken-1.1/audio-oscillator.js
+[61]:https://github.com/h4writer/arewefastyet/blob/master/benchmarks/kraken/tests/kraken-1.1/audio-oscillator-data.js#L687
+[62]:https://tc39.github.io/ecma262/#sec-math.round
+[63]:https://github.com/h4writer/arewefastyet/blob/master/benchmarks/kraken/tests/kraken-1.1/audio-oscillator-data.js#L566
+[64]:https://graphics.stanford.edu/~seander/bithacks.html#ModulusDivisionEasy
+[65]:https://docs.google.com/presentation/d/1wZVIqJMODGFYggueQySdiA3tUYuHNMcyp_PndgXsO1Y
+[66]:https://developers.google.com/octane
+[67]:https://blog.chromium.org/2012/08/octane-javascript-benchmark-suite-for.html
+[68]:https://blog.chromium.org/2013/11/announcing-octane-20.html
+[69]:http://www.typescriptlang.org/
+[70]:http://asmjs.org/
+[71]:https://developers.google.com/octane/benchmark
+[72]:https://github.com/kripken/emscripten
+[73]:http://emberjs.com/
+[74]:https://angularjs.org/
+[75]:https://github.com/hecht-software/box2dweb
+[76]:https://github.com/v8/v8/blob/5124589642ba12228dcd66a8cb8c84c986a13f35/src/runtime/runtime-object.cc#L884
+[77]:https://tc39.github.io/ecma262/#sec-abstract-relational-comparison
+[78]:https://github.com/v8/v8/blob/5124589642ba12228dcd66a8cb8c84c986a13f35/src/x64/code-stubs-x64.cc#L2495
+[79]:https://tc39.github.io/ecma262/#sec-abstract-relational-comparison
+[80]:https://codereview.chromium.org/1355113002
+[81]:http://asmjs.org/
+[82]:https://github.com/kripken/emscripten
+[83]:http://bulletphysics.org/wordpress/
+[84]:http://www.mandreel.com/
+[85]:https://bugzilla.mozilla.org/show_bug.cgi?id=1162272
+[86]:https://docs.google.com/presentation/d/1214p4CFjsF-NY4z9in0GEcJtjbyVQgU0A-UqEvovzCs
+[87]:https://codereview.chromium.org/1102523003
+[88]:https://arewefastyet.com/#machine=29&view=single&suite=octane&subtest=MandreelLatency&start=1415924086&end=1446461709
+[89]:https://github.com/chromium/octane/blob/master/splay.js
+[90]:https://github.com/chromium/octane/blob/master/splay.js#L85
+[91]:http://www.memorymanagement.org/glossary/g.html
+[92]:https://research.google.com/pubs/pub43823.html
+[93]:https://arewefastyet.com/#machine=12&view=single&suite=octane&subtest=SplayLatency&start=1384889558&end=1415405874
+[94]:https://research.google.com/pubs/pub43823.html
+[95]:https://bugs.chromium.org/p/v8/issues/detail?id=2935
+[96]:https://bugs.chromium.org/p/chromium/issues/detail?id=367694
+[97]:https://bugs.chromium.org/p/v8/issues/detail?id=3665
+[98]:http://v8project.blogspot.de/2016/04/jank-busters-part-two-orinoco.html
+[99]:http://venturebeat.com/2016/10/25/browser-benchmark-battle-october-2016-chrome-vs-firefox-vs-edge/3/
+[100]:http://browserbench.org/Speedometer
diff --git a/sources/tech/20161220 TypeScript: the missing introduction.md b/sources/tech/20161220 TypeScript: the missing introduction.md
new file mode 100644
index 0000000000..545d404c0f
--- /dev/null
+++ b/sources/tech/20161220 TypeScript: the missing introduction.md	
@@ -0,0 +1,406 @@
+TypeScript: the missing introduction
+============================================================
+
+
+**The following is a guest post by James Henry ([@MrJamesHenry][8]). I am a member of the ESLint Core Team, and a TypeScript evangelist. I am working with Todd on [UltimateAngular][9] to bring you more award-winning Angular and TypeScript courses.**
+
+> The purpose of this article is to offer an introduction to how we can think about TypeScript, and its role in supercharging our **JavaScript** development. 
+> 
+> We will also try and come up with our own reasonable definitions for a lot of the buzzwords surrounding types and compilation.
+
+There is huge amount of great stuff in the TypeScript project that we won’t be able to cover within the scope of this blog post. Please read the [official documentation][15] to learn more, and check out the [TypeScript courses over on UltimateAngular][16] to go from total beginner to TypeScript Pro!
+
+### [Table of contents][17]
+
+*   [Background][10]
+*   [Getting to grips with the buzzwords][11]
+    *   [JavaScript - interpreted or compiled?][1]
+    *   [Run Time vs Compile Time][2]
+    *   [The TypeScript Compiler][3]
+    *   [Dynamic vs Static Typing][4]
+*   [TypeScript’s role in our JavaScript workflow][12]
+    *   [Our source file is our document, TypeScript is our Spell Check][5]
+*   [TypeScript is a tool which enables other tools][13]
+    *   [What is an Abstract Syntax Tree (AST)?][6]
+    *   [Example: Renaming symbols in VS Code][7]
+*   [Summary][14]
+
+### [Background][18]
+
+TypeScript is an amazingly powerful tool, and really quite easy to get started with.
+
+It can, however, come across as more complex than it is, because it may simultaneously be introducing us to a whole host of technical concepts related to our JavaScript programs that we may not have considered before.
+
+Whenever we stray into the area of talking about types, compilers, etc. things can get really confusing, really fast.
+
+This article is designed as a “what you need to know” guide for a lot of these potentially confusing concepts, so that by the time you dive into the “Getting Started” style tutorials, you are feeling confident with the various themes and terminology that surround the topic.
+
+### [Getting to grips with the buzzwords][19]
+
+There is something about running our code in a web browser that makes us _feel_ differently about how it works. “It’s not compiled, right?”, “Well, I definitely know there aren’t any types…”
+
+Things get even more interesting when we consider that both of those statements are both correct and incorrect at the same time - depending on the context and how you define some of these concepts.
+
+As a first step, we are going to do exactly that!
+
+#### [JavaScript - interpreted or compiled?][20]
+
+Traditionally, developers will often think about a language being a “compiled language” when they are the ones responsible for compiling their own programs.
+
+> In basic terms, when we compile a program we are converting it from the form we wrote it in, to the form it actually gets run in.
+
+In a language like Golang, for example, you have a command line tool called `go build`which allows you to compile your `.go` file into a lower-level representation of the code, which can then be executed and run:
+
+```
+# We manually compile our .go file into something we can run
+# using the command line tool "go build"
+go build ultimate-angular.go
+# ...then we execute it!
+./ultimate-angular
+```
+
+As authors of JavaScript (ignoring our love of new-fangled build tools and module loaders for a moment), we don’t have such a fundamental compilation step in our workflow.
+
+We write some code, and load it up in a browser using a `<script>` tag (or a server-side environment such as node.js), and it just runs.
+
+**Ok, so JavaScript isn’t compiled - it must be an interpreted language, right?**
+
+Well, actually, all we have determined so far is that JavaScript is not something that we compile _ourselves_, but we’ll come back to this after we briefly look an example of an “interpreted language”.
+
+> An interpreted computer program is one that is executed like a human reads a book, starting at the top and working down line-by-line.
+
+The classic example of interpreted programs that we are already familiar with are bash scripts. The bash interpreter in our terminal reads our commands in line-by-line and executes them.
+
+Now, if we return to thinking about JavaScript and whether or not it is interpreted or compiled, intuitively there are some things about it that just don’t add up when we think about reading and executing a program line-by-line (our simple definition of “interpreted”).
+
+Take this code as an example:
+
+```
+hello();
+function hello() {
+  console.log('Hello!');
+}
+```
+
+This is perfectly valid JavaScript which will print the word “Hello!”, but we have used the `hello()` function before we have even defined it! A simple line-by-line execution of this program would just not be possible, because `hello()` on line 1 does not have any meaning until we reach its declaration on line 2.
+
+The reason that this, and many other concepts like it, is possible in JavaScript is because our code is actually compiled by the so called “JavaScript engine”, or environment, before it is executed. The exact nature of this compilation process will depend on the specific implementation (e.g. V8, which powers node.js and Google Chrome, will behave slightly differently to SpiderMonkey, which is used by FireFox).
+
+We will not dig any further into the subtleties of defining “compiled vs interpreted” here (there are a LOT).
+
+> It’s useful to always keep in mind that the JavaScript code we write is already not the actual code that will be executed by our users, even when we simply have a `<script>` tag in an HTML document.
+
+#### [Run Time vs Compile Time][21]
+
+Now that we have properly introduced the idea that compiling a program and running a program are two distinct phases, the terms “Run Time” and “Compile Time” become a little easier to reason about.
+
+When something happens at **Compile Time**, it is happening during the conversion of our code from what we wrote in our editor/IDE to some other form.
+
+When something happens at **Run Time**, it is happening during the actual execution of our program. For example, our `hello()` function above is executed at “run time”.
+
+#### [The TypeScript Compiler][22]
+
+Now that we understand these key phases in the lifecycle of a program, we can introduce the **TypeScript compiler**.
+
+The TypeScript compiler is at the core of how TypeScript is able to help us when we write our code. Instead of just including our JavaScript in a `<script>` tag, for example, we will first pass it through the TypeScript compiler so that it can give us helpful hints on how we can improve our program before it runs.
+
+> We can think about this new step as our own personal “compile time”, which will help us ensure that our program is written in the way we intended, before it even reaches the main JavaScript engine.
+
+It is a similar process to the one shown in the Golang example above, except that the TypeScript compiler just provides hints based on how we have written our program, and doesn’t turn it into a lower-level executable - it produces pure JavaScript.
+
+```
+# One option for passing our source .ts file through the TypeScript
+# compiler is to use the command line tool "tsc"
+tsc ultimate-angular.ts
+
+# ...this will produce a .js file of the same name
+# i.e. ultimate-angular.js
+```
+
+There are many great posts about the different options for integrating the TypeScript compiler into your existing workflow, including the [official documentation][23]. It is beyond the scope of this article to go into those options here.
+
+#### [Dynamic vs Static Typing][24]
+
+Just like with “compiled vs interpreted” programs, the existing material on “dynamic vs static typing” can be incredibly confusing.
+
+Let’s start by taking a step back and refreshing our memory on how much we _already_understand about types from our existing JavaScript code.
+
+We have the following program:
+
+```
+var name = 'James';
+var sum = 1 + 2;
+```
+
+How would we describe this code to somebody?
+
+“We have declared a variable called `name`, which is assigned the **string** of ‘James’, and we have declared the variable `sum`, which is assigned the value we get when we add the **number** `1` to the **number** `2`.”
+
+Even in such a simple program, we have already highlighted two of JavaScript’s fundamental types: String and Number.
+
+As with our introduction to compilation above, we are not going to get bogged down in the academic subtleties of types in programming languages - the key thing is understanding what it means for our JavaScript so that we can then extend it to properly understanding TypeScript.
+
+We know from our traditional nightly ritual of reading the [latest ECMAScript specification][25]**(LOL, JK - “wat’s an ECMA?”)**, that it makes numerous references to types and their usage in JavaScript.
+
+Taken directly from the official spec:
+
+> An ECMAScript language type corresponds to values that are directly manipulated by an ECMAScript programmer using the ECMAScript language. 
+> 
+> The ECMAScript language types are Undefined, Null, Boolean, String, Symbol, Number, and Object.
+
+We can see that the JavaScript language officially has 7 types, of which we have likely used 6 in just about every real-world program we have ever written (Symbol was first introduced in ES2015, a.k.a. ES6).
+
+Now, let’s think a bit more deeply about our “name and sum” JavaScript program above.
+
+We could take our `name` variable which is currently assigned the **string** ‘James’, and reassign it to the current value of our second variable `sum`, which is the **number** `3`.
+
+```
+var name = 'James';
+var sum = 1 + 2;
+
+name = sum;
+```
+
+The `name` variable started out “holding” a string, but now it holds a number. This highlights a fundamental quality of variables and types in JavaScript:
+
+The _value_ ‘James’ is always one type - a string - but the `name` variable can be assigned any value, and therefore any type. The exact same is true in the case of the `sum`assignment: the _value_ `1` is always a number type, but the `sum` variable could be assigned any possible value.
+
+> In JavaScript, it is _values_, not variables, which have types. Variables can hold any value, and therefore any _type_, at any time.
+
+For our purposes, this also just so happens to be the very definition of a **“dynamically typed language”**!
+
+By contrast, we can think of a **“statically typed language”** as being one in which we can (and very likely have to) associate type information with a particular variable:
+
+```
+var name: string = 'James';
+```
+
+In this code, we are better able to explicitly declare our _intentions_ for the `name` variable - we want it to always be used as a string.
+
+And guess what? We have just seen our first bit of TypeScript in action!
+
+When we reflect on our own code (no programming pun intended), we can likely conclude that even when we are working with dynamic languages like JavaScript, in almost all cases we should have pretty clear intentions for the usage of our variables and function parameters when we first define them. If those variables and parameters are reassigned to hold values of _different_ types to ones we first assigned them to, it is possible that something is not working out as we planned.
+
+> One great power that the static type annotations from TypeScript give us, as JavaScript authors, is the ability to clearly express our intentions for our variables. 
+> 
+> This improved clarity benefits not only the TypeScript compiler, but also our colleagues and future selves when they come to read and understand our code. Code is _read_ far more than it is written.
+
+### [TypeScript’s role in our JavaScript workflow][26]
+
+We have started to see why it is often said that TypeScript is just JavaScript + Static Types. Our so-called “type annotation” `: string` for our `name` variable is used by TypeScript at _compile time_ (in other words, when we pass our code through the TypeScript compiler) to make sure that the rest of the code is true to our original intention.
+
+Let’s take a look at our program again, and add another explicit annotation, this time for our `sum` variable:
+
+```
+var name: string = 'James';
+var sum: number = 1 + 2;
+
+name = sum;
+```
+
+If we let TypeScript take a look at this code for us, we will now get an error `Type 'number' is not assignable to type 'string'` for our `name = sum` assignment, and we are appropriately warned against shipping _potentially_ problematic code to be executed by our users.
+
+> Importantly, we can choose to ignore errors from the TypeScript compiler if we want to, because it is just a tool which gives us feedback on our JavaScript code before we ship it to our users.
+
+The final JavaScript code that the TypeScript compiler will output for us will look exactly the same as our original source above:
+
+```
+var name = 'James';
+var sum = 1 + 2;
+
+name = sum;
+```
+
+The type annotations are all removed for us automatically, and we can now run our code.
+
+> NOTE: In this example, the TypeScript Compiler would have been able to offer us the exact same error even if we hadn’t provided the explicit type annotations `: string` and `: number`. 
+> 
+> TypeScript is very often able to just _infer_ the type of a variable from the way we have used it!
+
+#### [Our source file is our document, TypeScript is our Spell Check][27]
+
+A great analogy for TypeScript’s relationship with our source code, is that of Spell Check’s relationship to a document we are writing in Microsoft Word, for example.
+
+There are three key commonalities between the two examples:
+
+1.  **It can tell us when stuff we have written is objectively, flat-out wrong:**
+    *   _Spell Check_: “we have written a word that does not exist in the dictionary”
+    *   _TypeScript_: “we have referenced a symbol (e.g. a variable), which is not declared in our program” 
+
+2.  **It can suggest that what we have written _might be_ wrong:**
+    *   _Spell Check_: “the tool is not able to fully infer the meaning of a particular clause and suggests rewriting it”
+    *   _TypeScript_: “the tool is not able to fully infer the type of a particular variable and warns against using it as is” 
+
+3.  **Our source can be used for its original purpose, regardless of if there are errors from the tool or not:**
+    *   _Spell Check_: “even if your document has lots of Spell Check errors, you can still print it out and “use” it as document”
+    *   _TypeScript_: “even if your source code has TypeScript errors, it will still produce JavaScript code which you can execute”
+
+### [TypeScript is a tool which enables other tools][28]
+
+The TypeScript compiler is made up of a couple of different parts or phases. We are going to finish off this article by looking at how one of those parts - **the Parser** - offers us the chance to build _additional developer tools_ on top of what TypeScript already does for us.
+
+The result of the “parser step” of the compilation process is what is called an **Abstract Syntax Tree**, or **AST** for short.
+
+#### [What is an Abstract Syntax Tree (AST)?][29]
+
+We write our programs in a free text form, as this is a great way for us humans to interact with our computers to get them to do the stuff we want them to. We are not so great at manually composing complex data structures!
+
+However, free text is actually a pretty tricky thing to work with within a compiler in any kind of reasonable way. It may contain things which are unnecessary for the program to function, such as whitespace, or there may be parts which are ambiguous.
+
+For this reason, we ideally want to convert our programs into a data structure which maps out all of the so-called “tokens” we have used, and where they slot into our program.
+
+This data structure is exactly what an AST is!
+
+An AST could be represented in a number of different ways, but let’s take a look at a quick example using our old buddy JSON.
+
+If we have this incredibly basic source code:
+
+```
+var a = 1;
+```
+
+The (simplified) output of the TypeScript Compiler’s **Parser** phase will be the following AST:
+
+```
+{
+  "pos": 0,
+  "end": 10,
+  "kind": 256,
+  "text": "var a = 1;",
+  "statements": [
+    {
+      "pos": 0,
+      "end": 10,
+      "kind": 200,
+      "declarationList": {
+        "pos": 0,
+        "end": 9,
+        "kind": 219,
+        "declarations": [
+          {
+            "pos": 3,
+            "end": 9,
+            "kind": 218,
+            "name": {
+              "pos": 3,
+              "end": 5,
+              "text": "a"
+            },
+            "initializer": {
+              "pos": 7,
+              "end": 9,
+              "kind": 8,
+              "text": "1"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
+```
+
+The objects in our in our AST are called _nodes_.
+
+#### [Example: Renaming symbols in VS Code][30]
+
+Internally, the TypeScript Compiler will use the AST it has produced to power a couple of really important things such as the actual **Type Checking** that occurs when we compile our programs.
+
+But it does not stop there!
+
+> We can use the AST to develop our own tooling on top of TypeScript, such as linters, formatters, and analysis tools.
+
+One great example of a tool built on top of this AST generation is the **Language Server**.
+
+It is beyond the scope of this article to dive into how the Language Server works, but one absolutely killer feature that it enables for us when we write our programs is that of “renaming symbols”.
+
+Let’s say that we have the following source code:
+
+```
+// The name of the author is James
+var first_name = 'James';
+console.log(first_name);
+```
+
+After a _thorough_ code review and appropriate bikeshedding, it is decided that we should switch our variable naming convention to use camel case instead of the snake case we are currently using.
+
+In our code editors, we have long been able to select multiple occurrences of the same text and use multiple cursors to change all of them at once - awesome!
+
+ ![Manually select matches](https://toddmotto.com/img/posts/typescript-the-missing-introduction/manually-select-match.gif) 
+
+Ah! We have fallen into one of the classic traps that appear when we continue to treat our programs as pieces of text.
+
+The word “name” in our comment, which we did not want to change, got caught up in our manual matching process. We can see how risky such a strategy would be for code changes in a real-world application!
+
+As we learned above, when something like TypeScript generates an AST for our program behind the scenes, it no longer has to interact with our program as if it were free text - each token has its own place in the AST, and its usage is clearly mapped.
+
+We can take advantage of this directly in VS Code using the “rename symbol” option when we right click on our `first_name` variable (TypeScript Language Server plugins are available for other editors).
+
+ ![Rename Symbol Example](https://toddmotto.com/img/posts/typescript-the-missing-introduction/rename-symbol-example.gif) 
+
+Much better! Now our `first_name` variable is the only thing that will be changed, and this change will even happen across multiple files in our project if applicable (as with exported and imported values)!
+
+### [Summary][31]
+
+Phew! We have covered a lot in this post.
+
+We cut through all of the academic distractions to decide on practical definitions for a lot of the terminology that surrounds any discussion on compilers and types.
+
+We looked at compiled vs interpreted languages, run time vs compile time, dynamic vs static typing, and how Abstract Syntax Trees give us a more optimal way to build tooling for our programs.
+
+Importantly, we provided a way of thinking about TypeScript as a tool for our _JavaScript_development, and how it in turn can be built upon to offer even more amazing utilities, such as renaming symbols as a way of refactoring code.
+
+Come join us over on [UltimateAngular][32] to continue the journey and go from total beginner to TypeScript Pro!
+
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://toddmotto.com/img/todd.jpg)
+
+I'm Todd, I teach the world Angular through @UltimateAngular. Conference speaker and Developer Expert at Google.
+
+--------------------------------------------------------------------------------
+
+via: https://toddmotto.com/typescript-the-missing-introduction
+
+作者：[Todd][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://twitter.com/intent/follow?original_referer=https%3A%2F%2Ftoddmotto.com%2Ftypescript-the-missing-introduction%3Futm_source%3Djavascriptweekly%26utm_medium%3Demail&ref_src=twsrc%5Etfw&region=follow_link&screen_name=toddmotto&tw_p=followbutton
+[1]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#javascript---interpreted-or-compiled
+[2]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#run-time-vs-compile-time
+[3]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#the-typescript-compiler
+[4]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#dynamic-vs-static-typing
+[5]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#our-source-file-is-our-document-typescript-is-our-spell-check
+[6]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#what-is-an-abstract-syntax-tree-ast
+[7]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#example-renaming-symbols-in-vs-code
+[8]:https://twitter.com/MrJamesHenry
+[9]:https://ultimateangular.com/courses
+[10]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#background
+[11]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#getting-to-grips-with-the-buzzwords
+[12]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#typescripts-role-in-our-javascript-workflow
+[13]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#typescript-is-a-tool-which-enables-other-tools
+[14]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#summary
+[15]:http://www.typescriptlang.org/docs
+[16]:https://ultimateangular.com/courses#typescript
+[17]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#table-of-contents
+[18]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#background
+[19]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#getting-to-grips-with-the-buzzwords
+[20]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#javascript---interpreted-or-compiled
+[21]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#run-time-vs-compile-time
+[22]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#the-typescript-compiler
+[23]:http://www.typescriptlang.org/docs
+[24]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#dynamic-vs-static-typing
+[25]:http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+[26]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#typescripts-role-in-our-javascript-workflow
+[27]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#our-source-file-is-our-document-typescript-is-our-spell-check
+[28]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#typescript-is-a-tool-which-enables-other-tools
+[29]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#what-is-an-abstract-syntax-tree-ast
+[30]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#example-renaming-symbols-in-vs-code
+[31]:https://toddmotto.com/typescript-the-missing-introduction?utm_source=javascriptweekly&utm_medium=email#summary
+[32]:https://ultimateangular.com/courses#typescript
diff --git a/sources/tech/20161222 Top open source creative tools in 2016.md b/sources/tech/20161222 Top open source creative tools in 2016.md
new file mode 100644
index 0000000000..ce320518fa
--- /dev/null
+++ b/sources/tech/20161222 Top open source creative tools in 2016.md	
@@ -0,0 +1,320 @@
+Top open source creative tools in 2016
+============================================================
+
+### Whether you want to manipulate images, edit audio, or animate stories, there's a free and open source tool to do the trick.
+
+ ![Top 34 open source creative tools in 2016 ](https://opensource.com/sites/default/files/styles/image-full-size/public/u23316/art-yearbook-paint-draw-create-creative.png?itok=KgEF_IN_ "Top 34 open source creative tools in 2016 ") 
+
+>Image by : opensource.com
+
+A few years ago, I gave a lightning talk at Red Hat Summit that took attendees on a tour of the [2012 open source creative tools][12] landscape. Open source tools have evolved a lot in the past few years, so let's take a tour of 2016 landscape.
+
+### Core applications
+
+These six applications are the juggernauts of open source design tools. They are well-established, mature projects with full feature sets, stable releases, and active development communities. All six applications are cross-platform; each is available on Linux, OS X, and Windows, although in some cases the Linux versions are the most quickly updated. These applications are so widely known, I've also included highlights of the latest features available that you may have missed if you don't closely follow their development.
+
+If you'd like to follow new developments more closely, and perhaps even help out by testing the latest development versions of the first four of these applications—GIMP, Inkscape, Scribus, and MyPaint—you can install them easily on Linux using [Flatpak][13]. Nightly builds of each of these applications are available via Flatpak by [following the instructions][14] for _Nightly Graphics Apps_. One thing to note: If you'd like to install brushes or other extensions to each Flatpak version of the app, the directory to drop the extensions in will be under the directory corresponding to the application inside the **~/.var/app** directory.
+
+### GIMP
+
+[GIMP][15] [celebrated its 20th anniversary in 2015][16], making it one of the oldest open source creative applications out there. GIMP is a solid program for photo manipulation, basic graphic creation, and illustration. You can start using GIMP by trying simple tasks, such as cropping and resizing images, and over time work into a deep set of functionality. Available for Linux, Mac OS X, and Windows, GIMP is cross-platform and can open and export to a wide breadth of file formats, including those popularized by its proprietary analogue, Photoshop.
+
+The GIMP team is currently working toward the 2.10 release; [2.8.18][17] is the latest stable version. More exciting is the unstable version, [2.9.4][18], with a revamped user interface featuring space-saving symbolic icons and dark themes, improved color management, more GEGL-based filters with split-preview, MyPaint brush support (shown in screenshot below), symmetrical drawing, and command-line batch processing. For more details, check out [the full release notes][19].
+
+ ![GIMP screenshot](https://opensource.com/sites/default/files/gimp_520.png "GIMP screenshot") 
+
+### Inkscape
+
+[Inkscape][20] is a richly featured vector-based graphic design workhorse. Use it to create simple graphics, diagrams, layouts, or icon art.
+
+The latest stable version is [0.91][21]; similarly to GIMP, more excitement can be found in a pre-release version, 0.92pre3, which was released November 2016\. The premiere feature of the latest pre-release is the [gradient mesh feature][22](demonstrated in screenshot below); new features introduce in the 0.91 release include [power stroke][23] for fully configurable calligraphic strokes (the "open" in "opensource.com" in the screenshot below uses powerstroke), the on-canvas measure tool, and [the new symbols dialog][24] (shown in the right side of the screenshot below). (Many symbol libraries for Inkscape are available on GitHub; [Xaviju's inkscape-open-symbols set][25] is fantastic.) A new feature available in development/nightly builds is the _Objects_ dialog that catalogs all objects in a document and provides tools to manage them.
+
+ ![Inkscape screenshot](https://opensource.com/sites/default/files/inkscape_520.png "Inkscape screenshot") 
+
+### Scribus
+
+[Scribus][26] is a powerful desktop publishing and page layout tool. Scribus enables you to create sophisticated and beautiful items, including newsletters, books, and magazines, as well as other print pieces. Scribus has color management tools that can handle and output CMYK and spot colors for files that are ready for reliable reproduction at print shops.
+
+[1.4.6][27] is the latest stable release of Scribus; the [1.5.x][28] series of releases is the most exciting as they serve as a preview to the upcoming 1.6.0 release. Version 1.5.3 features a Krita file (*.KRA) file import tool; other developments in the 1.5.x series include the _Table_ tool, text frame welding, footnotes, additional PDF formats for export, improved dictionary support, dockable palettes, a symbols tool, and expanded file format support.
+
+ ![Scribus screenshot](https://opensource.com/sites/default/files/scribus_520.png "Scribus screenshot") 
+
+### MyPaint
+
+[MyPaint][29] is a drawing tablet-centric expressive drawing and illustration tool. It's lightweight and has a minimal interface with a rich set of keyboard shortcuts so that you can focus on your drawing without having to drop your pen.
+
+[MyPaint 1.2.0][30] is the latest stable release and includes new features, such as the [intuitive inking tool][31] for tracing over pencil drawings, new flood fill tool, layer groups, brush and color history panel, user interface revamp including a dark theme and small symbolic icons, and editable vector layers. To try out the latest developments in MyPaint, I recommend installing the nightly Flatpak build, although there have not been significant feature additions since the 1.2.0 release.
+
+ ![MyPaint screenshot](https://opensource.com/sites/default/files/mypaint_520.png "MyPaint screenshot") 
+
+### Blender
+
+Initially released in January 1995, [Blender][32], like GIMP, has been around for more than 20 years. Blender is a powerful open source 3D creation suite that includes tools for modeling, sculpting, rendering, realistic materials, rigging, animation, compositing, video editing, game creation, and simulation.
+
+The latest stable Blender release is [2.78a][33]. The 2.78 release was a large one and includes features such as the revamped _Grease Pencil_ 2D animation tool; VR rendering support for spherical stereo images; and a new drawing tool for freehand curves.
+
+ ![Inkscape screenshot](https://opensource.com/sites/default/files/blender_520.png "Inkscape screenshot") 
+
+To try out the latest exciting Blender developments, you have many options, including:
+
+*   The Blender Foundation makes [unstable daily builds][2] available on the official Blender website.
+*   If you're looking for builds that include particular in-development features, [graphicall.org][3] is a community-moderated site that provides special versions of Blender (and occasionally other open source creative apps) to enable artists to try out the latest available code and experiments.
+*   Mathieu Bridon has made development versions of Blender available via Flatpak. See his blog post for details: [Blender nightly in Flatpak][4].
+
+### Krita
+
+[Krita][34] is a digital drawing application with a deep set of capabilities. The application is geared toward illustrators, concept artists, and comic artists and is fully loaded with extras, such as brushes, palettes, patterns, and templates.
+
+The latest stable version is [Krita 3.0.1][35], released in September 2016\. Features new to the 3.0.x series include 2D frame-by-frame animation; improved layer management and functionality; expanded and more usable shortcuts; improvements to grids, guides, and snapping; and soft-proofing.
+
+ ![Krita screenshot](https://opensource.com/sites/default/files/krita_520.png "Krita screenshot") 
+
+### Video tools
+
+There are many, many options for open source video editing tools. Of the members of the pack, [Flowblade][36] is a newcomer and Kdenlive is the established, newbie-friendly, and most fully featured contender. The main criteria that may help you eliminate some of this array of options is supported platforms—some of these only support Linux. These all have active upstreams and the latest stable versions of each have been released recently, within weeks of each other.
+
+### Kdenlive
+
+[Kdenlive][37], which was initially released back in 2002, is a powerful non-linear video editor available for Linux and OS X (although the OS X version is out-of-date). Kdenlive has a user-friendly drag-and-drop-based user interface that accommodates beginners, and with the depth experts need.
+
+Learn how to use Kdenlive with an [multi-part Kdenlive tutorial series][38] by Seth Kenlon.
+
+*   Latest Stable: 16.08.2 (October 2016)
+
+ ![](https://opensource.com/sites/default/files/images/life-uploads/kdenlive_6_leader.png) 
+
+### Flowblade
+
+Released in 2012, [Flowblade][39], a Linux-only video editor, is a relative newcomer.
+
+*   Latest Stable: 1.8 (September 2016)
+
+### Pitivi
+
+[Pitivi][40] is a user-friendly free and open source video editor. Pitivi is written in [Python][41] (the "Pi" in Pitivi), uses the [GStreamer][42] multimedia framework, and has an active community.
+
+*   Latest stable: 0.97 (August 2016)
+*   Get the [latest version with Flatpak][5]
+
+### Shotcut
+
+[Shotcut][43] is a free, open source, cross-platform video editor that started [back in 2004][44] and was later rewritten by current lead developer [Dan Dennedy][45].
+
+*   Latest stable: 16.11 (November 2016)
+*   4K resolution support
+*   Ships as a tarballed binary
+
+
+
+### OpenShot Video Editor
+
+Started in 2008, [OpenShot Video Editor][46] is a free, open source, easy-to-use, cross-platform video editor.
+
+*   Latest stable: [2.1][6] (August 2016)
+
+
+### Utilities
+
+### SwatchBooker
+
+[SwatchBooker][47] is a handy utility, and although it hasn't been updated in a few years, it's still useful. SwatchBooker helps users legally obtain color swatches from various manufacturers in a format that you can use with other free and open source tools, including Scribus.
+
+### GNOME Color Manager
+
+[GNOME Color Manager][48] is the built-in color management system for the GNOME desktop environment, the default desktop for a bunch of Linux distros. The tool allows you to create profiles for your display devices using a colorimeter, and also allows you to load/managed ICC color profiles for those devices.
+
+### GNOME Wacom Control
+
+[The GNOME Wacom controls][49] allow you to configure your Wacom tablet in the GNOME desktop environment; you can modify various options for interacting with the tablet, including customizing the sensitivity of the tablet and which monitors the tablet maps to.
+
+### Xournal
+
+[Xournal][50] is a humble but solid app that allows you to hand write/doodle notes using a tablet. Xournal is a useful tool for signing or otherwise annotating PDF documents.
+
+### PDF Mod
+
+[PDF Mod][51] is a handy utility for editing PDFs. PDF Mod lets users remove pages, add pages, bind multiple single PDFs together into a single PDF, reorder the pages, and rotate the pages.
+
+### SparkleShare
+
+[SparkleShare][52] is a git-backed file-sharing tool artists use to collaborate and share assets. Hook it up to a GitLab repo and you've got a nice open source infrastructure for asset management. The SparkleShare front end nullifies the inscrutability of git by providing a dropbox-like interface on top of it.
+
+### Photography
+
+### Darktable
+
+[Darktable][53] is an application that allows you to develop digital RAW files and has a rich set of tools for the workflow management and non-destructive editing of photographic images. Darktable includes support for an extensive range of popular cameras and lenses.
+
+ ![Changing color balance screenshot](https://opensource.com/sites/default/files/dt_colour.jpg "Changing color balance screenshot") 
+
+### Entangle
+
+[Entangle][54] allows you to tether your digital camera to your computer and enables you to control your camera completely from the computer.
+
+### Hugin
+
+[Hugin][55] is a tool that allows you to stitch together photos in order to create panoramic photos.
+
+### 2D animation
+
+### Synfig Studio
+
+[Synfig Studio][56] is a vector-based 2D animation suite that also supports bitmap artwork and is tablet-friendly.
+
+### Blender Grease Pencil
+
+I covered Blender above, but particularly notable from a recent release is [a refactored grease pencil feature][57], which adds the ability to create 2D animations.
+
+
+### Krita
+
+[Krita][58] also now provides 2D animation functionality.
+
+
+### Music and audio editing
+
+### Audacity
+
+[Audacity][59] is popular, user-friendly tool for editing audio files and recording sound.
+
+### Ardour
+
+[Ardour][60] is a digital audio workstation with an interface centered around a record, edit, and mix workflow. It's a little more complicated than Audacity to use but allows for automation and is generally more sophisticated. (Available for Linux, Mac OS X, and Windows.)
+
+### Hydrogen
+
+[Hydrogen][61] is an open source drum machine with an intuitive interface. It provides the ability to create and arrange various patterns using synthesized instruments.
+
+### Mixxx
+
+[Mixxx][62] is a four-deck DJ suite that allows you to DJ and mix songs together with powerful controls, including beat looping, time stretching, and pitch bending, as well as live broadcast your mixes and interface with DJ hardware controllers.
+
+### Rosegarden
+
+[Rosegarden][63] is a music composition suite that includes tools for score writing and music composition/editing and provides an audio and MIDI sequencer.
+
+### MuseScore
+
+[MuseScore][64] is a music score creation, notation, and editing tool with a community of musical score contributors.
+
+### Additional creative tools
+
+### MakeHuman
+
+[MakeHuman][65] is a 3D graphical tool for creating photorealistic models of humanoid forms.
+
+<iframe allowfullscreen="" frameborder="0" height="293" src="https://www.youtube.com/embed/WiEDGbRnXdE?rel=0" width="520"></iframe>
+
+### Natron
+
+[Natron][66] is a node-based compositor tool used for video post-production and motion graphic and special effect design.
+
+### FontForge
+
+[FontForge][67] is a typeface creation and editing tool. It allows you to edit letter forms in a typeface as well as generate fonts for using those typeface designs.
+
+### Valentina
+
+[Valentina][68] is an application for drafting sewing patterns.
+
+### Calligra Flow
+
+[Calligra Flow][69] is a Visio-like diagramming tool. (Available for Linux, Mac OS X, and Windows.)
+
+### Resources
+
+There are a lot of toys and goodies to try out there. Need some inspiration to start your exploration? These websites and conference are chock-full of tutorials and beautiful creative works to inspire you get you going:
+
+1.  [pixls.us][7]: Blog hosted by photographer Pat David that focuses on free and open source tools and workflow for professional photographers.
+2.  [David Revoy's Blog][8] The blog of David Revoy, an immensely talented free and open source illustrator, concept artist, and advocate, with credits on several of the Blender Foundation films.
+3.  [The Open Source Creative Podcast][9]: Hosted by Opensource.com community moderator and columnist [Jason van Gumster][10], who is a Blender and GIMP expert, and author of _[Blender for Dummies][1]_, this podcast is directed squarely at those of us who enjoy open source creative tools and the culture around them.
+4.  [Libre Graphics Meeting][11]: Annual conference for free and open source creative software developers and the creatives who use the software. This is the place to find out about what cool features are coming down the pipeline in your favorite open source creative tools, and to enjoy what their users are creating with them.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/picture-343-8e0fb148b105b450634e30acd8f5b22b.png?itok=oxzTm70z)
+
+Máirín Duffy - Máirín is a principal interaction designer at Red Hat. She is passionate about software freedom and free & open source tools, particularly in the creative domain: her favorite application is Inkscape (http://inkscape.org).
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/16/12/yearbook-top-open-source-creative-tools-2016
+
+作者：[Máirín Duffy][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/mairin
+[1]:http://www.blenderbasics.com/
+[2]:https://builder.blender.org/download/
+[3]:http://graphicall.org/
+[4]:https://mathieu.daitauha.fr/blog/2016/09/23/blender-nightly-in-flatpak/
+[5]:https://pitivi.wordpress.com/2016/07/18/get-pitivi-directly-from-us-with-flatpak/
+[6]:http://www.openshotvideo.com/2016/08/openshot-21-released.html
+[7]:http://pixls.us/
+[8]:http://davidrevoy.com/
+[9]:http://monsterjavaguns.com/podcast/
+[10]:https://opensource.com/users/jason-van-gumster
+[11]:http://libregraphicsmeeting.org/2016/
+[12]:https://opensource.com/life/12/9/tour-through-open-source-creative-tools
+[13]:https://opensource.com/business/16/8/flatpak
+[14]:http://flatpak.org/apps.html
+[15]:https://opensource.com/tags/gimp
+[16]:https://www.gimp.org/news/2015/11/22/20-years-of-gimp-release-of-gimp-2816/
+[17]:https://www.gimp.org/news/2016/07/14/gimp-2-8-18-released/
+[18]:https://www.gimp.org/news/2016/07/13/gimp-2-9-4-released/
+[19]:https://www.gimp.org/news/2016/07/13/gimp-2-9-4-released/
+[20]:https://opensource.com/tags/inkscape
+[21]:http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91
+[22]:http://wiki.inkscape.org/wiki/index.php/Mesh_Gradients
+[23]:https://www.youtube.com/watch?v=IztyV-Dy4CE
+[24]:https://inkscape.org/cs/~doctormo/%E2%98%85symbols-dialog
+[25]:https://github.com/Xaviju/inkscape-open-symbols
+[26]:https://opensource.com/tags/scribus
+[27]:https://www.scribus.net/scribus-1-4-6-released/
+[28]:https://www.scribus.net/scribus-1-5-2-released/
+[29]:http://mypaint.org/
+[30]:http://mypaint.org/blog/2016/01/15/mypaint-1.2.0-released/
+[31]:https://github.com/mypaint/mypaint/wiki/v1.2-Inking-Tool
+[32]:https://opensource.com/tags/blender
+[33]:http://www.blender.org/features/2-78/
+[34]:https://opensource.com/tags/krita
+[35]:https://krita.org/en/item/krita-3-0-1-update-brings-numerous-fixes/
+[36]:https://opensource.com/life/16/9/10-reasons-flowblade-linux-video-editor
+[37]:https://opensource.com/tags/kdenlive
+[38]:https://opensource.com/life/11/11/introduction-kdenlive
+[39]:http://jliljebl.github.io/flowblade/
+[40]:http://pitivi.org/
+[41]:http://wiki.pitivi.org/wiki/Why_Python%3F
+[42]:https://gstreamer.freedesktop.org/
+[43]:http://shotcut.org/
+[44]:http://permalink.gmane.org/gmane.comp.lib.fltk.general/2397
+[45]:http://www.dennedy.org/
+[46]:http://openshot.org/
+[47]:http://www.selapa.net/swatchbooker/
+[48]:https://help.gnome.org/users/gnome-help/stable/color.html.en
+[49]:https://help.gnome.org/users/gnome-help/stable/wacom.html.en
+[50]:http://xournal.sourceforge.net/
+[51]:https://wiki.gnome.org/Apps/PdfMod
+[52]:https://www.sparkleshare.org/
+[53]:https://opensource.com/life/16/4/how-use-darktable-digital-darkroom
+[54]:https://entangle-photo.org/
+[55]:http://hugin.sourceforge.net/
+[56]:https://opensource.com/article/16/12/synfig-studio-animation-software-tutorial
+[57]:https://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.78/GPencil
+[58]:https://opensource.com/tags/krita
+[59]:https://opensource.com/tags/audacity
+[60]:https://ardour.org/
+[61]:http://www.hydrogen-music.org/
+[62]:http://mixxx.org/
+[63]:http://www.rosegardenmusic.com/
+[64]:https://opensource.com/life/16/03/musescore-tutorial
+[65]:http://makehuman.org/
+[66]:https://natron.fr/
+[67]:http://fontforge.github.io/en-US/
+[68]:http://valentina-project.org/
+[69]:https://www.calligra.org/flow/
diff --git a/sources/tech/20161223 Will Android do for the IoT what it did for mobile.md b/sources/tech/20161223 Will Android do for the IoT what it did for mobile.md
new file mode 100644
index 0000000000..5d97f83b46
--- /dev/null
+++ b/sources/tech/20161223 Will Android do for the IoT what it did for mobile.md	
@@ -0,0 +1,140 @@
+
+Translating by fristadream
+
+Will Android do for the IoT what it did for mobile?
+============================================================
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*GF6e6Vd-22PViWT8EDpLNA.jpeg) 
+
+Android Things gives the IoT Wings
+
+### My first 24 hours with Android Things
+
+Just when I was in the middle of an Android based IoT commercial project running on a Raspberry Pi 3, something awesome happened. Google released the first preview of [Android Things][1], their SDK targeted specifically at (initially) 3 SBC’s (Single Board Computers) — the Pi 3, the Intel Edison and the NXP Pico. To say I was struggling is a bit of an understatement — without even an established port of Android to the Pi, we were at the mercy of the various quirks and omissions of the well-meaning but problematic homebrew distro brigade. One of these problems was a deal breaker too — no touchscreen support, not even for the official one sold by [Element14][2]. I had an idea Android was heading for the Pi already, and earlier a mention in a [commit to the AOSP project from Google][3] got everyone excited for a while. So when, on 12th Dec 2016, without much fanfare I might add, Google announced “Android Things” plus a downloadable SDK, I dived in with both hands, a map and a flashlight, and hung a “do not disturb” sign on my door…
+
+### Questions?
+
+I had many questions regarding Googles Android on the Pi, having done extensive work with Android previously and a few Pi projects, including being involved right now in the one mentioned. I’ll try to address these as I proceed, but the first and biggest was answered right away — there is full Android Studio support and the Pi becomes just another regular ADB-addressable device on your list. Yay! The power, convenience and sheer ease of use we get within Android Studio is available at last to real IoT hardware, so we get all the layout previews, debug system, source checkers, automated tests etc. I can’t stress this enough. Up until now, most of my work onboard the Pi had been in Python having SSH’d in using some editor running on the Pi (MC if you really want to know). This worked, and no doubt hardcore Pi/Python heads could point out far better ways of working, but it really felt like I’d timewarped back to the 80’s in terms of software development. My projects involved writing Android software on handsets which controlled the Pi, so this rubbed salt in the wound — I was using Android Studio for “real” Android work, and SSH for the rest. That’s all over now.
+
+All samples are for the 3 SBC’s, of which the the Pi 3 is just one. The Build.DEVICE constant lets you determine this at runtime, so you see lots of code like:
+
+```
+ public static String getGPIOForButton() {
+     switch (Build.DEVICE) {
+         case DEVICE_EDISON_ARDUINO:
+             return "IO12";
+         case DEVICE_EDISON:
+             return "GP44";
+         case DEVICE_RPI3:
+             return "BCM21";
+         case DEVICE_NXP:
+             return "GPIO4_IO20";
+         default:
+             throw new IllegalStateException(“Unknown Build.DEVICE “ + Build.DEVICE);
+     }
+ }
+```
+
+Of keen interest is the GPIO handling. Since I’m only familiar with the Pi, I can only assume the other SBCs work the same way, but this is the set of pins which can be defined as inputs/outputs and is the main interface to the physical outside world. The Pi Linux based OS distros have full and easy support via read and write methods in Python, but for Android you’d have to use the NDK to write C++ drivers, and talk to these via JNI in Java. Not that difficult, but something else to maintain in your build chain. The Pi also designates 2 pins for I2C, the clock and the data, so extra work would be needed handling those. I2C is the really cool bus-addressable system which turns many separate pins of data into one by serialising it. So here’s the kicker — all that’s done directly in Android Things for you. You just _read()_and _write() _to/from whatever GPIO pin you need, and I2C is as easy as this:
+
+```
+public class HomeActivity extends Activity {
+    // I2C Device Name
+    private static final String I2C_DEVICE_NAME = ...;
+    // I2C Slave Address
+    private static final int I2C_ADDRESS = ...;
+
+    private I2cDevice mDevice;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Attempt to access the I2C device
+        try {
+            PeripheralManagerService manager = new PeripheralManagerService();
+            mDevice = manager.openI2cDevice(I2C_DEVICE_NAME, I2C_ADDRESS)
+        } catch (IOException e) {
+            Log.w(TAG, "Unable to access I2C device", e);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (mDevice != null) {
+            try {
+                mDevice.close();
+                mDevice = null;
+            } catch (IOException e) {
+                Log.w(TAG, "Unable to close I2C device", e);
+            }
+        }
+    }
+}
+```
+
+### What version of Android is Android Things based on?
+
+This looks to be Android 7.0, which is fantastic because we get all the material design UI, the optimisations, the security hardening and so on from all the previous versions of Android. It also raises an interesting question — how are future platform updates rolled out, as opposed to your app which you have to manage separately? Remember, these devices may not be connected to the internet. We are no longer in the comfortable space of cellular/WiFi connections being assumed to at least be available, even if sometimes unreliable.
+
+The other worry was this being an offshoot version of Android in name only, where to accommodate the lowest common denominator, something so simple it could power an Arduino has been released — more of a marketing exercise than a rich OS. That’s quickly put to bed by looking at the [samples][4], actually — some even use SVG graphics as resources, a very recent Android innovation, rather than the traditional bitmap-based graphics, which of course it also handles with ease.
+
+Inevitably, regular Android will throw up issues when compared with Android Things. For example, there is the permissions conundrum. Mitigated somewhat by the fact Android Things is designed to power fixed hardware devices, so the user wouldn’t normally install apps after it’s been built, it’s nevertheless a problem asking them for permissions on a device which might not have a UI! The solution is to grant all the permissions an app might need at install time. Normally, these devices are one app only, and that app is the one which runs when it powers up.
+
+ ![](https://cdn-images-1.medium.com/max/800/1*pi7HyLT-BVwHQ_Rw3TDSWQ.png) 
+
+### What happened to Brillo?
+
+Brillo was the codename given to Googles previous IoT OS, which sounds a lot like what Android Things used to be called. In fact you see many references to Brillo still, especially in the source code folder names in the GitHub Android Things examples. However, it has ceased to be. All hail the new king!
+
+### UI Guidelines?
+
+Google issues extensive guidelines regarding Android smartphone and tablet apps, such as how far apart on screen buttons should be and so on. Sure, its best to follow these where practical, but we’re not in Kansas any more. There is nothing there by default — it’s up the the app author to manage _everything_. This includes the top status bar, the bottom navigation bar — absolutely everything. Years of Google telling Android app authors never to render an onscreen BACK button because the platform will supply one is thrown out, because for Android Things there [might not even be a UI at all!][5]
+
+### How much support of the Google services we’re used to from smartphones can we expect?
+
+Quite a bit actually, but not everything. The first preview has no bluetooth support. No NFC, either — both of which are heavily contributing to the IoT revolution. The SBC’s support them, so I can’t see them not being available for too long. Since there’s no notification bar, there can’t be any notifications. No Maps. There’s no default soft keyboard, you have to install one yourself. And since there is no Play Store, you have to get down and dirty with ADB to do this, and many other operations.
+
+When developing for Android Things I tried to make the same APK I was targeting for the Pi run on a regular handset. This threw up an error preventing it from being installed on anything other than an Android Things device: library “_com.google.android.things_” not present. Kinda makes sense, because only Android Things devices would need this, but it seemed limiting because not only would no smartphones or tablets have it present, but neither would any emulators. It looked like you could only run and test your Android Things apps on physical Android Things devices … until Google helpfully replied to my query on this in the [G+ Google’s IoT Developers Community][6] group with a workaround. Bullet dodged there, then.
+
+### How can we expect the Android Things ecosystem to evolve now?
+
+I’d expect to see a lot more porting of traditional Linux server based apps which didn’t really make sense to an Android restricted to smartphones and tablets. For example, a web server suddenly becomes very useful. Some exist already, but nothing like the heavyweights such as Apache or Nginx. IoT devices might not have a local UI, but administering them via a browser is certainly viable, so something to present a web panel this way is needed. Similarly comms apps from the big names — all it needs is a mike and speaker and in theory it’s good to go for any video calling app, like Duo, Skype, FB etc. How far this evolution goes is anyone’s guess. Will there be a Play Store? Will they show ads? Can we be sure they won’t spy on us, or let hackers control them? The IoT from a consumer point of view always was net-connected devices with touchscreens, and everyone’s already used to that way of working from their smartphones.
+
+I’d also expect to see rapid progress regarding hardware — in particular many more SBC’s at even lower costs. Look at the amazing $5 Raspberry Pi Zero, which unfortunately almost certainly can’t run Android Things due to its limited CPU and RAM. How long until one like this can? It’s pretty obvious, now the bar has been set, any self respecting SBC manufacturer will be aiming for Android Things compatibility, and probably the economies of scale will apply to the peripherals too such as a $2 3" touchscreen. Microwave ovens just won’t sell unless you can watch YouTube on them, and your dishwasher just put in a bid for more powder on eBay since it noticed you’re running low…
+
+However, I don’t think we can get too carried away here. Knowing a little about Android architecture helps when thinking of it as an all-encompassing IoT OS. It still uses Java, which has been hammered to death in the past with all its garbage-collection induced timing issues. That’s the least of it though. A genuine realtime OS relies on predictable, accurate and rock-solid timing or it can’t be described as “mission critical”. Think about medical applications, safety monitors, industrial controllers etc. With Android, your Activity/Service can, in theory, be killed at any time if the host OS thinks it needs to. Not so bad on a phone — the user restarts the app, kills other apps, or reboots the handset. A heart monitor is a different kettle all together though. If that foreground Activity/Service is watching a GPIO pin, and the signal isn’t dealt with exactly when it is supposed to, we have failed. Some pretty fundamental changes would have to be made to Android to support this, and so far there’s no indication it’s even planned.
+
+### Those 24 hours
+
+So, back to my project. I thought I’d take the work I’d done already and just port as much as I could over, waiting for the inevitable roadblock where I had to head over to the G+ group, cap in hand for help. Which, apart from the query about running on non-AT devices, never happened. And it ran great! This project uses some oddball stuff too, custom fonts, prescise timers — all of which appeared perfectly laid out in Android Studio. So its top marks from me, Google — at last I can start giving actual prototypes out rather than just videos and screenshots.
+
+### The big picture
+
+The IoT OS landscape today looks very fragmented. There is clearly no market leader and despite all the hype and buzz we hear, it’s still incredibly early days. Can Google do to the IoT with Android Things what it did to mobile, where it’s dominance is now very close to 90%? I believe so, and if that is to happen, this launch of Android Things is exactly how they would go about it.
+
+Remember all the open vs closed software wars, mainly between Apple who never licence theirs, and Google who can’t give it away for free to enough people? That policy now comes back once more, because the idea of Apple launching a free IoT OS is as far fetched as them giving away their next iPhone for nothing.
+
+The IoT OS game is wide open for someone to grab, and the opposition won’t even be putting their kit on this time…
+
+Head over to the [Developer Preview][7] site to get your copy of the Android Things SDK now.
+
+--------------------------------------------------------------------------------
+
+via: https://medium.com/@carl.whalley/will-android-do-for-iot-what-it-did-for-mobile-c9ac79d06c#.hxva5aqi2
+
+作者：[Carl Whalley][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://medium.com/@carl.whalley
+[1]:https://developer.android.com/things/index.html
+[2]:https://www.element14.com/community/docs/DOC-78156/l/raspberry-pi-7-touchscreen-display
+[3]:http://www.androidpolice.com/2016/05/24/google-is-preparing-to-add-the-raspberry-pi-3-to-aosp-it-will-apparently-become-an-officially-supported-device/
+[4]:https://github.com/androidthings/sample-simpleui/blob/master/app/src/main/res/drawable/pinout_board_vert.xml
+[5]:https://developer.android.com/things/sdk/index.html
+[6]:https://plus.google.com/+CarlWhalley/posts/4tF76pWEs1D
+[7]:https://developer.android.com/things/preview/index.html
diff --git a/sources/tech/20161225 Minecraft Server on Linux.md b/sources/tech/20161225 Minecraft Server on Linux.md
new file mode 100644
index 0000000000..3da09accfb
--- /dev/null
+++ b/sources/tech/20161225 Minecraft Server on Linux.md	
@@ -0,0 +1,147 @@
+**translating by [erlinux](https://github.com/erlinux)**
+Minecraft Server on Linux
+=============================
+
+![Title.jpg](https://www.linuxforum.com/attachments/title-jpg.89/) 
+
+Minecraft is a major game being played on many different consoles and computer systems. As of June 2016 there have been over 106 million units sold on all platforms. Because of the popularity, you may want to host a Minecraft party at home. To do this you install a Minecraft Server to allow all users to connect locally and play in the same world together.
+
+**System Requirements**
+
+To start, you need a Linux system with a fair amount of Random Access Memory (RAM). The more players you will host on the server the more RAM you will need. Hard Drive space is not a large requirement, just enough to install Java and the Minecraft Server Java file. The Minecraft Server should have a decent network connection whether wired or WiFi.
+
+Let's look at some minimum requirements for the Minecraft Server:
+
+**Processor: **Duo Core or better
+**RAM:** 2 GB (20-40 players), 3 GB (30-60 players), 8 GB (60+ players)
+**OS:** An OS with no Graphical User Interface (GUI) to allow more resources free
+
+**NOTE:** The requirements are for the Minecraft Server program and not for the whole OS! If more resources can be allocated to the Minecraft Server it will operate better.
+
+**Installing JAVA**
+
+Once you have a system with Linux running on it you will need to install the latest version of Java.
+
+To verify your Java version enter the following command in a terminal: “java -version”. The result should be:
+
+```
+java version "1.8.0_101"
+
+Java(TM) SE Runtime Environment (build 1.8.0_101-b13)
+
+Java HotSpot(TM) Client VM (build 25.101-b13, mixed mode)
+```
+
+If your current Java version is not 1.8 or higher then install Java version 8 by performing the following from a terminal on a Ubuntu system:
+
+1.  _sudo add-apt-repository ppa:webupd8team/java_
+2.  _sudo apt-get update_
+3.  _sudo apt-get install oracle-java8-installer_
+
+**NOTE:** If the 'add-apt-repository' command is not found, run 'sudo apt-get install software-properties-common'. You could also change the third command to be 'oracle-java9-installer' for the newest version of JAVA.
+
+For a Redhat system, such as CentOS, use the following command:
+
+1.  _sudo yum install java-1.8.0-openjdk_
+
+After the installation verify the version by entering the version command, 'java -version', and verify the output. Once you have the appropriate version of Java you may proceed with the rest of the installation.
+
+**Minecraft Server Version Download**
+
+The next thing is to check the version of Minecraft which the users will be running. See Figure 1 taken from a system running Minecraft and notice the version number in the bottom left corner.
+
+ ![Figure 01.jpg](https://www.linuxforum.com/attachments/figure-01-jpg.85/) 
+
+**FIGURE 1**
+
+Keep in mind the version number of the Minecraft client software. Each client should be the same version to make this work.
+
+The next thing to do is download the Minecraft Server for the version you will need for the clients. To download the version you need you will need to know its location. The command to get the needed file is:
+
+_sudo wget _[_https://s3.amazonaws.com/Minecraft.Download/versions/[version]/minecraft_server.[version].jar_][1]
+
+As seen in Figure 1, the version number is 1.10.2\. The command would then be:
+
+_sudo wget _[_https://s3.amazonaws.com/Minecraft.Download/versions/1.10.2/minecraft_server.1.10.2.jar_][2]
+
+When you download the file it will be saved to the current directory in which you are currently in when you run the command. To determine the current location use the command 'pwd'.
+
+Once you have the file and know the folder where it has been saved you are ready to continue.
+
+**Server Information**
+
+Before starting the Minecraft Server you must know the amount of available RAM on the current system to be able to use what is needed. When starting the Minecraft Server you will specify the starting amount of RAM and the maximum amount of RAM to use as more players join. Again, it is important to have enough RAM. If needed, use a minimal install of an Operating System (OS) such as a Minimal install of Ubuntu to have more RAM available.
+
+Once you have the Minecraft Server file you need it is time to determine the amount of RAM which can be allocated to Minecraft. To determine the available RAM open a terminal and type the following command – a sample output is shown in Figure 2:
+
+_free -h_
+
+ ![Figure 02.jpg](https://www.linuxforum.com/attachments/figure-02-jpg.86/) 
+
+**FIGURE 2**
+
+On this low end system as shown in Figure 2, you can see there is only 684 MB of free RAM. This is not an adequate system to use for a Minecraft Server. On another system I have 2.8 GB available to use for the Minecraft Server.
+
+Before we start the server we need to find the IP Address of the server. To do this, run the command 'ifconfig'. As shown in Figure 3, there should be a listing for a network connection that shows an Internet Address, or 'inet addr', which is '192.168.0.2'. On my server system it is listed with the address of '192.168.0.14', which is the address that will be used from the client systems.
+
+ ![Figure 03.jpg](https://www.linuxforum.com/attachments/figure-03-jpg.87/) 
+
+**FIGURE 3**
+
+**Start Minecraft Server**
+
+The next step is to actually start the Minecraft Server. There are a few items to cover before we actually start it. When starting the Minecraft Server you specify how much memory to initialize for Minecraft. You also will designate the maximum amount to use as well.
+
+If my system has 3.7 GB free and I know I will have less than 40 players, then I only need 2 GB set aside. Of course, I may add a little to allow for any growth of users. I also want to leave some memory for the system to use if needed. I will set my minimum at 2 GB and my maximum at 3 GB. Since my maximum is 3 GB I will leave the system 700 MB of RAM if needed, but this is only if the Minecraft Server uses more than the initial 2 GB.
+
+The command line to start the server is:
+
+_sudo java -Xms# -Xmx# -jar [path]/minecraft_server.[version].jar nogui_
+
+Now for a breakdown of the command structure:
+
+-Xms# - the amount of the initial startup RAM (-Xms2048m)
+-Xmx# - the amount of the maximum RAM (-Xmx3096m)
+[path] – the path to the Minecraft Server File (/home/tux/MCS/)
+[version] – the version of the Minecraft Server downloaded (1.10.2)
+nogui – used to show that the system is text based only to help reduce RAM use. If you install the GUI, then remove the _nogui_ parameter
+
+An example of the full command for a system using an initial 2 GB of RAM with a maximum of 3 GB with a path to '/home/tux/MCS/' and a version of '1.10.2' would be:
+
+_sudo java -Xms2048m -Xmx3096m -jar /home/tux/MCS/minecraft_server.1.10.2.jar nogui_
+
+**NOTE:** The RAM sizes are in values of megabytes. Multiply the value by 1024\. For example, for 2 GB of RAM multiply 2x1024 for a value of 2048\. Do not forget the lowercase 'm' to specify megabytes. You can easily specify '2g' and '3g' for 2 GB and 3 GB.
+
+After you run the server the first time there will be an error. It states that the EULA must be agreed to before starting the server.
+
+To agree to the EULA you need to edit the 'eula.txt' file in the same folder as the Minecraft Server JAR file.
+
+Open the 'eula.txt' file in a text editor such as nano. Make sure you do this with root privileges. Change the line 'eula=false' to 'eula=true' and save the file.
+
+Now, enter the command again to start the server. A screen full of information should pass by and then a section of lines which states it is preparing the spawn area. The lines will count up to 100% as it creates the initial world. Any error messages about the system time changing are normal so ignore them.
+
+At this point you can open the client program and see a screen similar to Figure 1 above. Click on the button 'Multiplayer'. At the next screen, Figure 4, choose 'Direct Connect'. You will then be prompted for the server address, so type in the IP Address of the Minecraft Server. You should now be able to connect to the game.
+
+ ![Figure 04.jpg](https://www.linuxforum.com/attachments/figure-04-jpg.88/) 
+
+**FIGURE 4**
+
+**Troubleshooting certain connections**
+
+If some clients cannot connect to the server, then you need to exit the JAVA program by pressing CTRL+Z. Open the file 'server.properties' with an editor such as 'nano'. Remember to be root. Edit the line 'online-mode'. It should be set to 'true'. Change this to 'false' and save the file. Reboot the system and start the Minecraft Server. Have the clients reconnect to the server and everything should be working.
+
+Happy mining!
+
+--------------------------------------------------------------------------------
+
+via: https://www.linuxforum.com/threads/minecraft-server-on-linux.3202/
+
+作者：[Jarret][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linuxforum.com/members/jarret.268/
+[1]:https://s3.amazonaws.com/Minecraft.Download/versions/%5Bversion%5D/minecraft_server.%5Bversion%5D.jar
+[2]:https://s3.amazonaws.com/Minecraft.Download/versions/%5Bversion%5D/minecraft_server.%5Bversion%5D.jar
diff --git a/sources/tech/20161226 Top 10 open source projects of 2016.md b/sources/tech/20161226 Top 10 open source projects of 2016.md
new file mode 100644
index 0000000000..4722bceaa2
--- /dev/null
+++ b/sources/tech/20161226 Top 10 open source projects of 2016.md	
@@ -0,0 +1,180 @@
+Top 10 open source projects of 2016
+============================================================
+
+### In our annual list of the year's top open source projects, we look back at popular projects our writers covered in 2016, plus favorites our Community Moderators picked.
+
+ ![Top 10 open source projects of 2016](https://opensource.com/sites/default/files/styles/image-full-size/public/images/law/bowling-10-ten-520_cc.png?itok=Jd1FYLWt "Top 10 open source projects of 2016") 
+
+Image by : [George Eastman House][1] and [Internet Archive Book Images][2]. Modified by Opensource.com. CC BY-SA 4.0
+
+We continue to be impressed with the wonderful open source projects that emerge, grow, change, and evolve every year. Picking 10 to include in our annual list of top projects is no small feat, and certainly no list this short can include every deserving project.
+
+To choose our 10, we looked back at popular open source projects our writers covered in 2016, and collected suggestions from our Community Moderators. After a round of nominations and voting by our moderators, our editorial team narrowed down the final list.
+
+So here they are, our top 10 open source projects of 2016:
+
+### Atom
+
+[Atom][3] is a hackable text editor from GitHub. Jono Bacon [wrote][4] about its "simple core" earlier this year, exclaiming approval for open source projects that give users options.
+
+"[Atom] delivers the majority of the core features and settings that most users likely will want, but is missing many of the more advanced or specific features some users may want. … Atom provides a powerful framework that allows pretty much any part of Atom to be changed and expanded."
+
+To get started contributing, read the [guide][5]. To connect with other users and the community, find Atom on [GitHub][6], [Discuss][7], and [Slack][8].
+
+Atom is [MIT][9] licensed and the [source code][10] is hosted on GitHub.
+
+### Eclipse Che
+
+[Eclipse Che][11] is a next-generation online integrated development environment (IDE) and developer workspace. Joshua Allen Holm brought us a [review][12] of Eclipse Che in November 2016, which provided a look at the developer community behind the project, its innovative use of container technology, and popular languages it supports out of the box.
+
+"The ready-to-go bundled stacks included with Eclipse Che cover most of the modern popular languages. There are stacks for C++, Java, Go, PHP, Python, .NET, Node.js, Ruby on Rails, and Android development. A Stack Library provides even more options and if that is not enough, there is the option to create a custom stack that can provide specialized environments."
+
+You can test out Eclipse Che in an online [hosted account][13], through a [local installation][14], or in your preferred [cloud provider][15]. The [source code][16] can be found on GitHub under an [Eclipse Public License][17].
+
+### FreeCAD
+
+[FreeCAD][18] is written in Python and one of the many computer-aided design—or computer-aided drafting—tools available to create design specifications for real-world objects. Jason Baker wrote about FreeCAD in [3 open source alternatives to AutoCAD][19].
+
+"FreeCAD can import and export from a variety of common formats for 3D objects, and its modular architecture makes it easy to extend the basic functionality with various plug-ins. The program has many built-in interface options, from a sketcher to renderer to even a robot simulation ability."
+
+FreeCAD is [LGPL][20] licensed and the [source code][21] is hosted on GitHub.
+
+### GnuCash
+
+[GnuCash][22] is a cross-platform open source desktop solution for managing your personal and small business accounts. Jason Baker included GnuCash in our [roundup][23] of the open source alternatives to Mint and Quicken for personal finance.
+
+GnuCash "features multi-entry bookkeeping, can import from a wide range of formats, handles multiple currencies, helps you create budgets, prints checks, creates custom reports in Scheme, and can import from online banks and pull stock quotes for you directly."
+
+You can find GnuCash's [source code][24] on GitHub under a GPL [version 2 or 3 license][25].
+
+An honorable mention goes to GnuCash alternative [KMyMoney][26], which also received a nomination for our list, and is another great option for keeping your finances in Linux.
+
+### Kodi
+
+[Kodi][27] is an open source media center solution, formerly known as XBMC, which works on a variety of devices as a do-it-yourselfer's tool to building a set-top box for playing movies, TV, music, and more. It is heavily customizable, and supports numerous skins, plugins, and a variety of remote control devices (including its own custom Android remote for your phone).
+
+Although we didn't cover Kodi in-depth this year, it kept popping up in articles on building a home Linux [music server][28], media [management tools][29], and even a previous poll on favorite open source [video players][30]. (If you're using Kodi at home and want to write about your experience, [let us know][31].)
+
+The [source code][32] to Kodi can be found on GitHub under a [GPLv2][33] license.
+
+### MyCollab
+
+[MyCollab][34] is a suite of tools for customer relationship management, document management, and project management. Community Moderator Robin Muilwijk covered the details of the project management tool MyCollab-Project in his roundup of [Top 11 project management tools for 2016][35].
+
+"MyCollab-Project includes many features, like a Gantt chart and milestones, time tracking, and issue management. It also supports agile development models with its Kanban board. MyCollab-Project comes in three editions, of which the [community edition][36] is the free and open source option."
+
+Installing MyCollab requires a Java runtime and MySQL stack. Visit the [MyCollab site][37] to learn how to contribute to the project.
+
+MyCollab is AGPLv3 licensed and the [source code][38] is hosted on GitHub.
+
+### OpenAPS
+
+[OpenAPS][39] is another project that our moderators found interesting in 2016, but also one that we have yet to cover in depth. OpenAPS, the Open Artificial Pancreas System project, is an open source project devoted to improving the lives of people with Type 1 diabetes.
+
+The project includes "[a safety-focused reference design,][40] a[ toolset][41], and an open source [reference implementation][42]" designed for device manufacturers or any individual to be able to build their own artificial pancreas device to be able to safely regulate blood glucose levels overnight by adjusting insulin levels. Although potential users should examine the project carefully and discuss it with their healthcare provider before trying to build or use the system themselves, the project founders hope opening up technology will accelerate the research and development pace across the medical devices industry to discover solutions and bring them to market even faster.
+
+### OpenHAB
+
+[OpenHAB][43] is a home automation platform with a pluggable architecture. Community Moderator D Ruth Bavousett [wrote][44] about OpenHAB after buying a home this year and trying it out.
+
+"One of the interesting modules I found was the Bluetooth binding; it can watch for the presence of specific Bluetooth-enabled devices (your smartphone, and those of your children, for instance) and take action when that device arrives or leaves—lock or unlock doors, turn on lights, adjust your thermostat, turn off security modes, and so on."
+
+Check out the [full list of binding and bundles][45] that provide integration and communication with social networks, instant messaging, cloud IoT platforms, and more.
+
+OpenHAB is EPL licensed and the [source code][46] is hosted on GitHub.
+
+### OpenToonz
+
+[OpenToonz][47] is production software for 2D animation. Community Moderator Joshua Allen Holm [reported][48] on its open source release in March 2016, and it has been mentioned in other animation-related articles on Opensource.com, but we haven't covered it in depth. Stay tuned for that.
+
+In the meantime, we can tell you that there are a number of features unique to OpenToonz, including GTS, which is a spanning tool developed by Studio Ghibli, and [a plug-in effect SDK][49] for image processing.
+
+To discuss development and video research topics, check out the [forum][50] on GitHub. OpenToonz [source code][51] is hosted on GitHub and the project is licensed under a modified BSD license.
+
+### Roundcube
+
+[Roundcube][52] is a modern, browser-based email client that provides much—if not all—of the functionality email users may be used to with a desktop client. Featuring support for more than 70 languages, integrated spell-checking, a drag-and-drop interface, a feature-rich address book, HTML email composition, multiple search features, PGP encryption support, threading, and more, Roundcube can work as a drop-in replacement email client for many users.
+
+Roundcube was included along with four other solutions in our roundup of open source [alternatives to Gmail][53].
+
+You can find the [source code][54] to Roundcube on GitHub under a [GPLv3][55] license. In addition to [downloading][56] and installing the project directly, you can also find it inside many complete email server packages, including [Kolab Groupware][57], [iRedMail][58], [Mail-in-a-Box][59], and [mailcow][60].
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/jen-headshot-square.jpeg?itok=GTMugLtD)
+
+Jen Wike Huger - Jen Wike Huger is the Content Manager for Opensource.com. She manages the publication calendar, coordinates the editing team, and guides new and current writers. Follow her on Twitter @jenwike, and see her extended portfolio at Jen.io.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/16/12/yearbook-top-10-open-source-projects
+
+作者：[Jen Wike Huger ][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/jen-wike
+[1]:https://www.flickr.com/photos/george_eastman_house/
+[2]:https://www.flickr.com/photos/internetarchivebookimages/14784547612/in/photolist-owsEVj-odcHUi-osAjiE-x91Jr9-obHow3-owt68v-owu56t-ouySJt-odaPbp-owajfC-ouBSeL-oeTzy4-ox1okT-odZmpW-ouXBnc-ot2Du4-ocakCh-obZ8Pp-oeTNDK-ouiMZZ-ie12mP-oeVPhH-of2dD4-obXM65-owkSzg-odBEbi-oqYadd-ouiNiK-icoz2G-ie4G4G-ocALsB-ouHTJC-wGocbd-osUxcE-oeYNdc-of1ymF-idPbwn-odoerh-oeSekw-ovaayH-otn9x3-ouoPm7-od8KVS-oduYZL-obYkk3-hXWops-ocUu6k-dTeHx6-ot6Fs5-ouXK46
+[3]:https://atom.io/
+[4]:https://opensource.com/life/16/2/culture-pluggable-open-source
+[5]:https://github.com/atom/atom/blob/master/CONTRIBUTING.md
+[6]:https://github.com/atom/atom
+[7]:http://discuss.atom.io/
+[8]:http://atom-slack.herokuapp.com/
+[9]:https://raw.githubusercontent.com/atom/atom/master/LICENSE.md
+[10]:https://github.com/atom/atom
+[11]:http://www.eclipse.org/che/
+[12]:https://opensource.com/life/16/11/introduction-eclipse-che
+[13]:https://www.eclipse.org/che/getting-started/cloud/
+[14]:https://www.eclipse.org/che/getting-started/download/
+[15]:https://bitnami.com/stack/eclipse-che
+[16]:https://github.com/eclipse/che/
+[17]:https://github.com/eclipse/che/blob/master/LICENSE
+[18]:http://www.freecadweb.org/
+[19]:https://opensource.com/alternatives/autocad
+[20]:https://github.com/FreeCAD/FreeCAD/blob/master/COPYING
+[21]:https://github.com/FreeCAD/FreeCAD
+[22]:https://www.gnucash.org/
+[23]:https://opensource.com/life/16/1/3-open-source-personal-finance-tools-linux
+[24]:https://github.com/Gnucash/
+[25]:https://github.com/Gnucash/gnucash/blob/master/LICENSE
+[26]:https://kmymoney.org/
+[27]:https://kodi.tv/
+[28]:https://opensource.com/life/16/1/how-set-linux-based-music-server-home
+[29]:https://opensource.com/life/16/6/tinymediamanager-catalogs-your-movie-and-tv-files
+[30]:https://opensource.com/life/15/11/favorite-open-source-video-player
+[31]:https://opensource.com/how-submit-article
+[32]:https://github.com/xbmc/xbmc
+[33]:https://github.com/xbmc/xbmc/blob/master/LICENSE.GPL
+[34]:https://community.mycollab.com/
+[35]:https://opensource.com/business/16/3/top-project-management-tools-2016
+[36]:https://github.com/MyCollab/mycollab
+[37]:https://community.mycollab.com/docs/developing-mycollab/how-can-i-contribute-to-mycollab/
+[38]:https://github.com/MyCollab/mycollab
+[39]:https://openaps.org/
+[40]:https://openaps.org/reference-design
+[41]:https://github.com/openaps/openaps
+[42]:https://github.com/openaps/oref0/
+[43]:http://www.openhab.org/
+[44]:https://opensource.com/life/16/4/automating-your-home-openhab
+[45]:http://www.openhab.org/features/supported-technologies.html
+[46]:https://github.com/openhab/openhab
+[47]:https://opentoonz.github.io/e/index.html
+[48]:https://opensource.com/life/16/3/weekly-news-march-26
+[49]:https://github.com/opentoonz/plugin_sdk
+[50]:https://github.com/opentoonz/opentoonz/issues
+[51]:https://github.com/opentoonz/opentoonz
+[52]:https://roundcube.net/
+[53]:https://opensource.com/alternatives/gmail
+[54]:https://github.com/roundcube/roundcubemail
+[55]:https://github.com/roundcube/roundcubemail/blob/master/LICENSE
+[56]:https://roundcube.net/download/
+[57]:http://kolab.org/
+[58]:http://www.iredmail.org/
+[59]:https://mailinabox.email/
+[60]:https://mailcow.email/
diff --git a/sources/tech/20161228 How to set up a Continuous Integration server for Android development.md b/sources/tech/20161228 How to set up a Continuous Integration server for Android development.md
new file mode 100644
index 0000000000..62097b8fe5
--- /dev/null
+++ b/sources/tech/20161228 How to set up a Continuous Integration server for Android development.md	
@@ -0,0 +1,535 @@
+How to set up a Continuous Integration server for Android development (Ubuntu + Jenkins + SonarQube)
+============================================================
+
+I have recently acquired a new MacBook Pro as my main Android development machine and instead of selling or giving away my old Mac BookPro (13", late 2011, 16GB RAM, 500G SSD, Core i5 2,4GHz, 64Bit) I have wiped it out and turned it into a Continuous Integration Server with dual boot MacOS-Ubuntu.
+
+The goal of this article is to summarize the installation steps for me as future reference and for any developer that may be interested in setting up its own CI server, I will explain how to:
+
+*   Configure a fresh Ubuntu installation to be able to run the Android SDK.
+*   Install Jenkins CI as a service to pull, compile, and run tests of an Android multi-module project hosted in GitHub.
+*   Install Docker to run a MySQL server and SonarQube in their own containers, to perform static code analysis triggered by Jenkins
+*   Android App configuration requirements.
+
+### Step 1 — Ubuntu Installation:
+
+I’m going to use Ubuntu as the SO of the CI because it has a strong community that will provide you support for any issue you may encounter and my personal recommendation is always to use the last LTS version, currently 16.04 LTS. There are plenty of tutorials about how to install it on virtually any hardware so I’m just providing the link to download it.
+
+[Install Ubuntu Desktop 16.04 LTS][1]
+
+You may wonder why I’m using the Desktop version instead of the pure server version, this is just a matter of personal preference, I’m not worried of losing a bit of performance and available RAM due to be running the desktop interface because I think that the usability that provides de GUI pays off enough in increased productivity.
+
+### Step 2 — Remote access management:
+
+#### SSH-Server:
+
+Ubuntu desktop is not shipped with the ssh server installed by default, so to be able to manage your server remotely through the command line just install it:
+
+```
+$ sudo apt-get install openssh-server
+```
+
+#### NoMachine Remote Desktop:
+
+Probably your CI is not going to be next to you but closer to your router, other room or even miles away from your current location. I have been dealing with different remote desktop solutions and I have to say that IMHO NoMachine performs the best, it is platform agnostic and works just out of the box just using your ssh credentials. (Obviously you have to install it both in your CI and your machine)
+
+[NoMachine - Free Remote Access For Everybody
+Free remote access and desktop sharing software. Access your computer to work on files and transfer documents, watch…www.nomachine.com][2][][3]</section>
+
+
+### Step 3 — Environment configuration
+
+Here I’m going to install JAVA8, Git and the Android SDK that are required by Jenkins to pull, compile and run android projects.
+
+#### SDKMAN!:
+
+This marvelous command line tool allows you install many popular SDK (eg. Gradle, Groovy, Grails, Kotlin, Scala…), list candidates and switch among different versions in parallel in a really easy and handy way.
+
+[SDKMAN! the Software Development Kit Manager
+SDKMAN! is a tool for managing parallel versions of multiple Software Development Kits on most Unix based systems. It…sdkman.io][4][][5]
+
+They have added recently support for JAVA8 so I preferred to install Java using it instead of using the popular webupd8 repository, so it is up to you to choose whether to install SDKMAN! or not but I’m pretty sure it is a tool that you will use in the near future.
+
+Installation of SDKMAN! is as easy as executing the following line:
+
+```
+$ curl -s "https://get.sdkman.io" | bash
+```
+
+
+#### Oracle JAVA8:
+
+As we have previously installed SDKMAN! now installing JAVA8 is as easy as:
+
+```
+$ sdk install java
+```
+
+Or using the webupd8 repository:
+
+[Install Oracle Java 8 In Ubuntu Or Linux Mint Via PPA Repository [JDK8]
+Oracle Java 8 is now stable. Below you'll find instructions on how to install it in Ubuntu or Debian via a PPA…www.webupd8.org][6][][7]
+
+#### Git:
+
+Installing git is straight forward, no more comments needed:
+
+```
+$ sudo apt install git
+```
+
+
+#### Android SDK:
+
+At the bottom of this page:
+
+[Download Android Studio and SDK Tools | Android Studio
+Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and…developer.android.com][8][][9]
+
+you can find “_Get just the command line tools_”, copy the link e.g:
+
+```
+https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+```
+
+Then download and unzip it at /opt/android-sdk-linux
+
+```
+$ cd /opt
+```
+
+```
+$ sudo wget https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+```
+
+```
+$ sudo unzip tools_r25.2.3-linux.zip -d android-sdk-linux
+```
+
+As we have used root user to create de directory we need to fix folder permissions to make it readable and writable by our main user:
+
+```
+$ sudo chown -R YOUR_USERNAME:YOUR_USERNAME android-sdk-linux/
+```
+
+Let’s set the SDK environmental variables editing the /.bashrc file:
+
+```
+$ cd
+$ nano .bashrc
+```
+
+Then add at the bottom (but before SDKMAN! config line) these lines:
+
+```
+export ANDROID_HOME="/opt/android-sdk-linux"
+export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
+```
+
+Close the terminal and open a new one to verify that variables have been properly exported:
+
+```
+$ echo $ANDROID_HOME
+/opt/android-sdk-linux
+```
+
+```
+$ android
+```
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*Q4o_LpfC5A3evFUwd62MOQ.png) 
+ 
+Running Android SDK Manager GUI
+
+
+### Step 4 — Jenkins server:
+
+Here I’m going to describe how to install the server, configure it, create a Jenkins Job to pull, build and test an Android project and how to get to the console output.
+
+#### Jenkins installation:
+
+Jenkins server is available at:
+
+[Jenkins
+Jenkins is an open source automation serverjenkins.io][12][][13]
+
+There are many ways to run Jenkins, executing a .war file, as a linux service, as a Docker container, etc….
+
+My first thought was to run it using a Docker container but then I realized that it was a nightmare to properly configure code folders, android-sdk folder visibility and USB visibility of physical devices plug to run Android Tests.
+
+For ease of use I finally decided to use it as service adding the Stable repository key to install and get updates with apt
+
+```
+$ wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo apt-key add -
+```
+
+Edit the sources.list file and add:
+
+```
+$ sudo nano /etc/apt/sources.list
+```
+
+```
+#Jenkin Stable
+deb https://pkg.jenkins.io/debian-stable binary/
+```
+
+Then install it:
+
+```
+sudo apt-get update
+sudo apt-get install jenkins
+```
+
+Add user _jenkins_ to your username group to allow it to read and write the Android SDK folder
+
+```
+$ sudo usermod -a -G YOUR_USERNAME jenkins
+```
+
+Jenkins service will always start at boot time and will be available at [http://localhost:8080][15]
+
+Just after installation due to security reasons this screen is shown, just follow the instructions to finally get your Jenkins instance up and running.
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*gN6-ncU7mRdQWL3wmlS_5g.png)
+ 
+Unlocking a successfully installed Jenkins server
+
+#### Jenkins Configuration:
+
+After unlocking Jenkins installation you are prompted to install plugins, click “Select plugins to Install” browse and select the following ones to be installed in addition to suggested plugins:
+
+*   JUnit
+
+[JUnit Plugin - Jenkins - Jenkins Wiki
+The JUnit plugin provides a publisher that consumes XML test reports generated during the builds and provides some…wiki.jenkins-ci.org][16][][17]
+
+*   JaCoCo
+
+[JaCoCo Plugin - Jenkins - Jenkins Wiki
+In order to get the coverage data published to Jenkins, you need to add a JaCoCo publisher and configure it so it will…wiki.jenkins-ci.org][18][][19]
+
+*   EnvInject
+
+[EnvInject Plugin - Jenkins - Jenkins Wiki
+Only previous environment variables are available for polling Some plugins provide polling mechanisms (such as SCM…wiki.jenkins-ci.org][20][][21]
+
+*   GitHub plugins
+
+[GitHub Plugin - Jenkins - Jenkins Wiki
+This plugin requires that you have an HTTP URL reachable from GitHub, which means it's reachable from the whole…wiki.jenkins-ci.org][22][][23]
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*xvG06qRSCvfw5OQgQleG0A.png)
+ 
+Installing Jenkins plugins
+
+Create the admin user and complete installation.
+
+To finish configuration we have to configure ANDROID_HOME and JAVA_HOME environmental variables:
+
+Go to Manage Jenkins > Configure System
+
+Scroll down and at Global properties section check the Environment variables box and add _ANDROID_HOME_ and _JAVA_HOME_
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*rpgkUsqWhkHk4xOKCGPcvw.png) 
+
+Adding global environmental variables common to all Jenkins jobs
+
+#### Creating a “Jenkins Job”
+
+A Jenkins Job describes a series of steps that are executed consecutively. I have prepared a “Hello Jenkins” Android project in GitHub that you can use to test your Jenkins configuration as you follow this tutorial. It is just a hello world multi-module app with Unit tests, Android tests and includes JaCoCo and SonarQube plugins.
+
+[pamartineza/helloJenkins
+helloJenkins - Hello Jenkins project for CI configuration testgithub.com][24][][25]
+
+First create a new _Freestyle project Job _and give it a name eg. “_Hello_Android_” (Don’t use spaces in Jenkins Job names to avoid future compatibility problems with SonarQube)
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*ITE7xIrbsrChWv45PSlPPw.png) 
+
+Creating a Freestyle Jenkins Job
+
+Then let’s configure it, I’m going to add screenshots of every section:
+
+General:
+
+This section is not very interesting for our goals, here you can change the name of the Job, add a description and if using a GitHub project add the project URL, (without *.git, the url of the web not the repo)
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*7QF2pfgM73FVIWTfQhcbEA.png) 
+
+Project Url Configuration
+
+Source Code Management:
+
+Here is where we have to chose our CVS as Git and add the repository url (this time include *.git) and select the branch to pull. As this is a public GitHub repository you don’t need to add credentials but otherwise you will have to add your user and password.
+
+I recommend you that instead of using your actual GitHub user with full permissions create a new GitHub user with read-only privileges of your private repos to be used exclusively by your Jenkins Jobs.
+
+In addition if you have enabled Two-Factor authentication Jenkins won’t be able to pull code and again having this exclusively created for Jenkins user will be the solution to pull code from private repos.
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*wkzdL70XrCzIpXDsHPA2Pg.png) 
+
+Repository configuration
+
+Build Triggers:
+
+Builds can be triggered manually, remotely, periodically, after another Job build, when changes are detected, etc…
+
+Ideally the optimal situation is to just trigger a build when a change has been pushed to the repository, GitHub provides a system called Webhooks
+
+[Webhooks | GitHub Developer Guide
+Webhooks allow you to build or set up integrations which subscribe to certain events on GitHub.com. When one of those…developer.github.com][26][][27]
+
+that we can configure to send events to the CI server and then trigger the build, but this obviously requires our CI sever to be online and reachable by GitHub servers.
+
+Your CI is going to be probably isolated in a private network for security reasons then the only solution is to poll GitHub periodically. In my personal case I just turn on the CI when I’m working, in the following screenshot I have configured it to poll Github every 15 minutes. Polling times are defined with CRON syntax, if you are not familiar with it, press the help button on the right to get an extensive documentation with examples.
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*eONz8DAwJ9PW7uc8VQw7wQ.png) 
+
+Repository polling configuration
+
+Build Environment:
+
+Here I recommend to configure the build _stuck_ timeout to avoid Jenkins blocking memory and CPU if any unexpected error happens. Here also you can Inject environmental variables, passwords, etc…
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*Y6FgbIQq8pMk6D72Sr9KdQ.png) 
+
+Build stuck time out
+
+Build:
+
+Here is where the magic happens! Add a _Build Step _that _Invokes Gradle Script _select the Gradle Wrapper (Android projects are shipped with a Gradle Wrapper by default, don’t forget to check it into Git) and let’s define which tasks are going to be executed:
+
+1.  clean: Deletes all build outputs of previous builds, this ensures nothing is cached and the freshness of this build.
+2.  assembleDebug: Generates the debug .apk
+3.  test: executes JUnit tests in all modules
+4.  connectedDebugAndroidTest: executes Android Tests on actual android devices connected to the CI. (It is also possible to run Android Test against an Android Emulator installing the Android Emulator Jenkins plugin, but it doesn’t support all emulator versions and its configuration is not trivial at all)
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*D0HDPOUYCWzsWKiLv4LrBA.png) 
+
+Gradle tasks definition
+
+Post-build Actions:
+
+Here we are going to add _Publish JUnit test result report _this step is provided by the JUnit plugin and collects the .XML reports generated with the outcome of the JUnit tests that will generate a fancy chart with the evolution of tests results in time.
+
+The path for debug flavor tests results in our app module is:
+
+app/build/test-results/debug/*.xml
+
+In multi-module projects the path for test results in other “pure” java modules is:
+
+*/build/test-results/*.xml
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*ZQtamiQ_8PzAFBd-pMfvdg.png) 
+
+
+Also add _Record JaCoCo coverage report _that will create a chart to show the evolution of the code coverage
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*wKaFykDl0qg-c79QwRTR2w.png) 
+
+
+#### Executing a Jenkins Job
+
+Our Job will execute every 15 minutes if new changes have been pushed to the repository but it can also be triggered manually if you don’t want to wait until next polling or you just want to verify any change in the configuration straight forward. Click _Build Now_ and then current build will be shown in the _Build History _, click on it to see the details.
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*vKi-BGQ2blimaoTl7PTXtQ.png) 
+ 
+Manual Job execution
+
+The most interesting part here is the console output, you can see how Jenkins pulls the code and starts executing the Gradle tasks we have previously defined e.g _clean._
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*dbtmlSr2owrj_CQfGXjdsw.png) 
+
+Beginning of console output
+
+If everything is OK console output will finish as follows (any repository connectivity problem, failing JUnit or Android test failure would make the build to fail)
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*WpOH-aHuuNRDYmY710ecLQ.png) 
+
+Yeehaa! build Sucsessful and test results with coverage collected
+
+### Step 5 — SonarQube
+
+In this section I will describe how to install and configure SonarQube and its companion MySQL database using Docker containers.
+
+[Continuous Code Quality | SonarQube
+The leading open source platform for continuous code qualitywww.sonarqube.org][28][][29]
+
+SonarQube is a code static analysis tool that helps developers to write cleaner code, detect bugs, learn good practices and it also keeps track of code coverage, tests results, technical debt, etc… all SonarQube detected issues can be imported easily to be fixed into Android Studio/IntelliJ with a plugin:
+
+[JetBrains Plugin Repository :: SonarQube Community Plugin
+Edit descriptionplugins.jetbrains.com][30][][31]</section>
+
+
+#### Installing Docker:
+
+Installation of Docker is pretty straightforward following official Docker documentation:
+
+[Install Docker on Ubuntu
+Instructions for installing Docker on Ubuntudocs.docker.com][32][][33]
+
+#### Creating Containers:
+
+MySQL:
+Let’s create a MySQL 5.7.17 server container called _mysqlserver, _that will allways start at boot time, with a local volume in your user folder, a password and exposed at localhost:3306 _(replace YOUR_USER and YOUR_MYSQL_PASSWORD with your values)_
+
+```
+$ docker run --name mysqlserver --restart=always -v /home/YOUR_USER/mysqlVolume:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=YOUR_MYSQL_PASSWORD -p 3306:3306 -d mysql:5.7.17
+```
+
+
+phpMyAdmin:
+To manage the MySQL server I’m used to phpMyAdmin then nothing more easy than creating another container called _phpmyadmin _linked to our _mysqlserver _container, that also starts at boot time, exposed at localhost:9090 and using the last version available.
+
+```
+$ docker run --name phpmyadmin --restart=always --link mysqlserver:db -p 9090:80 -d phpmyadmin/phpmyadmin
+```
+
+Using the phpMyAdmin interface at localhost:9090 login as _root and YOUR_MYSQL_PASSWORD _andcreate a database called _sonar_ with _utf8_general_ci _collation. Also create a new user _sonar_ with password _YOUR_SONAR_PASSWORD _and give it all privileges on the _sonar_ database.
+
+
+SonarQube:
+Now we are ready to create our SonarQube container called _sonarqube _that starts at boot time, linked to our db, exposed at localhost:9000 and using the 5.6.4 (LTS) version.
+
+```
+$ docker run --name sonarqube --restart=always --link mysqlserver:db -p 9000:9000 -p 9092:9092 -e "SONARQUBE_JDBC_URL=jdbc:mysql://db:3306/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" -e "SONARQUBE_JDBC_USER=sonar" -e "SONARQUBE_JDBC_PASSWORD=YOUR_SONAR_PASSWORD" -d sonarqube:5.6.4
+```
+
+
+#### SonarQube Configuration:
+
+If everything is OK browsing to localhost:9000 will lead you to this page:
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*tcgww8PENXdyrLS3K95ZEw.png) 
+
+Now let’s configure necessary plugins and Quality Profiles:
+
+1.  Login at the top right corner (Default administrator login is admin/admin)
+2.  Go to Administration > System > Update Center > Updates Only
+
+*   Update Java plugin if necessary
+
+3\. Now switch to Available and install the following plugins:
+
+*   Android (provides Android lint rules)
+*   Checkstyle
+*   Findbugs
+*   XML
+
+4\. Scroll back to the top and press restart button to complete the installation
+
+
+#### SonarQube Profiles:
+
+The plugins that we have installed define profiles that are sets of rules used to evaluate the code quality of a project.
+
+Only 1 profile can be applied to a project at a time but we can make profiles have a parent and therefore inherit rules, so to be able to have all rules evaluated against our project we can create a new custom profile and chain all profiles.
+
+Let’s do it, go to Quality Profiles > Create and give it a name e.g. CustomAndroidProfile
+
+Add Android Lint as parent, then switch to the Android Lint profile and add FindBugs Security Minimal as parent, continue this chain until you get this inheritance schema and set the CustomAndroidProfile as the default one:
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*w2CvH8uAOUcvajzjsOoCgQ.png) 
+
+
+#### Executing the SonarQube Analysis:
+
+Now that our SonarQube is properly configured we just have to add a new Gradle task, _sonarqube_, to our Jenkins job, that will be executed in last place:
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*EDAjalNzmdU-ptjhWzuCcQ.png) 
+
+
+
+Execute again the Jenkins job and once it has finished let’s see our sonarQube dashboard at localhost:9000 :
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*n7dKdPXyUPj1AZe6ujL3vw.png) 
+
+Dashboard with Analysis result
+
+If we press the project name we can navigate different dashboards, with tons of info, the most important one is probably _Issues. 
+_In the next screenshot I’m showing the detail of a _major _issue that flags an empty constructor method. Here personally what gives me the most important value of using Sonarqube is the explanation shown at the screen bottom when you click on the period … , this is an invaluable way of learning tips and tricks of programming.
+
+
+ ![](https://cdn-images-1.medium.com/max/1000/1*KKM9T2qHzanraAetghYCqg.png) 
+
+Getting the explanation of the issue
+
+### Step 6 — Extra: configuring other Android apps
+
+Configuring an Android app to get coverage and sonarqube results is just having the JaCoCo and SonarQube plugins applied. Again you can find more details at my demo app HelloJenkins:
+
+[pamartineza/helloJenkins
+helloJenkins - Hello Jenkins project for CI configuration testgithub.com][34][][35]
+
+### The end!
+
+Yes, you have finally reached the end of this long article! I hope you found it useful. If you find any error or you have any doubt please don’t hesitate to make any comment, I’ll do my best to try to help and if you liked it please share it!
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://cdn-images-1.medium.com/fit/c/60/60/0*DQl4jAoi2wXr6S3p.jpg)
+
+Entrepreneur & CEO at GreenLionSoft · Android Lead @MadridMBC & @Shoptimix · Android, OpenSource and OpenData promoter · Runner · Traveller
+
+--------------------------------------------------------------------------------
+
+via: https://medium.com/@pamartineza/how-to-set-up-a-continuous-integration-server-for-android-development-ubuntu-jenkins-sonarqube-43c1ed6b08d3#.x6jhcpg98
+
+作者：[Pablo A. Martínez][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://medium.com/@pamartineza
+[1]:https://www.ubuntu.com/download/desktop
+[2]:https://www.nomachine.com/download
+[3]:https://www.nomachine.com/download
+[4]:http://sdkman.io/
+[5]:http://sdkman.io/
+[6]:http://www.webupd8.org/2012/09/install-oracle-java-8-in-ubuntu-via-ppa.html
+[7]:http://www.webupd8.org/2012/09/install-oracle-java-8-in-ubuntu-via-ppa.html
+[8]:https://developer.android.com/studio/index.html
+[9]:https://developer.android.com/studio/index.html
+[10]:https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+[11]:https://dl.google.com/android/repository/tools_r25.2.3-linux.zip
+[12]:https://jenkins.io/
+[13]:https://jenkins.io/
+[14]:https://pkg.jenkins.io/debian-stable/jenkins.io.key
+[15]:http://localhost:8080/
+[16]:https://wiki.jenkins-ci.org/display/JENKINS/JUnit+Plugin
+[17]:https://wiki.jenkins-ci.org/display/JENKINS/JUnit+Plugin
+[18]:https://wiki.jenkins-ci.org/display/JENKINS/JaCoCo+Plugin
+[19]:https://wiki.jenkins-ci.org/display/JENKINS/JaCoCo+Plugin
+[20]:https://wiki.jenkins-ci.org/display/JENKINS/EnvInject+Plugin
+[21]:https://wiki.jenkins-ci.org/display/JENKINS/EnvInject+Plugin
+[22]:https://wiki.jenkins-ci.org/display/JENKINS/GitHub+Plugin
+[23]:https://wiki.jenkins-ci.org/display/JENKINS/GitHub+Plugin
+[24]:https://github.com/pamartineza/helloJenkins
+[25]:https://github.com/pamartineza/helloJenkins
+[26]:https://developer.github.com/webhooks/
+[27]:https://developer.github.com/webhooks/
+[28]:https://www.sonarqube.org/
+[29]:https://www.sonarqube.org/
+[30]:https://plugins.jetbrains.com/idea/plugin/7238-sonarqube-community-plugin
+[31]:https://plugins.jetbrains.com/idea/plugin/7238-sonarqube-community-plugin
+[32]:https://docs.docker.com/engine/installation/linux/ubuntulinux/
+[33]:https://docs.docker.com/engine/installation/linux/ubuntulinux/
+[34]:https://github.com/pamartineza/helloJenkins
+[35]:https://github.com/pamartineza/helloJenkins
diff --git a/sources/tech/20170105 Top 8 systems operations and engineering trends for 2017.md b/sources/tech/20170105 Top 8 systems operations and engineering trends for 2017.md
new file mode 100644
index 0000000000..4f480bdb1c
--- /dev/null
+++ b/sources/tech/20170105 Top 8 systems operations and engineering trends for 2017.md	
@@ -0,0 +1,79 @@
+翻译中--by zky001
+Top 8 systems operations and engineering trends for 2017
+=================
+
+Forecasting trends is tricky, especially in the fast-moving world of systems operations and engineering. This year, at our Velocity Conference, we have talked about distributed systems, SRE, containerization, serverless architectures, burnout, and many other topics related to the human and technological challenges of delivering software. Here are some of the trends we see for the next year:
+
+### 1\. Distributed Systems
+
+We think this is important enough that we [re-focused the entire Velocity conference on it][1].
+
+
+
+### 2\. Site Reliability Engineering
+
+[Site Reliability Engineering][3]—is it just ops? [Or is it DevOps by another name][4]? Google's profile for an ops professional calls for heavy doses of systems and software engineering. Spread further into the industry by Xooglers at companies like Dropbox, [hiring for SRE positions][5] continues to increase, particularly for web-facing companies with large data centers. In some contexts, the role of SREs becomes more about helping developers operate their own services.
+
+### 3\. Containerization
+
+Companies will continue to containerize their software delivery. Docker Inc. itself has positioned Docker as a tool for "[incremental revolution][6]," and containerizing legacy applications has become a common use case in the enterprise. What's the future of Docker? As engineers continue to adopt orchestration tools like Kubernetes and Mesos, the higher level of abstraction may make more room for other flavors of containers (like rkt, Garden, etc.).
+
+### 4\. Unikernels
+
+Are unikernels the next step after containerization? Are they unfit for production? Some tout the security and performance benefits of unikernels. Keep an eye out for how unikernels evolve in 2017, [particularly with an eye to what Docker Inc. does][7] in this area (having acquired Unikernel Systems this year).
+
+### 5\. Serverless
+
+Serverless architectures treat functions as the basic unit of computation. Some find the term misleading (and reminiscent of "noops"), and prefer to refer to this trend as Functions-as-a-Service. Developers and architects are experimenting with the technology more and more, and expect to see more applications being written in this paradigm. For more on what serverless/FaaS means for operations, check out the free ebook on [Serverless Ops][8] by Michael Hausenblas.
+
+### 6\. Cloud-Native application development
+
+Like DevOps, this term has been used and abused by marketers for a long while, but the Cloud Native Computing Foundation makes a strong case for these new sets of tools (often Google-inspired) that take advantage not just of the cloud, but in particular the strengths and opportunities provided by distributed systems—in short, microservices, containerization, and dynamic orchestration.
+
+### 7\. Monitoring
+
+As the industry has evolved from Nagios-style monitoring, to streaming metrics and visualizations, we've become great at producing loads of systems data. Interpretation is the next challenge. As such, we are seeing vendors offering machine learning-powered monitoring services, and, more generally, IT operations learning techniques for machine learning systems data. Similarly, as our infrastructure becomes more dynamic and distributed, monitoring becomes less and less about checking the health of individual resources and more about tracing flows between services. As such, distributed tracing has emerged.
+
+### 8\. DevOps Security
+
+With DevOpsSec increasing in popularity, [security is quickly becoming a team-wide concern][9]. The classic challenge of DevOps of achieving both velocity and reliability is especially pronounced when companies with security and compliance concerns are feeling the pinch to compete on speed.
+
+### Tell us about your work
+
+As an IT operations professional—whether you use the term sysadmin, DevOps, SRE, DBA, etc.—[you’re invited to share your insights][10] to help us learn about the demographics, work environments, tools, and compensation of practitioners in our growing field. All responses are reported in aggregate to assure your anonymity. The survey will require approximately 5–10 minutes to complete. Once we've closed the survey and analyzed the results, we'll share our findings with you. [Take the survey][11].
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://d3tdunqjn7n0wj.cloudfront.net/1440x1440/courtney-nash-crop-a9cb0b44a4262f20524d171195d6d485.jpg)
+
+Courtney Nash chairs multiple conferences for O'Reilly Media and is the strategic content director focused on areas of modern web operations, high performance applications, and security. An erstwhile academic neuroscientist, she is still fascinated by the brain and how it informs our interactions with and expectations of technology. She's spent 17 years working in the technology industry in a wide variety of roles, ever since moving to Seattle to work at a burgeoning online bookstore. Outside work, Courtney can be found biking, hiking, skiing, ...
+
+![](https://d3tdunqjn7n0wj.cloudfront.net/1440x1440/brian_anderson-ae207faed42e8b7a2e73b7f82573c8ea.jpg)
+
+Brian Anderson, Infrastructure and Operations Editor at O’Reilly Media, covers topics essential to the delivery of software — from traditional system administration, to cloud computing, web performance, Docker, and DevOps. He has been working in online education and serving the needs of working learners for more than ten years.
+
+--------------------------------------------------------------------------------
+
+via: https://www.oreilly.com/ideas/top-8-systems-operations-and-engineering-trends-for-2017
+
+作者：[Courtney Nash][a]，[Brian Anderson][b]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.oreilly.com/people/3f5d7-courtneyw-nash
+[b]:https://www.oreilly.com/people/brian_anderson
+[1]:https://www.oreilly.com/ideas/velocity-a-new-direction
+[2]:https://www.oreilly.com/ideas/top-8-systems-operations-and-engineering-trends-for-2017?imm_mid=0ec113&cmp=em-webops-na-na-newsltr_20170106
+[3]:https://www.oreilly.com/ideas/what-is-sre-site-reliability-engineering
+[4]:http://conferences.oreilly.com/velocity/devops-web-performance-ny/public/content/devops-sre-ama-video
+[5]:https://www.glassdoor.com/Salaries/site-reliability-engineer-salary-SRCH_KO0,25.htm
+[6]:http://blog.scottlowe.org/2016/06/21/dockercon-2016-day-2-keynote/
+[7]:http://www.infoworld.com/article/3024410/application-virtualization/docker-kicks-off-unikernel-revolution.html
+[8]:http://www.oreilly.com/webops-perf/free/serverless-ops.csp?intcmp=il-webops-free-lp-na_new_site_top_8_systems_operations_and_engineering_trends_for_2017_body_text_cta
+[9]:https://www.oreilly.com/learning/devopssec-securing-software-through-continuous-delivery
+[10]:http://www.oreilly.com/webops-perf/2016-ops-survey.html
+[11]:http://www.oreilly.com/webops-perf/2016-ops-survey.html
diff --git a/sources/tech/20170106 inxi – A Great Tool to Check Hardware Information on Linux.md b/sources/tech/20170106 inxi – A Great Tool to Check Hardware Information on Linux.md
new file mode 100644
index 0000000000..8e9dfdb954
--- /dev/null
+++ b/sources/tech/20170106 inxi – A Great Tool to Check Hardware Information on Linux.md	
@@ -0,0 +1,268 @@
+**translating by [erlinux](https://github.com/erlinux)**
+inxi – A Great Tool to Check Hardware Information on Linux
+============================================================
+
+One of the big challenge for Linux administrator to find, all the hardware information on the system. There are many command line utility is are available in Linux to get the hardware information but there will be a lack to get some of the information.
+
+[inxi][1] is a nifty tool to check hardware information on Linux and offers wide range of option to get all the hardware information on Linux system that i never found in any other utility which are available in Linux. It was forked from the ancient and mindbendingly perverse yet ingenius infobash, by locsmif.
+
+inxi is a script that quickly shows system hardware, CPU, drivers, Xorg, Desktop, Kernel, GCC version(s), Processes, RAM usage, and a wide variety of other useful information, also used for forum technical support & debugging tool.
+
+#### Install inix on Linux
+
+inxi is support all Linux distributions and never require latest dependencies, so no need to think about manual installation. Simply install inix from distribution official repository by using below commands.
+
+```
+[Install inxi on CentOS/RHEL]
+$ sudo yum install inxi
+
+[Install inix on Fedora]
+$ sudo dnf install inxi
+
+[Install inxi on Debian/Linux Mint/Ubuntu]
+$ sudo apt-get install inxi
+
+[Install inxi on openSUSE]
+$ sudo zypper in inxi
+
+[Install inxi on Mageia]
+$ sudo urpmi inxi
+
+[Install inxi on Arch based system]
+$ yaourt -S inxi
+```
+
+By default inxi output comes with colors which can be turned off by using `-c` followed by `0` (you can use 0-32) to get better visibility.
+
+#### Print one line output with inix
+
+Issue inxi command without any option to print the hardware information in one line like, CPU, kernel, architecture, uptime, memory, HDD, process & inxi version.
+
+```
+$ inxi -c 0
+CPU~Dual core Intel Core i7-6700HQ (-MCP-) speed~2591 MHz (max) Kernel~4.8.0-32-generic x86_64 Up~50 min Mem~1609.9/1999.8MB HDD~42.9GB(17.6% used) Procs~197 Client~Shell inxi~2.3.1
+```
+
+#### Print basic system hardware
+
+Issue inxi command with `-b` option wich will print basic system hardware information. I mean, it shows about System, Machine, CPU, Graphics, Network, Drives & Info.
+
+```
+$ inxi -b
+System:    Host: daygeek Kernel: 4.8.0-32-generic x86_64 (64 bit) Desktop: Unity 7.5.0  Distro: Ubuntu 16.10
+Machine:   System: innotek (portable) product: VirtualBox v: 1.2
+           Mobo: Oracle model: VirtualBox v: 1.2 BIOS: innotek v: VirtualBox date: 12/01/2006
+Battery    BAT0: charge: 31.5 Wh 63.0% condition: 50.0/50.0 Wh (100%)
+CPU:       Dual core Intel Core i7-6700HQ (-MCP-) speed: 2591 MHz (max)
+Graphics:  Card: InnoTek Systemberatung VirtualBox Graphics Adapter
+           Display Server: X.Org 1.18.4 drivers: (unloaded: fbdev,vesa) Resolution: 1920x955@59.89hz
+           GLX Renderer: Gallium 0.4 on llvmpipe (LLVM 3.8, 256 bits) GLX Version: 3.0 Mesa 12.0.3
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller driver: e1000
+Drives:    HDD Total Size: 42.9GB (17.6% used)
+Info:      Processes: 197 Uptime: 50 min Memory: 1586.2/1999.8MB Client: Shell (bash) inxi: 2.3.1
+```
+
+*   System : Host Name, Kernel version, Architecture, Desktop & Distribution
+*   Machine : Motherboard & Bios information
+*   CPU : Processor Name and core
+*   Graphics : Graphics card info
+*   Network : Network card info
+*   Drives : HDD size and used percent
+*   Info : Total process count, Server Uptime, Memory total and used, inxi version
+
+#### Show Audio/sound card information
+
+Issue inxi command with `-A` which will show Audio/sound card information.
+
+```
+$ inxi -A
+Audio:     Card Intel 82801AA AC'97 Audio Controller driver: snd_intel8x0 Sound: ALSA v: k4.8.0-32-generic
+```
+
+#### Show full CPU info
+
+Issue inxi command with `-C` which will show full CPU information, including per CPU clock speed and CPU max speed (if available).
+
+```
+$ inxi -C
+CPU:       Dual core Intel Core i7-6700HQ (-MCP-) cache: 6144 KB 
+           clock speeds: max: 2591 MHz 1: 2591 MHz 2: 2591 MHz
+```
+
+#### Show optical drive information
+
+Issue inxi command with `-d` which will show optical drive data information, including all storage.
+
+```
+$ inxi -d
+Drives:    HDD Total Size: 42.9GB (17.6% used) ID-1: /dev/sda model: VBOX_HARDDISK size: 42.9GB
+           Optical: /dev/sr0 model: VBOX CD-ROM dev-links: cdrom,dvd
+           Features: speed: 32x multisession: yes audio: yes dvd: yes rw: none
+```
+#### Show full hard Disk information
+
+Issue inxi command with `-D` which will show full hard Disk information, including HDD total size, used size and percentage, file system type & mount point.
+
+```
+$ inxi -D
+Drives:    HDD Total Size: 42.9GB (17.6% used) ID-1: /dev/sda model: VBOX_HARDDISK size: 42.9GB
+```
+
+Issue inxi command with `-p` which will show full partition information.
+
+```
+$ inxi -p
+Partition: ID-1: / size: 38G used: 5.2G (15%) fs: ext4 dev: /dev/sda1
+           ID-2: swap-1 size: 2.15GB used: 0.20GB (9%) fs: swap dev: /dev/sda5
+```
+
+Issue inxi command with `-0` which will show unmounted partition information.
+
+```
+$ inxi -o
+Unmounted: No unmounted partitions detected
+```
+
+#### Show Graphic card information
+
+Issue inxi command with `-G` which will show Graphic card information.
+
+```
+$ inxi -G
+Graphics:  Card: InnoTek Systemberatung VirtualBox Graphics Adapter
+           Display Server: X.Org 1.18.4 drivers: (unloaded: fbdev,vesa) Resolution: 1920x955@59.89hz
+           GLX Renderer: Gallium 0.4 on llvmpipe (LLVM 3.8, 256 bits) GLX Version: 3.0 Mesa 12.0.3
+```
+
+#### Show server public IP address
+
+Issue inxi command with `-i` (requires ifconfig network tool) which will show server public IP address.
+
+```
+$ inxi -i
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller driver: e1000
+           IF: enp0s3 state: up speed: 1000 Mbps duplex: full mac: 08:00:27:ae:1d:fe
+           WAN IP: 103.5.134.167 IF: enp0s3 ip-v4: 10.0.2.15
+```
+
+#### Show machine data information
+
+Issue inxi command with `-M` which will show machine data information, including Device, Motherboard, Bios, and if percentage, System Builder (Like Lenovo).
+
+```
+$ inxi -M
+Machine:   System: innotek (portable) product: VirtualBox v: 1.2
+           Mobo: Oracle model: VirtualBox v: 1.2 BIOS: innotek v: VirtualBox date: 12/01/2006
+Battery    BAT0: charge: 32.5 Wh 65.0% condition: 50.0/50.0 Wh (100%)
+```
+
+#### Show Show Network card information
+
+Issue inxi command with `-N` which will show Show Network card information.
+
+```
+$ inxi -N
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller driver: e1000
+```
+
+Issue inxi command with `-n` which will show Show Advanced Network card information, including interface, speed, mac id, state, etc.
+
+```
+$ inxi -n
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller driver: e1000
+           IF: enp0s3 state: up speed: 1000 Mbps duplex: full mac: 08:00:27:ae:1d:fe
+```
+
+#### Show distro repository data information
+
+Issue inxi command with `-r` which will show distro repository data information.
+
+```
+$ inxi -r
+Repos:     Active apt sources in file: /etc/apt/sources.list
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety main restricted
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety-updates main restricted
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety universe
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety-updates universe
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety multiverse
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety-updates multiverse
+           deb http://in.archive.ubuntu.com/ubuntu/ yakkety-backports main restricted universe multiverse
+           deb http://security.ubuntu.com/ubuntu yakkety-security main restricted
+           deb http://security.ubuntu.com/ubuntu yakkety-security universe
+           deb http://security.ubuntu.com/ubuntu yakkety-security multiverse
+           Active apt sources in file: /etc/apt/sources.list.d/arc-theme.list
+           deb http://download.opensuse.org/repositories/home:/Horst3180/xUbuntu_16.04/ /
+           Active apt sources in file: /etc/apt/sources.list.d/snwh-ubuntu-pulp-yakkety.list
+           deb http://ppa.launchpad.net/snwh/pulp/ubuntu yakkety main
+```
+
+#### Show possible system hardware information
+
+Issue inxi command with `-F` which will show possible system hardware information.
+
+```
+$ inxi -F
+System:    Host: daygeek Kernel: 4.8.0-32-generic x86_64 (64 bit) Desktop: Unity 7.5.0  Distro: Ubuntu 16.10
+Machine:   System: innotek (portable) product: VirtualBox v: 1.2
+           Mobo: Oracle model: VirtualBox v: 1.2 BIOS: innotek v: VirtualBox date: 12/01/2006
+Battery    BAT0: charge: 33.0 Wh 66.0% condition: 50.0/50.0 Wh (100%)
+CPU:       Dual core Intel Core i7-6700HQ (-MCP-) cache: 6144 KB 
+           clock speeds: max: 2591 MHz 1: 2591 MHz 2: 2591 MHz
+Graphics:  Card: InnoTek Systemberatung VirtualBox Graphics Adapter
+           Display Server: X.Org 1.18.4 drivers: (unloaded: fbdev,vesa) Resolution: 1920x955@59.89hz
+           GLX Renderer: Gallium 0.4 on llvmpipe (LLVM 3.8, 256 bits) GLX Version: 3.0 Mesa 12.0.3
+Audio:     Card Intel 82801AA AC'97 Audio Controller driver: snd_intel8x0 Sound: ALSA v: k4.8.0-32-generic
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller driver: e1000
+           IF: enp0s3 state: up speed: 1000 Mbps duplex: full mac: 08:00:27:ae:1d:fe
+Drives:    HDD Total Size: 42.9GB (17.6% used) ID-1: /dev/sda model: VBOX_HARDDISK size: 42.9GB
+Partition: ID-1: / size: 38G used: 5.2G (15%) fs: ext4 dev: /dev/sda1
+           ID-2: swap-1 size: 2.15GB used: 0.20GB (9%) fs: swap dev: /dev/sda5
+RAID:      No RAID devices: /proc/mdstat, md_mod kernel module present
+Sensors:   None detected - is lm-sensors installed and configured?
+Info:      Processes: 198 Uptime: 53 min Memory: 1587.5/1999.8MB Client: Shell (bash) inxi: 2.3.1
+```
+
+#### Get extra information about the device
+
+Add `-x` with any above individual output which will show extra information about the device.
+
+```
+$ inxi -F -x
+System:    Host: daygeek Kernel: 4.8.0-32-generic x86_64 (64 bit gcc: 6.2.0)
+           Desktop: Unity 7.5.0 (Gtk 3.20.9-1ubuntu2) Distro: Ubuntu 16.10
+Machine:   System: innotek (portable) product: VirtualBox v: 1.2
+           Mobo: Oracle model: VirtualBox v: 1.2 BIOS: innotek v: VirtualBox date: 12/01/2006
+Battery    BAT0: charge: 33.0 Wh 66.0% condition: 50.0/50.0 Wh (100%) model: innotek 1 status: Charging
+CPU:       Dual core Intel Core i7-6700HQ (-MCP-) cache: 6144 KB
+           flags: (lm nx sse sse2 sse3 sse4_1 sse4_2 ssse3) bmips: 10368
+           clock speeds: max: 2591 MHz 1: 2591 MHz 2: 2591 MHz
+Graphics:  Card: InnoTek Systemberatung VirtualBox Graphics Adapter bus-ID: 00:02.0
+           Display Server: X.Org 1.18.4 drivers: (unloaded: fbdev,vesa) Resolution: 1920x955@59.89hz
+           GLX Renderer: Gallium 0.4 on llvmpipe (LLVM 3.8, 256 bits)
+           GLX Version: 3.0 Mesa 12.0.3 Direct Rendering: Yes
+Audio:     Card Intel 82801AA AC'97 Audio Controller driver: snd_intel8x0 ports: d100 d200 bus-ID: 00:05.0
+           Sound: Advanced Linux Sound Architecture v: k4.8.0-32-generic
+Network:   Card: Intel 82540EM Gigabit Ethernet Controller
+           driver: e1000 v: 7.3.21-k8-NAPI port: d010 bus-ID: 00:03.0
+           IF: enp0s3 state: up speed: 1000 Mbps duplex: full mac: 08:00:27:ae:1d:fe
+Drives:    HDD Total Size: 42.9GB (17.6% used) ID-1: /dev/sda model: VBOX_HARDDISK size: 42.9GB
+Partition: ID-1: / size: 38G used: 5.2G (15%) fs: ext4 dev: /dev/sda1
+           ID-2: swap-1 size: 2.15GB used: 0.20GB (9%) fs: swap dev: /dev/sda5
+RAID:      No RAID devices: /proc/mdstat, md_mod kernel module present
+Sensors:   None detected - is lm-sensors installed and configured?
+Info:      Processes: 198 Uptime: 54 min Memory: 1592.5/1999.8MB Init: systemd runlevel: 5 Gcc sys: 6.2.0
+           Client: Shell (bash 4.3.461) inxi: 2.3.1
+```
+
+--------------------------------------------------------------------------------
+
+via: http://www.2daygeek.com/inxi-system-hardware-information-on-linux/2/
+
+作者：[ MAGESH MARUTHAMUTHU ][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.2daygeek.com/author/magesh/
+[1]:http://smxi.org/docs/inxi.htm
diff --git a/sources/tech/20170107 10 Useful Sudoers Configurations for Setting sudo in Linux.md b/sources/tech/20170107 10 Useful Sudoers Configurations for Setting sudo in Linux.md
new file mode 100644
index 0000000000..17b87a5fa2
--- /dev/null
+++ b/sources/tech/20170107 10 Useful Sudoers Configurations for Setting sudo in Linux.md	
@@ -0,0 +1,251 @@
+GHLandy Translating 
+
+
+10 Useful Sudoers Configurations for Setting ‘sudo’ in Linux
+============================================================
+
+In Linux and other Unix-like operating systems, only the root user can run all commands and perform certain critical operations on the system such as install and update, remove packages, [create users and groups][1], modify important system configuration files and so on.
+
+However, a system administrator who assumes the role of the root user can permit other normal system users with the help of [sudo command][2] and a few configurations to run some commands as well as carry out a number of vital system operations including the ones mentioned above.
+
+Alternatively, the system administrator can share the root user password (which is not a recommended method) so that normal system users have access to the root user account via su command.
+
+sudo allows a permitted user to execute a command as root (or another user), as specified by the security policy:
+
+1.  It reads and parses /etc/sudoers, looks up the invoking user and its permissions,
+2.  then prompts the invoking user for a password (normally the user’s password, but it can as well be the target user’s password. Or it can be skipped with NOPASSWD tag),
+3.  after that, sudo creates a child process in which it calls setuid() to switch to the target user
+4.  next, it executes a shell or the command given as arguments in the child process above.
+
+Below are ten /etc/sudoers file configurations to modify the behavior of sudo command using Defaults entries.
+
+```
+$ sudo cat /etc/sudoers
+```
+/etc/sudoers File
+```
+#
+# This file MUST be edited with the 'visudo' command as root.
+#
+# Please consider adding local content in /etc/sudoers.d/ instead of
+# directly modifying this file.
+#
+# See the man page for details on how to write a sudoers file.
+#
+Defaults	env_reset
+Defaults	mail_badpass
+Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+Defaults	logfile="/var/log/sudo.log"
+Defaults	lecture="always"
+Defaults	badpass_message="Password is wrong, please try again"
+Defaults	passwd_tries=5
+Defaults	insults
+Defaults	log_input,log_output
+```
+
+#### Types of Defaults Entries
+
+```
+Defaults                parameter,   parameter_list     #affect all users on any host
+Defaults@Host_List      parameter,   parameter_list     #affects all users on a specific host
+Defaults:User_List      parameter,   parameter_list     #affects a specific user
+Defaults!Cmnd_List      parameter,   parameter_list     #affects  a specific command 
+Defaults>Runas_List     parameter,   parameter_list     #affects commands being run as a specific user
+```
+
+For the scope of this guide, we will zero down to the first type of Defaults in the forms below. Parameters may be flags, integer values, strings, or lists.
+
+You should note that flags are implicitly boolean and can be turned off using the `'!'` operator, and lists have two additional assignment operators, `+=` (add to list) and `-=` (remove from list).
+
+```
+Defaults     parameter
+OR
+Defaults     parameter=value
+OR
+Defaults     parameter -=value   
+Defaults     parameter +=value  
+OR
+Defaults     !parameter       
+```
+
+### 1\. Set a Secure PATH
+
+This is the path used for every command run with sudo, it has two importances:
+
+1.  Used when a system administrator does not trust sudo users to have a secure PATH environment variable
+2.  To separate “root path” and “user path”, only users defined by exempt_group are not affected by this setting.
+
+To set it, add the line:
+
+```
+Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
+```
+
+### 2\. Enable sudo on TTY User Login Session
+
+To enable sudo to be invoked from a real tty but not through methods such as cron or cgi-bin scripts, add the line:
+
+```
+Defaults  requiretty   
+```
+
+### 3\. Run Sudo Command Using a pty
+
+A few times, attackers can run a malicious program (such as a virus or malware) using sudo, which would again fork a background process that remains on the user’s terminal device even when the main program has finished executing.
+
+To avoid such a scenario, you can configure sudo to run other commands only from a psuedo-pty using the `use_pty` parameter, whether I/O logging is turned on or not as follows:
+
+```
+Defaults  use_pty
+```
+
+### 4\. Create a Sudo Log File
+
+By default, sudo logs through syslog(3). However, to specify a custom log file, use the logfile parameter like so:
+
+```
+Defaults  logfile="/var/log/sudo.log"
+```
+
+To log hostname and the four-digit year in the custom log file, use log_host and log_year parameters respectively as follows:
+
+```
+Defaults  log_host, log_year, logfile="/var/log/sudo.log"
+```
+
+Below is an example of a custom sudo log file:
+
+[
+ ![Create Custom Sudo Log File](http://www.tecmint.com/wp-content/uploads/2017/01/Create-Sudo-Log-File.png) 
+][3]
+
+Create Custom Sudo Log File
+
+### 5\. Log Sudo Command Input/Output
+
+The log_input and log_output parameters enable sudo to run a command in pseudo-tty and log all user input and all output sent to the screen receptively.
+
+The default I/O log directory is /var/log/sudo-io, and if there is a session sequence number, it is stored in this directory. You can specify a custom directory through the iolog_dir parameter.
+
+```
+Defaults   log_input, log_output
+```
+
+There are some escape sequences are supported such as `%{seq}` which expands to a monotonically increasing base-36 sequence number, such as 000001, where every two digits are used to form a new directory, e.g. 00/00/01 as in the example below:
+
+```
+$ cd /var/log/sudo-io/
+$ ls
+$ cd  00/00/01
+$ ls
+$ cat log
+```
+[
+ ![Log sudo Input Output](http://www.tecmint.com/wp-content/uploads/2017/01/Log-sudo-Input-Output.png) 
+][4]
+
+Log sudo Input Output
+
+You can view the rest of the files in that directory using the [cat command][5].
+
+### 6\. Lecture Sudo Users
+
+To lecture sudo users about password usage on the system, use the lecture parameter as below.
+
+It has 3 possible values:
+
+1.  always – always lecture a user.
+2.  once – only lecture a user the first time they execute sudo command (this is used when no value is specified)
+3.  never – never lecture the user.
+
+```
+
+Defaults  lecture="always"
+```
+
+Additionally, you can set a custom lecture file with the lecture_file parameter, type the appropriate message in the file:
+
+```
+Defaults  lecture_file="/path/to/file"
+```
+[
+ ![Lecture Sudo Users](http://www.tecmint.com/wp-content/uploads/2017/01/Lecture-Sudo-Users.png) 
+][6]
+
+Lecture Sudo Users
+
+### 7\. Show Custom Message When You Enter Wrong sudo Password
+
+When a user enters a wrong password, a certain message is displayed on the command line. The default message is “sorry, try again”, you can modify the message using the badpass_message parameter as follows:
+
+```
+Defaults  badpass_message="Password is wrong, please try again"
+```
+
+### 8\. Increase sudo Password Tries Limit
+
+The parameter passwd_tries is used to specify the number of times a user can try to enter a password.
+
+The default value is 3:
+
+```
+Defaults   passwd_tries=5 
+```
+[
+ ![Increase Sudo Password Attempts](http://www.tecmint.com/wp-content/uploads/2017/01/Increase-Sudo-Password-Attempts.png) 
+][7]
+
+Increase Sudo Password Attempts
+
+To set a password timeout (default is 5 minutes) using passwd_timeout parameter, add the line below:
+
+```
+Defaults   passwd_timeout=2
+```
+
+### 9\. Let Sudo Insult You When You Enter Wrong Password
+
+In case a user types a wrong password, sudo will display insults on the terminal with the insults parameter. This will automatically turn off the badpass_message parameter.
+
+```
+Defaults  insults 
+```
+[
+ ![Let's Sudo Insult You When Enter Wrong Password](http://www.tecmint.com/wp-content/uploads/2017/01/Sudo-Insult-Message.png) 
+][8]
+
+Let’s Sudo Insult You When Enter Wrong Password
+
+### 10\. Learn More Sudo Configurations
+
+Additionally, you can learn more sudo command configurations by reading: [Difference Between su and sudo and How to Configure sudo in Linux][9].
+
+That’s it! You can share other useful sudo command configurations or [tricks and tips with Linux][10] users out there via the comment section below.
+
+--------------------------------------------------------------------------------
+
+作者简介：Aaron Kili is a Linux and F.O.S.S enthusiast, an upcoming Linux SysAdmin, web developer, and currently a content creator for TecMint who loves working with computers and strongly believes in sharing knowledge.
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/sudoers-configurations-for-setting-sudo-in-linux/
+
+作者：[Aaron Kili][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/add-users-in-linux/
+[2]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[3]:http://www.tecmint.com/wp-content/uploads/2017/01/Create-Sudo-Log-File.png
+[4]:http://www.tecmint.com/wp-content/uploads/2017/01/Log-sudo-Input-Output.png
+[5]:http://www.tecmint.com/13-basic-cat-command-examples-in-linux/
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/Lecture-Sudo-Users.png
+[7]:http://www.tecmint.com/wp-content/uploads/2017/01/Increase-Sudo-Password-Attempts.png
+[8]:http://www.tecmint.com/wp-content/uploads/2017/01/Sudo-Insult-Message.png
+[9]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[10]:http://www.tecmint.com/tag/linux-tricks/
diff --git a/sources/tech/20170107 Block Ads on All Your Devices at Home with Pi-hole and an Orange Pi.md b/sources/tech/20170107 Block Ads on All Your Devices at Home with Pi-hole and an Orange Pi.md
new file mode 100644
index 0000000000..c7af491c13
--- /dev/null
+++ b/sources/tech/20170107 Block Ads on All Your Devices at Home with Pi-hole and an Orange Pi.md	
@@ -0,0 +1,79 @@
+Block Ads on All Your Devices at Home with Pi-hole and an Orange Pi
+============================================================
+
+
+Do you find it irritating having to set up an ad blocker on your computer web browsers, smart phones, and tablets? I sure do.  And then there are some ‘smart’ devices at home that don’t appear to have ad blocking software of any kind.  Well, I learned about [Pi-hole][2] which is ad blocking software for your pi board and it blocks all the advertisements on your home network before they get to your various devices.  It gives you the ability to black list or white list any domain, plus it has a great dashboard that gives you insights into your home network’s most accessed domains/web sites, most active devices, and most frequent advertisers.
+
+Pi-hole was really targeted to run on the Raspberry Pi but I wanted to know if it would work on my inexpensive Orange Pi running Armbian Linux. Well, it absolutely does! Below is my process for getting Pi-hole up and running quickly.
+
+### Installing Pi-hole
+
+Installing Pi-hole is done using the terminal, so open a terminal on your Orange Pi’s desktop or ssh into the pi board.
+
+You will be downloading the software, so navigate to a directory of your choosing, making sure that you have write privileges. Like this:
+
+```
+cd <your preferred directory>/
+```
+
+I deviated from the “one command” installation on the Pi-hole home page. I mean, they do say right underneath that command that “piping to bash can be dangerous” and that a local install is “safer.” So, here’s my local installation steps:
+
+```
+git clone --depth 1 https://github.com/pi-hole/pi-hole.git Pi-hole
+cd Pi-hole/automated\ install/
+./basic-install.sh
+```
+
+If you are not logged in as the root user, then the basic-install script will prompt you to enter your password before continuing. If needed, the script will download and install some prerequisite Linux packages. Then it’ll provide you with a simple blue/red graphical interface, prompting you to answer a few questions about how you want Pi-hole configured. In my experience, simply accepting the defaults was fine and I later discovered that the Pi-hole web application enables you to change settings like DNS provider.
+
+The script will tell you what the password is for Pi-hole both in the graphical interface and in the terminal. Do take note of that password!
+
+The script will also tell you the web address for Pi-hole, which should be like this:
+
+```
+http://<your pi’s IP address>/admin
+```
+
+or even something like:
+
+```
+http://orangepipc/admin
+```
+
+You will need enter your Pi-hole password, and then you should get a nice dashboard that looks something like this:
+
+ ![Ph-hole](https://i1.wp.com/piboards.com/wp-content/uploads/2017/01/ph-hole.png?resize=640%2C532) 
+
+Remember to change the DNS setting on your home network router so it that uses the address of your pi board. Otherwise, the ads won’t be filtered!
+
+The instructions above are more or less the same as the alternative “safe” method as provided by the Pi-hole web site despite the fact that Armbian is not listed as an officially supported operating system. I believe that these instructions should work on a Raspberry Pi or other pi board running some form of Debian based Linux operating system. However, I haven’t tested that and I would be interested to hear your experience (just drop me a brief comment, please).
+
+
+### Thoughts and Observations
+
+After running Pi-hole for a while an studying the information in the Pi-hole dashboard, I found that there was a lot more network activity going on than I was aware of, not all of which did I approve of. For example, there were some ‘interesting’ connections going out from my kid’s devices related to game apps that I wonder about, plus social networking apps were apparently sending some data continuously which bothered me. Altogether, whether it was benign traffic or not, I was glad to reduce the traffic load even if by a little…I mean, why should I be content to allow apps and ads to eat up my network traffic for things I don’t want or care about? Well, now they are blocked. Period.
+
+Setting up an Orange Pi for ad blocking like this is cheap, easy, and helps to put my mind at ease about limiting some unwanted traffic to/from my home network (especially where the kids are involved). If you are interested, you can see my previous post about how to [easily setting up an Orange Pi][3] and check out how cheap the Orange Pis are at the links below.  I believe that it is a worthwhile investment.
+
+ Orange Pi on Amazon (affiliate link):  [Orange Pi PC Single Board Computer Quad Core ARM Cortex-A7 1GB DDR3 4K Decode][4]
+
+ [Orange Pi store on AliExpress][5] (affiliate link).
+
+EDIT:  The irony of this post is that if you successfully set up Pi-hole, then affiliate links on this site (s.click.aliexpress.com) gets blocked.  White list that if you like, you are in control.
+
+--------------------------------------------------------------------------------
+
+via: http://piboards.com/2017/01/07/block-ads-on-all-your-devices-at-home-with-pi-hole-and-an-orange-pi/
+
+作者：[MIKE WILMOTH][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://piboards.com/author/piguy/
+[1]:http://s.click.aliexpress.com/deep_link.htm?aff_short_key=N3VJQBY&dl_target_url=http://best.aliexpress.com
+[2]:https://pi-hole.net/
+[3]:http://piboards.com/2017/01/04/easy-set-up-orange-pi/
+[4]:https://www.amazon.com/gp/product/B018W6OTIM/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=B018W6OTIM&linkCode=as2&tag=piboards-20&linkId=ac292a536d58eabf1ee73e2c575e1111
+[5]:http://s.click.aliexpress.com/e/bAMVj2R
diff --git a/sources/tech/20170107 Min Browser Muffles the Web Noise.md b/sources/tech/20170107 Min Browser Muffles the Web Noise.md
new file mode 100644
index 0000000000..814c19d0ae
--- /dev/null
+++ b/sources/tech/20170107 Min Browser Muffles the Web Noise.md	
@@ -0,0 +1,122 @@
+Min Browser Muffles the Web's Noise
+============================================================
+ ![Min Browser Muffles the Web's Noise](http://www.linuxinsider.com/ai/637666/browser-tabs.jpg) 
+
+[Min][1] is a Web browser with a minimal design that provides speedy operation with simple features.
+
+When it comes to software design, "minimal" does not mean low functionality or undeveloped potential. If you like minimal distraction tools for your text editor and note-taking applications, that same comfort appeal is evident in the Min browser.
+
+I mostly use Google Chrome, Chromium and Firefox on my desktops and laptop computers. I am well invested in their add-on functionality, so I can access all the specialty services that get me through my long sessions in researching and working online.
+
+However, I sometimes prefer a fast, uncluttered alternative on-ramp to the Internet. With multiple projects in progress, I can amass a wide collection of open tabs or even separate windows of the powerhouse browsers in no time.
+
+I have tried other browser options with little success. The alternatives usually have their own sets of distracting add-ons and features that tend to pull me into more off-task behavior.
+
+The Min browser does not do that. It is a GitHub-sourced Web browser that is easy to use, and it keeps the typical interruptions from distracting me.
+
+ ![Min browser ](http://www.linuxinsider.com/article_images/2017/84212_620x514.jpg) 
+The Min browser is minimal-design Web browser that provides speedy operation with simple features. Just don't expect to take its tour any time soon.
+
+### What It Does
+
+The Min browser comes in versions for Debian Linux variants, Windows and Mac machines. It can not compete with the functionality available in the mainstream cross-platform Web browsers.
+
+It does not have to compete, though. Its claim to fame very well might be supplementing rather than replacing them.
+
+One big reason for this is its built-in ad blocking capability. Out of the box, the Min browser needs no configuration or hunting for compatible third-party apps to do end-runs around ads.
+
+In Edit/Preferences, you have three options to click/unclick for content blocking. It's easy to modify blocking tactics to suit your preferences. The Block Trackers and Ads option uses EasyList and EasyPrivacy. If nothing else, keep this option checked.
+
+You also can block scripts and block images. Doing both maximizes the website loading speeds and really ramps up your protection against rogue code attacks.
+
+### Have Search Your Way
+
+If you spend considerable time doing online research, you will adore the way Min handles searching. It is a top-notch feature.
+
+Search functionality is accessible right in the browser's URL bar. Min utilizes search engine DuckDuckGo and Wikipedia entries. You can enter search queries directly into the Web address field.
+
+This approach saves time since you do not have to go to the search engine window first. A nice bonus is the ability to search your bookmarks.
+
+In the Edit/Preferences menu, choose your choice for default search engine. The list includes DuckDuckGo, Google, Bing, Yahoo, Baidu, Wikipedia and Yandex.
+
+Try making DuckDuckGo your default search engine. Min is built around that option but does not impose it on you.
+
+ ![Min browser search function ](http://www.linuxinsider.com/article_images/2017/84212_620x466.jpg) 
+Min browser's search functionality is part of the URL bar. Min utilizes search engine DuckDuckGo and Wikipedia entries. You can enter search queries directly into the Web address window.
+
+The search bar displays answers to your questions very rapidly. It uses information from DuckDuckGo including Wikipedia entries, a calculator and more.
+
+It offers quick snippets, answers and Web suggestions. It sort of substitutes for not being in a Google-based environment.
+
+### Navigating Aids
+
+Min lets you jump to any site quickly with fuzzy search. It throws suggestions at you almost immediately.
+
+I like the way the tabs open next to the current tab. You do not have to set this preference. It is there by default with no other choice, but it makes sense.
+
+[
+ ![Min browser Tasks](http://www.linuxinsider.com/article_images/2017/84212_620x388-small.jpg) 
+][2]One of Min's really cool operations is the ability to organize tabs into Tasks that you can search anytime. (click image to enlarge)
+
+Tabs you have not clicked on for a while dim. This lets you concentrate on your current task without distractions.
+
+Min does not need an add-on tool to keep numerous tabs under control. The browser displays a list of tags and lets you split them into groups.
+
+### Stay Focused
+
+Min has an optional Focus Mode hidden in the View menu. When enabled, it hides all tabs except the one you have opened. You must return to the menu to turn off Focus Mode before you can open new tabs.
+
+The Tasks feature also helps you stay focused. You can create tasks from the File menu or with Control+Shift+N. If you want to open a new tab, you can select that option in the Files menu or use Control+T.
+
+Call the new task whatever fits your style. I like being able to organize and display as a group all the tabs associated with a work project or a specific portion of my research. I can recall the entire list at any time to easily and quickly find where I was in my browsing adventure.
+
+Another neat feature is found under the paragraph alignment icon in the tab area. Click it to enable Reading Mode. This mode saves the article for future reference and strips away everything on the page so you can focus on the task of reading.
+
+### Not Perfect
+
+The Min browser is not a perfect alternative to high-powered, feature-bloated alternatives. It does have a few glaring weaknesses that developers have taken too long to rectify.
+
+For instance, It lacks a solid developer website stocked with support forums and detailed user guides. That may be partly due to its home being GitHub rather than an independent developer website. Still, it's a weakness that is glaring to new users.
+
+Without website support, users are forced to struggle with lists of readme files and hard-to-follow directories on GitHub. You can access them from the Min browser Help menu -- but that's not much help.
+
+A case in point is the Welcome to Min splash screen that loads from the menu when you launch the browser. It displays two buttons. One says "Start Browsing." The other says "Take a Tour." Neither one works.
+
+However, you can start browsing by clicking on the menu bar at the top of the Min window. There is no workaround for the missing tour, though.
+
+### Bottom Line
+
+Min is not a full-featured Web browser with bells and whistles galore. It is not designed for add-ons and many other features you typically use in well-established Web browsers. However, Min serves an important niche purpose by offering speed and distraction-free browsing.
+
+The more I use the Min browser, the more productive it is for me -- but be wary when you first start to use it.
+
+Min is not complicated or confusing -- it is just quirky. You have to play around with it to discover how it works.
+
+### Want to Suggest a Review?
+
+Is there a Linux software application or distro you'd like to suggest for review? Something you love or would like to get to know?
+
+Please [email your ideas to me][3], and I'll consider them for a future Linux Picks and Pans column.
+
+And use the Reader Comments feature below to provide your input!
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+Jack M. Germain has been writing about computer technology since the early days of the Apple II and the PC. He still has his original IBM PC-Jr and a few other legacy DOS and Windows boxes. He left shareware programs behind for the open source world of the Linux desktop. He runs several versions of Windows and Linux OSes and often cannot decide whether to grab his tablet, netbook or Android smartphone instead of using his desktop or laptop gear. You can connect with him on Google+.
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxinsider.com/story/84212.html?rss=1
+
+作者：[Jack M. Germain][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.linuxinsider.com/story/84212.html?rss=1#searchbyline
+[1]:https://github.com/minbrowser/min/releases/
+[2]:http://www.linuxinsider.com/article_images/2017/84212_1200x750.jpg
+[3]:mailto:jack.germain@newsroom.ectnews.com
diff --git a/sources/tech/20170109 How to record a region of your desktop as animated GIF on Linux.md b/sources/tech/20170109 How to record a region of your desktop as animated GIF on Linux.md
new file mode 100644
index 0000000000..2ca614447b
--- /dev/null
+++ b/sources/tech/20170109 How to record a region of your desktop as animated GIF on Linux.md	
@@ -0,0 +1,150 @@
+How to record a region of your desktop as animated GIF on Linux
+============================================================
+
+### On this page
+
+1.  [Gifine][1]
+2.  [Gifine Download/Installation/Setup][2]
+3.  [Gifine Usage][3]
+4.  [Conclusion][4]
+
+It won't be a stretch to say - and you'll likely agree - that animated gifs have become a rage in the past few years. While one of the most popular uses of animated gifs is to add humor to the text-based conversation that people usually have online, there are many other areas where these animations prove to be really useful.
+
+Those in technical spheres usually use animated gifs to quickly describe how a problem or an error gets triggered. It's also a useful way of explaining how a particular feature in a software application works. You can easily use gifs in online forums, your company presentations, and more. 
+
+Now, suppose you have various applications opened on your Linux desktop, and for whatever purpose, you want to create an animated gif out of your activity with a particular application that's occupying only a small area of your desktop. What would you do? Obviously, look for a tool that lets you do the same.
+
+If you've been looking for one such tool that lets you record a particular region of you desktop and then automatically convert the recording into an animated gif, then look no further, as in this tutorial, we will discuss a Linux command line utility that lets you do just that.
+
+Before we proceed, keep in mind that all the examples in this tutorial have been tested on Ubuntu 14.04 with Bash version 4.3.11(1).
+
+### Gifine
+
+The tool in question is [Gifine][5]. It is is basically a GTK application implemented in MoonScript using lgi. Gifine not only lets you record your desktop screen and create animated gifs or video, but also lets you stitch together short gifs or videos.
+
+According to the application's developer: "You can either load a directory of frames, or select a region of your desktop to record. After loading some frames, you can scroll through them and trim out what isn't necessary. When you've finalized the video you can export to gif or mp4.".
+
+### Gifine Download/Installation/Setup
+
+Before we go ahead and tell you the steps to download and install Gifine, it's worth mentioning that the tool has several dependencies that you need to install before installing the tool itself.
+
+The first dependency that you need to install is FFmpeg, which is basically a cross-platform solution to record, convert and stream audio and video. Following is the command that should install the tool:
+
+```
+sudo apt-get install ffmpeg
+```
+
+Next up is GraphicsMagick, which is basically an image processing system. "It provides a robust and efficient collection of tools and libraries which support reading, writing, and manipulating an image in over 88 major formats including important formats like DPX, GIF, JPEG, JPEG-2000, PNG, PDF, PNM, and TIFF," the tool's official website says.
+
+Following is the command to download and install it:
+
+```
+sudo apt-get install graphicsmagick
+```
+
+Next up is a tool dubbed XrectSel. It's basically an application that tells you the geometry of a rectangular screen region which you have selected by dragging the mouse/pointer. The only way to install XrectSel is from source, which you can download by heading [here][6].
+
+Once you've downloaded theXrectSel source code on your system, the next step is extract the downloaded archive and enter the top-level directory on a command line terminal. Once there, run the following commands:
+
+```
+./bootstrap
+```
+
+The above command is required if ./configure is not present
+
+```
+./configure --prefix /usr
+
+make
+
+make DESTDIR="$directory" install
+```
+
+Moving on, the last dependency is Gifsicle. It's a command-line tool for creating, editing, and getting information about GIF images and animations. Downloading and installing Gifsicle is quite easy - all you need to do is to run the following command:
+
+```
+sudo apt-get install gifsicle
+```
+
+So that was all about the dependencies. Now, let us come to the installation of Gifine. The following two commands will do the needful:
+
+```
+sudo apt-get install luarocks
+
+sudo luarocks install --server=http://luarocks.org/dev gifine
+```
+
+Please note that the second command above may give you the following error:
+
+```
+No package 'gobject-introspection-1.0' found
+```
+
+In that case, you need to install the package using the following command:
+
+```
+sudo apt-get install libgirepository1.0-dev
+```
+
+And then run the 'luarocks install' command again.
+
+### Gifine Usage
+
+Once you're done with the installation part, you can launch the tool using the following command:
+
+```
+gifine
+```
+
+The application's UI looks like this:
+
+[
+ ![Gifine UI](https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/gifine-ui.png) 
+][7]
+
+So you have a couple of options here: record frames and load frames. If you click the Record rectangle button, then your mouse pointer gets converted into a +, allowing you to select a rectangular area on your screen. As soon as you are done selecting an area, the recording begins, and the 'Record rectangle' button is replaced by a 'Stop recording' button.
+
+[
+ ![Gifine screen recording](https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/gifine-stop-rec.png) 
+][8]
+
+As soon as you are done with the recording, click the 'Stop recording' button and you'll see that the Gifine window shows several buttons.
+
+[
+ ![Gifine preview](https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/gifine-post-rec.png) 
+][9]
+
+The upper part of the UI contains the recording, which you can see frame by frame using the slider below it. Suppose you want to delete all the frames before frame 5 or after frame 50, then this can be done using the Trim left of and Trim right of buttons. Then there are also buttons to delete a particular frame, half the number of frames, as well as reset any frame cuts that you've made.
+
+Once you are done with all the editing part, use the Save GIF... or Save MP4... buttons to save the recording as an animated gif or a video. There are options to set frame delay, frame rate, and number of loops as well.
+
+Please keep in mind that "the recorded frames recorded aren't automatically cleaned up. You can find them in your `/tmp` dir if you want to reload a session. Use the load directory button on the initial screen.".
+
+### Conclusion
+
+There's not much of a learning curve associated with Gifine - all the features are available in the form of buttons, and the text on them makes their functionality self explanatory.
+
+The only issue for me was the installation part - installing so many dependencies one by one and then dealing with errors that may pop up could be a big no no for many. But otherwise, on the whole, Gifine is a nice tool that does what it promises, and if that's what you were looking for, do give it a try. 
+
+Already a Gifine user? How has your experience been so far? Let us known in comments below.
+
+--------------------------------------------------------------------------------
+
+via: https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/
+
+作者：[Ansh][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/
+[1]:https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/#gifine
+[2]:https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/#gifine-downloadinstallationsetup
+[3]:https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/#gifine-usage
+[4]:https://www.howtoforge.com/tutorial/record-screen-to-animated-gif-on-linux/#conclusion
+[5]:https://github.com/leafo/gifine
+[6]:https://github.com/lolilolicon/xrectsel
+[7]:https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/big/gifine-ui.png
+[8]:https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/big/gifine-stop-rec.png
+[9]:https://www.howtoforge.com/images/record-screen-to-animated-gif-on-linux/big/gifine-post-rec.png
diff --git a/sources/tech/20170109 Open technology for land rights documentation.md b/sources/tech/20170109 Open technology for land rights documentation.md
new file mode 100644
index 0000000000..d9f568cad5
--- /dev/null
+++ b/sources/tech/20170109 Open technology for land rights documentation.md	
@@ -0,0 +1,77 @@
+Open technology for land rights documentation
+============================================================
+
+### One-third of people on the planet don't have documented rights to the land on which they rely.
+
+[up][3]
+ ![Open technology for land rights documentation](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/life_tree_clouds.png?itok=dSV0oTDS "Open technology for land rights documentation") 
+Image by : 
+
+[Pixabay][4]. Modified by Opensource.com. [CC BY-SA 4.0][5]
+
+The [Cadasta Foundation][6] creates tech to allow communities to document their land rights. By helping groups document the evidence of their individual and community rights to the land on which they depend, they can eventually obtain legal recognition of their land rights, and in the meantime, enjoy greater security.
+
+We are motivated by the fact that most of the world does not have documented legal rights to the land on which they live. Technology is only a small part of this larger social issue, but our hope is that tech tools can be part of the solution even in the most remote and low-tech environments.
+
+### The magnitude of property rights
+
+Many of us who come from the global north probably take our rights to our land, property, and home for granted. We have titles, deeds, and rental agreements that document and solidly protect our rights.
+
+But one-third of the people on the planet, from urban shanty towns to forest-dwelling indigenous communities, do not have documented rights to the land on which they rely. In fact, an estimated 70% of the property in emerging economies is undocumented. An estimated 25% of the world’s urban population live in homes to which they have no legal right.  A majority of smallholder farmers around the world farm without the protection of having legal rights to their land documented by government records.
+
+This is simply because government land and property records in many areas of the world either were never created or are out of date. For example, most rural land records in the state of Telangana, India haven't been updated since the 1940s. In other areas, such as parts of sub-Saharan Africa, there were never any records of land ownership to begin with—people simply farm the land their parents farmed, generation after generation.
+
+Consider for a moment working land to which you have no secure rights. Would you invest your savings or labor in improving the land, including applying good quality seeds and fertilizer, with the knowledge that you could be displaced any day by a more powerful neighbor or investor? Imagine living in a home that could be bulldozed or usurped by an official any day. Or how could you sell your house, or use it for collateral for a loan, if you don’t have any proof that you own it?
+
+For a majority of the world's population, these are not rhetorical questions. These are daily realities.
+
+### How open source matters for land
+
+Technology is only one part of the solution, but at Cadasta we believe it is a key component. While many governments had modern technology systems put in place to manage land records, often these were expensive to maintain, required highly trained staff, were not transparent, and were otherwise too complicated. Many of these systems, created at great expense by donor governments, are already outdated and no longer accurately reflect existing land and property rights.
+
+By building open and user-friendly technology for land rights documentation we aim to overcome these problems and create land documentation systems that are flexible and accessible, allowing them to be treated as living documents that are updated continually.
+
+We routinely train people who have never even used a smartphone before to use our technology to document their land rights in a single afternoon. The resulting data, hosted on an open source platform, is easy to access, update, and analyze. This flexibility means that governments in developing countries, should they adopt our platform, don't need to hire specially trained staff to manage the upkeep of these records.
+
+We also believe that by contributing to and fostering open communities we can benefit more people, instead of attempting to develop all the technology ourselves. We do this by building a community around our tools as well as contributing to other existing software.
+
+Over the past two years we've contributed and been involved in [OpenStreetMap][7]through the [Missing Maps Projec][8]t, used [OpenDataKit][9] extensively for data collection, and currently are integrating [Field Papers][10] with our system. Field Papers is technology that allows users to print paper maps, annotate those maps with pen, and then take a picture of those annotations with their phone and upload them to be transcribed.
+
+We've also released a few Django libraries we hope will be useful to others in other Django applications. These include a policy-based permission system called [django-tutelary][11] and [django-jsonattrs][12], which provides JavaScript Object Notification (JSON)-based attribute management for PostgresSQL. If others use these pieces and contribute bug reports and patches, this can help make Cadasta's work stronger.
+
+This work is critically important. Land rights are the foundation of stability and prosperity. Communities and countries seeking economic growth and sustainable development must document land rights and ensure land rights are secure for women, men, and communities.
+
+_Learn more in Kate Chapman's talk at linux.conf.au 2017 ([#lca2017][1]) in Hobart: [Land Matters: Creating Open Technology for Land Rights][2]._
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/kate-crop.jpg?itok=JkHxWrIQ)
+
+Kate Chapman - Kate Chapman is Chief Technology Officer of the Cadasta Foundation, leading the organization’s technology team and strategy. Cadasta develops free and open source software to help communities document their land rights around the world. Chapman is recognized as a leader in the domains of open source geospatial technology and community mapping, and an advocate for open imagery as a public good.
+
+--------------------------------------------------------------------------------
+
+
+via: https://opensource.com/article/17/1/land-rights-documentation-Cadasta
+
+作者：[Kate Chapman][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/wonderchook
+[1]:https://twitter.com/search?q=%23lca2017&src=typd
+[2]:https://linux.conf.au/schedule/presentation/50/
+[3]:https://opensource.com/article/17/1/land-rights-documentation-Cadasta?rate=E8gJkvb1mbBXytsZiKA_ZtBCOvpi41nDSfz4R8tNnoc
+[4]:https://pixabay.com/en/tree-field-cornfield-nature-247122/
+[5]:https://creativecommons.org/licenses/by-sa/4.0/
+[6]:http://cadasta.org/
+[7]:http://www.openstreetmap.org/
+[8]:http://www.missingmaps.org/
+[9]:https://opendatakit.org/
+[10]:http://fieldpapers.org/
+[11]:https://github.com/Cadasta/django-tutelary
+[12]:https://github.com/Cadasta/django-jsonattrs
diff --git a/sources/tech/20170109 Troubleshooting tips for the 5 most common Linux issues.md b/sources/tech/20170109 Troubleshooting tips for the 5 most common Linux issues.md
new file mode 100644
index 0000000000..912b76583e
--- /dev/null
+++ b/sources/tech/20170109 Troubleshooting tips for the 5 most common Linux issues.md	
@@ -0,0 +1,72 @@
+  Vic020
+
+Troubleshooting tips for the 5 most common Linux issues
+============================================================
+
+### Learn how to tackle the most common challenges Linux desktop users encounter.
+
+ ![Troubleshooting tips for the 5 most common Linux issues](https://opensource.com/sites/default/files/styles/image-full-size/public/images/law/rh_003601_05_mech_osyearbook2016_containers_cc.png?itok=0ZEfXLEE "Troubleshooting tips for the 5 most common Linux issues") 
+Image by : 
+
+Opensource.com
+
+Although Linux installs and operates as expected for most users, inevitably some users will run into problems. For my final article in The Queue column for the year, I thought it would be interesting to summarize the most common technical Linux issues people ran into in 2016\. I posted the question to LinuxQuestions.org and on social media, and I analyzed LQ posting patterns. Here are the results.
+
+### 1\. Wifi drivers (especially Broadcom chips)
+
+Generally speaking, wifi drivers—and Broadcom cards in particular—continue to be one of the most problematic technical issues facing Linux. There were hundreds of posts about this topic on LQ alone in 2016, and myriad more elsewhere. Dozens of Broadcom wireless cards are available, and detailed instructions for getting them to work with each distribution is far too involved for a single article, but the basic troubleshooting steps are the same:
+
+*   ascertain exactly which Broadcom card you have by using _lspci_ to find out the PCI ID,
+*   determine whether the distribution you use supports that card,
+*   and if it does, identify the proper way to get the card working.
+
+For example, if you have a 14e4:4315 PCI ID and are using Ubuntu, then you know the BCM4312 card is supported by installing the _firmware-b43-installer_package. The other option you have is to research the wifi card before your purchase to ensure it's fully supported by your distribution of choice out of the box.
+
+### 2\. Printer drivers (especially Canon and Lexmark)
+
+Printers also continue to be problematic, with Canon and Lexmark repeatedly cited for being an issue. If you're purchasing a new printer, research compatibility before you buy. But if you are migrating from another operating system, that may not be an option. If you are doing research, the [OpenPrinting][1] database and the official support channel for your distribution are the two best places to start. Note that you should ensure all functionality of a device is fully compatible, especially if it's a multifunction product. One common complaint with Canon printers is that the drivers are often only available on non-English and sometimes obscure sites.
+
+>If you're purchasing a new printer, research compatibility before you buy.
+
+### 3\. Video
+
+Video is a nuanced topic, as simple straightforward video works extremely well out of the box on Linux. Where the issues pop up are video accelerators/​acceleration; the latest video cards and newest technologies, such as NVIDIA Optimus and ATI dynamic GPU switching; installation and stability of proprietary drivers; efficient power management; and reliable suspend and resume. If you're not a gamer, do not need high-end graphics for another reason, and are not on a laptop, then you probably don't have to worry about this. If you're looking for a new laptop, be sure to research compatibility before your purchase. If you're a gamer or need the highest-end graphics, you'll need to know exactly what your requirements are and start your research there. Luckily, the situation here is improving and, Wayland teething issues aside, the situation should be quite a bit better in 2017.
+
+### 4\. Audio
+
+Once again, for simple setups, audio has been easy to configure and reliable under Linux for a while. As soon as you get into professional production, echo cancellation, audio routing, unified mixing, and other complex setups, however, it can go south pretty quickly. My suggestion is to use one of the dedicated audio-related distributions if you need high-end real-time audio.
+
+### 5\. Installation
+
+With a category this all-encompassing, it's almost guaranteed to be high volume. That said, I don't know that it's fair to say Linux has wide-spread installation issues. The vast majority of installs go as expected. The sheer variety of hardware that Linux supports, and nearly infinite combinations of hardware on which Linux installs are attempted, inevitably lead to edge cases here and there. Keep in mind that end users rarely install other operating systems, such as Mac OS and Windows, as they come pre-installed on new devices.
+
+>The vast majority of installs go as expected.
+
+### Future looks bright
+
+Other issues that were mentioned frequently include Bluetooth, suspend/resume, HiDPI, and touchscreens. You may see a pattern forming here—most of the issues noted in this article focus on desktop use cases. When you think about it, that makes sense. With Linux desktop adoption being relatively low, the result is that less testing and resources go into finding and fixing related issues. As desktop usage increases, you can anticipate these areas improving.
+
+On that note, I thought it would be nice to end with a mention of one area that used to pop up frequently as a problem area for Linux, and very rarely does these days: fonts. Only a few short years ago, getting high-quality antialiased fonts were the exception. With modern distribution releases, it has become the rule.
+
+What technical Linux issues did you find most common in 2016? Let me know about them in the comments.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/jeremy-garcia.jpg?itok=kqOMWJIg)
+
+Jeremy Garcia - Jeremy Garcia is the founder of LinuxQuestions.org  and an ardent but realistic open source advocate. Follow Jeremy on Twitter: @linuxquestions
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/yearbook-linux-troubleshooting-tips
+
+作者：[Jeremy Garcia][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/jeremy-garcia
+[1]:http://www.openprinting.org/printers
diff --git a/sources/tech/20170110 Why we need an open model to design and evaluate public policy.md b/sources/tech/20170110 Why we need an open model to design and evaluate public policy.md
new file mode 100644
index 0000000000..809d71349d
--- /dev/null
+++ b/sources/tech/20170110 Why we need an open model to design and evaluate public policy.md	
@@ -0,0 +1,69 @@
+Why we need an open model to design and evaluate public policy
+============================================================
+
+### Imagine an app that allows citizens to test drive proposed policies.
+
+[up][3]
+ ![Why we need an open model to design and evaluate public policy](https://opensource.com/sites/default/files/styles/image-full-size/public/images/government/GOV_citizen_participation.jpg?itok=eeLWQgev "Why we need an open model to design and evaluate public policy") 
+Image by : 
+
+opensource.com
+
+In the months leading up to political elections, public debate intensifies and citizens are exposed to a proliferation of information around policy options. In a data-driven society where new insights have been informing decision-making, a deeper understanding of this information has never been more important, yet the public still hasn't realized the full potential of public policy modeling.
+
+At a time where the concept of "open government" is constantly evolving to keep pace with new technological advances, government policy models and analysis could be the new generation of open knowledge.
+
+Government Open Source Models (GOSMs) refer to the idea that government-developed models, whose purpose is to design and evaluate policy, are freely available to everyone to use, distribute, and modify without restrictions. The community could potentially improve the quality, reliability, and accuracy of policy modeling, creating new data-driven apps that benefit the public.
+
+Today's generation interacts with technology like it's second nature, absorbing vast amounts of information tacitly. What if we could interact with different public policies in a virtual, immersive environment using a GOSM?
+
+Imagine an app that allows citizens to test drive proposed policies to determine the future in which they want to live. They would instinctively learn the key drivers and what to expect. Before long the public would have a deeper understanding of public policy impacts and become more savvy at navigating the controversial terrains of public debate.
+
+Why haven't we had greater access to these models before? The reason lies behind the veils of public policy modeling.
+
+In a society as complex as the one we live in, quantifying policy impacts is a difficult task and has been described as a "fine-art." Moreover, most government policy models are based on administrative and other privately held data. Nevertheless, policy analysts valiantly go about their quest with the aim of guiding policy design, and many a political battle has been won with a quantitative call to arms.
+
+Numbers are powerful. They build credibility and are often used as a rationale for introducing new policies. The development of public policy models lends power to both politicians and bureaucrats, who may be reluctant to disrupt the status quo. Giving that up may not be easy, but GOSMs provide an opportunity for unprecedented public policy reform.
+
+GOSMs level the playing field for everyone: politicians, the media, lobby groups, stakeholders, and the general public. By opening the doors of policy evaluation to the community, governments can tap into new and undiscovered capabilities for creativity, innovation, and efficiency within the public sphere. But what are the practical implications for the strategic interactions between stakeholders and governments in public policy design?
+
+GOSMs are unique because they are primarily a tool for designing public policy and do not necessarily require re-distribution for private gains. Stakeholders and lobby groups could potentially employ GOSMs along with their own privately held information to gain new insights into the workings of the policy environment in which they are economic players for private benefit.
+
+Could GOSMs become a weapon where stakeholders hold the balance of power in public debate and strategize for optimal benefit?
+
+Being a modifiable public good, GOSMs are, in notion, funded by the taxpayer and attributed to the state. Would it be ethically appropriate for private entities to gain from GOSMs without passing on the benefits to society? Unlike apps that may be used for more efficient service provision, alternate policy proposals are more likely to be used by consultancies and contribute to public debate.
+
+The open source community has frequently used the "copyleft license" to ensure that code and any derivative works under this license remains open to everyone. This works well when the product of value is the code itself, which requires re-distribution for maximum benefit. However, what if the code or GOSM redistribution is incidental to the main product, which may be new strategic insights into the existing policy environment?
+
+At a time when privately collected data is becoming prolific, the real value behind GOSMs may be the underlying data, which could be used to refine the models themselves. Ultimately, government is the only consumer with the authority to implement policy, and stakeholders may choose to share their modified GOSMs in negotiations.
+
+The big challenge government has when publicly releasing policy models is increasing transparency while protecting privacy. Ideally, releasing GOSMs would require securing closed data in a way that preserves the key features of the modeling.
+
+Publicly releasing GOSMs empower citizens by promoting a greater understanding and participation into our democracy, which would lead to improved policy outcomes and greater public satisfaction. In an open government utopia, open public policy development will be a collaborative effort between government and the community, where knowledge, data, and analysis are freely available to everyone.
+
+_Learn more in Audrey Lobo-Pulo's talk at linux.conf.au 2017 ([#lca2017][1]) in Hobart: [Publicly Releasing Government Models][2]._
+
+_Disclaimer: The views presented in this article belong to Audrey Lobo-Pulo and are not necessarily those of the Australian Government._
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/1-_mg_2552.jpg?itok=-RflZ4Wv)
+
+Audrey Lobo-Pulo - Dr. Audrey Lobo-Pulo is a co-founder of Phoensight and is an advocate for open government and open source software in government modelling. A physicist, she moved to working in economic policy modelling after joining the Australian Public Service. Audrey has been involved in modelling a wide range of economic policy options and is currently interested in government open data and open policy modelling. Audrey's vision for government is to bring data science to public policy analytics.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/government-open-source-models
+
+作者：[Audrey Lobo-Pulo ][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/audrey-lobo-pulo
+[1]:https://twitter.com/search?q=%23lca2017&src=typd
+[2]:https://linux.conf.au/schedule/presentation/31/
+[3]:https://opensource.com/article/17/1/government-open-source-models?rate=p9P_dJ3xMrvye9a6xiz6K_Hc8pdKmRvMypzCNgYthA0
diff --git a/sources/tech/20170111 Explore climate data with open source tools.md b/sources/tech/20170111 Explore climate data with open source tools.md
new file mode 100644
index 0000000000..9f3b45f0d7
--- /dev/null
+++ b/sources/tech/20170111 Explore climate data with open source tools.md	
@@ -0,0 +1,74 @@
+Martin translating…
+
+Explore climate data with open source tools
+============================================================[up][1]
+ ![Explore climate data with open source tools](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/bus-cloud.png?itok=bdROR1aE "Explore climate data with open source tools") 
+Image credits : 
+
+[Flickr user: theaucitron][2] (CC BY-SA 2.0)
+
+You can't look anywhere these days without seeing evidence of the changing weather patterns on the earth. Monthly, we are confronted with facts and figures that point to a warming planet.
+
+Climate scientists warn us that inaction could be fatal to our futures here. Military strategists at the Pentagon have [recently cautioned][3] President-Elect Trump that inaction on climate change could spell disaster for our national security as shrinking water supplies and meager rainfall cause crop failures will force large numbers of people to migrate to other parts of the world that can sustain them.
+
+With all of the research on our climate by NASA, the US Defense Department, and others, I was curious if there are open source tools that would allow interested citizens to explore climate data and draw our own conclusions. A quick search of the Internet led me to the [Open Climate Workbench][4], a project that is part of the [Apache Software Foundation][5].
+
+The Open Climate Workbench (OCW) develops software that performs climate model evaluation on data that comes from the [Earth System Grid Federation][6], [Coordinated Regional Climate Downscaling Environment][7], the U.S. Global Change Research Program's [National Climate Assessment][8], the[ North American Regional Climate Assessment Program][9], and from NASA, NOAA, and others.
+
+You can download the OCW's [tar ball][10] and install it on your Linux computer by following the [prerequisites][11]. You can also install the OCW in a virtual machine using Vagrant and a provider like VirtualBox. [Get the instructions][12] for an OCW virtual machine.  
+
+I found the easiest way to see how the OCW works is to download a [virtual machine image][13] from the Regional Climate Model Evaluation System (RCMES).
+
+According to its website, the RCMES "is designed to facilitate regional-scale evaluations of climate and Earth system models by providing standardized access to a vast and comprehensive set of observations (e.g., satellite, reanalyzes and in-situ) and modeling resources (e.g., [CMIP][14] & [CORDEX][15] on the [ESGF][16]), as well as tools for performing common analysis and visualization tasks (e.g., OCW)."
+
+You will need to have VirtualBox and Vagrant installed on your host computer. With it you can see an excellent example of the OCW in operation. The RCMES provides [detailed instructions][17] for downloading, importing, and running the virtual machine. Once your virtual machine is up and running you can log into it with the following credentials.
+
+**Username:vagrant, password:vagrant. **
+
+ ![Regional Climate Model Evaluation System Data Plot](https://opensource.com/sites/default/files/rcmes_data_plot.png "Regional Climate Model Evaluation System Data Plot") 
+
+RCMES data plot sample
+
+[Tutorials][18] for the RCMES are available on their website to help you quickly become familiar with the software. The community [is active][19] and they are looking for more [developers][20]. You can [subscribe to their mailing lists][21], too.
+
+[Source code][22] for the project is on GitHub and licensed under the Apache License, Version 2.0.
+
+--------------------------------------------------------------------------------
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/donw2-crop.jpg?itok=OqOYd3A8)
+
+Don Watkins - Educator, education technology specialist,  entrepreneur, open source advocate. M.A. in Educational Psychology, MSED in Educational Leadership, Linux system administrator, CCNA, virtualization using Virtual Box and VMware. Follow me at @Don_Watkins .
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/apache-open-climate-workbench
+
+作者：[Don Watkins][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/don-watkins
+[1]:https://opensource.com/article/17/1/apache-open-climate-workbench?rate=Hv4_T-1gbcRNsiP9jnevzP1OTNKHIyQLXwqdjnBy2Bs
+[2]:https://www.flickr.com/photos/theaucitron/5810163712/in/photolist-5p9nh3-6EkSKG-6EgGEF-9hYBcr-abCSpq-9zbjDz-4PVqwm-9RqBfq-abA2T4-4nXfwv-9RQkdN-dmjSdA-84o2ER-abA2Wp-ehyhPC-7oFYrc-4nvqBz-csMQXb-nRegFf-ntS23C-nXRyaB-6Xw3Mq-cRMaCq-b6wkkP-7u8sVQ-yqcg-6fTmk7-bzm3vU-6Xw3vL-6EkzCQ-d3W8PG-5MoveP-oMWsyY-jtMME6-XEMwS-2SeRXT-d2hjzJ-p2ZZVZ-7oFYoX-84r6Mo-cCizvm-gnnsg5-77YfPx-iDjqK-8gszbW-6MUZEZ-dhtwtk-gmpTob-6TBJ8p-mWQaAC/
+[3]:https://www.scientificamerican.com/article/military-leaders-urge-trump-to-see-climate-as-a-security-threat/
+[4]:https://climate.apache.org/
+[5]:https://www.apache.org/
+[6]:http://esgf.llnl.gov/
+[7]:http://www.cordex.org/
+[8]:http://nca2014.globalchange.gov/
+[9]:http://www.narccap.ucar.edu/
+[10]:http://climate.apache.org/downloads.html
+[11]:http://climate.apache.org/downloads.html#prerequsites
+[12]:https://cwiki.apache.org/confluence/display/CLIMATE/OCW+VM+-+A+Self+Contained+OCW+Environment
+[13]:https://rcmes.jpl.nasa.gov/RCMES_Turtorial_data/RCMES_June09-2016.ova
+[14]:http://cmip-pcmdi.llnl.gov/
+[15]:http://www.cordex.org/
+[16]:http://esgf.org/
+[17]:https://rcmes.jpl.nasa.gov/content/running-rcmes-virtual-machine
+[18]:https://rcmes.jpl.nasa.gov/content/tutorials-overview
+[19]:http://climate.apache.org/community/get-involved.html
+[20]:https://cwiki.apache.org/confluence/display/CLIMATE/Developer+Getting+Started+Guide
+[21]:http://climate.apache.org/community/mailing-lists.html
+[22]:https://github.com/apache/climate
diff --git a/sources/tech/20170112 3 Useful VIM Editor Tips and Tricks for Advanced Users - part 3.md b/sources/tech/20170112 3 Useful VIM Editor Tips and Tricks for Advanced Users - part 3.md
new file mode 100644
index 0000000000..aef1ad2c0a
--- /dev/null
+++ b/sources/tech/20170112 3 Useful VIM Editor Tips and Tricks for Advanced Users - part 3.md	
@@ -0,0 +1,100 @@
+3 Useful VIM Editor Tips and Tricks for Advanced Users
+============================================================
+
+![](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2017/01/vim-featured.jpg "3 Useful VIM Editor Tips and Tricks for Advanced Userss") 
+
+This article is part of the [VIM User Guide][12] series:
+
+*   [The Beginner’s Guide to Start Using Vim][3]
+*   [Vim Keyboard Shortcuts Cheatsheet][4]
+*   [5 Vim Tips and Tricks for Experienced Users][5]
+*   3 Useful VIM Editor Tips and Tricks for Advanced Users
+
+Vim is undoubtedly a very powerful text editor. It offers a plethora of features which means that studying and remembering every Vim functionality isn’t practically possible. But what we can do at least is keep learning easier ways of doing things so that our experience with the editor keeps on getting better with time.
+
+With that in mind, in this article we will discuss some Vim editor tips/tricks that are aimed at advanced users.
+
+**Note**: If you are completely new to Vim, you can first go through our [getting started guide][14]. For those who’ve just started using the editor, I’m sure our [Vim keyboard shortcuts cheatsheet][15] will be extremely useful to you. And if you’re already an experienced user, you might also want to find out [some tips and tricks for experienced users][16].
+
+Please note that all the tips mentioned in this article have been mostly explained using easy-to-understand coding situations, as they come in really handy while software development. But that does not mean normal users (who aren’t coders and use Vim for general text editing) can’t use them in their work.
+
+### 1\. Set file specific variables
+
+There may be times when – in a particular file – you would want any tab character that you type to get replaced by spaces. Or you may want a source code file to use two spaces for indentation even if the editor’s default indentation is set to four spaces.
+
+Basically we’re talking about file-specific changes here. There’s a feature that Vim provides which allows you to change certain settings only for a particular file. That feature is called “Modeline.”
+
+For example, to make sure that each tab you type gets replaced by spaces, all you have to do is to add the following modeline in the first or last few lines of the file in question:
+
+```
+# vim: set expandtab:
+```
+
+And to change the indentation from default (4) to 2, use the following modeline in the source file:
+
+```
+// vim: noai:ts=2:sw=2
+```
+
+Here are some important points that you need to keep in mind when dealing with modelines:
+
+*   Modelines should only be added in the first or last five lines of the file.
+*   The “modeline” option must be set (`:set modeline`) in the “.vimrc” file order to take advantage of this feature.
+*   The feature is off by default when editing as root.
+
+For more information, head to the feature’s [official documentation][17].
+
+### 2\. Keyword completion
+
+As you start writing more and more complex code or start working on large source files, you deal with several variable names. Sometimes it’s not easy to remember all the names, so whenever you have to write a variable name you usually copy it from where it’s already used.
+
+Thankfully, with Vim you can just write some initial letters of the variable. Without leaving the Insert mode, press “Ctrl + n” or “Ctrl + p” to get a list of matching keywords. While “Ctrl + n” is used to insert the next matching word, “Ctrl + p” gives you a list of previous matching words.
+
+Here’s this feature in action.
+
+ ![vim-keyword-completion1](https://maketecheasier-2d0f.kxcdn.com/assets/uploads/2017/01/vim-keyword-completion1.jpg "vim-keyword-completion1") 
+
+As is clear from the screenshot above, the list that pops up also contains words from other source files. For more information on this feature, head [here][18].
+
+### 3\. Searching
+
+Suppose you are debugging your code, and as part of that you need to quickly see all the occurrences of a variable in a file. A commonly used way to do this is to come out of the Insert mode, write `/[var-name]`, press Enter, and then go back and forth using the “n” and “p” keys.
+
+There’s no problem with the aforementioned approach, per se, but there’s a slightly more easier and quicker way to do this kind of search. For that, first you have to make sure that you are out of Insert mode and that the cursor is under the word/variable you’re trying to search, which isn’t time consuming at all. And next, all you have to do is press “Shift + *.”
+
+Do this repeatedly, and the editor will quickly take you to all the places where the word/variable is used in the file.
+
+### Conclusion
+
+Although aimed at advanced users, the tips/tricks discussed here aren’t difficult to understand and use. If your basics are clear, you can really benefit from them. Needless to say, as with any new feature or concept, you need to practice these tips to make them a habit.
+
+
+--------------------------------------------------------------------------------
+
+via: https://www.maketecheasier.com/vim-tips-tricks-advanced-users/
+
+作者：[Himanshu Arora][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.maketecheasier.com/author/himanshu/
+[1]:https://www.maketecheasier.com/author/himanshu/
+[2]:https://www.maketecheasier.com/vim-tips-tricks-advanced-users/#respond
+[3]:https://www.maketecheasier.com/start-with-vim-linux/
+[4]:https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/
+[5]:https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/
+[6]:https://www.maketecheasier.com/category/linux-tips/
+[7]:http://www.facebook.com/sharer.php?u=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-advanced-users%2F
+[8]:http://twitter.com/share?url=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-advanced-users%2F&text=3+Useful+VIM+Editor+Tips+and+Tricks+for+Advanced+Users
+[9]:mailto:?subject=3%20Useful%20VIM%20Editor%20Tips%20and%20Tricks%20for%20Advanced%20Users&body=https%3A%2F%2Fwww.maketecheasier.com%2Fvim-tips-tricks-advanced-users%2F
+[10]:https://www.maketecheasier.com/opt-out-google-personalized-ads/
+[11]:https://www.maketecheasier.com/wi-fi-vs-ethernet-vs-4g/
+[12]:https://www.maketecheasier.com/series/vim-user-guide/
+[13]:https://support.google.com/adsense/troubleshooter/1631343
+[14]:https://www.maketecheasier.com/start-with-vim-linux/
+[15]:https://www.maketecheasier.com/vim-keyboard-shortcuts-cheatsheet/
+[16]:https://www.maketecheasier.com/vim-tips-tricks-for-experienced-users/
+[17]:http://vim.wikia.com/wiki/Modeline_magic
+[18]:http://vim.wikia.com/wiki/Any_word_completion
diff --git a/sources/tech/20170112 How to Install Nextcloud with Nginx and PHP7-FPM on CentOS 7.md b/sources/tech/20170112 How to Install Nextcloud with Nginx and PHP7-FPM on CentOS 7.md
new file mode 100644
index 0000000000..26bcb1ff2c
--- /dev/null
+++ b/sources/tech/20170112 How to Install Nextcloud with Nginx and PHP7-FPM on CentOS 7.md	
@@ -0,0 +1,433 @@
+How to Install Nextcloud with Nginx and PHP7-FPM on CentOS 7
+============================================================
+
+### On this page
+
+1.  [Step 1 - Install Nginx and PHP7-FPM on CentOS 7][1]
+2.  [Step 2 - Configure PHP7-FPM][2]
+3.  [Step 3 - Install and Configure MariaDB][3]
+4.  [Step 4 - Generate a Self-signed SSL Certificate for Nextcloud][4]
+5.  [Step 5 - Download and Install Nextcloud][5]
+6.  [Step 6 - Configure Nextcloud Virtual Host in Nginx][6]
+7.  [Step 7 - Configure SELinux and FirewallD for Nextcloud][7]
+8.  [Step 8 - Nextcloud Installation Wizard][8]
+9.  [Reference][9]
+
+Nextcloud is a free (Open Source) Dropbox-like software, a fork of the ownCloud project. Nextcloud is written in PHP and JavaScript, it supports many database systems such as, MySQL/MariaDB, PostgreSQL, Oracle Database and SQLite. In order to keep your files synchronized between Desktop and your own server, Nextcloud provides applications for Windows, Linux and Mac desktops and a mobile app for android and iOS. Nextcloud is not just a dropbox clone, it provides additional features like Calendar, Contacts, Schedule tasks, and streaming media with Ampache.
+
+In this tutorial, I will show you how to install and configure the latest Nextcloud 10 release on a CentOS 7 server. I will run Nextcloud with a Nginx web server and PHP7-FPM and use MariaDB as the database system.
+
+**Prerequisite**
+
+*   CentOS 7 64bit
+*   Root privileges on the server
+
+### Step 1 - Install Nginx and PHP7-FPM on CentOS 7
+
+Before we start with the Nginx and php7-fpm installation, we have to add the EPEL package repository. Install it with this yum command.
+
+yum -y install epel-release
+
+Now install Nginx from the EPEL repository.
+
+yum -y install nginx
+
+Then we have to add another repository for php7-fpm. There are several repositories available on the net that provide PHP 7 packages, I will use webtatic here.
+
+Add the PHP7-FPM webtatic repository:
+
+rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm
+
+Next, install PHP7-FPM and some additional packages for the Nextcloud installation.
+
+yum -y install php70w-fpm php70w-cli php70w-gd php70w-mcrypt php70w-mysql php70w-pear php70w-xml php70w-mbstring php70w-pdo php70w-json php70w-pecl-apcu php70w-pecl-apcu-devel
+
+Finally, check the PHP version from server terminal to verify that PHP installed correctly.
+
+php -v
+
+[
+ ![Check the PHP version on CentOS](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/1.png) 
+][10]
+
+### Step 2 - Configure PHP7-FPM
+
+In this step, we will configure php-fpm to run with Nginx. Php7-fpm will run under user nginx and listen on port 9000.
+
+Edit the default php7-fpm configuration file with vim.
+
+vim /etc/php-fpm.d/www.conf
+
+In line 8 and 10, change user and group to '**nginx**'.
+
+user = nginx
+group = nginx
+
+In line 22, make sure php-fpm is running under server port.
+
+listen = 127.0.0.1:9000
+
+Uncomment line 366-370 to activate the php-fpm system environment variables.
+
+env[HOSTNAME] = $HOSTNAME
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+env[TMP] = /tmp
+env[TMPDIR] = /tmp
+env[TEMP] = /tmp
+
+Save the file and exit the vim editor.
+
+Next, create a new directory for the session path in the '/var/lib/' directory, and change the owner to the 'nginx' user.
+
+mkdir -p /var/lib/php/session
+chown nginx:nginx -R /var/lib/php/session/
+
+Now start php-fpm and Nginx, then enable the services to start at boot time.
+
+sudo systemctl start php-fpm
+sudo systemctl start nginx
+
+sudo systemctl enable php-fpm
+sudo systemctl enable nginx
+
+[
+ ![Start Nginx and PHP-FPM](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/2.png) 
+][11]
+
+PHP7-FPM configuration is done.
+
+### Step 3 - Install and Configure MariaDB
+
+I will use MariaDB for the Nextcloud database. Install the mariadb-server package from the CentOS repository with yum.
+
+yum -y install mariadb mariadb-server
+
+Start the MariaDB service and add it to run at boot time.
+
+systemctl start mariadb
+systemctl enable mariadb
+
+Now configure the MariaDB root password.
+
+mysql_secure_installation
+
+Type in your root password when requested.
+
+Set root password? [Y/n] Y
+New password:
+Re-enter new password:
+
+Remove anonymous users? [Y/n] Y
+Disallow root login remotely? [Y/n] Y
+Remove test database and access to it? [Y/n] Y
+Reload privilege tables now? [Y/n] Y
+
+The MariaDB root password has been set, now we can login to the mysql shell to create a new database and a new user for Nextcloud. I will create a new database named '**nextcloud_db**' and a user '**nextclouduser**' with password '**nextclouduser@**'. Choose a secure password for your installation!
+
+mysql -u root -p
+Type Password
+
+Type in the mysql query below to create a new database and a new user.
+
+create database nextcloud_db;
+create user nextclouduser@localhost identified by 'nextclouduser@';
+grant all privileges on nextcloud_db.* to nextclouduser@localhost identified by 'nextclouduser@';
+flush privileges;
+
+[
+ ![Create a Nextcloud database and user in MariaDB](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/3.png) 
+][12]
+
+The nextcloud_db database with user 'nextclouduser' has been created.
+
+### Step 4 - Generate a Self-signed SSL Certificate for Nextcloud
+
+In this tutorial, I will run nextcloud with a https connection for the client. You can use free SSL such as let's encrypt or create  <g class="gr_ gr_207 gr-alert gr_gramm gr_run_anim Grammar only-ins doubleReplace replaceWithoutSep" id="207" data-gr-id="207">self signed</g> SSL certificate. I will create my own self-signed SSL certificate file with the OpenSSL command.
+
+Create a new directory for the SSL file.
+
+mkdir -p /etc/nginx/cert/
+
+And generate a new SSL certificate file with the the openssl command below.
+
+openssl req -new -x509 -days 365 -nodes -out /etc/nginx/cert/nextcloud.crt -keyout /etc/nginx/cert/nextcloud.key
+
+Finally, change the permission of all certificate files to 600 with chmod.
+
+chmod 700 /etc/nginx/cert
+chmod 600 /etc/nginx/cert/*
+
+[
+ ![Generate new SSL Certificate file for Nextcloud](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/4.png) 
+][13]
+
+### Step 5 - Download and Install Nextcloud
+
+We will download Nextcloud with wget directly to the server, so we have to install wget first. Additionally, we need the unzip program. Install both applications with yum.
+
+yum -y install wget unzip
+
+Go to the /tmp directory and download latest stable Nextcloud 10 version from the Nextcloud web site with wget.
+
+cd /tmp
+wget https://download.nextcloud.com/server/releases/nextcloud-10.0.2.zip
+
+Extract the nextcloud zip file and move it's content to the '/usr/share/nginx/html/' directory.
+
+unzip nextcloud-10.0.2.zip
+mv nextcloud/ /usr/share/nginx/html/
+
+Next, go to the Nginx web root directory and create a new 'data' directory for Nextcloud.
+
+cd /usr/share/nginx/html/
+mkdir -p nextcloud/data/
+
+Change the owner of the 'nextcloud' directory to the 'nginx' user and group.
+
+chown nginx:nginx -R nextcloud/
+
+### Step 6 - Configure Nextcloud Virtual Host in Nginx
+
+In step 5 we've downloaded the Nextcloud source code and configured it to run under the Nginx web server. But we still need to configure a virtual host for Nextcloud. Create a new virtual host configuration file 'nextcloud.conf' in the Nginx 'conf.d' directory.
+
+cd /etc/nginx/conf.d/
+vim nextcloud.conf
+
+Paste the Nextcloud virtual host configuration below.
+
+```
+upstream php-handler {
+    server 127.0.0.1:9000;
+    #server unix:/var/run/php5-fpm.sock;
+}
+
+server {
+    listen 80;
+    server_name cloud.nextcloud.co;
+    # enforce https
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name cloud.nextcloud.co;
+
+    ssl_certificate /etc/nginx/cert/nextcloud.crt;
+    ssl_certificate_key /etc/nginx/cert/nextcloud.key;
+
+    # Add headers to serve security related headers
+    # Before enabling Strict-Transport-Security headers please read into this
+    # topic first.
+    add_header Strict-Transport-Security "max-age=15768000;
+    includeSubDomains; preload;";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Robots-Tag none;
+    add_header X-Download-Options noopen;
+    add_header X-Permitted-Cross-Domain-Policies none;
+
+    # Path to the root of your installation
+    root /usr/share/nginx/html/nextcloud/;
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    # The following 2 rules are only needed for the user_webfinger app.
+    # Uncomment it if you're planning to use this app.
+    #rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+    #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json
+    # last;
+
+    location = /.well-known/carddav {
+      return 301 $scheme://$host/remote.php/dav;
+    }
+    location = /.well-known/caldav {
+      return 301 $scheme://$host/remote.php/dav;
+    }
+
+    # set max upload size
+    client_max_body_size 512M;
+    fastcgi_buffers 64 4K;
+
+    # Disable gzip to avoid the removal of the ETag header
+    gzip off;
+
+    # Uncomment if your server is build with the ngx_pagespeed module
+    # This module is currently not supported.
+    #pagespeed off;
+
+    error_page 403 /core/templates/403.php;
+    error_page 404 /core/templates/404.php;
+
+    location / {
+        rewrite ^ /index.php$uri;
+    }
+
+    location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
+        deny all;
+    }
+    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
+        deny all;
+    }
+
+    location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) {
+        include fastcgi_params;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param HTTPS on;
+        #Avoid sending the security headers twice
+        fastcgi_param modHeadersAvailable true;
+        fastcgi_param front_controller_active true;
+        fastcgi_pass php-handler;
+        fastcgi_intercept_errors on;
+        fastcgi_request_buffering off;
+    }
+
+    location ~ ^/(?:updater|ocs-provider)(?:$|/) {
+        try_files $uri/ =404;
+        index index.php;
+    }
+
+    # Adding the cache control header for js and css files
+    # Make sure it is BELOW the PHP block
+    location ~* \.(?:css|js)$ {
+        try_files $uri /index.php$uri$is_args$args;
+        add_header Cache-Control "public, max-age=7200";
+        # Add headers to serve security related headers (It is intended to
+        # have those duplicated to the ones above)
+        # Before enabling Strict-Transport-Security headers please read into
+        # this topic first.
+        add_header Strict-Transport-Security "max-age=15768000;
+        includeSubDomains; preload;";
+        add_header X-Content-Type-Options nosniff;
+        add_header X-Frame-Options "SAMEORIGIN";
+        add_header X-XSS-Protection "1; mode=block";
+        add_header X-Robots-Tag none;
+        add_header X-Download-Options noopen;
+        add_header X-Permitted-Cross-Domain-Policies none;
+        # Optional: Don't log access to assets
+        access_log off;
+    }
+
+    location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+        try_files $uri /index.php$uri$is_args$args;
+        # Optional: Don't log access to other assets
+        access_log off;
+    }
+}
+```
+
+Save the file and exit vim.
+
+Now test the Nginx configuration to ensure that there are no error,s- Then restart the service.
+
+nginx -t
+systemctl restart nginx
+
+[
+ ![Nextcloud Virtual Host Nginx](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/5.png) 
+][14]
+
+### Step 7 - Configure SELinux and FirewallD for Nextcloud
+
+In this tutorial, we will leave SELinux on in enforcing mode, so we need a new package SELinux management tools to configure SELinux for Nextcloud.
+
+Install the SELinux management tools with this command.
+
+yum -y install policycoreutils-python
+
+Then execute the commands below as root user to allow Nextcloud to run under SELinux. Remember to change the Nextcloud directory in case you use a different directory.
+
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/data(/.*)?'
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/config(/.*)?'
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/apps(/.*)?'
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/assets(/.*)?'
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/.htaccess'
+semanage fcontext -a -t httpd_sys_rw_content_t '/usr/share/nginx/html/nextcloud/.user.ini'
+
+restorecon -Rv '/usr/share/nginx/html/nextcloud/'
+
+Next, we will enable the firewalld service and open the HTTP and HTTPS ports for Nextcloud.
+
+Start firewalld and enable it to start at boot time.
+
+systemctl start firewalld
+systemctl enable firewalld
+
+Now open the HTTP and HTTPS ports with the firewall-cmd command, then reload the firewall.
+
+firewall-cmd --permanent --add-service=http
+firewall-cmd --permanent --add-service=https
+firewall-cmd --reload
+
+[
+ ![Configure Firewalld for Nextcloud](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/6.png) 
+][15]
+
+All the server configuration is done.
+
+### Step 8 - Nextcloud Installation Wizard
+
+Open your web browser and type in your Nextcloud domain name, mine is: cloud.nextcloud.co. You will be redirected to the secure https connection.
+
+Type in your desired admin user name and password, and then type in your database credentials. Click '**Finish Setup**'.
+
+[
+ ![Nextcloud stup wizards on CentOS 7](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/7.png) 
+][16]
+
+The Nextcloud Admin Dashboard (File Manager) appears.
+
+[
+ ![Nextcloud Admin Dashboard File Manager](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/8.png) 
+][17]
+
+Nextcloud User Settings.
+
+[
+ ![Nextcloud user settings](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/9.png) 
+][18]
+
+Admin Settings.
+
+[
+ ![The Nextcloud admin area](https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/10.png) 
+][19]
+
+Nextcloud has been installed with Nginx, PHP7-FPM, and MariaDB on a CentOS 7 Server.
+
+--------------------------------------------------------------------------------
+
+via: https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/
+
+作者：[Muhammad Arul][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/
+[1]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-install-nginx-and-phpfpm-on-centos-
+[2]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-configure-phpfpm
+[3]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-install-and-configure-mariadb
+[4]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-generate-a-selfsigned-ssl-certificate-for-nextcloud
+[5]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-download-and-install-nextcloud
+[6]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-configure-nextcloud-virtual-host-in-nginx
+[7]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-configure-selinux-and-firewalld-for-nextcloud
+[8]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#step-nextcloud-installation-wizard
+[9]:https://www.howtoforge.com/tutorial/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/#reference
+[10]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/1.png
+[11]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/2.png
+[12]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/3.png
+[13]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/4.png
+[14]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/5.png
+[15]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/6.png
+[16]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/7.png
+[17]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/8.png
+[18]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/9.png
+[19]:https://www.howtoforge.com/images/how-to-install-nextcloud-with-nginx-and-php-fpm-on-centos-7/big/10.png
diff --git a/sources/tech/20170112 Let Sudo Insult You When You Enter Incorrect Password.md b/sources/tech/20170112 Let Sudo Insult You When You Enter Incorrect Password.md
new file mode 100644
index 0000000000..7e2283474b
--- /dev/null
+++ b/sources/tech/20170112 Let Sudo Insult You When You Enter Incorrect Password.md	
@@ -0,0 +1,96 @@
+Let Sudo Insult You When You Enter Incorrect Password
+============================================================
+
+Sudoers is the default sudo security policy plugin in Linux, however, experienced system administrators can specify a custom security policy as well as input and output logging plugins. It is driven by the `/etc/sudoers`file or alternatively in LDAP.
+
+You can define sudoers insults option or several others in the file above. It is set under defaults entries section. Read through our last article that explains [10 Useful Sudoers Configurations for Setting ‘sudo’ in Linux][1].
+
+In this article, we will explain a sudoers configuration parameter to enable an individual or system administrator set [sudo command][2] to insult system users who enter wrong password.
+
+Start by opening the file `/etc/sudoers` like so:
+
+```
+$ sudo visudo
+```
+
+Go to the defaults section and add the following line:
+
+```
+Defaults   insults
+```
+
+Below is a sample of /etc/sudoers file on my system showing defaults entries.
+
+[
+ ![Set sudo Insults Parameter](http://www.tecmint.com/wp-content/uploads/2017/01/Set-sudo-Insults-Parameter.png) 
+][3]
+
+Set sudo Insults Parameter
+
+From the screenshot above, you can see that there are many other defaults defined such as send mail to root when each time a user enters a bad password, set a secure path, configure a custom sudo log file and more.
+
+Save the file and close it.
+
+Run a command with sudo and enter the wrong password, then observe how insults option works:
+
+```
+$ sudo visudo
+```
+[
+ ![sudo Insult in Action](http://www.tecmint.com/wp-content/uploads/2017/01/How-sudo-Insult-Works.png) 
+][4]
+
+sudo Insult in Action
+
+Note: When you configure the insults parameter, it disables the `badpass_message` parameter which prints a specific message on the command line (the default message is “sorry, try again”) in case a user enters a wrong password.
+
+To modify the message, add the `badpass_message` parameter to the /etc/sudoers file as shown below.
+
+```
+Defaults  badpass_message="Password is wrong, please try again"  #try to set a message of your own
+```
+[
+ ![Set sudo badpassword Message](http://www.tecmint.com/wp-content/uploads/2017/01/Set-sudo-badpassword-Message.png) 
+][5]
+
+Set sudo badpassword Message
+
+Save the file and close it, then invoke sudo and see how it works, the message you set as the value of badpass_message will be printed every time you or any system user types a wrong password.
+
+```
+$ sudo visudo
+```
+[
+ ![Sudo badpassword Message](http://www.tecmint.com/wp-content/uploads/2017/01/sudo-badpassword-Message.png) 
+][6]
+
+Sudo badpassword Message
+
+That’s all, in this article we reviewed how to set sudo to print insults when users type a wrong password. Do share your thoughts via the comment section below.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili is a Linux and F.O.S.S enthusiast, an upcoming Linux SysAdmin, web developer, and currently a content creator for TecMint who loves working with computers and strongly believes in sharing knowledge.
+
+--------------------------------------------------------------------------------
+
+
+via: http://www.tecmint.com/sudo-insult-when-enter-wrong-password/
+
+作者：[Aaron Kili][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/sudoers-configurations-for-setting-sudo-in-linux/
+[2]:http://www.tecmint.com/su-vs-sudo-and-how-to-configure-sudo-in-linux/
+[3]:http://www.tecmint.com/wp-content/uploads/2017/01/Set-sudo-Insults-Parameter.png
+[4]:http://www.tecmint.com/wp-content/uploads/2017/01/How-sudo-Insult-Works.png
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Set-sudo-badpassword-Message.png
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/sudo-badpassword-Message.png
diff --git a/sources/tech/20170113 3 open source music players.md b/sources/tech/20170113 3 open source music players.md
new file mode 100644
index 0000000000..336c6b1e71
--- /dev/null
+++ b/sources/tech/20170113 3 open source music players.md	
@@ -0,0 +1,142 @@
+3 open source music players: Aqualung, Lollypop, and GogglesMM
+============================================================
+ ![3 open source music players: Aqualung, Lollypop, and GogglesMM](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/music-birds-recording-520.png?itok=wvh1g4Lw "3 open source music players: Aqualung, Lollypop, and GogglesMM") 
+Image by : 
+
+[Internet Archive][2] book images; modified by Opensource.com. [CC BY-SA 4.0][3]
+
+Music is a part of life. [Wikipedia's article on the history of music][4] contains this great phrase: "Since all people of the world, including the most isolated tribal groups, have a form of music...." Well, we open source folk form a tribe—that's for sure. I propose that our "form of music" includes open music players. Over the past year, I've been taking a look at the various players available; in [December 2016][5] I summarized my ongoing evaluation of open music players using these six criteria:
+
+1.  Must be configurable to pass the music through unchanged to [ALSA][1]. (max 5 marks)
+2.  Should have a good "smart playlist" feature. (1 mark)
+3.  Should not force the user to always interact through playlists. (1 mark)
+4.  Should provide a simple approach to cover art—use the embedded cover art or fall back to cover.jpg (or .png) in the music directory. (1 mark)
+5.  Should show the signal level and effective bit rate as the music plays. (1 mark)
+6.  Should present good-to-great overall organization, layout, and performance. (1 mark)
+
+Three players suggested to me by kind readers were not available in my repositories: [Aqualung][6], [Lollypop][7], and [GogglesMM][8]. Not wanting to install stuff from the wild on my work computer, I promised to configure a "test bed" for this purpose and detail the results.
+
+### Aqualung
+
+[Aqualung][9] has a clearly written website that explains its various features. One of the comments there I found interesting was this one:
+
+"You can (and should) organize your music into a tree of Artists/Records/Tracks, thereby making life easier than with the all-in-one Winamp/XMMS playlist."
+
+This puzzled me because I think I have always had my music organized into a tree of artists, albums, and tracks. But maybe this explains why I find the XMMS-derived players to be a bit odd in terms of their music browsing capability.
+
+According to the Aqualung download page, the official release is source-only. While the comments there suggest that most major Linux distributions include a built copy of Aqualung, this is not the case with the distro I'm currently using on my work computer, Ubuntu 16.10. [Launchpad.net][10] does have personal package archives (PPAs), but they seem a bit out of date, so why not build from source?
+
+I installed **pkgconf** and dev versions of **libasound**, **libflac**, **libmp3lame**, **libvorbis**, **libxml2**, **libglib2.0**, and **libgtk+-2.0**, generally following the suggestions of the compiling page on the site and the usual "hints" from the configure script. Next, I was able to **configure** cleanly and do a **make** and a **make install**. And from there, I was able to execute **/usr/local/bin/aqualung**.
+
+ ![Aqualung](https://opensource.com/sites/default/files/aqualung.png "Aqualung") 
+
+Aqualung, unable to switch resolution.
+
+Once Aqualung was up and running, I saw a straightforward and relatively barebones two-window user interface, the player itself and the "Music Store." I opened Preferences by right-clicking on the music pane of the player and looked around to see where I could select my AudioQuest DragonFly digital-to-analog converter, but I saw no sign of anything there. However, the site notes that you can specify the output device on the command line. I ended up needing to use the **plughw** device to get Aqualung to start.
+
+At that point, I was disappointed to discover that Aqualung seems to require a fixed output sample rate. I could play my 44.1-KHz files just fine with the default setting, but to play my 96-KHz files, I had to stop and restart with that sample rate. Aqualung will not pass the bit stream unchanged through to the digital-to-analog converter. With that, I did not bother to continue my evaluation.
+
+**Not rated.**
+
+### Lollypop
+
+ ![Lollypop interface](https://opensource.com/sites/default/files/lollypop_interface.png "Lollypop interface") 
+
+The lovely Lollypop user interface.
+
+[Lollypop][11] has a gorgeous website. Although it's not in my work computer's repositories, there is a "Download Ubuntu/Debian" link that points to an [up-to-date PPA on launchpad.net][12]. The site offers other downloads for Flatpak, Arch Linux, Fedora, FreeBSD, and OpenSUSE. Out of curiosity, I took a look at the [Fedora link on Fedora COPR][13], and it also looks quite up-to-date, offering builds for Fedora 23–26.
+
+One build from source was enough excitement for that day, so I decided to try the PPA. I was able to execute Lollypop from the command line. The Settings menu was obvious in the upper right of the screen. After updating my music, I went looking for my output device configuration, but after some poking around, I couldn't find how to select the output device. Even executing on the command line with **–help** did not enlighten me.
+
+After some searching on the Internet I found a Lollypop developer stating that I needed **gstreamer libav** to get Lollypop to work. From this I have tentatively concluded that there may be a **gstreamer** configuration possibility to make this work, but I'm not going to pursue that for now, at least.
+
+Lollypop has a lovely user interface to match its lovely web page, but for now, I did not rate it. I have another reason to learn more about **gstreamer**.
+
+**Not rated.**
+
+### GogglesMM
+
+[Goggles Music Manager][14] also has an [up-to-date PPA on launchpad.net][15]; the installation was straightforward and I was able to execute **gogglesmm** from the command line.
+
+GogglesMM, out of the box, looks somewhat like Rhythmbox. I found the Audio tab under Settings > Preferences, which let me select ALSA and set my output device. I confirmed that I can play MP3, 44.1-KHz / 24-bit and 96-KHz / 24-bit music by looking at **/proc/asound/DragonFly/stream0** and the LED color on the DragonFly itself; therefore, 5 points for "rate/depth passthrough."
+
+ ![GogglesMM](https://opensource.com/sites/default/files/gogglesmm.png "GogglesMM") 
+
+GogglesMM playing at 96/24, showing output device.
+
+The documentation for GogglesMM is not largely detailed at this point, but as far as I am able to tell, the developers use filters to implement something like "smart playlists." I reviewed the functioning of filters as best as I could with the three albums installed on my test bed, and while I like what I see (especially being able to define selection criteria for songs based on a broad range of criteria), this is not what I mean when I use the term "smart playlists," which I think of as using some kind of community database of "songs like the current one." Maybe I should call this "automatic DJ" instead, but as far as I am able to determine, this feature does not exist in the current version of GogglesMM, so 0 points for "smart playlist."
+
+As for the queue versus playlist operation, the application supports either playing through the selected songs both in order or randomly or putting songs in a playlist, so 1 for "queue option to playlist."
+
+Similarly, it seemed to manage my cover art well without extra intervention (each album contained the appropriate cover art, which was recognized automatically by GogglesMM), so 1 for "embedded cover art or cover.jpg."
+
+I could not find any way to show signal level or effective bit rate. Nor could I find any way of seeing the bit rate and bit depth; although the application can display a "format" column, it doesn't show anything in that field on my music, so 0 for "signal level and effective bit rate."
+
+With respect to overall organization, GogglesMM hits all the right buttons for me. I can see what's in the play queue, the time and proportion of song played and left to play, album cover, song name, album title, and artist. Also, the available display column list seems quite large and useful, including composer for example. Finally, a really wonderful thing, the volume control actually controls the ALSA volume. If I bring up alsamixer and adjust the volume in either GogglesMM or alsamixer, the other's volume control moves and the volume adjusts. This is pretty cool and surprisingly not all that common, so 1 for overall organization.
+
+In total, then, GogglesMM merits an 8\. Excellent performance indeed.
+
+**Rating: 8**
+
+### The ratings so far
+
+As I've mentioned in the past, my favorite player is [Guayadeque][16], which gets a perfect 10, according to my ranking. Take a look at a summary of my ratings to date (N/R meaning "not rated," because I was unable to determine how to configure those players to work in bit-perfect, passthrough mode so that my digital-to-analog converter receives the PCM data at the bit rate and bit depth of the source):
+
+ ![Open source audio players](https://opensource.com/sites/default/files/open_source_audio.png "Open source audio players") 
+
+Please note that my ranking scheme is not for everyone. In particular, many people don't find value in music files at higher-than-CD resolution, and many people are happy with proprietary formats that promise better audio quality.
+
+Meanwhile, I will continue to evaluate some of the promising non-rated options. I especially like the look of Lollypop, and I feel that there is a secret spell for **gstreamer** just waiting to be unlocked that will let **gstreamer**-based players pass their data through without conversions.
+
+### And the music...
+
+My vinyl buying spree continues, and I have some great recommendations.
+
+First is Nils Frahm's album, [Felt][17], which was a very thoughtful gift from my daughter. I really, really like this album, which was largely recorded late at night with microphones very close to the piano strings and lots of interesting ambient piano noise—really beautiful music. Like other Nils Frahm music, the vinyl comes with a download code that allows the downloading of the album in up to 96-KHz, 24-bit FLAC format.
+
+The second is [Mad Professor's remix][18] of Massive Attack's album, Protection, titled No Protection. You can [get an idea of it here][19], and if you would like to try out the original, [here is what it's all about][20]. Originally released in the 1990s, this album is back on vinyl and it sounds fantastic. Unfortunately, no download code accompanies it.
+
+The third is [Primitives][21] by Bayonne. [Here is an idea][22] of what it's like. The Guardian newspaper has lumped this in with "the new boring," how's that for a genre? Really, if it's all so boring, maybe it's time for a career change, Anyway, give this one a whirl; maybe you'll find it boring, or maybe, like me, you'll like it!
+
+--------------------------------------------------------------------------------
+
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/clh_portrait2.jpg?itok=V1V-YAtY)
+
+Chris Hermansen - Engaged in computing since graduating from the University of British Columbia in 1978, I have been a full-time Linux user since 2005 and a full-time Solaris, SunOS and UNIX System V user before that. On the technical side of things, I have spent a great deal of my career doing data analysis; especially spatial data analysis. I have a substantial amount of programming experience in relation to data analysis, using awk, Python, PostgreSQL, PostGIS and lately Groovy
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/open-source-music-players
+
+作者：[Chris Hermansen][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/clhermansen
+[1]:http://www.alsa-project.org/main/index.php/Main_Page
+[2]:https://www.flickr.com/photos/internetarchivebookimages/14565158187/in/photolist-ocoBRG-ocqdPM-ot9YYX-ovb7SE-oroqfj-ot8Sfi-of1HoD-oc5c28-otBk3B-foZxvq-ocoUvo-4TqEKE-otsG7t-oeYo4w-ornGMQ-orpD9y-wLDBUf-outZV7-oc26Ui-ortZpW-ocpWLH-ocoK6c-ocYDY1-od6ADb-xxAKyY-ocofDx-oc4Jr5-otyT2E-ocpUyu-xqTAb6-oc8gK1-otdsK5-ovhkz2-ocpcHj-oc8xwk-otgmZG-otr595-otnv4o-otvdRs-ovfYEt-ovDXUV-obUPJ6-oc2MuJ-oc4zLE-oruPbN-oc1P2H-ouRk93-otaGd3-otTmwB-oc5f62
+[3]:http://creativecommons.org/licenses/by-sa/4.0/
+[4]:https://en.wikipedia.org/wiki/History_of_music
+[5]:https://opensource.com/article/16/12/soundtrack-open-source-music-players
+[6]:http://aqualung.jeremyevans.net/
+[7]:https://gnumdk.github.io/lollypop-web/
+[8]:https://gogglesmm.github.io/
+[9]:http://aqualung.jeremyevans.net/
+[10]:https://launchpad.net/+search?field.text=aqualung+ppa
+[11]:https://gnumdk.github.io/lollypop-web/
+[12]:https://launchpad.net/~gnumdk/+archive/ubuntu/lollypop
+[13]:https://copr.fedorainfracloud.org/coprs/gnumdk/lollypop/
+[14]:https://gogglesmm.github.io/
+[15]:https://launchpad.net/~s.jansen/+archive/ubuntu/gogglesmm
+[16]:http://www.guayadeque.org/
+[17]:http://www.nilsfrahm.com/works/felt/
+[18]:https://en.wikipedia.org/wiki/No_Protection_(Massive_Attack_album)
+[19]:https://www.youtube.com/watch?v=9TvgRb4wiB0
+[20]:https://www.youtube.com/watch?v=LCUv-hLN71c
+[21]:https://musicglue.com/bayonne/products/primitives---vinyl--/
+[22]:https://www.youtube.com/watch?v=WZ6xl6CKITE
diff --git a/sources/tech/20170113 Best Linux Distributions for New Users.md b/sources/tech/20170113 Best Linux Distributions for New Users.md
new file mode 100644
index 0000000000..339800ac70
--- /dev/null
+++ b/sources/tech/20170113 Best Linux Distributions for New Users.md	
@@ -0,0 +1,114 @@
+Best Linux Distributions for New Users
+============================================================
+
+ ![](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/distros-new-users.jpg?itok=Prp88H71) 
+Jack Wallen considers which Linux distributions are best designed for new users coming from different environments.[Creative Commons Zero][5]Pixabay
+
+Ah, the age-old question...one that holds far more importance than simply pointing out which Linux distribution is a fan-favorite. Why is that?
+
+Let me set the stage: You have a user—one who has, most likely, spent the majority of their time in front of either a Windows or Mac machine—and they’ve come to you for an alternative. You want to point them in a direction that will bring about the least amount of hiccups along the way and highlight the power and flexibility of Linux.
+
+But, remember, the single most important aspect is that they must _get it_, out of the box.
+
+That’s why we often take the time to point out which distributions are best designed for new users -- because bringing new users into the mix is the best way to spread the word and grow the base. 
+
+With that said, what are the best distributions for new users? I’m going to take a bit of a different approach this time and point out which distributions would be best for users coming from different environments. You can also check out my list of [best distros for 2017][11].
+
+[
+ ![Advertisement for Intro to Linux](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/introtolinux_1_800x200.jpg?itok=VV8GZold "Advertisement for Intro to Linux") 
+][12]
+
+### From Windows 7 to Linux: ZorinOS
+
+When Windows 8 rolled out, there was a reason so many wanted to stick with Windows 7—familiarity. Users had been working with the same desktop metaphor for decades and they had no desire to migrate to the more touchscreen-centric platform of Windows 8\. So, what distribution do you turn to for that? You first must consider desktop environment. Why? Because that is where you immediately hook those Windows 7 users. And what better distribution for such a task than [ZorinOS][13]?
+
+ZorinOS was designed specifically as a replacement for Windows (and Mac) computers, so it goes a very long way to replicate the look and feel of those desktops. In fact, you’d be hard-pressed to find a Linux distribution that does as good a job of making the transition from Windows 7 to Linux—while still retaining that which makes Linux such a powerful, flexible platform.
+
+Beyond the desktop environment (Figure 1), ZorinOS is based on Ubuntu, so under the hood, everything is going to just work (so there’s little need to worry their hardware won’t be detected). Couple that with the readily available software and you have the perfect distribution for new users coming from Windows 7.
+
+### [zorinos.jpg][6]
+
+ ![ZorinOS](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/zorinos.jpg?itok=i970f1Id "ZorinOS") 
+
+Figure 1: The ZorinOS Windows 7-like desktop ready to serve.[Used with permission][1]
+
+Do note, however, there are two versions of ZorinOS: Zorin Ultimate and Zorin Core. While Core is free, it doesn’t include nearly the amount of software that you’ll find in Ultimate. If you want an out of the box distribution that will please anyone coming from Windows 7, I highly recommend purchasing [Zorin Ultimate][14] (for approximately $20.00 USD). Of course, if you don’t want to splurge for the Ultimate edition, you can always install nearly everything you need from the included Software package management tool.
+
+[
+ ![Advertisement for New Year&#039;s resolution to be a Linux sysadmin](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/newyearsresolution_1_800x200.jpg?itok=BeGasy1I "Advertisement for New Year&#039;s resolution to be a Linux sysadmin") 
+][15]
+
+### From Windows 8 to Linux: Ubuntu GNOME
+
+The shift to Windows 8, brought about a very touchscreen-centric environment that changed the way users interact with their machines. The old metaphor of Star Menu/Panel/System tray was replaced with an interface that shined in a touchscreen environment. If you’re looking for the best environment to give a new-to-Linux user something different, yet still function as a best-in-breed should, look no further than [Ubuntu GNOME][16].
+
+Ubuntu GNOME is a best of two worlds amalgamation between Ubuntu and GNOME (Figure 2). Replacing the Unity interface with a desktop that is equal parts modern elegance and user-friendly simplicity, Ubuntu GNOME shouldn’t cause much in the way of issues for any user coming from Windows 8\. Not only does this distribution lay its foundation on the latest LTS release of Ubuntu (so support will last), it makes use of the latest stable release of the GNOME desktop—which means the user will enjoy an incredibly solid experience.  
+
+### [ubuntugnome.jpg][7]
+
+ ![Ubuntu GNOME](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/ubuntugnome.jpg?itok=SNjA3y7T "Ubuntu GNOME") 
+
+Figure 2: Simplicity at its elegant best can be found in Ubuntu GNOME.[Used with permission][2]
+
+### From Mac to Linux: Elementary OS
+
+Without a doubt, the hands-down winner for this category is [Elementary OS][17]. Although Elementary does an incredible job of looking and feeling like an OS X desktop, it is much more than that. Elementary OS is, at its very heart, Linux—it just happens to have taken a cue from OS X for many of the design elements.
+
+Any Mac user would feel immediately at home on the desktop environment (Figure 3). With an all-too familiar doc and the inclusion of an applications menu, Elementary OS always stands at the top of my best-of distribution list. And, if we’re talking about Mac users, there is no better drop-in replacement than Elementary OS.
+
+### [elementaryos.jpg][8]
+
+ ![Elementary OS](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/elementaryos.jpg?itok=qaXRClRM "Elementary OS") 
+
+Figure 3: The glory that is the Elementary OS desktop.[Used with permission][3]
+
+One thing that Mac users will greatly appreciate is how great a job the Elementary OS developers have done keeping design consistency throughout the desktop. From the dock, panel, menus, and included applications, you will not find a single element that doesn’t look and feel like it belongs.
+
+There is one caveat that I would add to Elementary OS. You’ll need to install a sufficient browser (as it “ships” with Epiphany—a browser not widely supported by many necessary sites) and you’ll want to install LibreOffice from the downloadable package from the official [LibreOffice site][18] (as the package found in the Elementary OS AppCenter is a bit out of date).
+
+### From Android to Linux: Ubuntu 
+
+This may seem like a bit of a stretch, but considering how dominant Android is within the global market, you will come across users who might need a Linux desktop that would make them feel instantly at home, after coming from a more mobile-centric interface. For me, there is no clearer winner than [Ubuntu][19]. Why? Ubuntu Unity does an outstanding job of making the desktop feel more like an all-encompassing interface than any other. If you want, you can include online search results (now disabled by default), which is something found in nearly every mobile environment. Also, the Unity HUD menu system (Figure 4) is one of the most unique menu systems found in any interface. With this, users can depend less on the mouse (as they would on a mobile device powered by Android).
+
+### [ubuntu.jpg][9]
+
+ ![Ubuntu Unity](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/ubuntu.jpg?itok=HsvBJAIN "Ubuntu Unity") 
+
+Figure 4: The Unity Heads Up Display in action.[Used with permission][4]
+
+Of course, Ubuntu also offers one of the most stable desktop platforms on the market, so the user experience will be nearly flawless.
+
+### There’s a distribution for everyone
+
+One of the important things to remember is that there is a distribution of Linux that is sure to please everyone. But for those coming from specific environments, I highly recommend finding a flavor of Linux that will help make the transition seamless. Give one of these a try and see if you find yourself humming along smoothly with the power of Linux and open source at your fingertips.
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/news/best-linux-distributions-new-users
+
+作者：[JACK WALLEN][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linux.com/users/jlwallen
+[1]:https://www.linux.com/licenses/category/used-permission
+[2]:https://www.linux.com/licenses/category/used-permission
+[3]:https://www.linux.com/licenses/category/used-permission
+[4]:https://www.linux.com/licenses/category/used-permission
+[5]:https://www.linux.com/licenses/category/creative-commons-zero
+[6]:https://www.linux.com/files/images/zorinosjpg
+[7]:https://www.linux.com/files/images/ubuntugnomejpg
+[8]:https://www.linux.com/files/images/elementaryosjpg-1
+[9]:https://www.linux.com/files/images/ubuntujpg
+[10]:https://www.linux.com/files/images/distros-new-usersjpg
+[11]:https://www.linux.com/news/learn/sysadmin/best-linux-distributions-2017
+[12]:http://bit.ly/2jJgK0Q
+[13]:https://zorinos.com/
+[14]:https://zorinos.com/download/#ultimate
+[15]:https://training.linuxfoundation.org/certification/lfcs?utm_source=linux-inline-ad&utm_campaign=new-users-2017&utm_medium=online-advertising&utm_content=new-year
+[16]:https://ubuntugnome.org/
+[17]:https://elementary.io/
+[18]:http://www.libreoffice.org/download/libreoffice-fresh/
+[19]:https://www.ubuntu.com/
diff --git a/sources/tech/20170113 How to install a Ceph Storage Cluster on Ubuntu 16.04.md b/sources/tech/20170113 How to install a Ceph Storage Cluster on Ubuntu 16.04.md
new file mode 100644
index 0000000000..424b4df92a
--- /dev/null
+++ b/sources/tech/20170113 How to install a Ceph Storage Cluster on Ubuntu 16.04.md	
@@ -0,0 +1,463 @@
+How to install a Ceph Storage Cluster on Ubuntu 16.04
+============================================================
+
+### On this page
+
+1.  [Step 1 - Configure All Nodes][1]
+2.  [Step 2 - Configure the SSH Server][2]
+3.  [Step 3 - Configure the Ubuntu Firewall][3]
+4.  [Step 4 - Configure the Ceph OSD Nodes][4]
+5.  [Step 5 - Build the Ceph Cluster][5]
+6.  [Step 6 - Testing Ceph][6]
+7.  [Reference][7]
+
+Ceph is an open source storage platform, it provides high performance, reliability, and scalability. It's a free distributed storage system that provides an interface for object, block, and file-level storage and can operate without a single point of failure.
+
+In this tutorial, I will guide you to install and build a Ceph cluster on Ubuntu 16.04 server. A Ceph cluster consists of these components:
+
+*   **Ceph OSDs (ceph-osd)** - Handles the data storage, data replication, and recovery. A Ceph cluster needs at least two Ceph OSD servers. We will use three Ubuntu 16.04 servers in this setup.
+*   **Ceph Monitor (ceph-mon)** - Monitors the cluster state and runs the OSD map and CRUSH map. We will use one server here.
+*   **Ceph Meta Data Server (ceph-mds)** - this is needed if you want to use Ceph as a File System.
+
+### **Prerequisites**
+
+*   6 server nodes with Ubuntu 16.04 server installed
+*   Root privileges on all nodes
+
+I will use the following hostname / IP setup:
+
+**hostname**        **IP address**
+
+_ceph-admin        10.0.15.10
+mon1                 10.0.15.11
+osd1                  10.0.15.21
+osd2                  10.0.15.22
+osd3                  10.0.15.23
+client                 10.0.15.15_
+
+### Step 1 - Configure All Nodes
+
+In this step, we will configure all 6 nodes to prepare them for the installation of the Ceph Cluster software. So you have to follow and run the commands below on all nodes. And make sure that ssh-server is installed on all nodes.
+
+**Create the Ceph User**
+
+Create a new user named '**cephuser**' on all nodes.
+
+useradd -m -s /bin/bash cephuser
+passwd cephuser
+
+After creating the new user, we need to configure **cephuser** for passwordless sudo privileges. This means that 'cephuser' can run and get sudo privileges without having to enter a password first.
+
+Run the commands below to achieve that.
+
+echo "cephuser ALL = (root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/cephuser
+chmod 0440 /etc/sudoers.d/cephuser
+sed -i s'/Defaults requiretty/#Defaults requiretty'/g /etc/sudoers
+
+**Install and Configure NTP**
+
+Install NTP to synchronize date and time on all nodes. Run the ntpdate command to set the date and time via NTP. We will use the US pool NTP servers. Then start and enable NTP server to run at boot time.
+
+sudo apt-get install -y ntp ntpdate ntp-doc
+ntpdate 0.us.pool.ntp.org
+hwclock --systohc
+systemctl enable ntp
+systemctl start ntp
+
+**Install Open-vm-tools
+**
+
+If you are running all nodes inside VMware, you need to install this virtualization utility.
+
+sudo apt-get install -y open-vm-tools
+
+**Install Python and parted
+**
+
+In this tutorial, we need python packages for building the ceph-cluster. Install python and python-pip.
+
+sudo apt-get install -y python python-pip parted
+
+**Configure the Hosts File**
+
+Edit the hosts file on all nodes with vim editor.
+
+vim /etc/hosts
+
+Paste the configuration below:
+
+```
+10.0.15.10        ceph-admin
+10.0.15.11        mon1
+10.0.15.21        ceph-osd1
+10.0.15.22        ceph-osd2
+10.0.15.23        ceph-osd3
+10.0.15.15        ceph-client
+```
+
+Save the hosts file and exit the vim editor.
+
+Now you can try to ping between the server hostnames to test the network connectivity.
+
+ping -c 5 mon1
+
+[
+ ![Ceph cluster Installation on Ubuntu 16.04](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/1.png) 
+][8]
+
+### Step 2 - Configure the SSH Server
+
+In this step, we will configure the **ceph-admin node**. The admin node is used for configuring the monitor node and osd nodes. Login to the ceph-admin node and access the '**cephuser**'.
+
+ssh root@ceph-admin
+su - cephuser
+
+The admin node is used for installing and configuring all cluster node, so the user on the ceph-admin node must have privileges to connect to all nodes without a password. We need to configure password-less SSH access for 'cephuser' on the 'ceph-admin' node.
+
+Generate the ssh keys for '**cephuser**'.
+
+ssh-keygen
+
+Leave passphrase is blank/empty.
+
+Next, create a configuration file for the ssh config.
+
+vim ~/.ssh/config
+
+Paste the configuration below:
+
+```
+Host ceph-admin
+        Hostname ceph-admin
+        User cephuser
+
+Host mon1
+        Hostname mon1
+        User cephuser
+
+Host ceph-osd1
+        Hostname ceph-osd1
+        User cephuser
+
+Host ceph-osd2
+        Hostname ceph-osd2
+        User cephuser
+
+Host ceph-osd3
+        Hostname ceph-osd3
+        User cephuser
+
+Host ceph-client
+        Hostname ceph-client
+        User cephuser
+```
+
+Save the file and exit vim.
+
+[
+ ![Ceph-admin configuration](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/2.png) 
+][9]
+
+Change the permission of the config file to 644.
+
+chmod 644 ~/.ssh/config
+
+Now add the key to all nodes with the ssh-copy-id command.
+
+ssh-keyscan ceph-osd1 ceph-osd2 ceph-osd3 ceph-client mon1 >> ~/.ssh/known_hosts
+ssh-copy-id ceph-osd1
+ssh-copy-id ceph-osd2
+ssh-copy-id ceph-osd3
+ssh-copy-id mon1
+
+Type in your cephuser password when requested.
+
+[
+ ![Ceph-admin deploy ssh key to all cluster nodes](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/3.png) 
+][10]
+
+Now try to access the osd1 server from the ceph-admin node to test if the password-less login works.
+
+ssh ceph-osd1
+
+[
+ ![SSH Less password from ceph-admin to all nodes cluster](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/4.png) 
+][11]
+
+### Step 3 - Configure the Ubuntu Firewall
+
+For security reasons, we need to turn on the firewall on the servers. Preferably we use Ufw (Uncomplicated Firewall), the default Ubuntu firewall, to protect the system. In this step, we will enable ufw on all nodes, then open the ports needed by ceph-admin, ceph-mon and ceph-osd.
+
+Login to the ceph-admin node and install the ufw packages.
+
+ssh root@ceph-admin
+sudo apt-get install -y ufw
+
+Open port 80, 2003 and 4505-4506, then reload firewalld.
+
+sudo ufw allow 22/tcp
+sudo ufw allow 80/tcp
+sudo ufw allow 2003/tcp
+sudo ufw allow 4505:4506/tcp
+
+Start and enable ufw to start at boot time.
+
+sudo ufw enable
+
+[
+ ![UFW Firewall with Ceph service](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/5.png) 
+][12]
+
+From the ceph-admin node, login to the monitor node 'mon1' and install ufw.
+
+ssh mon1
+sudo apt-get install -y ufw
+
+Open the ports for the ceph monitor node and start ufw.
+
+sudo ufw allow 22/tcp
+sudo ufw allow 6789/tcp
+sudo ufw enable
+
+Finally, open these ports on each osd node: ceph-osd1, ceph-osd2 and ceph-osd3 - port 6800-7300.
+
+Login to each of the ceph-osd nodes from the ceph-admin, and install ufw.
+
+ssh ceph-osd1
+sudo apt-get install -y ufw
+
+Open the ports on the osd nodes and reload firewalld.
+
+sudo ufw allow 22/tcp
+sudo ufw allow 6800:7300/tcp
+sudo ufw enable
+
+The ufw firewall configuration is finished.
+
+### Step 4 - Configure the Ceph OSD Nodes
+
+In this tutorial, we have 3 OSD nodes, each of these nodes has two hard disk partitions.
+
+1.  **/dev/sda** for root partition
+2.  **/dev/sdb** is empty partition - 20GB
+
+We will use **/dev/sdb** for the ceph disk. From the ceph-admin node, login to all OSD nodes and format the /dev/sdb partition with **XFS** file system.
+
+ssh ceph-osd1
+ssh ceph-osd2
+ssh ceph-osd3
+
+Check the partition scheme with the fdisk command.
+
+sudo fdisk -l /dev/sdb
+
+Format the /dev/sdb partition with an XFS filesystem and with a GPT partition table by using the parted command.
+
+sudo parted -s /dev/sdb mklabel gpt mkpart primary xfs 0% 100%
+
+Next, format the partition in XFS format with the mkfs command.
+
+sudo mkfs.xfs -f /dev/sdb
+
+Now check the partition, and you will see a XFS /dev/sdb partition.
+
+sudo fdisk -s /dev/sdb
+sudo blkid -o value -s TYPE /dev/sdb
+
+[
+ ![Format partition ceph OSD nodes](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/6.png) 
+][13]
+
+### Step 5 - Build the Ceph Cluster
+
+In this step, we will install Ceph on all nodes from the ceph-admin. To get started, login to the ceph-admin node.
+
+ssh root@ceph-admin
+su - cephuser
+
+**Install ceph-deploy on ceph-admin node**
+
+In the first step we've already installed python and python-pip on to the system. Now we need to install the Ceph deployment tool '**ceph-deploy**' from the pypi python repository.
+
+Install ceph-deploy on the ceph-admin node with the pip command.
+
+sudo pip install ceph-deploy
+
+Note: Make sure all nodes are updated.
+
+After the ceph-deploy tool has been installed, create a new directory for the Ceph cluster configuration.
+
+**Create a new Cluster**
+
+Create a new cluster directory.
+
+mkdir cluster
+cd cluster/
+
+Next, create a new cluster with the '**ceph-deploy**' command by defining the monitor node '**mon1**'.
+
+ceph-deploy new mon1
+
+The command will generate the Ceph cluster configuration file 'ceph.conf' in cluster directory.
+
+[
+ ![Generate new ceph cluster configuration](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/7.png) 
+][14]
+
+Edit the ceph.conf file with vim.
+
+vim ceph.conf
+
+Under the [global] block, paste the configuration below.
+
+```
+# Your network address
+public network = 10.0.15.0/24
+osd pool default size = 2
+```
+
+Save the file and exit the editor.
+
+**Install Ceph on All Nodes**
+
+Now install Ceph on all nodes from the ceph-admin node with a single command.
+
+ceph-deploy install ceph-admin ceph-osd1 ceph-osd2 ceph-osd3 mon1
+
+The command will automatically install Ceph on all nodes: mon1, osd1-3 and ceph-admin - The installation will take some time.
+
+Now deploy the monitor node on the mon1 node.
+
+ceph-deploy mon create-initial
+
+The command will create a monitor key, check the key with this ceph command.
+
+ceph-deploy gatherkeys mon1
+
+[
+ ![Deploy key ceph](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/8.png) 
+][15]
+
+**Adding OSDS to the Cluster**
+
+After Ceph has been installed on all nodes, now we can add the OSD daemons to the cluster. OSD Daemons will create the data and journal partition on the disk /dev/sdb.
+
+Check the available disk /dev/sdb on all osd nodes.
+
+ceph-deploy disk list ceph-osd1 ceph-osd2 ceph-osd3
+
+[
+ ![disk list of osd nodes](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/9.png) 
+][16]
+
+You will see /dev/sdb with the XFS format that we created before.
+
+Next, delete the partition tables on all nodes with the zap option.
+
+ceph-deploy disk zap ceph-osd1:/dev/sdb ceph-osd2:/dev/sdb ceph-osd3:/dev/sdb
+
+The command will delete all data on /dev/sdb on the Ceph OSD nodes.
+
+Now prepare all OSD nodes and ensure that there are no errors in the results.
+
+ceph-deploy osd prepare ceph-osd1:/dev/sdb ceph-osd2:/dev/sdb ceph-osd3:/dev/sdb
+
+When you see the ceph-osd1-3 is ready for OSD use in the result, then the command was successful.
+
+[
+ ![Prepare the ceph-osd nodes](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/10.png) 
+][17]
+
+Activate the OSD'S with the command below:
+
+ceph-deploy osd activate ceph-osd1:/dev/sdb ceph-osd2:/dev/sdb ceph-osd3:/dev/sdb
+
+Now you can check the sdb disk on OSDS nodes again.
+
+ceph-deploy disk list ceph-osd1 ceph-osd2 ceph-osd3
+
+[
+ ![Ceph osds activated](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/11.png) 
+][18]
+
+The result is that /dev/sdb has two partitions now:
+
+1.  **/dev/sdb1** - Ceph Data
+2.  **/dev/sdb2** - Ceph Journal
+
+Or you check it directly on the OSD node.
+
+ssh ceph-osd1
+sudo fdisk -l /dev/sdb
+
+[
+ ![Ceph OSD nodes were created](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/12.png) 
+][19]
+
+Next, deploy the management-key to all associated nodes.
+
+ceph-deploy admin ceph-admin mon1 ceph-osd1 ceph-osd2 ceph-osd3
+
+Change the permission of the key file by running the command below on all nodes.
+
+sudo chmod 644 /etc/ceph/ceph.client.admin.keyring
+
+The Ceph Cluster on Ubuntu 16.04 has been created.
+
+### Step 6 - Testing Ceph
+
+In step 4, we've installed and created a new Ceph cluster, and added OSDS nodes to the cluster. Now we should test the cluster to make sure that it works as intended.
+
+From the ceph-admin node, log in to the Ceph monitor server '**mon1**'.
+
+ssh mon1
+
+Run the command below to check the cluster health.
+
+sudo ceph health
+
+Now check the cluster status.
+
+sudo ceph -s
+
+You can see results below:
+
+[
+ ![Ceph Cluster Status](https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/13.png) 
+][20]
+
+Make sure the Ceph health is **OK** and there is a monitor node '**mon1**' with IP address '**10.0.15.11**'. There are **3 OSD** servers and all are **up** and running, and there should be an available disk space of **45GB** - 3x15GB Ceph Data OSD partition.
+
+We build a new Ceph Cluster on Ubuntu 16.04 successfully.
+
+--------------------------------------------------------------------------------
+
+via: https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/
+
+作者：[Muhammad Arul][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/
+[1]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-configure-all-nodes
+[2]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-configure-the-ssh-server
+[3]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-configure-the-ubuntu-firewall
+[4]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-configure-the-ceph-osd-nodes
+[5]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-build-the-ceph-cluster
+[6]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#step-testing-ceph
+[7]:https://www.howtoforge.com/tutorial/how-to-install-a-ceph-cluster-on-ubuntu-16-04/#reference
+[8]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/1.png
+[9]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/2.png
+[10]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/3.png
+[11]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/4.png
+[12]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/5.png
+[13]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/6.png
+[14]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/7.png
+[15]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/8.png
+[16]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/9.png
+[17]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/10.png
+[18]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/11.png
+[19]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/12.png
+[20]:https://www.howtoforge.com/images/how-to-install-a-ceph-cluster-on-ubuntu-16-04/big/13.png
diff --git a/sources/tech/20170113 Learn The Basics of How Linux IO Redirection Works.md b/sources/tech/20170113 Learn The Basics of How Linux IO Redirection Works.md
new file mode 100644
index 0000000000..2f201d7506
--- /dev/null
+++ b/sources/tech/20170113 Learn The Basics of How Linux IO Redirection Works.md	
@@ -0,0 +1,228 @@
+Learn The Basics of How Linux I/O (Input/Output) Redirection Works
+============================================================
+
+One of the most important and [interesting topics under Linux administration][4] is I/O redirection. This feature of the command line enables you to redirect the input and/or output of commands from and/or to files, or join multiple commands together using pipes to form what is known as a “command pipeline”.
+
+All the commands that we run fundamentally produce two kinds of output:
+
+1.  the command result – data the program is designed to produce, and
+2.  the program status and error messages that informs a user of the program execution details.
+
+In Linux and other Unix-like systems, there are three default files named below which are also identified by the shell using file descriptor numbers:
+
+1.  stdin or 0 – it’s connected to the keyboard, most programs read input from this file.
+2.  stdout or 1 – it’s attached to the screen, and all programs send their results to this file and
+3.  stderr or 2 – programs send status/error messages to this file which is also attached to the screen.
+
+Therefore, I/O redirection allows you to alter the input source of a command as well as where its output and error messages are sent to. And this is made possible by the `“<”` and `“>”` redirection operators.
+
+### How To Redirect Standard Output to File in Linux
+
+You can redirect standard output as in the example below, here, we want to store the output of the [top command][5]for later inspection:
+
+```
+$ top -bn 5 >top.log
+```
+
+Where the flags:
+
+1.  `-b` – enables top to run in batch mode, so that you can redirect its output to a file or another command.
+2.  `-n` – specifies the number of iterations before the command terminates.
+
+You can view the contents of `top.log` file using [cat command][6] as follows:
+
+```
+$ cat top.log
+```
+
+To append the output of a command, use the `“>>”` operator.
+
+For instance to append the output of [top command][7] above in the top.log file especially within a script (or on the command line), enter the line below:
+
+```
+$ top -bn 5 >>top.log
+```
+
+Note: Using the file descriptor number, the output redirect command above is the same as:
+
+```
+$ top -bn 5 1>top.log
+```
+
+### How To Redirect Standard Error to File in Linux
+
+To redirect standard error of a command, you need to explicitly specify the file descriptor number, `2` for the shell to understand what you are trying to do.
+
+For example the [ls command][8] below will produce an error when executed by a normal system user without root privileges:
+
+```
+$ ls -l /root/
+```
+
+You can redirect the standard error to a file as below:
+
+```
+$ ls -l /root/ 2>ls-error.log
+$ cat ls-error.log 
+```
+[
+ ![Redirect Standard Error to File](http://www.tecmint.com/wp-content/uploads/2017/01/Redirect-Standard-Error-in-Linux.png) 
+][9]
+
+Redirect Standard Error to File
+
+In order to append the standard error, use the command below:
+
+```
+$ ls -l /root/ 2>>ls-error.log
+```
+
+### How To Redirect Standard Output/ Error To One File
+
+It is also possible to capture all the output of a command (both standard output and standard error) into a single file. This can be done in two possible ways by specifying the file descriptor numbers:
+
+1. The first is a relatively old method which works as follows:
+
+```
+$ ls -l /root/ >ls-error.log 2>&1
+```
+
+The command above means the shell will first send the output of the [ls command][10] to the file ls-error.log (using `>ls-error.log`), and then writes all error messages to the file descriptor 2 (standard output) which has been redirected to the file ls-error.log (using `2>&1`). Implying that standard error is also sent to the same file as standard output.
+
+2. The second and direct method is:
+
+```
+$ ls -l /root/ &>ls-error.log
+```
+
+You can as well append standard output and standard error to a single file like so:
+
+```
+$ ls -l /root/ &>>ls-error.log
+```
+
+### How To Redirect Standard Input to File
+
+Most if not all commands get their input from standard input, and by default standard input is attached to the keyboard.
+
+To redirect standard input from a file other than the keyboard, use the `“<”` operator as below:
+
+```
+$ cat <domains.list 
+```
+[
+ ![Redirect Standard Input to File](http://www.tecmint.com/wp-content/uploads/2017/01/Redirect-Standard-Input-to-File.png) 
+][11]
+
+Redirect Standard Input to File
+
+### How To Redirect Standard Input/Output to File
+
+You can perform standard input, standard output redirection at the same time using [sort command][12] as below:
+
+```
+$ sort <domains.list >sort.output
+```
+
+### How to Use I/O Redirection Using Pipes
+
+To redirect the output of one command as input of another, you can use pipes, this is a powerful means of building useful command lines for complex operations.
+
+For example, the command below will [list the top five recently modified files][13].
+
+```
+$ ls -lt | head -n 5 
+```
+
+Here, the options:
+
+1.  `-l` – enables long listing format
+2.  `-t` – [sort by modification time with the newest files][1] are shown first
+3.  `-n` – specifies the number of header lines to show
+
+### Important Commands for Building Pipelines
+
+Here, we will briefly review two important commands for building command pipelines and they are:
+
+xargs which is used to build and execute command lines from standard input. Below is an example of a pipeline which uses xargs, this command is used to [copy a file into multiple directories in Linux][14]:
+
+```
+$ echo /home/aaronkilik/test/ /home/aaronkilik/tmp | xargs -n 1 cp -v /home/aaronkilik/bin/sys_info.sh
+```
+[
+ ![Copy Files to Multiple Directories](http://www.tecmint.com/wp-content/uploads/2017/01/Copy-Files-to-Multiple-Directories.png) 
+][15]
+
+Copy Files to Multiple Directories
+
+And the options:
+
+1.  `-n 1` – instructs xargs to use at most one argument per command line and send to the [cp command][2]
+2.  `cp` – copies the file
+3.  `-v` – [displays progress of copy command][3].
+
+For more usage options and info, read through the xargs man page:
+
+```
+$ man xargs 
+```
+
+A tee command reads from standard input and writes to standard output and files. We can demonstrate how teeworks as follows:
+
+```
+$ echo "Testing how tee command works" | tee file1 
+```
+[
+ ![tee Command Example](http://www.tecmint.com/wp-content/uploads/2017/01/tee-command-example.png) 
+][16]
+
+tee Command Example
+
+[File or text filters][17] are commonly used with pipes for [effective Linux file operations][18], to process information in powerful ways such as restructuring output of commands (this can be vital for [generation of useful Linux reports][19]), modifying text in files plus several other [Linux system administration tasks][20].
+
+To learn more about Linux filters and pipes, read this article [Find Top 10 IP Addresses Accessing Apache Server][21], shows a useful example of using filters and pipes.
+
+In this article, we explained the fundamentals of I/O redirection in Linux. Remember to share your thoughts via the feedback section below.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili is a Linux and F.O.S.S enthusiast, an upcoming Linux SysAdmin, web developer, and currently a content creator for TecMint who loves working with computers and strongly believes in sharing knowledge.
+
+--------------------------------------------------------------------------------
+
+
+
+via: http://www.tecmint.com/linux-io-input-output-redirection-operators/
+
+作者：[Aaron Kili][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/find-and-sort-files-modification-date-and-time-in-linux/
+[2]:http://www.tecmint.com/progress-monitor-check-progress-of-linux-commands/
+[3]:http://www.tecmint.com/monitor-copy-backup-tar-progress-in-linux-using-pv-command/
+[4]:http://www.tecmint.com/how-to-setup-and-configure-static-network-routing-in-rhel/
+[5]:http://www.tecmint.com/12-top-command-examples-in-linux/
+[6]:http://www.tecmint.com/13-basic-cat-command-examples-in-linux/
+[7]:http://www.tecmint.com/12-top-command-examples-in-linux/
+[8]:http://www.tecmint.com/tag/linux-ls-command/
+[9]:http://www.tecmint.com/wp-content/uploads/2017/01/Redirect-Standard-Error-in-Linux.png
+[10]:http://www.tecmint.com/15-basic-ls-command-examples-in-linux/
+[11]:http://www.tecmint.com/wp-content/uploads/2017/01/Redirect-Standard-Input-to-File.png
+[12]:http://www.tecmint.com/sort-command-linux/
+[13]:http://www.tecmint.com/find-recent-modified-files-in-linux/
+[14]:http://www.tecmint.com/copy-file-to-multiple-directories-in-linux/
+[15]:http://www.tecmint.com/wp-content/uploads/2017/01/Copy-Files-to-Multiple-Directories.png
+[16]:http://www.tecmint.com/wp-content/uploads/2017/01/tee-command-example.png
+[17]:http://www.tecmint.com/linux-file-operations-commands/
+[18]:http://www.tecmint.com/linux-file-operations-commands/
+[19]:http://www.tecmint.com/linux-performance-monitoring-and-file-system-statistics-reports/
+[20]:http://www.tecmint.com/automating-linux-system-administration-tasks/
+[21]:http://www.tecmint.com/find-top-ip-address-accessing-apache-web-server/
diff --git a/sources/tech/20170114 Set Date and Time for Each Command You Execute in Bash History.md b/sources/tech/20170114 Set Date and Time for Each Command You Execute in Bash History.md
new file mode 100644
index 0000000000..a461b43cf9
--- /dev/null
+++ b/sources/tech/20170114 Set Date and Time for Each Command You Execute in Bash History.md	
@@ -0,0 +1,96 @@
+Translating by Hymantin
+Set Date and Time for Each Command You Execute in Bash History
+============================================================
+
+By default, all commands executed by Bash on the command line are stored in history buffer or recorded in a file called ~/.bash_history. This means that a system administrator can view a list of commands executed by users on the system or a user can view his/her command history using the [history command][1] like so.
+
+```
+$ history
+```
+[
+ ![Linux History Command](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-History-Command.png) 
+][2]
+
+Linux History Command
+
+From the output of the [history command][3] above, the date and time when a command was executed is not shown. This is the default setting on most if not all Linux distributions.
+
+In this article, we will explain how you can configure time stamp information when each command in the Bash history was executed to be displayed.
+
+The date and time associated with each history entry can be written to the history file, marked with the history comment character by setting the HISTTIMEFORMAT variable.
+
+There are two possible ways of doing this: one does it temporarily while the other makes it permanent.
+
+To set HISTTIMEFORMAT variable temporarily, export it as below on the command line:
+
+```
+$ export HISTTIMEFORMAT='%F %T'
+```
+
+In the export command above, the time stamp format:
+
+1.  `%F` – expands to full date same, as %Y-%m-%d (year-month-date).
+2.  `%T` – expands to time; same as %H:%M:%S (hour:minute:seconds).
+
+Read through the [date command][4] man page for additional usage information:
+
+```
+$ man date
+```
+
+Then check your command history as follows:
+
+```
+$ history 
+```
+[
+ ![Display Linux Command History with Date and Time](http://www.tecmint.com/wp-content/uploads/2017/01/Set-Date-and-Time-on-Linux-Commands-History.png) 
+][5]
+
+Display Linux Command History with Date and Time
+
+However, if you want to configure this variable permanently, open the file `~/.bashrc` with your favorite editor:
+
+```
+$ vi ~/.bashrc
+```
+
+And add the line below in it (you mark it with a comment as your own configuration):
+
+```
+#my config
+export HISTTIMEFORMAT='%F %T'
+```
+
+Save the file and exit, afterwards, run the command below to effect the changes made to the file:
+
+```
+$ source ~/.bashrc
+```
+
+That’s all! Do share with us any interesting history command tips and tricks or your thoughts about this guide via the comment section below.
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/7badddbc53297b2e8ed7011cf45df0c0?s=128&d=blank&r=g)
+
+I am Ravi Saive, creator of TecMint. A Computer Geek and Linux Guru who loves to share tricks and tips on Internet. Most Of My Servers runs on Open Source Platform called Linux. Follow Me: Twitter, Facebook and Google+
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/display-linux-command-history-with-date-and-time/
+
+作者：[Ravi Saive][a]
+译者：[译者ID](https://github.com/译者ID)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/admin/
+[1]:http://www.tecmint.com/history-command-examples/
+[2]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-History-Command.png
+[3]:http://www.tecmint.com/history-command-examples/
+[4]:http://www.tecmint.com/sort-ls-output-by-last-modified-date-and-time/
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Set-Date-and-Time-on-Linux-Commands-History.png
diff --git a/translated/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md b/translated/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md
new file mode 100644
index 0000000000..7b01bd8541
--- /dev/null
+++ b/translated/talk/20161104 Build Strong Real-Time Streaming Apps with Apache Calcite.md	
@@ -0,0 +1,56 @@
+# 用 Apache Calcite 构建强大的实时流应用
+
+ ![Calcite](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/calcite.jpg?itok=CUZmjPjy "Calcite ") 
+
+Calcite 是一个数据框架，它允许你创建自定义数据库功能，微软开发者 Atri Sharma 在 Apache 即将到来的 11 月 14-16 日在西班牙塞维利亚举行的 Big Data Europe 中解释。[Creative Commons Zero][2]
+
+Wikimedia Commons: Parent Géry
+
+[Apache Calcite][7] 数据管理框架包含许多典型的数据库管理系统，但省略了其他部分，如存储数据和算法来处理数据。 Microsoft 在 Azure Data Lake 的软件工程师 Atri Sharma 在西班牙塞维利亚的即将到来的 [Apache：Big Data][6] 会议上的演讲中将讨论使用 [Apache Calcite][5]的高级查询规划能力。我们与 Sharma 讨论了解有关 Calcite 的更多信息，以及现有程序如何利用其功能。
+
+ ![Atri Sharma](https://www.linux.com/sites/lcom/files/styles/floated_images/public/atri-sharma.jpg?itok=77cvZWfw "Atri Sharma") 
+
+Atri Sharma，微软 Azure Data Lake 的软件工程师，已经[授权使用][1]
+
+**Linux.com：你能提供一些关于 Apache Calcite 的背景吗？ 它有什么作用？
+
+Atri Sharma：Calcite是一个框架，它是许多数据库内核的基础。Calcite 允许你构建自定义数据库功能并使用 Calcite 所需的资源。例如，Hive 使用 Calcite 进行基于成本的查询优化、Drill 和 Kylin 使用 Calcite 进行 SQL 解析和优化、Apex 使用 Calcite 进行流式 SQL。
+
+**Linux.com：有哪些是使得 Apache Calcite 与其他框架不同的特性？
+
+Atri：Calcite 是独一无二的，它允许你建立自己的数据平台。 Calcite 不直接管理你的数据，而是允许你使用 Calcite 的库来定义你自己的组件。 例如，它允许使用 Calcite 中可用的 Planner 定义自定义查询优化器，而不是提供通用查询优化器。
+
+**Linux.com：Apache Calcite 本身不会存储或处理数据。 它如何影响程序开发？
+
+Atri：Calcite 是数据库内核中的依赖项。它面向希望扩展其功能的数据管理平台，而无需从头开始编写大量功能。
+
+** Linux.com：谁应该使用它？ 你能举几个例子吗？**
+
+Atri：任何旨在扩展其功能的数据管理平台都应使用 Calcite。 我们是你下一个高性能数据库的基础！
+
+具体来说，我认为最大的例子是 Hive 使用 Calcite 用于查询优化、Flink 解析和流 SQL 处理。 Hive 和 Flink 是成熟的数据管理引擎，并使用 Calcite 高度专业目的。这是对 Calcite 应用进一步加强数据管理平台核心的一个好的案例研究。
+
+**Linux.com：你有哪些期待的新功能？
+
+Atri：流 SQL 增强是令我非常兴奋的事情。这些功能令人兴奋，因为它们将使 Calcite 的用户能够更快地开发实时流式应用程序，并且这些程序的强大和功能将是多方面的。流程序是新的事实，并且在流 SQL 中具有查询优化的优点对于大部分人将是非常有用的。此外，关于暂存表的讨论还在进行，所以请继续关注！
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/news/build-strong-real-time-streaming-apps-apache-calcite
+
+作者：[AMBER ANKERHOLZ][a]
+
+译者：[geekpi](https://github.com/geekpi)
+
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.linux.com/users/aankerholz
+[1]:https://www.linux.com/licenses/category/used-permission
+[2]:https://www.linux.com/licenses/category/creative-commons-zero
+[3]:https://www.linux.com/files/images/atri-sharmajpg
+[4]:https://www.linux.com/files/images/calcitejpg
+[5]:https://calcite.apache.org/
+[6]:http://events.linuxfoundation.org/events/apache-big-data-europe
+[7]:https://calcite.apache.org/
diff --git a/translated/talk/20170111 The difference between development and deployment.md b/translated/talk/20170111 The difference between development and deployment.md
new file mode 100644
index 0000000000..ed5d55ca33
--- /dev/null
+++ b/translated/talk/20170111 The difference between development and deployment.md	
@@ -0,0 +1,59 @@
+开发和部署的不同
+============================================================
+ ![The difference between development and deployment](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/BUS_OpenSourceExperience_520x292_cm.png?itok=APna2N9Y "The difference between development and deployment") 
+图片提供 : 
+
+opensource.com
+
+多年来，我是一名 Smalltalk 程序员，这种经验给让我在观察编程世界时有不同的想法。例如，源代码应该存储在文本文件中的想法需要一些习惯。
+
+我们作为程序员通常区分“开发”和“部署”，特别是我们在一个地方开发使用的工具不同于我们之后部署软件时的地点和工具。在Smalltalk世界里，没有这样的区别。
+
+Smalltalk 构建于虚拟机包含了你的开发环境（IDE、调试器、文本编辑器、版本控制等）的想法上，如果你必须修改任何代码，你将修改内存中运行副本。如果你想快照运行中的机器，你可以这样做，如果你想分发你的代码，你可以发送一个运行的机器镜像（包括IDE、调试器、文本编辑器、版本控制等）的副本到用户。这就是 90 年代软件开发的工作原理（对我们中的一些人来说）。
+
+如今部署环境与开发环境有了很大的不同。对于初学者，你不希望那里有任何开发工具。一旦部署，就没有版本控制、没有调试、没有开发环境。有记录和监视，这些在我们的开发环境中没有，并且有一个“构建管道”，它将我们的软件从我们开发形式转换为部署形式。例如，Docker 容器试图重新抓住 1990 年代 Smalltalk 程序员部署经验的一些简单性，而不希望对开发体验做同样的事情。
+
+我想如果 Smalltalk 世界是我唯一的编程隐喻体验，无法区分开发和部署环境，我可能作为侥幸回顾一下它。但在我是一名 Smalltalk 程序员之前，我是一位 APL 程序员，这也是一个可以修改虚拟机镜像的世界，其中开发和部署是无法区分的。因此，我相信，当前的世界，人们编辑单独的源代码文件，然后运行构建管道以e创建在编辑代码时不存在的部署工作，然后将这些作品部署到用户。我们已经以某种方式将这种反模式软件开发制度化，并且不断发展的软件环境的需求正在迫使我们找到回到 20  世纪 90 年代更有效的技术的方法。因此会有 Docker 的成功。因此，我需要提出建议。
+
+我有两个建议：我们在运行时系统中实现（和使用）版本控制，我们通过更改运行系统来开发软件，而不是用新的运行系统替换它们。这两个想法是相关的。为了安全地更改正在运行的系统，我们需要一些版本控制功能来支持“撤消”功能。也许公平地说，我只提出一个建议。让我举例来说明。
+
+让我们开始想象一个静态网站。你要修改一些 HTML 文件。你应该如何工作？如果你像大多数开发者一样，你会有两个，也许三个网站 - 一个用于开发，一个用于QA（或者预发布），一个用于生产。你将直接编辑开发实例中的文件。准备就绪后，你将“部署”你的修改到预发布实例。在用户验收测试之后，你将再次部署，这次是生产环境。
+
+使用 Occam 的 Razor，让我们避免不必要地创建实例。我们需要多少台机器？我们可以使用一台电脑。我们需要多少台网络服务器？我们可以使用具有多个虚拟主机的单台 web 服务器，而不是多个虚拟主机，我们可以使用单台虚拟主机吗？然后，我们需要多个目录，并需要使用 URL 的顶级路径来区分不同的版本，而不是虚拟主机名。但是为什么我们需要多个目录？因为 web 服务器将从文件系统中提供静态文件。我们的问题是，目录有三个不同的版本，我们的解决方案是创建目录的三个不同的副本。这不是像 Subversion 和 Git 这样的版本控制系统解决的问题？制作目录的多个副本以存储多个版本的策略回到了 CVS 之前的日子。为什么不使用，也就是一个空的的 Git 仓库来存储文件？因为要这样做，web 服务器将需要能够从 git 仓库读取文件（参见[mod_git] [3]）。
+
+这将是一个支持版本控制的运行时系统。
+
+使用这样的 web 服务器，使用的版本可以由 cookie 来标识。这样，任何人都可以推送到仓库，用户将继续看到他们发起会话时分配的版本。版本控制系统有不可改变的提交; 一旦会话开始，开发人员可以在不影响正在运行的用户的情况下快速推送更改。开发人员可以重置其会话以跟踪他们的新提交，因此开发人员或测试人员就可能如普通用户一样查看在同台服务器上同一个URL上正在开发或正在测试的版本。作为偶然的副作用，A/B 测试仅仅是将不同的用户分配给不同的提交的情况。所有用于管理多个版本的 git 设施都在运行环境中发挥作用。当然，git reset 为我们提供了前面提到的“撤销”功能。
+
+为什么不是每个人都这样做？
+
+一种可能性是，诸如版本控制系统的工具不被设计为在生产环境中使用。例如，给某人许可推送到测试分支而不是生产分支是不可能的。对这个方案最常见的反对是，如果发现了一个漏洞，你会想要将某些提交标记为不可访问。这将是另一种更细粒度的权限的情况;开发人员将具有对所有提交的读取权限，但外部用户不会。我们可能需要对现有工具进行一些额外的工作以支持这种模式，但是这些功能很容易理解，并已被设计到其他软件中。例如，Linux （或 PostgreSQL）实现了对不同用户的细粒度权限的想法。
+
+随着云环境变得越来越普及，这些想法变得更加相关：云总是在运行。例如，我们可以看到，AWS 中等价的 “文件系统”（S3）实现了版本控制，所以你可能有一个不同的想法，使用一台 web 服务器提供来自 S3 的资产，并使用会话信息选择不同版本的资产。重要的想法并不是实现是最好的，而是支持运行时版本控制的愿望。
+
+部署的软件环境应该是“版本感知”的原则扩展到除了服务静态资产的web服务器之外的其他工具。在将来的文章中，我将介绍版本库，数据库和应用程序服务器的方法。
+
+_在 linux.conf.au 中了解更多 Robert Lefkowitz 2017 年 （[＃lca2017][1]）在 Hobart：[保持 Linux 伟大][2]的主题。_
+
+--------------------------------------------------------------------------------
+
+作者简介： 
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/robert_lefkowitz.jpg?itok=CFoX-OUI)
+
+Robert M. Lefkowitz - Robert（a / k / a r0ml）是一个喜欢复杂编程语言的编程语言爱好者。 他是一个提高清晰度、提高可靠性和最大限度地简化编程技术的收藏家。他通过让计算机更加容易获得来使它普及化。他经常演讲中世纪晚期和早期文艺复兴对编程艺术的影响。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/difference-between-development-deployment
+
+作者：[Robert M. Lefkowitz][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/r0ml
+[1]:https://twitter.com/search?q=%23lca2017&src=typd
+[2]:https://www.linux.conf.au/schedule/presentation/107/
+[3]:https://github.com/r0ml/mod_git
diff --git a/translated/talk/The history of Android/29 - The (updated) history of Android.md b/translated/talk/The history of Android/29 - The (updated) history of Android.md
new file mode 100644
index 0000000000..be378ae6d4
--- /dev/null
+++ b/translated/talk/The history of Android/29 - The (updated) history of Android.md	
@@ -0,0 +1,225 @@
+安卓编年史
+============================================================
+
+### 让我们跟着安卓从 0.5 版本到 7 的无尽迭代来看看它的发展历史。
+
+
+毫不夸张地说，谷歌搜索在棒棒糖中无处不在。“持续开启语音识别”这项特性让用户可以在任何界面随时说出“OK Google”，即时是在息屏状态也没有问题。谷歌应用依然是谷歌的首要主屏，这项特性是自奇巧时引入的。现在搜索栏也会显示在新的最近应用界面。
+
+Google Now 依然是最左侧的主屏，但现在 Material Design 对它进行了大翻新，给了它一个色彩大胆的头部以及重新设计的排版。
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/play-store-1-150x150.jpg)
+    ][1]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/play2-150x150.jpg)
+    ][2]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/6-150x150.jpg)
+    ][3]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/5-150x150.jpg)
+    ][4]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/12-2-150x150.jpg)
+    ][5]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/14-1-150x150.jpg)
+    ][6]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/19-1-150x150.jpg)
+    ][7]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/13-2-150x150.jpg)
+    ][8]
+
+Play 商店遵从了和其它棒棒糖应用相似的轨迹。它在视觉上焕然疑一新，大胆的色彩，新排版，还有一个全新的布局。通常这里不会有什么新增功能，就只是给一切换件新马甲。
+
+Play 商店的导航面板现在真的可以用于导航了，每个分类有各自的入口。棒棒糖也不再在操作栏放“更多”按钮了，取而代之的是一个独立的操作按钮（通常是搜索），并且去掉了导航栏中多余的选项。这给了用户一个单独的地方来查找项目，而不用在两个菜单中寻找搜索的地方。
+
+棒棒糖还给了应用让状态栏透明的能力。这让操作栏的颜色可以渗透到状态栏，让它只比周围的界面暗一点点。一些界面甚至在顶部使用了全幅英雄图片，同时显示到了状态栏上。
+
+[
+ ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1-980x481.jpg)
+][38]
+
+
+谷歌日历完全重写了，获得了很多新设计，也失去了很多特性。你不再能够双指缩放来调整时间视图，月份视图也从手机上消失了，周视图从七天退化成了五天的视图。在用户抱怨之后，谷歌将会花费接下来几个版本的时间来重新添加回这里面的一些特性。“谷歌日历”还加强了“谷歌”部分，去除了直接在应用内添加第三方账户的能力。非谷歌账户现在需要从 Gamil 来添加。
+
+尽管如此，它看起来还是很棒。在一些视图上，月份开头带有头图，就像是真实的纸质日历。带有地点的事件会附带显示来自那个地点的照片。举个例子，我的“去往旧金山”会显示金门大桥。谷歌日历还会从 Gamil 获取事件并在你的日历中显示。
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/7-150x150.jpg)
+    ][9]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/8-150x150.jpg)
+    ][10]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/12-150x150.jpg)
+    ][11]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/13-150x150.jpg)
+    ][12]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/3-1-150x150.jpg)
+    ][13]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/14-150x150.jpg)
+    ][14]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/6-2-150x150.jpg)
+    ][15]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/5-3-150x150.jpg)
+    ][16]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/7-2-150x150.jpg)
+    ][17]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/9-1-150x150.jpg)
+    ][18]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/10-1-150x150.jpg)
+    ][19]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/28-1-150x150.jpg)
+    ][20]
+
+其它应用都可以套用基本相同的描述：功能上没有太多新鲜的，但新设计换掉了奇巧中的灰色以大胆，明亮的色彩。环聊获得了收取 Google Voice 信息的能力，时钟应用的背景颜色会随着每天时间的变化而改变。
+
+#### 任务调度器鞭策应用生态成型
+
+谷歌决定在棒棒糖中实施“伏特计划（Project Volta）”，关注电量使用问题。谷歌从“电池史学家（Battery Historian）”开始，为自己和开发者创建了更多的电池追踪工具。这个 python 脚本获取所有的安卓电量日志数据，并转换成可读，交互式的图表。在这个新诊断工具的帮助下，谷歌将后台任务标记为主要的耗电大户。
+
+在 2014 年的 I/O 大会上，这家公司注意到启用飞行模式并关闭屏幕可以让安卓手机待机将近一个月。但是，如果用户全部启用并使用设备，它们没法坚持一整天。结论就是如果你能让一切都停止活动，你的电池表现就能好得多。
+
+因此，谷歌创建了一个新 API，称作“JobScheduler（任务调度器）”，这是个新的针对安卓后台任务的警察。在任务调度器出现之前，每个单独的应用为它自己的后台进程负责，这意味着每个应用会独立唤醒处理器和调制解调器，检查连通性、组织数据库、下载更新以及上传日志。所有东西都有它自己独立的定时器，所以你的手机会一直被唤醒。有了任务调度器，后台任务从无组织的混乱，转变为统一的批处理，有有序的后台进程处理窗口。
+
+任务调度器可以让应用指定它们的任务所需的条件（连通性、Wi-Fi、接入电源等等），它会在那些条件满足的时候发送一条通知。这就像是推送邮件和每五分钟检查一次邮件的区别……但是带上任务需求的。谷歌还开始给后台任务推进一个“懒”实现。如果一些事情可以推迟到设备处于 Wi-Fi，接入电源以及待机状态，那它就应该等到那时候执行。你现在可以看到这一策略的成果，在 Wi-Fi 下，你可以将安卓手机接入电源，并且只有在_这种条件下_它才会开始下载应用更新。你通常不需要立即下载应用更新，最好的时候是等到用户有无限的电源和网络的时候进行。
+
+#### 开机设置获得面向未来的新设计
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/25-1-150x150.jpg)
+    ][21]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/26-150x150.jpg)
+    ][22]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup2-150x150.jpg)
+    ][23]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup3-150x150.jpg)
+    ][24]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup4-150x150.jpg)
+    ][25]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup5-150x150.jpg)
+    ][26]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/10/setup6-150x150.png)
+    ][27]
+
+开机设置经过了大翻新，它不止是为了跟上 Material Design 指南，还是“面向未来”的，这样不管未来谷歌采用什么新的登录和验证方案，它都能够适应。记住，写“安卓编年史”的部分原因就是一些旧版安卓已经不再能工作了。这些年来，谷歌已经为用户升级了更佳加密的验证方案以及二次验证，但添加这些新的登录要求破坏了旧客户端的兼容性。很多安卓特性要求访问谷歌云设施，所以你没法登录的话，像安卓 1.0 的 Gmail 这样的就没法工作了。
+
+在棒棒糖中，开机设置工作的前几个界面和之前的很像。你可以看到“欢迎使用安卓界面”以及一些设置数据和 Wi-Fi 连接的选项。但在这个界面之后就有了变化。一旦棒棒糖连接到了互联网，它会连接到谷歌的服务器来“检查更新”。这并不是检查系统或应用的更新，是在检查即将执行的设置工作的更新。安卓下载了最新版本的设置，_然后_它会要求你登录你的谷歌账户。
+
+在今天登录进棒棒糖和奇巧的时候这个好处很明显。有可以可升级的设置流程，“2014”的棒棒糖系统可以适应 2016 的改进，像是谷歌新的“[触碰登录][39]”双重认证。奇巧在这就卡住了，但幸运的是它有个“浏览器登录”可以解决双重认证的问题。
+
+棒棒糖的开机设置对将你的谷歌账户和密码放在单独的页面持极端立场。[谷歌讨厌密码][40]并提供了一些[实验性的方式][40]来不用单独页面登录到谷歌。如果你的账户设置为不使用密码，棒棒糖可以跳过密码页面。如果你设置了双重认证，设置页面就会进入到“输入双因素码”的设置流程。每个登录部分都是在单独的一个页面，所以设置流程是模块化的。页面可以随要求添加或移除。
+
+开机设置还给了用户对应用还原的控制。安卓在这之前也提供了一些数据还原，但那是无法理解的，因为它仅仅只是在没有任何用户输入的情况下选择你的一台设备并开始恢复。开机设置流程中的一个新界面让用户可以看到在云端的设备配置集合，并选择合适的那个。你还可以选择要从那个备份还原的应用。备份有应用，你的主屏布局，以及一些小设置如 Wi-Fi 热点。它不是完全的应用数据备份。
+
+#### 设置
+
+
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/29-1-150x150.jpg)
+    ][28]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/settings-1-150x150.jpg)
+    ][29]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/2014-11-11-16.45.47-150x150.png)
+    ][30]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/battery-150x150.jpg)
+    ][31]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/user1-150x150.jpg)
+    ][32]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/users2-150x150.jpg)
+    ][33]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/30-1-150x150.jpg)
+    ][34]
+*   [
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/31-150x150.jpg)
+    ][35]
+
+设置从暗色主题切换到了亮色。除了新外观，它还有方便的搜索功能。每个界面用户都能访问放大镜，让他们可以更容易地找到难找的选项。
+
+这里有一些和伏特计划有关的额设置。“网络限制”允许用户将一个 Wi-Fi 连接标记为计费的，让任务调度器处理后台处理时避免使用它。同时作为伏特计划的一部分，添加了一个“节电模式”。它会限制后台任务并限制 CPU 性能，给你更长的续航但更慢的设备。
+
+多用户支持已经出现在安卓平板中有一段时间了，但棒棒糖终于将它带到了安卓手机上。设置界面添加了一个新的“用户”页面，让你添加额外的账户或设置一个“访客”账户。访客账户是临时的——它们可以一次点击轻松删除。它不会像正常账户那样尝试下载关联到你账户的每个应用，因为它注定要在不久后被删除。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+Ron 是 Ars Technica 的评论编缉，专注于安卓系统和谷歌产品。他总是在追寻新鲜事物，还喜欢拆解事物看看它们到底是怎么运作的。
+
+--------------------------------------------------------------------------------
+
+via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/
+
+作者：[RON AMADEO][a]
+译者：[alim0x](https://github.com/alim0x)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: http://arstechnica.com/author/ronamadeo
+[1]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[2]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[3]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[4]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[5]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[6]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[7]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[8]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[9]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[10]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[11]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[12]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[13]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[14]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[15]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[16]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[17]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[18]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[19]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[20]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[21]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[22]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[23]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[24]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[25]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[26]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[27]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[28]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[29]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[30]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[31]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[32]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[33]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[34]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[35]:http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/29/#
+[36]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1.jpg
+[37]:http://arstechnica.com/author/ronamadeo/
+[38]:https://cdn.arstechnica.net/wp-content/uploads/2016/10/2-1.jpg
+[39]:http://arstechnica.com/gadgets/2016/06/googles-new-two-factor-authentication-system-tap-yes-to-log-in/
+[40]:https://www.theguardian.com/technology/2016/may/24/google-passwords-android
+[41]:http://www.androidpolice.com/2015/12/22/google-appears-to-be-testing-a-new-way-to-log-into-your-account-on-other-devices-with-just-your-phone-no-password-needed/
diff --git a/sources/talk/The history of Android/30 - The (updated) history of Android.md b/translated/talk/The history of Android/30 - The (updated) history of Android.md
similarity index 57%
rename from sources/talk/The history of Android/30 - The (updated) history of Android.md
rename to translated/talk/The history of Android/30 - The (updated) history of Android.md
index 6454f3f054..c9408033a5 100644
--- a/sources/talk/The history of Android/30 - The (updated) history of Android.md	
+++ b/translated/talk/The history of Android/30 - The (updated) history of Android.md	
@@ -1,169 +1,169 @@
-The (updated) history of Android
+安卓编年史
 ============================================================
 
-> Follow the endless iterations from Android 0.5 to Android 7 and beyond.
+> 让我们跟着安卓从 0.5 版本到 7 的无尽迭代来看看它的发展历史。
 
 ### Android TV
 
 
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/IMG_0002-22-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/IMG_0002-22-150x150.jpg)
     ][2]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-172334-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-172334-150x150.png)
     ][3]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/play-store-2-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/play-store-2-150x150.png)
     ][4]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/search-2-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/search-2-150x150.png)
     ][5]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/search-1-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/search-1-150x150.png)
     ][6]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-150246-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-150246-150x150.png)
     ][7]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-1548581-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-1548581-150x150.png)
     ][8]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-170651-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-170651-150x150.png)
     ][9]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-174128-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2014/11/device-2014-10-31-174128-150x150.png)
     ][10]
 
-November 2014 saw Android continue its march to take over everything with a screen as Google unveiled Android TV. A division inside the company had previously tried to take over the living room with Google TV during the Honeycomb era, but this was a total reboot of the idea directly from the Android team. Android TV took Android 5.0 Lollipop and gave it a Material Design interface purpose-built for the biggest screen in the house. For launch hardware, Google tapped Asus to build the "Nexus Player," an underpowered-but-versatile set top box.
+2014 年 11 月谷歌公布了安卓 TV，安卓继续进行它带着一块屏幕征服一切的征程。这家公司里的一个部门之前在蜂巢时代尝试过用谷歌 TV 掌控客厅，但这次完全是来自安卓团队的新点子。安卓 TV 使用安卓 5.0 棒棒糖，并给了它一个为室内最大屏幕设计的 Material Design 界面。首发硬件谷歌选择了华硕来代工“Nexus Player”，这是一个配置不足但够用的机顶盒。
 
-Android TV was really about three things: video, music, and games. You controlled the TV with a tiny remote consisting only of a D-Pad with 4 buttons: Back, Home, Microphone, and Play/Pause. For games, Asus simply cloned the Xbox 360 controller, giving players a million buttons and a pair of analog sticks.
+安卓 TV 专注于三样东西：视频，音乐，以及游戏。你可以用一个小遥控器控制电视，它只有四向方向键以及四个按钮，后退、主页、麦克风以及播放/暂停。至于游戏，华硕克隆了一个 Xbox 360 手柄，给了玩家一堆按键和一对摇杆。
 
-The interface was pretty simple. Large horizontally-scrolling media thumbnails occupied the screen, filling the TV with content from YouTube, Google Play, Netflix, Hulu, and other sources. Instead of soiling everything in an app, the thumbnails were actually "recommended" items from many different content sources. Below that you could directly access the apps and settings.
+安卓 TV 的界面很简单。大幅的媒体略缩图占据了屏幕，可以横向滚动，这些媒体中有 Youtube、Google Play、Netflix、Hulu 以及其它来源。这些略缩图实际上是来自不同媒体源的“推荐”项目，它不是简单地将一个应用的内容填满屏幕。在那下面你可以直接访问应用和设置。
 
-The voice interface was great. You could ask Android TV to play whatever you wanted, instead of hunting it down through the GUI. You could also run clever search results on content, like "show me movies with Harrison Ford." And instead of app silos, every app could provide content to the indexing service. All these apps were housed in a TV-version of the Play Store. Developers specifically supporting Android TV devices also supported the Google cast protocol, allowing users to beam videos and music from their phones and tablets to the TV.
+语音界面很赞。你可以告诉安卓 TV 播放任意你想要的内容，而不用通过图形界面去寻找。你还能在内容里获得更聪明的搜索结果，比如“显示和 Harrison Ford 有关的电影”。每个应用都可以给索引服务提供内容，而不是简单的应用集合。所有的这些应用都在 Play 商店有一个 TV 版本。开发者对安卓 TV 的特别支持还包括谷歌 cast 协议，允许用户从他们的手机和平板向电视投射视频和音乐。
 
 ### Android 5.1 Lollipop
 
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/lock1-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/lock1-150x150.jpg)
     ][11]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/2015-03-14-17.33.58-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/2015-03-14-17.33.58-150x150.png)
     ][12]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/quick-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/quick-150x150.jpg)
     ][13]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/new-quick-panels-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/new-quick-panels-150x150.jpg)
     ][14]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumepress-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumepress-150x150.jpg)
     ][15]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumetouch-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumetouch-150x150.jpg)
     ][16]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumebell-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/volumebell-150x150.jpg)
     ][17]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/interrupts1-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/interrupts1-150x150.jpg)
     ][18]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/heads-up1-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/heads-up1-150x150.jpg)
     ][19]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/screen-pin-2-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/screen-pin-2-150x150.jpg)
     ][20]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/screen-pin-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/screen-pin-150x150.jpg)
     ][21]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/gif1-150x150.gif) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/gif1-150x150.gif)
     ][22]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/Untitled-1-150x150.gif) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/Untitled-1-150x150.gif)
     ][23]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/51-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/51-150x150.jpg)
     ][24]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/scrollbar-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/scrollbar-150x150.jpg)
     ][25]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/simcard-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/simcard-150x150.jpg)
     ][26]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/sip-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/sip-150x150.jpg)
     ][27]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/status-screen-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/status-screen-150x150.jpg)
     ][28]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/time-picker-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/time-picker-150x150.jpg)
     ][29]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/icons-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/icons-150x150.jpg)
     ][30]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/play-store-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/03/play-store-150x150.jpg)
     ][31]
 
-Android 5.1 came out in March 2015 and was the tiniest of updates. The goal here was mainly to [fix encryption performance][43] on the Nexus 6, along with adding device protection and a few interface tweaks.
+安卓 5.1 在 2015 年 3 月发布，这是安卓最小的更新。它的目的主要是[修复 Nexus 6 上的加密性能问题][43]，还添加了设备保护和一些小的界面调整。
 
-Device protection's only UI addition took the form of a new warning during setup. The feature offered to "Protect your device from reuse" if it was stolen. Once a lock screen was set, device protection would kick in, and could be triggered during a device wipe. If you wiped the phone the way an owner normally would—by unlocking the phone and picking "reset" from the settings—nothing would happen. If you wipe the phone through developer tools though, the device would demand that you "verify a previously-synced Google Account" during the next setup.
+设备保护是唯一的新增界面，采用的是在开机设置显示新警告的形式。这个特性在设备被偷了之后“保护你的设备不被再次利用”。一旦设置了锁屏，设备保护就开始介入，并且会在擦除设备的时候被触发。如果你以机主正常的方式擦除设备——解锁手机并从设置选择“重置”——什么都不会发生。但如果你通过开发者工具擦除，设备会在下次开机设置的时候要求你“验证之前同步的谷歌账户”。
 
-The idea was that a developer would know the pervious Google credentials on the device, but a thief would not so they'd be stuck at setup. In practice this triggered [a cat and mouse game][44] of people finding exploits that get around device protection, and Google getting word of the bug and patching it. Software features added by OEM skins also introduced fun new bugs to get around device protection.
+这个想法是基于开发者是会知道之前登录的谷歌帐号凭证的，但小偷就不知道了，他们会卡在设置这一步。在现实中这引发了[一个猫鼠游戏][44]，人们寻找漏洞来绕过设备保护，而谷歌知道了这个 bug 并修补它。OEM 定制也引入了一些有趣的 bug 来绕过设备保护。
 
-There was also a whole host of extremely minor UI changes that we have dutifully cataloged in the gallery, above. There's not much to say about them beyond the captions.
+还有很多特别微小的界面改动，我们没法一一列在上面的图中。除了上面的图片描述之外没什么可说的了。
 
 ### Android Auto
 
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/Android_Auto_The_right_information_for_the_road_ahead_-_YouTube_-_Google_Chrome_2016-10-29_19-49-56-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/Android_Auto_The_right_information_for_the_road_ahead_-_YouTube_-_Google_Chrome_2016-10-29_19-49-56-150x150.jpg)
     ][32]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/Android-Auto-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2016/10/Android-Auto-150x150.jpg)
     ][33]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-105548-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-105548-150x150.png)
     ][34]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-091514-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-091514-150x150.png)
     ][35]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-10-194221-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-10-194221-150x150.png)
     ][36]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-110323-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-110323-150x150.png)
     ][37]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-10-113659-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-10-113659-150x150.png)
     ][38]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-105654-150x150.png) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-105654-150x150.png)
     ][39]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-1117341-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/screendump-2015-07-09-1117341-150x150.jpg)
     ][40]
 *   [
-     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/IMG_3594-150x150.jpg) 
+     ![](https://cdn.arstechnica.net/wp-content/uploads/2015/07/IMG_3594-150x150.jpg)
     ][41]
 
-Also in March 2015, Google launched "Android Auto," a new Android-inspired interface for car infotainment systems. Android Auto was Google's answer to Apple's CarPlay and worked much the same way. It wasn't a full operating system—it's a "casted" interface that runs on your phone and uses the car's built-in screen as an external monitor. Running Android Auto means having a compatible car, installing the Android Auto app on your phone (Android 5.0 and above), and hooking the phone up to the car with a USB cable.
+同样是在 2015 年 3 月，谷歌发布了“安卓 Auto”，一个基于安卓界面的全新车载娱乐信息系统。安卓 Auto 是谷歌面对苹果的 CarPlay 交出的答卷，它们很多地方都很相似。安卓 Auto 不完全是个操作系统——它是一个运行在你手机上的“投射”界面，使用车载显示屏作为一块外置显示器。运行安卓 Auto 意味着拥有一款兼容的汽车，在手机上（安卓 5.0 及以上版本）安装了安卓 Auto 应用，并用 USB 线将手机连接到汽车。
 
-Android Auto brought Google's Material Design interface to your existing infotainment system, bringing top-tier software design to a platform that [typically struggles][45] with designing good software. Android Auto was a ground up redesign of the Android interface made specifically to comply with the myriad of infotainment regulations around the world. There was no tradition "home screen" full of app icons, instead Android's navigation bar was changed into an always-on app launcher (almost like a tabbed interface).
+安卓 Auto 给你已有的车载系统带来了谷歌的 Material Design 界面，给这个[通常挣扎于]设计好软件的平台带来了顶级的软件设计。安卓 Auto 是个对安卓界面的完全重新设计，以遵循世界各地对车载系统无数的规定。它没有通常充满应用图标的“主屏”，安卓的导航栏也变为了一个常驻的应用启动器（几乎像是个标签页式的界面）。
 
-The paired down feature set only really had four sections, from left to right on the navigation bar: Google Maps, a dialer/contacts screen, the "home" section that was a hybrid of Google Now and a notification panel, and a music page. The last button was an "OEM" page that let you exit Android Auto and return to the stock infotainment system (it was also meant to eventually house custom car manufacturer features). There was Google's voice command system, which took the form of a microphone button on the top right of the screen.
+算下来特性实际上只有四部分，导航栏从左到右是：谷歌地图，一个拨号/联系人界面，“主屏”部分混合了 Google Now 和一个通知面板，还有一个音乐页面。最后一个按钮是一个“OEM”页面，让你可以退出安卓 Auto，返回到自带的车载系统（这也是为了放置汽车制造商的定制特性）。安卓 Auto 还带有谷歌的语音命令系统，以一个麦克风按钮的形式显示在屏幕右上角。
 
-There wasn't much in the way of apps for Android Auto. Only two categories were allowed: music and messaging apps. Infotainment regulations meant customizing the UI wasn't really an option. Messaging apps had no interface and could just plug into the voice system, and music apps couldn't change the interface much, only tweaking the colors and iconography of Google's default "music app" template. What really mattered was delivering the music and messages though, and apps could do that.
+安卓 Auto 的应用没有多少。它只允许两个类别的应用：音乐和信息应用。车载信息娱乐系统的规定意味着自定义界面不是个好选择。信息应用没有界面，并且可以接入语音系统，音乐应用也不会太多地改变界面，仅仅只是调整一下谷歌默认的“音乐应用”模板的颜色和图标。但实际上重要的是音乐和消息的送达，在不让驾驶员太多分心的情况下，一般的应用就没法使用了。
 
-Android Auto hasn't seen much in the way of updates after its initial launch, but it has seen a ton of car manufacturer support. In 2017, there will be [over 100][46] compatible vehicle models.
+安卓 Auto 在它的最初发布之后就没看到多少更新了，但已经逐渐有很多汽车制造商支持了。到了 2017 年，将会有[超过 100][46] 款支持的汽车型号。
 
 --------------------------------------------------------------------------------
 
 作者简介：
 
-Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS and Google products. He is always on the hunt for a new gadget and loves to rip things apart to see how they work.
+Ron 是 Ars Technica 的评论编缉，专注于安卓系统和谷歌产品。他总是在追寻新鲜事物，还喜欢拆解事物看看它们到底是怎么运作的。
 
 
 --------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ Ron is the Reviews Editor at Ars Technica, where he specializes in Android OS an
 via: http://arstechnica.com/gadgets/2016/10/building-android-a-40000-word-history-of-googles-mobile-os/30/
 
 作者：[RON AMADEO][a]
-译者：[译者ID](https://github.com/译者ID)
+译者：[alim0x](https://github.com/alim0x)
 校对：[校对者ID](https://github.com/校对者ID)
 
 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/translated/tech/20160110 3 Ways to Permanently and Securely Delete ‘Files and Directories in Linux.md b/translated/tech/20160110 3 Ways to Permanently and Securely Delete ‘Files and Directories in Linux.md
new file mode 100644
index 0000000000..d7865aa590
--- /dev/null
+++ b/translated/tech/20160110 3 Ways to Permanently and Securely Delete ‘Files and Directories in Linux.md	
@@ -0,0 +1,210 @@
+3 个在 Linux 中永久并安全删除`文件和目录`的方法
+============================================================
+
+在大多数情况下，我们习惯于[从我们的计算机中删除文件][1]，例如使用 `Delete` 键、垃圾箱或 `rm` 命令，这不是永久安全地从硬盘中（或任何存储介质）删除文件的方法。
+
+该文件只是对用户隐藏，它驻留在硬盘上的某个地方。它可以通过数据窃贼、执法或其他威胁来恢复。
+
+假设文件包含密级或机密内容，例如安全系统的用户名和密码，具有必要知识和技能的攻击者可以轻松地[恢复删除文件的副本][2]并访问这些用户凭证（你可以猜测到这种情况的后果）。
+
+在本文中，我们将解释一些命令行工具，用于永久并安全地删除 Linux 中的文件。
+
+### 1\. shred – 覆盖文件来隐藏内容
+
+shred 会覆盖文件来隐藏它的内容，并且也可以选择删除它。
+
+```
+$ shred -zvu -n  5 passwords.list
+```
+
+在下面的命令中，选项有：
+
+1. `-z` - 用零覆盖以隐藏碎片
+2. `-v` - 显示操作进度
+3. `-u` - 在覆盖后截断并删除文件
+4. `-n` - 指定覆盖文件内容的次数（默认值为3）
+
+[
+ ![shred - overwrite a file to hide its contents](http://www.tecmint.com/wp-content/uploads/2017/01/shred-command-example.png) 
+][3]
+
+shred - 覆盖文件来隐藏它的内容
+
+你可以在 shred 的帮助页中找到更多的用法选项和信息：
+
+```
+$ man shred
+```
+
+### 2\. wipe – 在 Linux 中安全删除文件
+
+Linux wipe 命令可以安全地擦除磁盘中的文件，从而不可能[恢复删除的文件或目录内容] 4]。
+
+首先，你需要安装 wipe 工具，运行以下适当的命令：
+
+```
+$ sudo apt-get install wipe   [On Debian and its derivatives]
+$ sudo yum install wipe       [On RedHat based systems]
+```
+
+下面的命令会摧毁 private 目录下的所有文件。
+
+```
+$ wipe -rfi private/*
+```
+
+当使用下面的标志时：
+
+1. `-r` - 告诉 wipe 递归擦除子目录
+2. `-f` - 启用强制删除并禁用确认查询
+3. `-i` - 显示擦除进度
+
+[
+ ![Wipe - Securely Erase Files in Linux](http://www.tecmint.com/wp-content/uploads/2017/01/Wipe-Securely-Erase-Files.png) 
+][5]
+
+wipe – 在 Linux 中安全擦除文件
+
+注意：wipe 仅在磁性存储上可以可靠地工作，因此对固态磁盘（内存）请使用其他方法。
+
+阅读 wipe 手册以获取其他使用选项和说明：
+
+```
+$ man wipe
+```
+
+### 3\. Linux 中的安全删除工具集
+
+secure-delete 是一个安全文件删除工具的集合，它包含srm（secure_deletion）工具，用于安全删除文件。
+
+首先，你需要使用以下相关命令安装它：
+
+```
+$ sudo apt-get install secure-delete   [On Debian and its derivatives]
+$ sudo yum install secure-delete       [On RedHat based systems]
+```
+
+安装完成后，你可以使用 srm 工具在 Linux 中安全地删除文件和目录。
+
+```
+$ srm -vz private/*
+```
+
+下面是使用的选项：
+
+1.  `-v` – 启用 verbose 模式
+2.  `-z` – 用0而不是随机数据来擦除最后的写入
+
+[
+ ![srm - Securely Delete Files in Linux ](http://www.tecmint.com/wp-content/uploads/2017/01/srm-securely-delete-Files-in-Linux.png) 
+][6]
+
+srm – 在 Linux 中安全删除文件
+
+阅读 srm 手册来获取更多的使用选项和信息：
+
+```
+$ man srm
+```
+
+### 4\. sfill -安全免费的磁盘/inode 空间擦除器
+
+sfill 是 secure-deletetion 工具包的一部分，是一个安全免费的磁盘和 inode 空间擦除器，它以安全的方法删除可用磁盘空间中的文件。 sfill 会[检查指定分区上的可用空间][7]，并使用来自 /dev/urandom 的随机数据填充它。
+
+以下命令将在我的根分区上执行 sfill，使用 `-v' 选项启用 verbose 模式：
+
+```
+$ sudo sfill -v /home/aaronkilik/tmp/
+```
+
+假设你创建了一个单独的分区 `/home` 来存储正常的系统用户主目录，你可以在该分区上指定一个目录，以便在其上应用 sfill：
+
+```
+$ sudo sfill -v /home/username
+```
+
+你可以在 sfill 的手册上看到一些限制，你也可以看到额外的使用标志和命令：
+
+```
+$ man sfill
+```
+
+注意：secure-deletetion 工具包中的两个工具（sswap 和 sdmem）与本指南的范围不直接相关，但是，我们会在将来为了传播知识的目的来解释它们。
+
+### 5\. sswap – 安全 swap 擦除器
+
+它是一个安全的分区擦除器，sswap以安全的方式删除 swap 分区上存在的数据。
+
+警告：请记住在使用 sswap 之前卸载 swap 分区！ 否则你的系统可能会崩溃！
+
+只需确定交换分区（并检查分页和交换设备/文件是否使用 swapon 命令打开），接下来，使用 swapoff 命令禁用分页和交换设备/文件（使 swap 分区不可用）。
+
+然后在 swap 分区上运行 sswap 命令：
+
+```
+$ cat /proc/swaps 
+$ swapon
+$ sudo swapoff /dev/sda6
+$ sudo sswap /dev/sda6    #this command may take some time to complete with 38 default passes
+```
+[
+ ![sswap - Secure Swap Wiper](http://www.tecmint.com/wp-content/uploads/2017/01/sswap-Secure-Swap-Wiper.png) 
+][8]
+
+sswap – 安全 swap 擦除器
+
+阅读 sswap 的手册来获取更多的选项和信息：
+
+```
+$ man sswap
+```
+
+### 6\. sdmem – 安全内存擦除器
+
+sdmem 是一个安全的内存擦除器，它被设计为以安全的方式删除存储器（RAM）中的数据。
+
+它最初命名为[smem][9]，但是因为在 Debain 系统上存在另一个包[smem - 报告每个进程和每个用户的内存消耗][10]，开发人员决定将它重命名为 sdmem。
+
+```
+$ sudo sdmem -f -v
+```
+
+关于更多的使用信息，阅读 sdmen 的手册：
+
+```
+$ man sdmem 
+```
+
+**推荐阅读：** [PhotoRec – 在 Linux 中恢复删除或遗失的文件][11]
+
+就是这样了！在本文中，我们审查了一系列可以永久安全地删除 Linux 中的文件的工具。像往常一样，通过下面的评论栏发表你对本篇文章的想法或建议。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/7badddbc53297b2e8ed7011cf45df0c0?s=128&d=blank&r=g)
+我是 Ravi Saive，TecMint 的创建者。 一个计算机 Geek 和 Linux 大师，喜欢在互联网上分享技巧和贴士。我的服务器大多数运行在称为 Linux 的开源平台上。关注我：Twitter、Facebook 和 Google+
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/permanently-and-securely-delete-files-directories-linux/
+
+作者：[Ravi Saive][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/admin/
+[1]:http://www.tecmint.com/delete-all-files-in-directory-except-one-few-file-extensions/
+[2]:http://www.tecmint.com/photorec-recover-deleted-lost-files-in-linux/
+[3]:http://www.tecmint.com/wp-content/uploads/2017/01/shred-command-example.png
+[4]:http://www.tecmint.com/recover-deleted-file-in-linux/
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Wipe-Securely-Erase-Files.png
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/srm-securely-delete-Files-in-Linux.png
+[7]:http://www.tecmint.com/find-top-large-directories-and-files-sizes-in-linux/
+[8]:http://www.tecmint.com/wp-content/uploads/2017/01/sswap-Secure-Swap-Wiper.png
+[9]:http://www.tecmint.com/smem-linux-memory-usage-per-process-per-user/
+[10]:http://www.tecmint.com/smem-linux-memory-usage-per-process-per-user/
+[11]:http://www.tecmint.com/photorec-recover-deleted-lost-files-in-linux/
diff --git a/translated/tech/20160425 What is SRE.md b/translated/tech/20160425 What is SRE.md
new file mode 100644
index 0000000000..2663122a8d
--- /dev/null
+++ b/translated/tech/20160425 What is SRE.md	
@@ -0,0 +1,84 @@
+什么是SRE（网站可靠性工程）？
+============================================================
+
+网站可靠性工程师是近来越来越多看到的一个职位。它是什么意思？它来自哪里？让我们从 Google SRE 团队来学习。
+
+ ![Bridge](https://d3tdunqjn7n0wj.cloudfront.net/360x240/bridge-1031545-1400-389c9609ff7c64083c93db48dc77eeff.jpg) 
+
+这里有一篇由  Niall Richard Murphy、Jennifer Petoff、Chris Jones、Betsy Beyer 编辑一篇来自[网站可靠性工程][9]的摘录。
+
+网站可靠性工程也在[11月7-10日在阿姆斯特丹举办的 O'Reilly Velocity 会议][10]上有提到。
+
+### 介绍
+
+> 希望不是一种策略。
+> 
+> 传统的 SRE 说
+
+一个公认的事实是系统不会自己。 那么，一个特定系统的复杂大规模系统_应该_怎么运行呢？
+
+
+### sysadmin 服务管理方法
+
+sysadmin服务管理模型有几个优点。对于决定该如何运行和服务的公司而言，这种方法相对容易实现：它作为一个熟悉的行业范例，有很多例子可以从中学习和效仿。相关人才库已经广泛普及。有一系列现有的工具，软件组件（现成的或其他）和集成公司可用于帮助运行这些组装的系统，所以新手sysadmin团队不必重新发明轮子以及从头设计系统。
+
+因此，传统运营团队及其在产品开发中的同行往往会发生冲突，最突出的是如何将软件发布到生产环境。在他们核心中，开发团队希望推出新功能，并看到它们被用户采纳。在_他们_的核心上，ops 团队希望确保服务在运行中不会中断。因为大多数中断是由某种变化引起的 - 新的配置、新的功能发布或者新的用户流量类型 - 这两个团队的目标基本上处于紧张状态。
+
+两个团队都明白，以最可能的条款（“我们可以没有阻碍地在任何时间发布任何东西”以及“我们不想在系统工作后改变任何东西”）来表达他们的利益是不可接受的。因为他们的词汇和风险假设都不同，两个团体经常采用熟悉斗争形式来提高他们的利益。 ops 团队试图通过发布介绍和提高门槛来保护运行中的系统免受更改的风险。例如，发布审查可能包含对_每个_问题的显式审查，这些问题过去都_曾经_引起过服务中断 - 它可能是一个任意长度的列表，并且不是所有元素都提供相等的值。开发团队很快学会了如何回应。他们有较少的“发布”和更多的“标志翻转”、“增量更新”或“cherrypicks”。他们采取诸如分割产品功能的策略，以便更少的功能受到发布审查。
+
+
+### Google 服务管理的方法：网站可靠性工程
+
+冲突不是提供软件服务的必然部分。Google 选择以不同的方式运行我们的系统：我们的网站可靠性工程团队专注于雇佣软件工程师来运行我们的产品，并创建系统来完成那些本来由sysadmins手动完成的工作。
+
+什么是网站可靠性工程，是如它在谷歌定义的那样么？我的解释很简单：SRE 是当你要求一位软件工程师设计一个运维团队时会发生的那样。当我在2003年加入 Google 并负责运行一个由 7 名工程师组成的“生产团队”时，那时我工作的全部都是软件工程。所以我设计和管理了一个假如我是一名 SRE ，_我_想要的团队的样子。这个团队已经成为了 Google 的目前的 SRE 团队，它仍然是一名终生软件工程师所想象的那个样子。
+
+Google 服务管理方法的主要构成部分是由每个 SRE 团队的组成。作为一个整体，SRE可以分为两大类。
+
+50-60％ 的人是 Google 软件工程师，或者更确切地说，是通过 Google 软件工程师的标准程序招聘的人。其他 40-50％ 的候选人非常接近 Google 软件工程师资格（即所需技能集的 85-99％），以及一些具有大多数软件工程师没有的一些 SRE 技术技能的人。到目前为止，UNIX 系统内部和网络（第1层到第3层）的专业知识是我们寻求的两种最常见的替代技术技能。
+
+所有 SRE 的共同点是对开发软件系统以解决复杂问题的信念和能力。在 SRE 中，我们密切跟踪两个团队的职业发展，并且迄今为止发现在两种工程师之间的表现没有实际差异。事实上，SRE 团队的多样背景经常产生聪明、高质量的系统，这显然是几个技能集合成的产物。
+
+我们这样招聘 SRE 的结果是，我们有了这样一个团队：（a）手动执行任务很快会变得无聊。（b）他们有必要的技能集来写出软件以取代以前的手动操作，即使解决方案很复杂。SRE 还会与其他开发部门分享学术以及知识背景。因此，SRE 从根本上做了一个运维团队历来做的工作，但它使用具有软件专业知识的工程师，并期望这些内在倾向于用软件，并且有能力用软件的人用软件设计并实现自动化来代替人力劳动。
+
+按照设计，至关重要的是 SRE 团队专注于工程。没有恒定的工程，运维工作增加，团队将需要更多的人来上工作量。最终，传统的以 ops 为中心的团队与服务规模呈线性关系：如果服务支持的产品成功，运维工作将随着流量而增长。这意味着雇用更多的人一遍又一遍地完成相同的任务。
+
+为了避免这种命运，负责管理服务的团队需要写代码否则就会被工作淹没。因此，Google _设置了一个 “ops” 工作如 ticket、紧急呼叫、手动任务最多只占 50% SRE 工作的上限_。此上限确保SRE团队在其计划中有足够的时间使服务稳定及可操作。50% 是上限;随着时间的推移，除了自己的设备，SRE 团队应该只有很少的运维工作，他们几乎可以完全从事开发任务，因为服务基本上可以运行和维修自己：我们想要的系统是_自动的_，而不只是_自动化_。在实践中，规模和新功能始终 SRE 要考虑的
+
+Google的经验法则是，SRE团队必须花费剩余的 50％ 的时间来进行实际开发。那么我们该如何执行这个阈值呢？首先，我们必须测量 SRE 如何花费时间。通过测量，我们确保团队不断花费不到 50% 的时间用于开发改变他们实践的工作上。通常这意味着会将一些运维负担转移回开发团队，或者给团队添加新的员工，而不指派该团队额外的运维责任。意识到在运维和开发工作之间保持这种平衡使我们能保证 SRE 具有参与创造性的自主工程的空间，同时仍然保留从运维那学来的智慧。
+
+我们发现Google SRE 的运行大规模系统的方法有很多优点。由于 SRE 是直接修改代码以使Google的系统运行自己，SRE团队的特点是快速创新以及大量接受变革。这样的团队能相对价廉地支持相同的服务，面向运维的团队需要大量的人。相反，运行、维护和改进系统所需的 SRE 的数量随系统的大小而线性地缩放。最后，SRE 不仅规避了开发/运维分裂的障碍，而且这种结构也改善了我们的产品开发团队：产品开发和 SRE 团队之间的轻松转移交叉培训整个团队，并且提高了那些在学习构建百万级别分布式系统上有困难的开发人员的技能。
+
+尽管有这些好处，SRE 模型的特点是其自身独特的挑战。 Google 面临的一个持续挑战是招聘 SRE：SRE 不仅与产品开发招聘流程竞争相同的候选人，而且我们将招聘人员的编码和系统工程技能都设置得如此之高，这意味着我们的招聘池必然很小。由于我们的学科相对新颖独特，在如何建立和管理 SRE 团队方面没有太多的行业信息（尽管希望这本书能朝着这个方向迈进！）。一旦 SRE 团队到位，他们潜在的非正统的服务管理方法需要强有力的管理支持。例如，一旦错误预估耗尽，除非是管理层的强制要求, 否则在季度剩余的时间里决定停止发布可能不会被产品开发团队所接受。
+
+###### DevOps 或者 SRE？
+
+“DevOps” 这个术语在 2008 年末出现，并在写这篇文章时（2016 年早期）仍在发生变动。 其核心原则：IT部门在系统设计和开发的每个阶段的参与、对自动化与人力投入的严重依赖、工程实践和工具在操作任务中的应用，与许多 SRE 的原则和实践一致。 人们可以将 DevOps 视为向更广泛的组织，管理结构和人员的几种核心SRE原则。 可以等价地将 SRE 视为具有某些特殊扩展的 DevOps 的特定实现。
+
+
+------------------------
+
+作者简介：Benjamin Treynor Sloss 创造了“网站可靠性工程”一词，他自2003年以来一直负责 Google 的全球运营、网络和生产工程。截至2016年，他管理着全球范围内一个大约4000名软硬件和网络工程师团队。
+
+--------------------------------------------------------------------------------
+
+via: https://www.oreilly.com/ideas/what-is-sre-site-reliability-engineering
+
+作者：[Benjamin Treynor][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.oreilly.com/people/benjamin-treynor-sloss
+[1]:https://shop.oreilly.com/product/0636920053385.do
+[2]:https://shop.oreilly.com/product/0636920053385.do
+[3]:https://www.oreilly.com/ideas/what-is-sre-site-reliability-engineering
+[4]:https://shop.oreilly.com/product/0636920053385.do
+[5]:https://shop.oreilly.com/product/0636920053385.do
+[6]:https://www.oreilly.com/people/benjamin-treynor-sloss
+[7]:https://pixabay.com/
+[8]:https://www.oreilly.com/people/benjamin-treynor-sloss
+[9]:http://shop.oreilly.com/product/0636920041528.do?intcmp=il-webops-books-videos-update-na_new_site_site_reliability_engineering_text_cta
+[10]:http://conferences.oreilly.com/velocity/devops-web-performance-eu?intcmp=il-webops-confreg-update-vleu16_new_site_what_is_sre_text_cta
+[11]:https://pixabay.com/
diff --git a/translated/tech/20160510 What is Docker.md b/translated/tech/20160510 What is Docker.md
new file mode 100644
index 0000000000..7457e827f4
--- /dev/null
+++ b/translated/tech/20160510 What is Docker.md	
@@ -0,0 +1,114 @@
+Docker 是什么？
+================
+
+![](https://d3tdunqjn7n0wj.cloudfront.net/720x480/card-catalog-crop-c76cf2c8b4881e6662c4e9058367a874.jpg)
+
+这是一段摘录，取自于 Karl Matthias 和 Sean P. Kane 撰写的书籍 [Docker: Up and Running][3]。其中或许包含一些其他资源的引用，您可以点击其中的链接。
+
+2013 年 3 月 15 日，在加利福尼亚州圣克拉拉召开的 Python 开发者大会上，dotCloud 的创始人兼首席执行官 Solomon Hvkes 在一场仅五分钟的[微型演讲][4]中，首次提出了 Docker 这一概念。当时，仅约 40 人（除 dotCloud 内部人员）获得了使用 Docker 的机会。
+
+这在之后的几周内，有关 Docker 的新闻铺天盖地。随后这个项目很快在 [Github][5] 上开源，任何人都可以下载它并为其做出贡献。在之后的几个月中，越来越多的业界人士开始听说 Docker 以及它是如何彻底地改变了软件开发，交付和运行的方式。一年之内，Docker 的名字几乎无人不知无人不晓，但还是有很多人不太明白 Docker 究竟是什么，人们为何如此兴奋。
+
+Docker 是一个工具，它致力于为任何应用程序创建易于分发的构建产物，将其部署到任何环境中，并简化敏捷软件组织的工作流程，降低响应速度。
+
+### Docker 带来的希望
+
+虽然表面上被视为一个虚拟化平台，但 Docker 远远不止如此。Docker 涉及的领域横跨了业界多个方面，包括 KVM, Xen, OpenStack, Mesos, Capistrano, Fabric, Ansible, Chef, Puppet, SaltStack 等技术。或许你已经发现了，在 Docker 的竞争产品列表中有一个值得一提的事儿。例如，大多数工程师不会说，虚拟化产品会和配置管理工具是竞争关系，但 Docker 和这两种技术都有点关系。前面列举的一些技术常常因其提高了工作效率而获得称赞，这就导致了大量的探讨。而现在 Docker 正处在这些过去十年间最广泛使用的技术之中。
+
+如果你要拿 Docker 分别与这些领域的卫冕冠军按照功能逐项比较，那么 Docker 看上去可能只是个一般的竞争对手。Docker 在某些领域表现的更好，但它带来的是一个跨越广泛的解决工作流程中众多挑战的功能集合。通过结合应用程序部署工具（如 Capistrano, Fabric）的易用性和易于管理的虚拟化系统，提供使工作流程自动化和业务流程易于实施的钩子，Docker 提供了一个非常强大的功能集合。
+
+大量的新技术来来去去，因此对这些新事物保持一定的怀疑总是好的。如果不深入研究，人们很容易误以为 Docker 只是另一种为开发者和运营团队解决一些具体问题的技术。如果只是把 Docker 看作一种虚拟化技术或者部署技术，这似乎并不能令人信服。不过 Docker 可比表面上看起来的强大得多。
+
+即使在小型团队中，团队内部的沟通和相处也往往是困难的。然而在我们生活的这个世界里，团队内部对于细节的沟通是迈向成功越来越不可或缺的因素。而一个能够降低沟通复杂性，协助开发更为强健软件的工具，无疑是一个巨大的成功。这正是 Docker 值得我们深入了解的原因。当然 Docker 也不是什么灵丹妙药，它的正确使用还需深思熟虑，不过 Docker 确实能够解决一些组织层面的现实问题，还能够帮助公司更好更快地发布软件。使用精心设计的 Docker 工作流程能够让技术团队更加和谐，为组织创造实实在在的收益。
+
+那么，最让公司感到头疼的问题是什么呢？现如今，很难按照预期的速度发布软件，而随着公司从只有一两个开发人员成长到拥有若干开发团队的时候，发布新版本时的沟通负担将越来越重，难以管理。开发者不能不去了解软件所处环境的复杂性，生产运营团队也需要不断地理解所发布软件的内部细节。通常这些都是不错的工作技能，因为它们有利于更好地从整体上理解发布环境，从而促进软件的鲁棒性设计。但是随着团队的壮大，需要掌握的技能也越来越多。
+
+充分了解所用的环境细节往往需要团队之间大量的沟通，而这并不能直接为团队创造值。例如，为了发布版本1.2.1, 开发人员要求运维团队升级特定的库，这个过程就降低了开发效率，也没有为公司创造价值。如果开发人员能够直接升级他们所使的库，然后编写代码，测试新版本，最后发布软件，那么整个交付过程所用的时间将会明显缩短。如果运维人员无需与多个应用开发团队相协调，就能够在宿主系统上升级软件，那么效率将大大提高。Docker 有助于在软件层面建立一层隔离，从而减轻团队的沟通负担。
+
+除了有助于解决沟通问题，在某种程度上 Docker 的软件架构还鼓励开发出更多精致的应用程序。这种架构哲学的核心是一次性的小型容器。在新版本部署的时候，会将旧版本应用的整个运行环境全部丢弃。在应用所处的环境中，任何东西的存在时间都不会超过应用程序本身。这是一个简单却影响深远的想法。这就意味着，应用程序不会意外地依赖于之前版本的遗留产物; 对应用的短暂调试和修改也不会存在于未来的版本中; 应用程序具有高度的可移植性，因为应用的所有状态要么直接包含于用于部署的构建产物中，且不可修改，要么存储于数据库、缓存或文件服务器等外部依赖中。
+
+因此，应用程序不仅具有更好的可扩展性，而且更加可靠。存储应用的容器实例数量的增减，对于前端网站的影响很小。事实证明，这种架构对于非 Docker 化的应用程序已然成功，但是 Docker 自身包含了这种架构方式，使得  Docker 化的应用程序始终遵循这些最佳实践，这也是一件好事。
+
+### Docker 工作流程的好处
+
+我们很难把 Docker 的好处一一举例。如果用得好，Docker 能在多个方面为组织，团队，开发者和运营工程师带来帮助。从宿主系统的角度看，所有应用程序的本质是一样的，因此这就决定了 Docker 让架构的选择更加简单。这也让工具的编写和应用程序之间的分享变得更加容易。这世上没有什么只有好处却没有挑战的东西，但是 Docker 似乎就是一个例外。以下是一些我们使用 Docker 能够得到的好处：
+
+**使用开发人员已经掌握的技能打包软件**
+
+> 许多公司为了管理各种工具来为它们的平台构建软件包，不得不提供一些软件发布和构建工程师的岗位。像 rpm, mock, dpkg 和 pbuilder 等工具使用起来并不容易，每一种工具都需要单独学习。而 Docker 则把你所有需要的东西全部打包起来，定义为一个文件。
+
+**使用标准化的镜像格式打包应用软件及其所需的文件系统**
+
+> 过去，不仅需要打包应用程序，还需要包含一些依赖库和守护进程等。然而，我们永远不能百分之百地保证，软件运行的环境是完全一致的。这就使得软件的打包很难掌握，许多公司也不能可靠地完成这项工作。使用 Scientific Linux 的用户经常会试图部署一个来自社区的，仅在 Red Hat Linux 上经过测试的软件包，希望这个软件包足够接近他们的需求。如果使用 Dokcer， 只需将应用程序和其所依赖的每个文件一起部署即可。Docker 的分层镜像使得这个过程更加高效，确保应用程序运行在预期的环境中。
+
+**测试打包好的构建产物并将其部署到运行任意系统的生产环境**
+
+> 当开发者将更改提交到版本控制系统的时候，可以构建一个新的 Docker，然后通过测试，部署到生产环境，整个过程中无需任何的重新编译和重新打包。
+
+**将应用软件从硬件中抽象出来，无需牺牲资源**
+
+> 传统的企业级虚拟化解决方案，例如 VMware，以消耗资源为代价在物理硬件和运行其上的应用软件之间建立抽象层。虚拟机管理程序和每一个虚拟机中运行的内核都要占用一定的硬件系统资源，而这部分资源将不能够被宿主系统的应用程序使用。而容器仅仅是一个能够与 Linux 内核直接通信的进程，因此它可以使用更多的资源，直到系统资源耗尽或者配额达到上限为止。
+
+Docker 出现之前，Linux 容器技术已经存在了很多年，Docker 使用的技术也不是全新的。但是这个独一无二的集强大架构和工作流程于一身的 Docker 要比各个技术加在一起还要强大的多。Docker 终于让已经存在了十余年的 Linux 容器走进了普通技术人员的生活中。Docker 让容器更加轻易地融入到公司现有的工作流程中。以上讨论到的问题是被很多人所关注的，以至于 Docker 项目的快速发展超出了所有人的合理预期。
+
+Docker 发布的第一年，许多刚接触的新人惊讶地发现，尽管 Docker 还不能在生产环境中使用，但是来自 Docker 开源社区源源不断的提交，飞速推动着这个项目向前发展。随着时间的推移，这一速度似乎越来越快。现在 Docker 进入了 1.x 发布周期，稳定性好了，可以在生产环境中使用。因此，许多公司使用 Docker 来解决它们在应用程序交付过程中面对的棘手问题。
+
+### Docker 不是什么
+
+Docker 可以解决很多问题，这些问题是其他类型的传统工具专门解决的。那么 Docker 在功能上的广度就意味着它在特定的功能上缺乏深度。例如，一些组织认为，使用 Docker 之后可以完全摈弃配置管理工具，但 Docker 真正强大之处在于，它虽然能够取代某些传统的工具，但通常与它们是兼容的，甚至与它们结合使用还能增强更加自身的功能。下面将列举一些 Docker 还未能完全取代的工具，如果与它们结合起来使用，往往能取得更好的效果。
+
+**企业级虚拟化平台（VMware, KVM 等）**
+
+> 容器并不是传统意义上的虚拟机。虚拟机包含完整的操作系统，运行在宿主操作系统之上。虚拟化平台最大的优点是，一台宿主机上可以使用虚拟机运行多个完全不同的操作系统。而容器是和主机共用同一个内核，这就意味着容器使用更少的系统资源，但必须基于同一个底层操作系统（如 Linux）。
+
+**云平台（Openstack, CloudStack 等）**
+
+> 与企业级虚拟化平台一样，容器和云平台的工作流程表面上有大量的相似之处。从传统意义上看，二者都可以按需横向扩展。但是，Docker 并不是云平台，它只能在预先安装 Docker 的宿主机中部署，运行和管理容器，并能创建新的宿主系统（实例），对象存储，数据块存储以及其他与云平台相关的资源。
+
+**配置管理工具（Puppet，Chef 等）**
+
+> 尽管 Docker 能够显著提高一个组织管理应用程序及其依赖的能力，但不能完全取代传统的配置管理工具。Dockerfile 文件用于定义一个容器构建时内容，但不能持续管理容器运行时的状态和 Docker 的宿主系统。
+
+**部署框架（Capistrano，Fabric等）**
+
+> Docker 通过创建自成一体的容器镜像，简化了应用程序在所有环境上的部署过程。这些用于部署的容器镜像封装了应用程序的全部依赖。然而 Docker 本身不无法执行复杂的自动化部署任务。我们通常使用其他工具一起实现较大的工作流程自动化。
+
+**工作负载管理工具（Mesos，Fleet等）**
+
+> Docker 服务器没有集群的概念。我们必须使用其他的业务流程工具（如 Docker 自己开发的 Swarm）智能地协调多个 Docker 主机的任务，跟踪所有主机的状态及其资源使用情况，确保运行着足够的容器。
+
+**虚拟化开发环境（Vagrant等）**
+
+> 对开发者来说，Vagrant 是一个虚拟机管理工具，经常用来模拟与实际生产环境尽量一致的服务器软件栈。此外，Vagrant 可以很容易地让 Mac OS X 和基于 Windows 的工作站运行 Linux 软件。由于 Docker 服务器只能运行在 Linux 上，于是它提供了一个名为 Boot2Docker 的工具允许开发人员在不同的平台上快速运行基于 Linux 的 Docker 容器。Boot2Docker 足以满足很多标准的 Docker 工作流程，但仍然无法支持 Docker Machine 和 Vagrant 的所有功能。
+
+如果没有参考标准，很难理解 Docker 的作用。下一章我们将简要介绍，什么是 Docker，它的目标使用场景，以及 它的优势。
+
+-----------------
+作者简介：
+
+#### [Karl Matthias][1]
+
+Karl Matthias 曾先在创业公司和世界 500 强企业中担任过开发人员，系统管理员和网络工程师。在德国和英国的初创公司工作了若干年后，他和家人回到了美国俄勒冈州波特兰，在 New Relic 公司担任首席网站可靠性工程师。业余时间，他会和他的两个女儿玩，用他那老式相机摄摄影，或者骑骑自行车。
+
+#### [Sean Kane][2]
+
+Sean Kane 目前在 New Relic 公司的共享基础设施团队中担任首席网站可靠性工程师。他在生产运维领域有很长的职业生涯，在不同的行业中工作过，有许多不同的头衔。他在各类聚会和技术论坛做过演讲，涉及过疲劳预警和硬件自动化等话题。他的青年阶段大部分在海外度过，毕业于林林兄弟及巴纳姆和贝利小丑学院，在美国中央情报局做过两次实习等等，他一直在探索生活的真谛。
+
+--------------------------------------------------------------------------------
+
+via: https://www.oreilly.com/learning/what-is-docker
+
+作者：[Karl Matthias ][a],[Sean Kane][b]
+译者：[译者ID](https://github.com/Cathon)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://www.oreilly.com/people/5abbf-karl-matthias
+[b]:https://www.oreilly.com/people/d5ce6-sean-kane
+[1]:https://www.oreilly.com/people/5abbf-karl-matthias
+[2]:https://www.oreilly.com/people/d5ce6-sean-kane
+[3]:http://shop.oreilly.com/product/0636920036142.do?intcmp=il-security-books-videos-update-na_new_site_what_is_docker_text_cta
+[4]:http://youtu.be/wW9CAH9nSLs
+[5]:https://github.com/docker/docker
+[6]:https://commons.wikimedia.org/wiki/File:2009_3962573662_card_catalog.jpg
diff --git a/translated/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md b/translated/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md
new file mode 100755
index 0000000000..999338d476
--- /dev/null
+++ b/translated/tech/20160610 Setting Up Real-Time Monitoring with Ganglia.md	
@@ -0,0 +1,226 @@
+使用Ganglia来监控linux类型的网格和集群服务器
+===========
+自从SA接手服务和主机管理以后，监控类的工具就成了他们的好帮手。其中比较有名的有[Nagios][11], [Zabbix][10], [Icinga][9], 和 Centreon.以上这些重量级的监控工具，让一个新手SA来设置，并使用其中的高级特性是非常困难的。
+本文将向你介绍Ganglia，它是一个容易扩展配置的监控系统。它可以查看服务器中的各项性能指标，也可以实时图形化的展示集群配置。
+[![Install Gangila Monitoring in Linux](http://www.tecmint.com/wp-content/uploads/2016/06/Install-Gangila-Monitoring-in-Linux.png)][8]
+
+在Linux上安装Ganglia
+Ganglia能够让集群和网格服务器更加容易管理。
+我们可以远程创建一个包含所有主机的网格配置，其中的成员主机可以使用模板设置。
+
+此外Ganglia对移动设备进行过页面优化，排版非常人性化。当然你还可以导出`csv`和 `.json`格式的数据。
+
+我们的测试环境包括一个安装Ganglia的主节点服务器CentOS7(IP 地址 192.168.0.29)和一个作为被监控端的Ubuntu 14.04主机 (192.168.0.32)。我们将通过Ganglia Web的页面来监控这台Ubuntu主机。
+
+下面的例子可以给大家提供参考，CentOS7作为主节点，Ubuntu作为被监控对象。
+
+### 安装和配置 Ganglia
+
+请遵循以下步骤在主节点服务器安装监控工具。
+
+#### 1. 1. 使用yum源 [EPEL repository][7] ，然后安装 Ganglia和相关工具:
+命令如下
+
+```
+# yum update && yum install epel-release
+# yum install ganglia rrdtool ganglia-gmetad ganglia-gmond ganglia-web
+```
+
+Ganglia将附加安装一些应用，它们的功能如下：
+
+  1.  `rrdtool`, 轮询数据库，它是一个储存以及用图形化显示变化数据的工具
+  2.  `ganglia-gmetad` 一个守护进程，用来收集被监控主机的数据。被监控主机与主节点主机都要安装Ganglia-gmond（监控守护进程自己）
+  3.  `ganglia-web` 提供Web前端用于显示监控系统的历史数据
+
+#### 2. 使用Apache为Ganglia配置Web身份认证
+
+  如果你想了解更多的高级认证机制，请参阅[Authorization and Authentication][6]选择Apache部分。
+
+  为完成这部分的任务，我们需要用Apache来创建一个用户名和对应的密码，下面的例子我们先来创建一个叫`adminganglia`的用户名，然后给他分配一个密码，它将被储存在 /etc/httpd/auth.basic（如果随便选择根目录或其他Apache没有权限读取的目录，这项配置最终将会以失败告终。） 
+
+```
+# htpasswd -c /etc/httpd/auth.basic adminganglia
+
+```
+
+给adminganglia添加密码，需要经过2次确认
+
+#### 3. 修改配置文件 /etc/httpd/conf.d/ganglia.conf 
+
+```
+Alias /ganglia /usr/share/ganglia
+<Location /ganglia>
+AuthType basic
+AuthName "Ganglia web UI"
+AuthBasicProvider file
+AuthUserFile "/etc/httpd/auth.basic"
+Require user adminganglia
+</Location>
+
+```
+
+#### 4. 编辑 /etc/ganglia/gmetad.conf:
+
+  首先, 使用gridname命令来设置集群的名称。
+
+```
+gridname "Home office"
+
+```
+
+  然后, 使用data_source命令根据集群的名称来设置主节点主机和被监控节点的轮询时间
+
+```
+data_source "Labs" 60 192.168.0.29:8649 # Master node
+data_source "Labs" 60 192.168.0.32 # Monitored node
+
+```
+
+#### 5. 编辑 /etc/ganglia/gmond.conf.
+
+  a)确保集群的配置和下面的一样。
+
+```
+cluster {
+name = "Labs" # The name in the data_source directive in gmetad.conf
+owner = "unspecified"
+latlong = "unspecified"
+url = "unspecified"
+}
+
+```
+
+  b) 在udp_send_chanel 中，注释掉 mcast_join directive:
+
+```
+udp_send_channel   {
+# mcast_join = 239.2.11.71
+host = localhost
+port = 8649
+ttl = 1
+}
+
+```
+
+  c)在udp_recv_channel 中:注释掉mcast_join 和bind部分
+
+```
+udp_recv_channel {
+# mcast_join = 239.2.11.71 ## comment out
+port = 8649
+# bind = 239.2.11.71 ## comment out
+}
+```
+
+  保存并退出
+
+#### 6.打开8649/udp端口，更改SELinux确保php脚本能够连接：
+
+```
+# firewall-cmd --add-port=8649/udp
+# firewall-cmd --add-port=8649/udp --permanent
+# setsebool -P httpd_can_network_connect 1
+
+```
+
+#### 7.重启Apache，gmetad，gmond并确保他们在开机启动里面。
+
+```
+# systemctl restart httpd gmetad gmond
+# systemctl enable httpd gmetad httpd
+
+```
+
+至此，我们现在能够打开并登录Ganglia的Web页面 `http://192.168.0.29/ganglia` 
+
+  [![Gangila Web Interface](http://www.tecmint.com/wp-content/uploads/2016/06/Gangila-Web-Interface.png)][5]
+
+  Gangila Web Interface
+
+#### 8. 在Ubuntu上安装Ganglia-monitor：
+
+```
+$ sudo aptitude update && aptitude install ganglia-monitor
+
+```
+
+#### 9. 编辑被监控主机的配置文件/etc/ganglia/gmond.conf，在主节点主机上也是相同的文件，注释掉网格里面不在线的主机。需要编辑udp_send_channel和udp_recv_channelshould这两项
+
+```
+cluster {
+name = "Labs" # The name in the data_source directive in gmetad.conf
+owner = "unspecified"
+latlong = "unspecified"
+url = "unspecified"
+}
+udp_send_channel   {
+mcast_join = 239.2.11.71
+host = localhost
+port = 8649
+ttl = 1
+}
+udp_recv_channel {
+mcast_join = 239.2.11.71 ## comment out
+port = 8649
+bind = 239.2.11.71 ## comment out
+}
+
+```
+
+Then, restart the service:
+之后重启服务
+
+```
+$ sudo service ganglia-monitor restart
+
+```
+
+#### 10. 刷新页面你将看到各种状态以及图形化的展示集群或网格的配置情况(用下拉菜单选择我们想查看的集群或网格):
+
+[![Ganglia Home Office Grid Report](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Home-Office-Grid-Report.png)][4]
+
+Ganglia中网格的报告
+
+使用菜单按钮你可以选择组里面的节点主机，这将非常容易的获取到你感兴趣的信息。可以使用对比选项来查看集群中所有主机的信息。
+
+当然你也可以使用正则表达式来快速对比一组主机
+
+[![Ganglia Host Server Information](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Server-Information.png)][3]
+
+Ganglia Host Server Information
+
+One of the features I personally find most appealing is the mobile-friendly summary, which you can access using the Mobile tab. Choose the cluster you’re interested in and then the individual host:
+能够使用移动设备管理，对于移动端有友好界面，这是一个非常吸引人的特点。在集群中选中一个主机，点击它。
+
+[![Ganglia Mobile Friendly Summary View](http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Mobile-View.png)][2]
+
+Ganglia 移动端截图
+### 总结
+
+本篇文章向大家介绍了Ganglia，他是一个功能强大扩展性很好的监控工具，主要用来监控集群和网格。它可以随意安装，便捷的组合各种功能（你甚至可以尝试一下官方提供的demo网站[official website][1]）。
+此时你可能会发现许多知名的it企业或许并不使用Ganglia来监控作为监控工具。他们有自己更好的工具去实现，除了那些工具以外，我们这篇文章里面提到的Ganglia可能是最方便的图形化（在图示主机上显示对应的名字）工具。
+但是请不要拘泥于本篇文章，尝试一下自己去做，不必犹豫不敢尝试。如果你有任何问题也欢迎给我留言。
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/install-configure-ganglia-monitoring-centos-linux/
+
+作者：[Gabriel Cánepa][a]
+
+译者：[ivo-wang](https://github.com/ivo-wang)
+
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: http://www.tecmint.com/author/gacanepa/
+[1]:http://ganglia.info/
+[2]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Mobile-View.png
+[3]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Server-Information.png
+[4]:http://www.tecmint.com/wp-content/uploads/2016/06/Ganglia-Home-Office-Grid-Report.png
+[5]:http://www.tecmint.co m/wp-content/uploads/2016/06/Gangila-Web-Interface.png
+[6]:http://httpd.apache.org/docs/current/howto/auth.html
+[7]:http://www.tecmint.com/how-to-enable-epel-repository-for-rhel-centos-6-5/
+[8]:http://www.tecmint.com/wp-content/uploads/2016/06/ Install-Gangila-Monitoring-in-Linux.png
+[9]:http://www.tecmint.com/install-icinga-in-centos-7/
+[10]:http://www.tecmint.com/install-and-configure-zabbix-monitoring-on-debian-centos-rhel/
+[11]:http://www.tecmint.com/install-nagios-in-linux/
diff --git a/translated/tech/20161012 Introduction to FirewallD on CentOS.md b/translated/tech/20161012 Introduction to FirewallD on CentOS.md
deleted file mode 100644
index 6a84431bc3..0000000000
--- a/translated/tech/20161012 Introduction to FirewallD on CentOS.md	
+++ /dev/null
@@ -1,406 +0,0 @@
-在CentOS 上介绍 FirewallD
-============================================================
-
-
-[FirewallD][4] 是iptables的前端控制器，用于实现持久网络流量规则。它提供命令行和图形界面，在大多数Linux发行版的仓库中都有。与直接控制iptables相比，使用 FirewallD 有两个主要区别：
-
-1. FirewallD 使用 _zones_ 和 _services_ 而不是链式规则。
-2. 它动态管理规则集，允许更新而不破坏现有会话和连接。
-
-> FirewallD是 iptables 的一个封装，允许更容易地管理 iptables 规则 - 它并*不是* iptables 的替代品。虽然 iptables 命令仍可用于 FirewallD，但建议仅在 FirewallD 中使用 FirewallD 命令。
-
-本指南将向您介绍 FirewallD的 zone 和 service 的概念，以及一些基本的配置步骤。
-
-### 安装与管理 FirewallD
-
-CentOS 7 和 Fedora 20+ 已经包含了 FirewallD 但是默认没有激活。像其他 systemd 单元那样控制它。
-
-1. 启动服务，并在启动时启动该服务：
-
-
-    ```
-    sudo systemctl start firewalld
-    sudo systemctl enable firewalld
-    ```
-
-    要停止并禁用：
-
-
-    ```
-    sudo systemctl stop firewalld
-    sudo systemctl disable firewalld
-    ```
-     
-
-2. 检查firewall状态。输出应该是 `running` 或者 `not running`。
-
-
-    ```
-    sudo firewall-cmd --state
-    ```
-     
-
-3. 要查看 FirewallD 守护进程的状态：
-
-
-    ```
-    sudo systemctl status firewalld
-    ```
-   
-
-    示例输出
-
-
-    ```
-    firewalld.service - firewalld - dynamic firewall daemon
-       Loaded: loaded (/usr/lib/systemd/system/firewalld.service; disabled)
-       Active: active (running) since Wed 2015-09-02 18:03:22 UTC; 1min 12s ago
-     Main PID: 11954 (firewalld)
-       CGroup: /system.slice/firewalld.service
-           └─11954 /usr/bin/python -Es /usr/sbin/firewalld --nofork --nopid
-    ```
-     
-
-4. 重新加载 FirewallD 配置：
-
-
-    ```
-    sudo firewall-cmd --reload
-    ```
-     
-
-### 配置 FirewallD
-
-FirewallD 使用 XML 进行配置。除非是非常具体的配置，你不必处理它们，而应该使用 ** firewall-cmd **。
-
-配置文件位于两个目录中：
-
-* `/usr/lib/FirewallD` 保存默认配置，如默认 zone 和公共 service。 避免更新它们，因为这些文件将被每个 firewalld 包更新覆盖。
-* `/etc/firewalld` 保存系统配置文件。 这些文件将覆盖默认配置。
-
-### 配置集
-
-FirewallD 使用两个_配置集_：Runtime 和 Permanent。 在重新启动或重新启动 FirewallD 时，不会保留运行时的配置更改，而永久更改不会应用于正在运行的系统。
-
-默认情况下，`firewall-cmd` 命令适用于运行时配置，但使用 `--permanent` 标志将建立持久配置。要添加和激活永久性规则，你可以使用两种方法之一。
-
-1. 将规则同时添加到 permanent 和 runtime 中。
-
-
-    ```
-    sudo firewall-cmd --zone=public --add-service=http --permanent
-    sudo firewall-cmd --zone=public --add-service=http
-    ```
-     
-
-2. 将规则添加到 permanent 中并重新加载 FirewallD。
-
-
-    ```
-    sudo firewall-cmd --zone=public --add-service=http --permanent
-    sudo firewall-cmd --reload
-    ```
-     
-
-    > reload 命令会删除所有运行时配置并应用永久配置。因为firewalld 动态管理规则集，所以它不会破坏现有的连接和会话。
-
-### Firewall Zone
-
-zone 是针对给定位置或场景（例如家庭、公共、受信任等）可能具有的各种信任级别的预构建规则集。不同的 zone 允许不同的网络服务和入站流量类型，而拒绝其他任何流量。 首次启用 FirewallD 后，_Public_ 将是默认 zone。
-
-zone 也可以用于不同的网络接口。例如，对于内部网络和Internet的单独接口，你可以在内部 zone 上允许 DHCP，但在外部 zone 仅允许HTTP和SSH。未明确设置为特定区域的任何接口将添加到默认 zone。
-
-要浏览默认的 zone：
-
-
-```
-sudo firewall-cmd --get-default-zone
-```
- 
-
-要修改默认的 zone：
-
-```
-sudo firewall-cmd --set-default-zone=internal
-```
- 
-
-要查看你网络接口使用的 zone：
- 
-```
-sudo firewall-cmd --get-active-zones
-```
- 
-
-示例输出：
-
-
-```
-public
-  interfaces: eth0
-```
- 
-
-要得到特定 zone 的所有配置：
-
-
-```
-sudo firewall-cmd --zone=public --list-all
-```
-
-
-示例输出：
-
-
-```
-public (default, active)
-  interfaces: ens160
-  sources:
-  services: dhcpv6-client http ssh
-  ports: 12345/tcp
-  masquerade: no
-  forward-ports:
-  icmp-blocks:
-  rich rules:
-```
- 
-要得到所有 zone 的配置：
-
-```
-sudo firewall-cmd --list-all-zones
-```
- 
-
-示例输出：
-
-```
-block
-  interfaces:
-  sources:
-  services:
-  ports:
-  masquerade: no
-  forward-ports:
-  icmp-blocks:
-  rich rules:
-
-  ...
-
-work
-  interfaces:
-  sources:
-  services: dhcpv6-client ipp-client ssh
-  ports:
-  masquerade: no
-  forward-ports:
-  icmp-blocks:
-  rich rules:
-```
- 
-
-### 与 Service 一起使用
-
-FirewallD 可以根据特定网络服务的预定义规则允许相关流量。你可以创建自己的自定义系统规则，并将它们添加到任何 zone。 默认支持的服务的配置文件位于 `/usr/lib /firewalld/services`，用户创建的服务文件在`/etc/firewalld/services`中。
-
-要查看默认的可用服务：
-
-
-```
-sudo firewall-cmd --get-services
-```
- 
-
-比如，要启用或禁用 HTTP 服务：
-
-
-```
-sudo firewall-cmd --zone=public --add-service=http --permanent
-sudo firewall-cmd --zone=public --remove-service=http --permanent
-```
- 
-
-### 允许或者拒绝任意端口/协议
-
-比如：允许或者禁用 12345 的 TCP 流量。
-
-
-```
-sudo firewall-cmd --zone=public --add-port=12345/tcp --permanent
-sudo firewall-cmd --zone=public --remove-port=12345/tcp --permanent
-```
- 
-
-### 端口转发
-
-下面是**在同一台服务器上**将 80 端口的流量转发到 12345 端口。
-
-```
-sudo firewall-cmd --zone="public" --add-forward-port=port=80:proto=tcp:toport=12345
-```
- 
-
-要将端口转发到**另外一台服务器上**：
-
-1. 在需要的 zone 中激活 masquerade。
-
-
-    ```
-    sudo firewall-cmd --zone=public --add-masquerade
-    ```
-
-
-2. 添加转发规则。例子中是将 IP 地址为：123.456.78.9 的_远程服务器上_ 80 端口的流量转发到 8080 上。
-
-
-    ```
-    sudo firewall-cmd --zone="public" --add-forward-port=port=80:proto=tcp:toport=8080:toaddr=123.456.78.9
-    ```
-     
-
-要删除规则，用 `--remove` 替换 `--add`。比如：
-
-
-```
-sudo firewall-cmd --zone=public --remove-masquerade
-```
-
-
-### 用 FirewallD 构建规则集
-
-例如，以下是如何使用 FirewallD 为你的 Linode 配置基本规则（如果您正在运行 web 服务器）。
-
-1. 将eth0的默认 zone 设置为 _dmz_。 在提供的默认 zone 中，dmz（非军事区）是最适合开始这个程序的，因为它只允许SSH和ICMP。
-
-
-    ```
-    sudo firewall-cmd --set-default-zone=dmz
-    sudo firewall-cmd --zone=dmz --add-interface=eth0
-    ```
-    
-
-2. 为 HTTP 和 HTTPS 添加永久服务规则到 dmz zone 中：
-
-
-    ```
-    sudo firewall-cmd --zone=dmz --add-service=http --permanent
-    sudo firewall-cmd --zone=dmz --add-service=https --permanent
-    ```
-
-
-3. 重新加载 FirewallD 让规则立即生效：
-
- 
-    ```
-    sudo firewall-cmd --reload
-    ```
-
-
-    如果你运行 `firewall-cmd --zone=dmz --list-all`， 会有下面的输出：
-
-
-
-    ```
-    dmz (default)
-      interfaces: eth0
-      sources:
-      services: http https ssh
-      ports:
-      masquerade: no
-      forward-ports:
-      icmp-blocks:
-      rich rules:
-    ```
-
-
-    这告诉我们，**dmz** zone 是我们的**默认** zone，它被分配到 **eth0 接口**中所有网络的**源**和**端口**。 允许传入 HTTP（端口80）、HTTPS（端口443）和 SSH（端口22）的流量，并且由于没有 IP 版本控制的限制，这些适用于 IPv4 和 IPv6。 **不允许伪装**以及**端口转发**。 我们没有** ICMP 块**，所以 ICMP 流量是完全允许的，没有** rich 规则**。 允许所有出站流量。
-
-### 高级配置
-
-服务和端口适用于基本配置，但对于高级情景可能会太有限制。 rich 规则和 direct 接口允许你为任何端口、协议、地址和操作向任何 zone 添加完全自定义的防火墙规则。
-
-### rich 规则
-
-rich 规则的语法有很多，但都完整地记录在 [firewalld.richlanguage(5)][5] 的手册页中（或在终端中 `man firewalld.richlanguage`）。 使用 `--add-rich-rule`、`--list-rich-rules` 、 `--remove-rich-rule` 和 firewall-cmd 命令来管理它们。
-
-这里有一些常见的例子：
-
-允许来自主机 192.168.0.14 的所有IPv4流量。
-
-
-```
-sudo firewall-cmd --zone=public --add-rich-rule 'rule family="ipv4" source address=192.168.0.14 accept'
-```
-
-
-拒绝来自主机 192.168.1.10 到 22 端口的 IPv4 的 TCP 流量。
-
-
-```
-sudo firewall-cmd --zone=public --add-rich-rule 'rule family="ipv4" source address="192.168.1.10" port port=22 protocol=tcp reject'
-```
-
-
-允许来自主机 10.1.0.3 到 80 端口的IPv4 的 TCP 流量，并将流量转发到 6532 端口上。
-
-
-```
-sudo firewall-cmd --zone=public --add-rich-rule 'rule family=ipv4 source address=10.1.0.3 forward-port port=80 protocol=tcp to-port=6532'
-```
-
-
-将主机 172.31.4.2 上 80 端口的 IPv4 流量转发到 8080 端口（需要在 zone 上激活 masquerade）。
-
-
-```
-sudo firewall-cmd --zone=public --add-rich-rule 'rule family=ipv4 forward-port port=80 protocol=tcp to-port=8080 to-addr=172.31.4.2'
-```
-
-
-列出你目前的 rich 规则：
-
-
-```
-sudo firewall-cmd --list-rich-rules
-```
-
-
-### iptables 的直接接口
-
-对于最高级的使用，或对于 iptables 专家，FirewallD 提供了一个直接接口，允许你给它传递原始 iptables 命令。 直接接口规则不是持久的，除非使用 `--permanent`。
-
-要查看添加到 FirewallD 的所有自定义链或规则：
-
-
-```
-firewall-cmd --direct --get-all-chains
-firewall-cmd --direct --get-all-rules
-```
-
-
-讨论 iptables 的具体语法已经超出了这篇文章的范围。如果你想学习更多，你可以查看我们的 [iptables 指南][6]。
-
-### 更多信息
-
-你可以查阅以下资源以获取有关此主题的更多信息。虽然我们希望我们提供的是有效的，但是请注意，我们不能保证外部材料的准确性或及时性。
-
-* [FirewallD 官方网站][1]
-* [RHEL 7 安全指南：FirewallD 简介][2]
-* [Fedora Wiki：FirewallD][3]
-
---------------------------------------------------------------------------------
-
-via: https://www.linode.com/docs/security/firewalls/introduction-to-firewalld-on-centos
-
-作者：[Linode][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.linode.com/docs/security/firewalls/introduction-to-firewalld-on-centos
-[1]:http://www.firewalld.org/
-[2]:https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Security_Guide/sec-Using_Firewalls.html#sec-Introduction_to_firewalld
-[3]:https://fedoraproject.org/wiki/FirewallD
-[4]:http://www.firewalld.org/
-[5]:https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.richlanguage.html
-[6]:https://www.linode.com/docs/networking/firewalls/control-network-traffic-with-iptables
diff --git a/translated/tech/20161018 Suspend to Idle.md b/translated/tech/20161018 Suspend to Idle.md
new file mode 100644
index 0000000000..989f113f69
--- /dev/null
+++ b/translated/tech/20161018 Suspend to Idle.md	
@@ -0,0 +1,147 @@
+
+# Suspend to Idle
+
+### 简介
+
+Linux内核提供了多种睡眠状态，各个状态通过设置系统中的不同部件进入低耗电模式来节约能源。目前总共有四种状态，分别是：suspend to idle，power-on standby，suspend to ram和suspend to disk。这些状态分别对应ACPI的4种状态：S0,S1，S3和S4。suspend to idle是纯软件实现的，主要用于尽量保持CPU处于睡眠状态。powder-on standby则使设备处于低耗电状态，并且停止non-boot CPU运行。suspend to ram则会更进一步处理关闭部件节约能源，包括停止CPU运行，只保持内存自刷新工作，保证内存中的内容仍然存在。suspend to disk则是尽最大努力关闭部件进行节能，包括关闭内存。然后内存中的内容会被写到硬盘，待唤醒计算机的时候将硬盘中的内容重新恢复到内存中。
+
+这篇博文主要介绍挂起suspend to idle的实现。如上所说，suspend to idle主要通过软件实现。一般平台的挂起过程包括冻结用户空间并将外围设备调至低耗电模式。但是系统并不是直接关闭和拔掉运行中的cpu，而是静静地强制将CPU进入休眠状态。随着外围设备进入了低耗电模式，除了唤醒相关的中断外不会有其他中断产生。唤醒中断包括那些设置用于唤醒系统的计时器（比如RTC，普通计时器等）、或者电源开关、USB和其它外围设备。
+
+在冻结过程中，当系统进入休眠状态时会调用一个特殊的cpu休眠函数。这个enter_freeze()函数可以简单得和调用cpu进入休眠的enter()函数相同，也可以更复杂。复杂的程度由将SoCs置为低耗电模式的条件和方法决定。
+
+### 先决条件
+
+### 平台挂起条件
+
+一般情况，为了支持S2I，系统必须实现platform_suspend_ops并提供最低限度的挂起支持。这意味着至少要实现platform_suspend_ops中的所有必要函数的功能。如果suspend to idle 和suspend to ram都支持，那么至少要实现suspend_valid_only_men。
+
+最近，内核开始支持支持S2I。Sudeep Holla表示无须满足platform_suspend_ops条件也会支持S2I。这个分支已经被接收并将在4.9版本被合并，该分支的路径在[https://lkml.org/lkml/2016/8/19/474][1]
+
+如果定义了suspend_ops。那么可以通过查看/sys/power/state文件得知系统具体支持哪些挂起状态。如下操作：
+
+```
+# cat /sys/power/state
+```
+
+freeze mem_
+
+这个示例的结果显示该平台支持S0（suspend to idle）和S3（suspend to ram）。随着Sudeep's的发展，只有那些没有实现platform_suspend_ops的平台才会显示freeze的结果。
+
+### 唤醒中断
+
+一旦系统处于某种睡眠状态，系统必须要接收某个唤醒事件才能恢复系统。这些唤醒事件一般由系统的设备产生。因此确保这些设备的驱动实现了唤醒中断，并且在接收这些中断的基础上产生了唤醒事件。如果唤醒设备没有正确配置，那么系统收到中断后只能继续保持睡眠状态而不会恢复。
+
+一旦设备正确实现了唤醒接口的调用，那么该设备就能产生唤醒事件。确保DT正确配置了唤醒源。下面是一个示例唤醒源配置，该文件来自（arch/arm/boot/dst/am335x-evm.dts）:
+
+```
+    gpio_keys: volume_keys@0 {__
+               compatible = “gpio-keys”;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               autorepeat;
+
+               switch@9 {
+                       label = “volume-up”;
+                       linux,code = <115>;
+                       gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
+                       wakeup-source;
+               };
+
+               switch@10 {
+                       label = “volume-down”;
+                       linux,code = <114>;
+                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       wakeup-source;
+               };
+       };
+```
+如上所示，有两个gpio键被配置为了唤醒源，在系统挂起期间按下其中任何一个键都会产生一个唤醒事件。
+
+相对与DT文件配置的另一个唤醒源配置就是设备驱动配置自身，如果设备驱动在代码里面配置了唤醒支持，那么就会使用该默认唤醒配置。
+
+### 补充
+
+### freeze功能
+
+如果系统希望能够充分使用suspend to idle，那么应该在cpu空闲驱动代码中定义enter_freeze()函数。enter_freeze()与enter()的使用方式完全不同，因此不能给enter和enter_freeze实现相同的enter()功能。如果没有定义enter_freeze()，虽然系统会挂起，但是不会触发那些只有当enter_freeze()定义了才会触发的函数，比如tick_freeze()和stop_critical_timing()都不会发生。虽然这也会导致中断唤醒系统，但不会导致系统恢复，系统处理完中断后会继续睡眠。在该最低限度情况下，系统会直接调用enter()。
+
+在挂起过程中，越少中断产生越好（最好一个也没有）。
+
+下图显示了能耗和时间的对比。图中的两个尖刺分别是挂起和恢复阶段。挂起前后的能耗尖刺是系统退出空闲态正在进行的记录操作，进程调度，计时器处理等。由于潜在的原因系统进入更深层次休眠状态进行的默认操作需要花很多时间。
+
+ ![blog-picture-one](http://www.linaro.org/wp-content/uploads/2016/10/blog-picture-one-1024x767.png) 
+Power Usage Time Progression
+
+下面的跟踪时序图显示了4核CPU在系统挂起和恢复操作这段时间内的活动。如图所示，在挂起这段时间没有请求或者中断被处理。
+
+ ![blog-picture-2](http://www.linaro.org/wp-content/uploads/2016/10/blog-picture-2-1024x577.png) 
+
+Ftrace capture of Suspend/Resume
+
+### 空闲状态
+
+你必须确定哪个空闲状态支持冻结，在冻结期间，电源相关代码会决定用哪个空闲状态来实现冻结。这个过程是通过在每个空闲状态中查找谁定义了enter_freeze()来决定的。cpu空闲驱动代码或者SoC挂起相关代码必须实现冻结相关操作，并通过指定冻结功能给所有CPU的可应用空闲状态进行配置。
+
+比如Qualcomm会在平台的挂起功能中的初始化代码处定义enter_freeze函数。这个工作是在cpu空闲驱动已经初始化并且所有数据结构已经定义就位的情况下进行的。
+
+### 挂起/恢复相关驱动支持
+
+你可能会在第一次成功挂起操作后碰到驱动相关的bug。很多驱动开发者没有精力完全测试挂起和恢复相关的代码。由于用户空间已经被冻结，唤醒设备此时已经处于休眠状态并且pm_runtime已经被禁止。你可能会发现挂起操作并没有多少工作可做，因为pm_runtime已经做好了挂起相关的准备。
+
+### 测试相关
+
+测试suspend to idle可以手动进行，也可以用（脚本或程序）自动挂起，使用自动睡眠或者Android中的wakelock来让系统挂起。如果手动测试，下面的操作会直接将系统冻结。
+
+```
+/ # echo freeze > /sys/power/state
+[  142.580832] PM: Syncing filesystems … done.
+[  142.583977] Freezing user space processes … (elapsed 0.001 seconds) done.
+[  142.591164] Double checking all user space processes after OOM killer disable… (elapsed 0.000 seconds)
+[  142.600444] Freezing remaining freezable tasks … (elapsed 0.001 seconds) done._
+_[  142.608073] Suspending console(s) (use no_console_suspend to debug)
+[  142.708787] mmc1: Reset 0x1 never completed.
+[  142.710608] msm_otg 78d9000.phy: USB in low power mode
+[  142.711379] PM: suspend of devices complete after 102.883 msecs
+[  142.712162] PM: late suspend of devices complete after 0.773 msecs
+[  142.712607] PM: noirq suspend of devices complete after 0.438 msecs
+< system suspended >
+….
+< wake irq triggered >
+[  147.700522] PM: noirq resume of devices complete after 0.216 msecs
+[  147.701004] PM: early resume of devices complete after 0.353 msecs
+[  147.701636] msm_otg 78d9000.phy: USB exited from low power mode
+[  147.704492] PM: resume of devices complete after 3.479 msecs
+[  147.835599] Restarting tasks … done.
+/ #
+```
+
+在上面的例子中，需要注意MMC驱动的操作占了102.883ms中的100ms。有些设备驱动在挂起的时候有很多工作要做，比如将数据刷出到硬盘，或者其他耗时的操作等。
+
+如果系统定义了freeze。那么系统将尝试挂起操作，如果没有freeze功能，那么你会看到下面的提示：
+
+```
+/ # echo freeze > /sys/power/state 
+sh: write error: Invalid argument
+/ #
+```
+
+### 未来的发展
+
+目前在ARM平台上的suspend to idle有两方面的工作需要做。第一方面是前面提到的需要准备好platform_suspend_ops相关工作，该工作致力于冻结状态的合法化并将并到4.9版本的内核中。另一方面是关于冻结功能方面的支持。
+
+如果你希望设备有更好的响应及表现那么应该继续完善冻结相关功能的实现。然而很多SoCs会使用ARM的cpu空闲驱动，这使得ARM能够完善自己独特的冻结功能。而事实上，ARM正在尝试添加自己特有的支持。如果SoCs供应商希望实现他们自己的cpu空闲驱动或者需要在进入更深层次的冻结休眠状态时提供额外的支持，那么只有实现自己的冻结功能。
+
+--------------------------------------------------------------------------------
+
+via: http://www.linaro.org/blog/suspend-to-idle/
+
+作者：[Andy Gross][a]
+
+译者：[beyondworld](https://github.com/beyondworld)
+
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.linaro.org/author/andygross/
+[1]:https://lkml.org/lkml/2016/8/19/474
diff --git a/translated/tech/20161103 Perl and the birth of the dynamic web.md b/translated/tech/20161103 Perl and the birth of the dynamic web.md
new file mode 100644
index 0000000000..a48a80d33d
--- /dev/null
+++ b/translated/tech/20161103 Perl and the birth of the dynamic web.md	
@@ -0,0 +1,90 @@
+# Perl 与动态网站的诞生
+
+>在新闻组和邮件列表，计算机科学实验室，各大陆之间流传着一个关于 Perl 对于动态网站的作用的迷人故事。
+
+ ![Perl and the birth of the dynamic web](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/osdc-lead-web-internet.png?itok=hq81pSDs "Perl and the birth of the dynamic web") 
+>图片来源 : [Internet Archive Book Images][30], 由 Opensource.com 修改. [CC BY-SA 4.0][29].
+
+人们记得这样一些早期互联网历史中的一系列的萌芽事件：如 Tim Berners-Lee 在邮件组上 [述说][28] WWW-project 的那天，[CERN][27] 将项目代码及文档释出到公共域的时刻，以及 1993 年 1 月的[第一版 NCSA Mosaic 浏览器][26]。虽然这些独立的时刻是相当重要的，但是当时的技术的开发已经更为丰富而不再是由一组的孤立事件组成，更像是一系列有内在联系的故事。
+
+其中的一个故事描述的是网站是如何变成_动态的_，通俗说来就是我们如何使服务器比在提供静态 HTML 文档的状态下做更多的事。这是个流传在新闻组和邮件列表，计算机科学实验室，各大陆之间的故事，专注于一个人，一种编程语言：Perl。
+
+### CGI 脚本和信息套件（这里将 infoware 翻译成了信息套件件不确定是否合适）
+
+在上世纪 90 年代中后期，Perl 几乎和动态网站是同义词。Perl 是一种相对来说容易学习的解释型语言并且有强大的文本处理特性，使得它能够很容易的编写脚本来连接网站的数据库，处理由用户发送的格式化数据，同时生成这些上世纪 90 年代的网站图标，点击量和用户手册。
+
+类似的网站特性渐渐的变成了格式话的 CGI 脚本，全称为通用网关接口（Common Gateway Interface），[第一次实现][24]由 Rob McCool 于 1993 年 11 月在 NCSA HTTPD 上完成。CGI 被设计成允许功能话的访问接入，并且在短短几年之内任何人都可以很容易的找到一些由 Perl 写的预制脚本存档。有一个声名狼籍的案例就是 [Matt's Scripts Archive][23]，这是一种流行的包含安全缺陷的源使得 Perl 社区成员创建了一种被称为 [Not Matt‘s Scripts][22] 的更为专业的替换选项。
+
+在当时爱好者和职业程序员都采用 Perl 来制作动态网站和应用，Tim O’Reilly [创造了词汇“信息套件”][21] 来描述网站和 Perl 处于变化中的计算机工业的哪一部分。考虑到 Yahoo！ 和 Amazon 带来的创新，O‘Reilly 写道：“传统软件在大量的软件中仅仅包含了少量的信息;信息套件则在少量的软件中包含了大量的信息。” Perl 是一种像瑞士军刀一样的完美的小而强大的工具支撑了信息媒体从巨大的网站目录向早期的用户生成内容平台的转变。
+
+### 题外话
+
+尽管我们可以很溜的使用 Perl 来制作 CGI，但是编程语言和不断提升中的动态网站之间的关系变得更加的密切与深入。在[第一个网站][20]（在 1990 年的圣诞节前）出现到 1993 年 McCool 实现 CGI 的大多数时间里，对于上世纪 90 年代和更早以前的网站定义为格式化的位图和让人云里雾里的表格。尽管 Berners-Lee 也对这些早期的岁月产生了影响，但是不同的人看到的是网络不同的潜在作用，并将它推向各自不同的方向。一方面，这样的结果来自一些著名的辩论，例如 [HTML 应该和 SGML 保持多近的关系][19], [是否应该实现一个图像标签][18]。在另一方面，在没有直接因素影响的情况下改变是及其缓慢的。后者已经很好的描述了动态网站是如何被开发的。
+
+从某种意义上说，第一个网关的诞生可以追溯到 1991 至 1992 年之间，当时 Berners-Lee 和一些计算及科学家与超文本爱好者编写服务程序使得一些特定的资源能够连接到一起，例如 CERN 的内部应用程序，通用的应用程序如 Oracle 数据库，[广域信息查询系统（WAIS）][16]。（WAIS 是由互联网的先驱在上世纪 80 年代后期开发的，其中，[Brewster Kahle][15]，是一个数字化图书管理员和 [Internet Archive][14] 的创始人。）这样的话，网关就是一个被设计用来连接其它网络，数据库或者应用程序的客户网络服务器。任何的动态特性就是意味着在不同的端口上运行另外的守护进程（参考阅读，例如 Berners-Lee 对于在网站上 [如何添加一个搜索功能][13] 的描述）。Berners-Lee 期望万维网（将这里的web翻译成了万维网不知是否合适）可以成为不同信息系统之间的通用接口，并且鼓励单一目的服务的扩展。他也提到 Perl 是一种强大的（甚至是不可思议）可以将各种东西组合起来的语言。
+
+然而，另一种对“网关”的理解指出它不一定是一个客户端设备可能只是一个脚本，一个不需要额外服务器的低吞吐量的附加脚本。这种形式的首次出现是有争议性的 Jim Davis 的 [Gateway to the U Mich Geography server][11]，在 1992 年的 11 月被发布在了 WWW-talk 邮件列表中。Davis 的脚本是使用 Perl 编写的，是一种网络 API 的原型，基于用户格式化的查询从另外的服务器拉取数据。我们来说明一下这两种对于网关的理解的不同之处，Berners-Lee [回复了][10] Davis 的邮件期望他和 Michigan 服务器的作者“能够达成一些共识”，“从网络的角度来看的话”使用一台服务器（这里将one server翻译成了一台服务器不知是否合理，似乎也可能是一类服务器程序）来提供这样的信息可能会更有意义。Berners-Lee，可能是期待着网络（这里将web翻译成了网络可能有点不妥）的发明者可以提出一种有秩序的信息资源访问方式。这样的不断增加的从不同服务器上拉取数据的网关和脚本意味着一种潜在的网络的质的变化，这里扩展了当然也可能有点偏离了 Berners-Lee 的原始观点。
+
+### 回到 Perl HTTPD
+
+在 Davis 的地理服务器上的网关向标准化的低吞吐量的通过 CGI 方式实现的脚本化的网关之间，Perl HTTPD 的出现是很重要的事件，在 1993 初由印地安纳大学的研究生 Marc Van Heyningen 在布卢明顿（Bloomington）完全使用 Perl 语言实现了一个网络服务器程序。从 Van Heyningen 给出的[设计原则][8]来看，基于使用 Perl 就不需要任何的编译过程这样一种事实，使得它能够成为一种极易扩展的服务器程序，这个服务器包含了一个特性，只要简单的重启一下就可以添加新特性到服务器程序中并且不会有任何的宕机时间，使得这个服务器程序可以频繁的加入新功能（这里似乎有点敏捷开发的样子，不太确定该如何描述更好）。
+
+Perl HTTPD 代表了那种服务器程序应该是单一，特定目的相对观点。相应的，这种模式似乎暗示了在网络发展中像这样持续不断提高测试软件产品可能会最终变成一种共识。Van Heyningen 在后来[提到过][7]他从头编写这样一个服务器程序的初衷是当时没有一种简便的方式使用 CERN 服务器程序来生成“虚拟文件”（例如，动态生成的页面），他打趣说使用 Perl 这样像天书一样的语言来写可能是最简单的方式了。在他编写的众多脚本的初期就是一个连接 Sun 用户手册的网络接口同时也是一个 [Finger Gateway][6]（一种用来共享计算机系统信息或者是用户信息的早期协议）。
+
+虽然 Van Heyningen 将印地安纳大学的服务器主要用来连接现存的信息资源，他和研究生们同时也看见了作为个出版形式的潜在可能。其中一件广为人知事件是在 1993-1994 年之间围绕着一个著名的加拿大案件而[公布][5]的一系列的文件，照片和新闻故事，与此同时所有的全国性媒体保持了沉默。
+
+Perl HTTPD 没有必要保持持久的活力。今天，Van Heyningen 回忆起这个程序的时候认为这个程序只是当时的一个原型产品。它的原始目的只是向那些已经选择了 Gopher 作为大需网络接口的高级职员们展示网络的另一种利用方式。Van Heyningen 用代码回应了他导师们自豪的[一种基于网络的索引搜索的原型][4]。就是说，在服务器程序技术方面关键创新是为了赢得争论的胜利而诞生的，在这个角度上来看代码做到了所有呼唤它所做的事。
+
+不管服务器程序是否是短暂的，伴随者 Perl HTTPD 一起出现的理念已经传播到了各个角落。Van Heyningen 开始收到代码请求并且将它分享到了网上，总之就是如果想要将服务器与其它系统相连接就需要了解一些 Perl。不久之后，居住在奥斯汀（Austin）的程序员 Tony Sanders 开发了一个被称为 [Plexus][3] 的轻便版本。Sander 的服务器程序是一款全功能的产品并且同样包含了 Perl HTTPD 所建议的以扩展性，当你需要的时候可以添加一些新的特性如图片解码等。Plexus [直接影响了][2] Rob McCool 给 NCSA HTTPD 服务器上的脚本开发的“htbin”，并且同样影响到了不久之后诞生的通用网关接口（CGI）。
+
+在这些历史遗产之外，感谢妙不可言的 Internet Archive（互联网时光机）使得 Perl HTTPD 在今天保留在一种我们依然可以获取的形式，你可以从[这里下载][1]。
+
+### 历史展望
+
+对于技术世界的颠覆来说，技术的改变总是在一个相互对立的过程中。现有的技术是思考新技术的基础与起点。过时的编程形式启迪了今天人们做事的新方式。网络世界的创新可能看起来更像是对于就技术的扩展，不仅仅是 Perl。
+
+在简单枯燥的萌芽事件时间轴之外，网络历史学者也许可以从 Perl 获取更多的线索。其中一部份的挑战在于材料的获取。更多需要作的事情包括从可获得的大量杂乱的数据中梳理出它的结构，将分散在邮件列表，归档网站，书本和杂志中的信息内容组合在一起。还有一部分的挑战是需要认识到互联网的历史不仅仅是新技术发布的日子，它同时包括了个人记忆，人类情感与社会进程等，并且这不仅仅是单一的历史线而是有许许多多条相似的历史线组合而成的。就如 Perl 的信条一样“殊途同归。（There's More Than One Way To Do It.）”
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/life/16/11/perl-and-birth-dynamic-web
+
+作者：[Michael Stevenson][a]
+
+译者：[wcnnbdk1](https://github.com/wcnnbdk1)
+
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/mstevenson
+[1]:https://web.archive.org/web/20011126190051/http://www.cs.indiana.edu/perl-server/httpd.pl.tar.Z
+[2]:http://1997.webhistory.org/www.lists/www-talk.1993q4/0516.html
+[3]:https://web.archive.org/web/19990421192342/http://www.earth.com/server/doc/plexus.html
+[4]:https://web.archive.org/web/19990428030253/http://www.cs.indiana.edu:800/cstr/search
+[5]:https://web.archive.org/web/19970720205155/http://www.cs.indiana.edu/canada/karla.html
+[6]:https://web.archive.org/web/19990429014629/http://www.cs.indiana.edu:800/finger/gateway
+[7]:https://web.archive.org/web/19980122184328/http://www.cs.indiana.edu/perl-server/history.html
+[8]:https://web.archive.org/web/19970720025822/http://www.cs.indiana.edu/perl-server/intro.html
+[9]:https://web.archive.org/web/19970720025822/http://www.cs.indiana.edu/perl-server/code.html
+[10]:https://lists.w3.org/Archives/Public/www-talk/1992NovDec/0069.html
+[11]:https://lists.w3.org/Archives/Public/www-talk/1992NovDec/0060.html
+[12]:http://info.cern.ch/hypertext/WWW/Provider/ShellScript.html
+[13]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0109.html
+[14]:https://archive.org/index.php
+[15]:http://brewster.kahle.org/about/
+[16]:https://en.wikipedia.org/wiki/Wide_area_information_server
+[17]:http://info.cern.ch/hypertext/WWW/Daemon/Overview.html
+[18]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0182.html
+[19]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0096.html
+[20]:http://info.cern.ch/hypertext/WWW/TheProject.html
+[21]:https://web.archive.org/web/20000815230603/http://www.edventure.com/release1/1198.html
+[22]:http://nms-cgi.sourceforge.net/
+[23]:https://web.archive.org/web/19980709151514/http://scriptarchive.com/
+[24]:http://1997.webhistory.org/www.lists/www-talk.1993q4/0518.html
+[25]:https://en.wikipedia.org/wiki/Usenet_newsgroup
+[26]:http://1997.webhistory.org/www.lists/www-talk.1993q1/0099.html
+[27]:https://tenyears-www.web.cern.ch/tenyears-www/
+[28]:https://groups.google.com/forum/#!msg/alt.hypertext/eCTkkOoWTAY/bJGhZyooXzkJ
+[29]:https://creativecommons.org/licenses/by-sa/4.0/
+[30]:https://www.flickr.com/photos/internetarchivebookimages/14591826409/in/photolist-oeqVBX-xezHCD-otJDtG-whb6Qz-tohe9q-tCxH8y-xq4VfN-otJFfh-xEmn3b-tERUdv-oucUgd-wKDyLy-owgebW-xd6Wew-xGEvuT-toqHkP-oegBCj-xtDdzN-tF19ip-xGFbWP-xcQMJq-wxrrkN-tEYczi-tEYvCn-tohQuy-tEzFwN-xHikPT-oetG8V-toiGvh-wKEgAu-xut1qp-toh7PG-xezovR-oegRMa-wKN2eg-oegSRp-sJ29GF-oeqXLV-oeJTBY-ovLF3X-oeh2iJ-xcQBWs-oepQoy-ow4xoo-xknjyD-ovunVZ-togQaj-tEytff-xEkSLS-xtD8G1
diff --git a/translated/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md b/translated/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md
new file mode 100644
index 0000000000..950d21ab7c
--- /dev/null
+++ b/translated/tech/20161107 CLOUD FOCUSED LINUX DISTROS FOR PEOPLE WHO BREATHE ONLINE.md	
@@ -0,0 +1,110 @@
+
+为了畅游网络的人们、专注于云端的 Linux 发行版
+============================================================
+
+[
+ ![Best Linux distributions for cloud computing](https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg) 
+][6]
+
+概述：我们列举几款以云端为中心的 Linux 发行版，它们被视为真正能替代 Chrome OS 的 Linux 发行版。
+
+这个世界正在向云端服务转变，而且我们都知道 Chrome OS 倍受人们喜爱。嗯，它确实值得尊重。它超级快、轻盈、省电、简约、设计精美而且充分发挥了当今科技所能提供的云端潜能。
+
+虽然 [Chrome OS][7] 只能在谷歌的硬件上使用，但是，就只是在你的台式机或者笔记本上，还是有其他的方法来体验云计算的潜能。
+
+正如我重复所说的，在 Linux 领域中，人们总能参与其中。有那些看起来像 Windows 或者 Mac OS 的Linux 发行版。Linux 汇集了分享，爱和计算体验的最前沿。让我们马上看看这份列表吧！
+
+### 1\. CUB LINUX
+
+ ![Cub Linux Desktop](https://itsfoss.com/wp-content/uploads/2016/10/cub1.jpg) 
+ 
+这不是 Chrome OS ，上述图片描绘的是 Cub Linux 的桌面。不清楚我说的什么？
+
+Cub Linux 对于 Linux 用户来说不再新鲜，但是如果你确实不知道的话，（我来解释下，）Cub Linux 灵感来源于主流的 Chrome OS ，是一款专注于网页的 Linux 发行版。从母亲 Linux 来讲，它也是 Chrome OS 的开源兄弟。
+
+Chrome OS 内置了 Chrome 浏览器。不久之前，一个名为 [Chromixium OS][10] 的项目启动，旨在用 Chromium 浏览器取代 Chrome 浏览器，来提供与 Chrome OS 同样的体验。因为一些法律上的争论，项目名字后来改为 Cub Linux （取自 Chromium 和 Ubuntu 两个词）。
+
+ ![cub2](https://itsfoss.com/wp-content/uploads/2016/10/cub2.jpg) 
+ 
+在历史部分，如名字提示的那样，Cub Linux 基于 Ubuntu ，使用了轻量的 Openbox 桌面环境。定制桌面来给人以 Chrome OS 的印象，而且看起来很整洁。
+
+在应用部分，你能安装 Chrome 网上商店的网络应用和所有的 Ubuntu 应用。对，有 Chrome OS 的精美应用，你仍能体会到 Ubuntu 的好处。
+
+就表现而言，这操作系统相当快多亏了它自身的 Openbox 桌面环境。基于 Ubuntu ，Cub Linux 的稳定性是毋庸置疑的。这桌面流畅的动画和漂亮的用户界面，对于眼睛是一种享受，
+
+[Suggested Read[Year 2013 For Linux] 2 Linux Distributions Discontinued][11]
+
+我向花费大部分时间在浏览器，时不时做些家务的人推荐 Cub Linux 。嗯，一个浏览器就是你所需要的全部，而且，一个浏览器正是你将会得到的全部。
+
+### 2\. PEPPERMINT OS
+
+不少人把目光投向 Linux 因为他们想要一个良好的使用计算机的体验。一些人是真的不喜欢防病毒软件、磁盘整理程序、清理工具的打扰，他们只是想要一个操作系统而不是个孩子。我必须说 Peppermint OS 真的不会打扰用户。[Peppermint OS][12] 的开发者在理解用户需求上花费了大量的时间精力。
+
+ ![pep1](https://itsfoss.com/wp-content/uploads/2016/11/pep1.jpg) 
+
+系统默认内置了很少的软件。内置从每一个软件类别挑选的一些应用，这传统的想法没有被开发者所采纳，这为了良好的用户体验。个性化定制电脑的权力已经移交给用户。顺便说一句，当能用网页替代几乎大部分应用时，我们真的需要安装那么多的应用吗？
+
+Ice
+
+Ice 是一个有用的小工具，它能将你最喜爱和经常用到的网页转化成桌面应用，这样你就能直接从你的桌面或菜单启动。这就是我们所说的特定页浏览器。
+
+ ![pep4](https://itsfoss.com/wp-content/uploads/2016/11/pep4.jpg) 
+
+喜欢 facebook ？为了快速启动，为什么不弄一个 facebook 的网页应用在你的桌面上？当人们抱怨 Linux 上不知如何正确安装 Google Drive 应用时，Ice 能让你在一次单击就能访问 
+
+Peppermint OS 7 是基于 Ubuntu 16.04 。它不仅有流畅、稳固的表现，而且反应很快。一个深度定制的 LXDE 将会是你的首页。我所说的定制是为了实现华丽的表现和视觉吸引力。
+
+Peppermint OS 介于云操作系统和本地操作系统。虽然这操作系统的框架被设计来支持快速的云端应用，但是本地的 Ubuntu 应用运行得也不错。如果你是像我那样，想要一个能在在线和离线之间保持平衡的操作系统的话，[Peppermint OS 很适合你][13]。
+
+[Suggested ReadPennsylvania High School Distributes 1,700 Ubuntu Laptops to Students][14]
+
+### 3.APRICITY OS
+
+[Apricity OS][15] 在这里是极具美感的 Linux 发行版之一。它就像是 Linux 里的蒙娜丽莎。但是，不止外观优美，它还有更多优点。
+
+ ![ap2](https://itsfoss.com/wp-content/uploads/2016/11/ap2.jpg) 
+
+将 [Apricity OS][16] 加入这名单中的基本理由是它的简洁。当桌面操作系统设计变得越来越乱、堆砌元素时（我只是在讨论 Linux 操作系统），Apricity 除去所有杂项，简化最基本的人机交互。在这，Gnome 桌面环境被定制得非常优美。他们使其变得更简单。
+
+预装的软件真的很少。几乎所有的 Linux 发行版有同样的预装软件。但是 Apricity OS 有一个全新的软件集合。Chrome 而不是 Firefox 。我真的很期待这点。我是说为什么不在外面告诉我们改变了什么？
+
+Apricity OS 也展现了我们在上一段讨论的 Ice 工具。但不是 Firefox ，Chrome 浏览器被用在网页-桌面一体化里。Apricity OS 默认内置了 Numix Circle 图标。。每一次你添加一个网页应用，那就会有一个优美的图标放在你的底栏上。
+
+ ![](https://itsfoss.com/wp-content/uploads/2016/11/ap1.jpg) 
+
+看见我所说的了吗？
+
+Apricity OS 基于 Arch Linux 。（所以任何想要快速上手 Arch ，想要优美发行版的人，来[这里][17]下载 Apricity 的 ISO 文件。) Apricity 完全保持了 Arch  选择自由的原则。
+
+华丽的背景，极简主义的桌面和一大堆的功能。这些特性使得 Apricity OS 在建立一个很棒的云端系统上成为一个极佳选择。在 Apricity OS 花上5分钟来使你完全爱上它。我是认真的。
+
+到此你就看完了全部。给网上居住者的云端 Linux 发行版。给我们关于网页应用和本地应用话题的看法。别忘了分享。
+
+--------------------------------------------------------------------------------
+
+via: https://itsfoss.com/cloud-focused-linux-distros/
+
+作者：[Aquil Roshan ][a]
+译者：[ypingcn](https://github.com/ypingcn)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://itsfoss.com/author/aquil/
+[1]:https://itsfoss.com/author/aquil/
+[2]:https://itsfoss.com/cloud-focused-linux-distros/#comments
+[3]:https://twitter.com/share?original_referer=https%3A%2F%2Fitsfoss.com%2F&source=tweetbutton&text=Cloud+Focused+Linux+Distros+For+People+Who+Breathe+Online&url=https%3A%2F%2Fitsfoss.com%2Fcloud-focused-linux-distros%2F&via=%40itsfoss
+[4]:https://www.linkedin.com/cws/share?url=https://itsfoss.com/cloud-focused-linux-distros/
+[5]:http://pinterest.com/pin/create/button/?url=https://itsfoss.com/cloud-focused-linux-distros/&description=Cloud+Focused+Linux+Distros+For+People+Who+Breathe+Online&media=https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg
+[6]:https://itsfoss.com/wp-content/uploads/2016/11/cloud-centric-Linux-distributions.jpg
+[7]:https://en.wikipedia.org/wiki/Chrome_OS
+[8]:https://itsfoss.com/windows-like-linux-distributions/
+[9]:https://cublinux.com/
+[10]:https://itsfoss.com/chromixiumos-released/
+[11]:https://itsfoss.com/year-2013-linux-2-linux-distributions-discontinued/
+[12]:https://peppermintos.com/
+[13]:https://peppermintos.com/
+[14]:https://itsfoss.com/pennsylvania-high-school-ubuntu/
+[15]:https://apricityos.com/
+[16]:https://itsfoss.com/apricity-os/
+[17]:https://apricityos.com/
diff --git a/translated/tech/20161110 How to check if port is in use on Linux or Unix.md b/translated/tech/20161110 How to check if port is in use on Linux or Unix.md
deleted file mode 100644
index 8a83a45864..0000000000
--- a/translated/tech/20161110 How to check if port is in use on Linux or Unix.md	
+++ /dev/null
@@ -1,119 +0,0 @@
-如何在 \*nix 系统中验证端口是否被占用
-==========
-
-[![](https://s0.cyberciti.org/images/category/old/linux-logo.png)][1]
-
-在 Linux 或者类 Unix 中，我该如何检查某个端口是否被占用？我又该如何验证 Linux 服务器中有哪些端口处于监听状态？
-
-验证哪些端口在服务器的网络接口上处于监听状态是非常重要的。你需要注意那些用于监听指令的开放端口。暂且不说那些用于排除故障的指令，确认服务器上的某个端口是否被其他应用程序占用也是必要的。比方说，你可能会在同一个系统中安装了 Apache 和 Nginx 服务，所以了解是 Apache 还是 Nginx 占用 # 80/443 TCP端口真的很重要。本文会提及使用 netstat、nmap 和 lsof 命令来检查端口是否被占用以及查看程序使用了那些端口。
-
-### 如何检查 Linux 中的监听端口和程序
-
-1. 打开一个终端，如 shell 命令窗口。
-2. 运行一下任意一行命令：
-
-  ```
-  sudo lsof -i -P -n | grep LISTEN
-  sudo netstat -tulpn | grep LISTEN
-  sudo nmap -sTU -O IP-address-Here
-  ```
-
-下面我们看看这些命令输出的详细内容：
-
-### 选择 #1：lsof 命令
-
-语法如下：
-
-```
-$ sudo lsof -i -P -n
-$ sudo lsof -i -P -n | grep LISTEN
-$ doas lsof -i -P -n | grep LISTEN
-```
-
-### [OpenBSD] ###
-
-输出如下：
-
-[![Fig.01: Check the listening ports and applications with lsof command](https://s0.cyberciti.org/uploads/faq/2016/11/lsof-outputs.png)][2]
-
-图 1：使用 lsof 命令检查监听端口和程序
-
-如上图输出的最后一行：
-
-```
-sshd    85379     root    3u  IPv4 0xffff80000039e000      0t0  TCP 10.86.128.138:22 (LISTEN)
-```
-
-- sshd 是程序的名称
-- 10.86.128.138 是 sshd 程序绑定监听 (LISTEN) 的 IP 地址
-- 22 是被占用 (LISTEN) 的 TCP 端口
-- 85379 是 sshd 进程的进程 ID (PID)
-
-### 选择 #2：netstat 命令
-
-netstat 命令检查监听端口和程序的用法如下：
-
-### Linux 中 netstat 语法如下：
-
-```
-$ netstat -tulpn | grep LISTEN
-```
-
-### FreeBSD/MacOS X 中 netstat 语法如下：
-
-```
-$ netstat -anp tcp | grep LISTEN
-$ netstat -anp udp | grep LISTEN
-```
-
-### OpenBSD 中 netstat 语法如下：
-
-```
-$ netstat -na -f inet | grep LISTEN
-$ netstat -nat | grep LISTEN
-```
-
-### 选择 #3：nmap 命令
-
-语法如下：
-
-```
-$ sudo nmap -sT -O localhost
-$ sudo nmap -sU -O 192.168.2.13 ##[ list open UDP ports ]##
-$ sudo nmap -sT -O 192.168.2.13 ##[ list open TCP ports ]##
-```
-
-输出如下：
-
-[![Fig.02: Determines which ports are listening for TCP connections using nmap](https://s0.cyberciti.org/uploads/faq/2016/11/nmap-outputs.png)][3]
-
-图 2：使用 nmap 探测那些端口用于监听 TCP 连接
-
-你可以在单个命令中同时探测 TCP/UDP 连接：
-
-`$ sudo nmap -sTU -O 192.168.2.13`
-
-### 关于 Windows 用户
-
-你可以使用以下 Windows  自带的命令来检查端口的使用情况：
-
-```
-netstat -bano | more
-netstat -bano | grep LISTENING
-netstat -bano | findstr /R /C:"[LISTING]"
-```
-
-----------------------------------------------------
-
-via: https://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/
-
-作者：[ VIVEK GITE][a]
-译者：[GHLandy](https://github.com/GHLandy)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/
-[1]:https://www.cyberciti.biz/faq/category/linux/
-[2]:http://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/lsof-outputs/
-[3]:http://www.cyberciti.biz/faq/unix-linux-check-if-port-is-in-use-command/nmap-outputs/
diff --git a/translated/tech/20161111 Can Linux containers save IoT from a security meltdown.md b/translated/tech/20161111 Can Linux containers save IoT from a security meltdown.md
new file mode 100644
index 0000000000..e76f5a1882
--- /dev/null
+++ b/translated/tech/20161111 Can Linux containers save IoT from a security meltdown.md	
@@ -0,0 +1,167 @@
+
+###[Linux容器能否弥补IoT的安全短板？][28]
+
+ ![](http://hackerboards.com/files/internet_of_things_wikimedia1-thm.jpg) 
+在这个最后的物联网系列文章中，Canonical和Resin.io向以Linux容器技术作为物联网安全性和互操作性的解决方案发起挑战。
+
+ ![](http://hackerboards.com/files/samsung_artik710-thm.jpg) 
+
+**Artik 7** |
+
+尽管受到日益增长的安全威胁，物联网炒作没有显示减弱的迹象。为了刷存在感，公司正忙于重新安排物联网的路线图。物联网大潮迅猛异常，比移动互联网革命渗透地更加深入和广泛。IoT像黑洞一样，吞噬一切，包括智能手机，它通常是我们在物联网世界中的窗口，有时作为我们的集线器或传感器端点。
+
+新的物联网处理器和嵌入式主板继续重塑技术版图。自从9月份推出[Linux和开源硬件IoT] [5]系列文章之后，我们看到了面向物联网网关的“Apollo Lake]”SoC [Intel Atom E3900] [6]以及[新三星Artik模块][7]，包括用于网关并由Linux驱动的64位Artik 7 COM及自带RTOS的Cortex-M4 Artik。 ARM为具有ARMv8-M和TrustZone安全性的IoT终端发布了[Cortex-M23和Cortex-M33] [8]内核。
+
+安全是这些产品的卖点。最近攻击Dyn服务并在一天内摧毁了美国大部分互联网的未来僵尸网络将基于Linux的物联网推到台前 - 当然这种方式似乎不太体面。通过DDoS攻击可以黑掉物联网设备，其设备所有者同样可能直接遭受恶意攻击。
+
+ ![](http://hackerboards.com/files/arm_cortexm33m23-thm.jpg) 
+
+**Cortex-M33 和 -M23** 
+
+Dyn攻击让我们更加笃定，物联网将更加自信地在受控制和受保护的工业环境而不是家用环境中向前发展。这不是因为消费者[物联网安全技术] [9]不可用，但除非产品设计之初就以安全为目标，否则如我们的[智能家居集线器系列] [10]中的许多解决方案，后期再考虑安全就会增加成本和复杂性。
+
+在物联网系列的最后一个未来展望的部分，我们将探讨两种基于Linux的面向Docker的容器技术，这些技术被提出作为物联网安全解决方案。容器还可以帮助解决在[物联网框架] [11]中探讨的开发复杂性和互操作性障碍的问题。
+
+我们与Canonical的Ubuntu客户平台工程副总裁Oliver Ries讨论了Ubuntu Core和Docker友好的容器式Snaps包管理技术。我们还就新的基于Docker的物联网方案ResinO采访了Resin.io首席执行官和联合创始人Alexandros Marinos。
+
+**Ubuntu Core 与快照管理**
+
+Canonical面向物联网的[Snappy Ubuntu Core] [12]版本的Ubuntu是围绕一个类似容器的快照包管理机制构建，并提供应用商店支持。 snap技术最近[自行发布] [13]用于其他Linux发行版。 11月3日，Canonical发布了[Ubuntu Core 16] [14]，该版本改进了白标应用商店和更新控制服务。
+
+<center>
+[
+ ![](http://hackerboards.com/files/canonical_ubuntucore16_diagram-sm.jpg) 
+][15]
+**传统Ubuntu（左）架构 与 Ubuntu Core 16**
+(点击图片放大)
+</center>
+
+快照机制提供自动更新，并有助于阻止未经授权的更新。 使用事务系统管理，快照可确保更新按预期部署或根本不部署。 在Ubuntu Core中，使用AppArmor进一步加强了安全性，并且所有应用程序文件都只读且保存在隔离的孤岛中。
+ ![](http://hackerboards.com/files/limesdr-thm.jpg) 
+
+**LimeSDR** |
+
+Ubuntu Core是我们最近展开的[开源物联网操作系统调查] [16]的一部分，现在运行在Gumstix主板，Erle机器人无人机，Dell Edge网关，[Nextcloud Box] [17]，LimeSDR，Mycroft家庭集线器 ，英特尔的Joule和符合Linaro的96Boards规范的SBC上。 Canonical公司还与Linaro物联网和嵌入式（LITE）部门集团[96Boards物联网版] [18]合作。最初，96Boards IE专注于Zephyr驱动的Cortex-M4板卡，如Seeed的[BLE Carbon] [19] 它将扩展到可以运行Ubuntu Core的网关板卡。
+
+“Ubuntu Core和快照具有从边缘到网关到云的相关性，”Canonical的Ries说。 “能够在任何主要发行版（包括Ubuntu Server和Ubuntu for Cloud）上运行快照包，使我们能够提供一致的体验。 Snaps可以使用事务更新以故障安全方式升级，可用于安全性，错误修复或新功能的持续更新，这在物联网环境中非常重要。
+
+ ![](http://hackerboards.com/files/nextcloud_box3-thm.jpg) 
+
+**Nextcloud盒子** |
+
+安全性和可靠性是关注的重点，Ries说。 “Snaps可以完全独立于彼此和操作系统运行，使得两个应用程序可以安全地在单个网关上运行，”他说。 “Snaps是只读的和经过认证的，可以保证代码的完整性。
+
+Ries还采用了减少开发时间的技术。 “Snap软件包允许开发人员向支持它的任何平台提供相同的二进制包，从而降低开发和测试成本，减少部署时间和提高更新速度。 “使用snap包，开发人员完全控制开发生命周期，并可以立即更新。 Snap包提供所有必需的依赖项，因此开发人员可以选择定制他们使用的组件。
+
+**ResinOS: 为IoT而生的Docker**
+
+Resin.io公司，与其商用IoT框架同名，最近剥离了该框架的Yocto Linux [ResinOS 2.0] [20]，ResinOS 2.0将作为一个独立的开源项目运营。 Ubuntu Core在snap包中运行Docker容器引擎，ResinOS在主机上运行Docker。 极致简约的ResinOS抽离了使用Yocto代码的复杂性，使开发人员能够快速部署Docker容器。
+
+<center>
+[
+ ![](http://hackerboards.com/files/resinio_resinos_arch-sm.jpg) 
+][21]
+**ResinOS 2.0 架构**
+(点击图片放大)
+</center>
+
+与基于Linux的CoreOS一样，ResinOS集成了系统控制服务和网络协议栈，可通过异构网络安全地部署更新的应用程序。 但是，它为在资源受限的设备（如ARM黑客板）上运行而设计，与之相反，CoreOS和其他基于Docker的操作系统（例如基于Red Hat的Project Atomic）目前仅能运行在x86上，并且更喜欢资源丰富的服务器平台。 ResinOS可以在20个Linux设备上运行，包括Raspberry Pi，BeagleBone和Odroid-C1等。
+
+“我们认为Linux容器对嵌入式系统比对于云更重要，”Resin.io的Marinos说。 “在云中，容器代表了对之前进程的优化，但在嵌入式中，它们代表了姗姗来迟的通用虚拟化“
+
+ ![](http://hackerboards.com/files/beaglebone-hand-thm.jpg) 
+
+**BeagleBone Black** |
+
+当应用于物联网时，完整的企业虚拟机有直接硬件访问的性能问题和限制，Marinos说。像OSGi和Android的Dalvik这样的移动虚拟机可以用于IoT，但是它们依赖Java并有其他限制。
+
+对于企业开发人员来说，使用Docker似乎很自然，但是你如何说服嵌入式黑客转向全新的范式呢？ “Marinos解释说，”ResinOS不是把云技术的实践经验照单全收，而是针对嵌入式进行了优化。”此外，他说，容器比典型的物联网技术更好地包容故障。 “如果有软件缺陷，主机操作系统可以继续正常工作，甚至保持连接。要恢复，您可以重新启动容器或推送更新。更新设备而不重新启动它的能力进一步消除了故障引发问题的机率。”
+
+根据Marinos，其他好处源自与云技术的一致性，例如拥有更广泛的开发人员。容器提供了“跨数据中心和边缘的统一范式，以及一种方便地将技术，工作流，基础设施，甚至应用程序转移到边缘（终端）的方式。
+
+Marinos说，容器中的固有安全性优势正在被其他技术增强。 “随着Docker社区推动实现签名的图像和证据，这些自然转移并应用到ResinOS，”他说。 “当Linux内核被强化以提高容器安全性时，或者获得更好地管理容器所消耗的资源的能力时，会产生类似的好处。
+
+容器也适合开源IoT框架，Marinos说。 “Linux容器很容易与几乎各种协议，应用程序，语言和库结合使用，”Marinos说。 “Resin.io参加了AllSeen联盟，我们与使用IoTivity和Thread的伙伴合作。
+
+**IoT的未来：智能网关与智能终端**
+
+Marinos和Canonical的Ries对未来物联网的几个发展趋势具有一致的看法。 首先，物联网的最初概念（其中基于MCU的端点直接与云进行通信以进行处理）正在迅速被雾化计算架构取代。 这需要更智能的网关，也需要比仅仅在ZigBee和WiFi之间聚合和转换数据更多的功能。
+
+第二，网关和智能边缘设备越来越多地运行多个应用程序。 第三，许多这些设备将提供板载分析，这些在最新的[智能家居集线器] [22]上都有体现。 最后，富媒体将很快成为物联网组合的一部分。
+
+<center>
+[
+ ![](http://hackerboards.com/files/eurotech_reliagate2026-sm.jpg) 
+][23] [
+ ![](http://hackerboards.com/files/advantech_ubc221-sm.jpg) 
+][24]
+**最新设备网关: Eurotech’s [ReliaGate 20-26][1] 和 Advantech’s [UBC-221][2]**
+(点击图片放大)
+</center>
+
+“智能网关正在接管最初为云服务设计的许多处理和控制功能，”Marinos说。 “因此，我们看到对容器化的推动力在增加，可以在IoT设备中使用类似云工作流程来部署与功能和安全相关的优化。 去中心化是由移动数据紧缩，不断发展的法律框架和各种物理限制等因素驱动的。
+
+Ubuntu Core等平台正在使“可用于网关的软件爆炸式增长”，Canonical的Ries说。 “在单个设备上运行多个应用程序的能力吸引了众多单一功能设备的用户，以及现在可以产生持续的软件收入的设备所有者。
+
+<center>
+[
+ ![](http://hackerboards.com/files/myomega_mynxg-sm.jpg) 
+][25] [
+ ![](http://hackerboards.com/files/technexion_ls1021aiot_front-sm.jpg) 
+][26]
+**两种IoT网关: [MyOmega MYNXG IC2 Controller (左) 和TechNexion’s ][3][LS1021A-IoT Gateway][4]**
+(点击图片放大)
+</center>
+
+不仅是网关 - 终端也变得更聪明。 “阅读大量的物联网新闻报道，你得到的印象是所有终端都运行在微控制器上，”Marinos说。 “但是我们对大量的Linux终端，如数字标牌，无人机和工业机械等直接执行任务，而不是作为操作中介（数据转发）感到惊讶。我们称之为影子IoT。
+
+Canonical的Ries同意，对简约技术的专注使他们忽视了新兴物联网领域。 “轻量化的概念在一个发展速度与物联网一样快的行业中初现端倪，”Ries说。 “今天的高级消费硬件可以持续为终端供电数月。“
+
+虽然大多数物联网设备将保持轻量和“无头”（一种配置方式，比如物联网设备缺少显示器，键盘等），它们装备有传感器如加速度计和温度传感器并通过低速率的数据流通信，但是许多较新的物联网应用已经使用富媒体。 “媒体输入/输出只是另一种类型的外设，”Marinos说。 “总是存在多个容器竞争有限资源的问题，但它与传感器或蓝牙竞争天线资源没有太大区别。”
+
+Ries看到了工业和家庭网关中“提高边缘智能”的趋势。 “我们看到人工智能，机器学习，计算机视觉和上下文意识的大幅上升，”Ries说。 “为什么要在云中运行面部检测软件，如果相同的软件可以在边缘设备运行而又没有网络延迟和带宽及计算成本？“
+
+当我们在这个物联网系列的[开篇故事] [27]中探索时，我们发现存在与安全相关的物联网问题，例如隐私丧失和生活在监视文化中的权衡。还有一些问题如把个人决策交给可能由他人操控的AI裁定。这些不会被容器，快照或任何其他技术完全解决。
+
+Perhaps we’d be happier if Alexa handled the details of our lives while we sweat the big stuff, and maybe there’s a way to balance privacy and utility. For now, we’re still exploring, and that’s all for the good.
+如果Alexa可以处理生活琐碎，而我们专注在要事上，也许我们会更快乐。或许有一个方法来平衡隐私和效用，现在，我们仍在探索，如此甚好。
+
+--------------------------------------------------------------------------------
+
+via: http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
+
+作者：[Eric Brown][a]
+译者：[firstadream](https://github.com/firstadream)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
+[1]:http://hackerboards.com/atom-based-gateway-taps-new-open-source-iot-cloud-platform/
+[2]:http://hackerboards.com/compact-iot-gateway-runs-yocto-linux-on-quark/
+[3]:http://hackerboards.com/wireless-crazed-customizable-iot-gateway-uses-arm-or-x86-coms/
+[4]:http://hackerboards.com/iot-gateway-runs-linux-on-qoriq-accepts-arduino-shields/
+[5]:http://hackerboards.com/linux-and-open-source-hardware-for-building-iot-devices/
+[6]:http://hackerboards.com/intel-launches-14nm-atom-e3900-and-spins-an-automotive-version/
+[7]:http://hackerboards.com/samsung-adds-first-64-bit-and-cortex-m4-based-artik-modules/
+[8]:http://hackerboards.com/new-cortex-m-chips-add-armv8-and-trustzone/
+[9]:http://hackerboards.com/exploring-security-challenges-in-linux-based-iot-devices/
+[10]:http://hackerboards.com/linux-based-smart-home-hubs-advance-into-ai/
+[11]:http://hackerboards.com/open-source-projects-for-the-internet-of-things-from-a-to-z/
+[12]:http://hackerboards.com/lightweight-snappy-ubuntu-core-os-targets-iot/
+[13]:http://hackerboards.com/canonical-pushes-snap-as-a-universal-linux-package-format/
+[14]:http://hackerboards.com/ubuntu-core-16-gets-smaller-goes-all-snaps/
+[15]:http://hackerboards.com/files/canonical_ubuntucore16_diagram.jpg
+[16]:http://hackerboards.com/open-source-oses-for-the-internet-of-things/
+[17]:http://hackerboards.com/private-cloud-server-and-iot-gateway-runs-ubuntu-snappy-on-rpi/
+[18]:http://hackerboards.com/linaro-beams-lite-at-internet-of-things-devices/
+[19]:http://hackerboards.com/96boards-goes-cortex-m4-with-iot-edition-and-carbon-sbc/
+[20]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/%3Ca%20href=
+[21]:http://hackerboards.com/files/resinio_resinos_arch.jpg
+[22]:http://hackerboards.com/linux-based-smart-home-hubs-advance-into-ai/
+[23]:http://hackerboards.com/files/eurotech_reliagate2026.jpg
+[24]:http://hackerboards.com/files/advantech_ubc221.jpg
+[25]:http://hackerboards.com/files/myomega_mynxg.jpg
+[26]:http://hackerboards.com/files/technexion_ls1021aiot_front.jpg
+[27]:http://hackerboards.com/an-open-source-perspective-on-the-internet-of-things-part-1/
+[28]:http://hackerboards.com/can-linux-containers-save-iot-from-a-security-meltdown/
diff --git a/translated/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md b/translated/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md
new file mode 100644
index 0000000000..75a8efb822
--- /dev/null
+++ b/translated/tech/20161115 Build Deploy and Manage Custom Apps with IBM Bluemix.md	
@@ -0,0 +1,175 @@
+使用IBM Bluemix构建，部署和管理自定义应用程序
+============================================================
+
+
+ ![IBM Bluemix logo](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/IBM-Blue-mix-logo.jpg?resize=300%2C266) 
+
+IBM Bluemix为开发人员提供了构建，部署和管理自定义应用程序的机会。Bluemix建立在Cloud Foundry上。它支持多种编程语言包括IBM的OpenWhisk，它允许开发人员调用任何函数但不需要资源管理。
+
+Bluemix是由IBM实现的开放标准的基于云的平台。它具有开放的架构，其允许组织能够在云上创建，开发和管理其应用程序。它基于Cloud Foundry，因此可以被视为平台即服务（PaaS）。使用Bluemix，开发人员不必关心云配置，可以专注于他们的应用程序。 云配置将由Bluemix自动完成。
+
+Bluemix还提供了一个仪表板，通过它，开发人员可以创建，管理和查看服务和应用程序，同时还可以监控资源使用情况。
+它支持以下编程语言：
+
+*   Java
+*   Python
+*   Ruby on Rails
+*   PHP
+*   Node.js
+
+它还支持OpenWhisk（FaaS），这也是一个IBM的产品，其允许开发人员调用任一功能而不需要任何资源管理。
+
+![图1 IBM Bluemix概述](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-1-An-Overview-of-IBM-Bluemix.jpg?resize=296%2C307) 
+
+图1 IBM Bluemix概述
+
+![图2 IBM Bluemix体系结构](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-2-The-IBM-Bluemix-architecture.jpg?resize=350%2C239)
+
+图2 IBM Bluemix体系结构
+
+![图3 在IBM Bluemix中创建组织](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-3-Creating-an-organisation-in-IBM-Bluemix.jpg?resize=350%2C280) 
+
+图3 在IBM Bluemix中创建组织
+
+**IBM Bluemix如何工作**
+
+Bluemix构建在IBM的SoftLayer IaaS（基础架构即服务）之上。它使用Cloud Foundry作为开源PaaS平台。它通过将代码推送到Cloud Foundry开始，Cloud Foundry通过使用其编写应用程序的编程语言，扮演了组合代码和适当的运行时环境的角色。IBM服务，第三方服务或社区构建的服务可用于不同的功能。安全连接器可用于连接本地系统到云。
+
+![图4 在IBM Bluemix中设置空间](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-4-Setting-up-Space-in-IBM-Bluemix.jpg?resize=350%2C267) 
+
+图4 在IBM Bluemix中设置空间
+
+![图5 应用程序模板](http://i2.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-5-The-app-template.jpg?resize=350%2C135) 
+
+图5 应用程序模板
+
+![图6 IBM Bluemix支持的编程语言](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-6-IBM-Bluemix-supported-programming-languages.jpg?resize=350%2C173) 
+
+图6 IBM Bluemix支持的编程语言
+
+**在Bluemix中创建应用程序**
+在本文中，我们将使用Liberty for Java的入门包在IBM Bluemix中创建一个示例“Hello World”应用程序，只需几个简单的步骤。
+
+1. 打开[_https：//console.ng.bluemix.net/registration/_] [2]
+
+2. 注册Bluemix帐户
+
+3. 点击邮件中的确认链接完成注册过程
+
+4. 输入您的电子邮件ID，然后点击_Continue_进行登录
+
+5. 输入密码并点击_Log in_
+
+6. 进入_Set up_->_Environment_设置特定区域中的资源共享
+
+7. 创建空间方便管理访问控制和在Bluemix中回滚操作。 我们可以将空间映射到多个开发阶段，如dev，test，uat，pre-prod和prod
+
+![图7 命名应用程序](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-7-Naming-the-app.jpg?resize=350%2C133) 
+
+图7 命名应用程序
+
+![图8 了解应用程序何时准备就绪](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-8-Knowing-when-the-app-is-ready.jpg?resize=350%2C170) 
+
+图8 了解应用程序何时准备就绪
+
+![图9 IBM Bluemix Java应用程序](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-9-The-IBM-Bluemix-Java-App.jpg?resize=350%2C151) 
+
+图9 IBM Bluemix Java应用程序
+
+8. 完成初始配置后，单击_ I'm ready_ -> _Good to Go_！
+
+9. 成功登录后，此时检查IBM Bluemix仪表板，特别是Cloud Foundry Apps（其中2GB可用）和Virtual Server（其中0个实例可用）的部分
+
+10. 点击_Create app_，选择应用创建模板。在我们的例子中，我们将使用一个Web应用程序
+
+11. 如何开始？单击Liberty for Java，然后检查其描述
+
+12. 单击_Continue_
+
+13. 为新应用命名。对于本文，让我们使用osfy-bluemix-tutorial命名然后单击_Finish_
+
+14. 在Bluemix上创建资源和托管应用程序需要等待一些时间。
+
+15. 几分钟后，应用程式就会开始运作。注意应用程序的URL。
+
+16. 访问应用程序的URL _http：//osfy-bluemix-tutorial.au-syd.mybluemix.net/_, Bingo，我们的第一个在IBM Bluemix上的Java应用程序成功运行。
+
+17. 为了检查源代码，请单击_Files_并在门户中导航到不同文件和文件夹
+
+18. _Logs_部分提供所有活动日志，包括从应用程序的创建时起
+
+19.  _Environment Variables_部分提供关于VCAP_Services的所有环境变量以及用户定义的环境变量的详细信息
+
+20. 要检查应用程序的资源消耗，需要到Liberty for Java部分。
+
+21. 默认情况下，每个应用程序的_Overview_部分包含资源，应用程序的运行状况和活动日志的详细信息
+
+22. 打开Eclipse，转到帮助菜单，然后单击_Eclipse Marketplace_
+
+23. 查找_IBM Eclipse tools for Bluemix_并单击_Install_
+
+24. 确认所选的功能并将其安装在Eclipse中
+
+25. 下载应用程序启动器代码。点击_File Menu_，将它导入到Eclipse中，选择_Import Existing Projects_ -> _Workspace_, 然后开始修改代码
+
+![图10 Java应用程序源文件](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-10-The-Java-app-source-files.jpg?resize=350%2C173) 
+
+图10 Java应用程序源文件
+
+![图11 Java应用程序日志](http://i1.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-11-The-Java-app-logs.jpg?resize=350%2C133) 
+
+图11 Java应用程序日志
+
+![图12 Java应用程序 - Liberty for Java](http://i0.wp.com/opensourceforu.com/wp-content/uploads/2016/10/Figure-12-Java-app-Liberty-for-Java.jpg?resize=350%2C169) 
+
+图12 Java应用程序 - Liberty for Java
+
+**为什么选择IBM Bluemix？**
+以下是使用IBM Bluemix的一些令人信服的理由：
+
+*   支持多种语言和平台
+*   免费试用
+
+    1. 简化的注册过程
+    
+    2. 不需要信用卡
+    
+    3. 30天试用期 - 配额2GB的运行时，支持20个服务，500个route
+    
+    4. 无限制地访问标准支持
+    
+    5. 没有生产使用限制
+    
+*   仅为每个使用的运行时和服务付费
+*   快速设置 - 从而加快上市时间
+*   持续交付新功能
+*   与本地资源的安全集成
+*   用例
+
+    1. Web应用程序和移动后端
+    
+    2. API和内部集成
+    
+*   DevOps服务可部署在云上的SaaS，并支持持续交付：
+
+    1. Web IDE
+    
+    2. SCM
+    
+    3. 敏捷规划
+    
+    4. 交货管道服务
+
+--------------------------------------------------------------------------------
+
+via: http://opensourceforu.com/2016/11/build-deploy-manage-custom-apps-ibm-bluemix/
+
+作者：[MITESH_SONI][a]
+译者：[Vic020](http//www.vicyu.net)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 组织编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://opensourceforu.com/author/mitesh_soni/
+[1]:http://opensourceforu.com/wp-content/uploads/2016/10/Figure-7-Naming-the-app.jpg
+[2]:https://console.ng.bluemix.net/registration/
diff --git a/translated/tech/20161201 How to Configure a Firewall with UFW.md b/translated/tech/20161201 How to Configure a Firewall with UFW.md
deleted file mode 100644
index e06defee70..0000000000
--- a/translated/tech/20161201 How to Configure a Firewall with UFW.md	
+++ /dev/null
@@ -1,251 +0,0 @@
-如何用UFW配置防火墙
-============================================================
-
-UFW或者称之为_uncomplicated firewall_，是一个Arch Linux、Debian或Ubuntu中管理防火墙规则的前端。 UFW通过命令行使用（尽管它有可用的GUI），它的目的是使防火墙配置简单（或不复杂）。
-
- ![How to Configure a Firewall with UFW](https://www.linode.com/docs/assets/ufw_tg.png "How to Configure a Firewall with UFW") 
-
-### 开始之前
-
-1. 熟悉我们的[入门][1]指南，并完成设置Linode主机名和时区的步骤。
-
-2. 本指南将尽可能使用`sudo`。 完成[保护你的服务器][2]指南的部分创建一个标准用户帐户，加强SSH访问和删除不必要的网络服务。 **不要**遵循创建防火墙部分 - 本指南是介绍使用UFW的，它对于iptables而言是一个单独的控制防火墙的方法。
-
-3. 升级系统
-
-    **Arch Linux**
-
-    ```
-    sudo pacman -Syu
-    ```
-
-
-    **Debian / Ubuntu**
-
-    ```
-    sudo apt-get update && sudo apt-get upgrade
-    ```
-
-
-### 安装 UFW
-
-UFW默认包含在Ubuntu中，但必须安装在Arch和Debian中。 Debian将自动启用UFW的systemd单元，并使其在重新启动时启动，但Arch不会。 _这与告诉UFW启用防火墙规则不同_，因为使用systemd或者upstart启用UFW仅告知init系统打开UFW守护程序。
-
-默认情况下，UFW的规则集为空，因此即使守护程序正在运行，也不会强制执行任何防火墙规则。 强制执行防火墙规则集的部分[在下面][3]。
-
-### Arch Linux
-
-1.  安装 UFW:
-
-    ```
-    sudo pacman -S ufw
-    ```
- 
-
-2.  启动并启用UFW的systemd单元:
-
-    ```
-    sudo systemctl start ufw
-    sudo systemctl enable ufw
-    ```
-
-### Debian / Ubuntu
-
-1.  安装 UFW
-
-    ```
-    sudo apt-get install ufw
-    ```
- 
-
-### 使用UFW管理防火墙规则
-
-### 设置默认规则
-
-大多数系统只需要少量的端口打开传入连接，并且所有剩余的端口都关闭。 要一个简单的规则基础开始，`ufw default`命令可以用于设置对传入和传出连接的默认响应。 要拒绝所有传入并允许所有传出连接，那么运行：
-
-```
-sudo ufw default allow outgoing
-sudo ufw default deny incoming
-```
- 
-
-`ufw default`也允许使用`reject`参数。
-
-> 除非明确允许规则，否则配置默认deny或reject规则会锁定你的Linode。确保在应用默认deny或reject规则之前，已按照下面的部分配置了SSH和其他关键服务的允许规则。
-
-### 添加规则
-
-可以有两种方式添加规则：用**端口号**或者**服务名**表示。
-
-要允许SSH的22端口的传入和传出连接，你可以运行：
-
-```
-sudo ufw allow ssh
-```
-
-你也可以运行：
-
-```
-sudo ufw allow 22
-```
- 
-相似的，要在特定端口（比如111）上**deny**流量，你需要运行：
-
-```
-sudo ufw deny 111
-```
- 
-为了更好地调整你的规则，你也可以允许基于TCP或者UDP的包。下面例子会允许80端口的TCP包：
-
-
-```
-sudo ufw allow 80/tcp
-sudo ufw allow http/tcp
-```
- 
-这个会允许1725端口上的UDP包：
-
-
-```
-sudo ufw allow 1725/udp
-```
- 
-
-### 高级规则
-
-除了基于端口的允许或阻止，UFW还允许您通过IP地址、子网和IP地址/子网/端口组合来允许/阻止。
-
-允许从IP地址连接：
-
-```
-sudo ufw allow from 123.45.67.89
-```
- 
-
-允许特定子网的连接：
-
-```
-sudo ufw allow from 123.45.67.89/24
-```
- 
-允许特定IP/端口组合：
-
-```
-sudo ufw allow from 123.45.67.89 to any port 22 proto tcp
-```
-
-
-`proto tcp`可以删除或者根据你的需求变成`proto udp`，所有例子的`allow`都可以根据需要变成`deny`。
-
-### 删除规则
-
-要删除一条规则，在规则的前面加上`delete`。如果你希望不在允许HTTP流量，你可以运行：
-
-
-```
-sudo ufw delete allow 80
-```
- 
-删除规则同样允许基于服务名。
-
-### 编辑UFW的配置文件
-
-虽然可以通过命令行添加简单的规则，但仍有可能需要添加或删除更高级或特定的规则。 在通过终端运行规则输入之前，UFW将运行一个文件`before.rules`，它允许回环、ping和DHCP。要添加或改变这些规则，编辑`/etc/ufw/before.rules`这个文件。 `before6.rules`文件也位于IPv6的同一目录中。
-
-还存在一个`after.rule`和`after6.rule`文件，用于添加在UFW运行添加命令行规则后需要添加的任何规则。
-
-额外的配置文件位于`/etc/default/ufw`。 从此处可以禁用或启用IPv6，可以设置默认规则，并可以设置UFW以管理内置防火墙链。
-
-### UFW状态
-
-你可以在任何时候使用命令：`sudo ufw status`查看UFW的状态。这会显示所有规则列表，以及UFW是否是激活状态：
-
-```
-Status: active
-
-To                         Action      From
---                         ------      ----
-22                         ALLOW       Anywhere
-80/tcp                     ALLOW       Anywhere
-443                        ALLOW       Anywhere
-22 (v6)                    ALLOW       Anywhere (v6)
-80/tcp (v6)                ALLOW       Anywhere (v6)
-443 (v6)                   ALLOW       Anywhere (v6)
-```
- 
-### 启用防火墙
-
-随着你选择规则完成，你初始运行`ufw status`可能会输出`Status: inactive`。 启用UFW并强制执行防火墙规则：
-
-```
-sudo ufw enable
-```
- 
-相似地，禁用UFW规则：
-
-```
-sudo ufw disable
-```
-
-> 这让UFW继续运行并且在下次启动时再次启动。
-
-### 日志记录
-
-你可以用下面的命令启动日志记录：
-
-```
-sudo ufw logging on
-```
-
-可以通过运行`sudo ufw logging low|medium|high`设计日志级别，可以选择`low`、 `medium` 或者 `high`。默认级别是`low`。
-
-常规日志类似于下面这样，位于`/var/logs/ufw`：
-
-```
-Sep 16 15:08:14 <hostname> kernel: [UFW BLOCK] IN=eth0 OUT= MAC=00:00:00:00:00:00:00:00:00:00:00:00:00:00 SRC=123.45.67.89 DST=987.65.43.21 LEN=40 TOS=0x00 PREC=0x00 TTL=249 ID=8475 PROTO=TCP SPT=48247 DPT=22 WINDOW=1024 RES=0x00 SYN URGP=0
-```
- 
-
-初始的值有你的Linode的日期、时间、主机名。额外的信息包括：
-
-* ** [UFW BLOCK]：**此位置是记录事件的描述所在的位置。在这种例子中，它阻止了连接。
-
-* ** IN：**如果这包含一个值，那么事件传入的
-
-* ** OUT：**如果这包含一个值，那么事件是传出的
-
-* ** MAC：**目的地和源MAC地址的组合
-
-* ** SRC：**包源的IP
-
-* ** DST：**包目的地的IP
-
-* ** LEN：**数据包长度
-
-* ** TTL：**数据包TTL，或称为_time to live_。 如果没有找到目的地，它将在路由器之间跳跃，直到它过期。
-
-* ** PROTO：**数据包的协议
-
-* ** SPT：**包的源端口
-
-* ** DPT：**包的目标端口
-
-* ** WINDOW：**发送方可以接收的数据包的大小
-
-* ** SYN URGP：**指示是否需要三次握手。 `0`表示不是。
-
---------------------------------------------------------------------------------
-
-via: https://www.linode.com/docs/security/firewalls/configure-firewall-with-ufw
-
-作者：[Linode ][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.linode.com/docs/security/firewalls/configure-firewall-with-ufw
-[1]:https://www.linode.com/docs/getting-started
-[2]:https://www.linode.com/docs/security/securing-your-server
-[3]:http://localhost:4567/docs/security/firewalls/configure-firewall-with-ufw#enable-the-firewall
diff --git a/translated/tech/20161203 Redirect a Website URL from One Server to Different Server in Apache.md b/translated/tech/20161203 Redirect a Website URL from One Server to Different Server in Apache.md
deleted file mode 100644
index be65f0eb6e..0000000000
--- a/translated/tech/20161203 Redirect a Website URL from One Server to Different Server in Apache.md	
+++ /dev/null
@@ -1,63 +0,0 @@
-在Apache中重定向URL从一台服务器到另外一台服务器上
-============================================================
-
-如我们前面两篇文章（[使用mod_rewrite执行内部重定向][1]和[基于浏览器显示自定义内容][2]）中所承诺的，在本文中，我们将解释如何在Apache中使用mod_rewrite模块将已移动的资源重定向到不同服务器上。
-
-假设你正在重新设计公司的网站。你已决定将内容和样式（HTML文件，JavaScript和CSS）存储在一个服务器上，将文档存储在另一个服务器上 - 这样可能会更稳健。
-
-**建议阅读：** [5个提高Apache Web服务器性能的提示][3]
-
-但是，你希望这个更改对用户透明，以便他们仍然能够通过常用网址访问文档。
-
-在下面的例子中，名为“assets.pdf”的文件已从192.168.0.100（主机名：web）中的/var/www /html移动到192.168.0.101（主机名：web2）中的相同位置。
-
-为了让用户在浏览到“192.168.0.100/assets.pdf”时访问此文件，请打开192.168.0.100上的Apache配置文件并添加以下重写规则（或者也可以将以下规则添加到[.htaccess文件][4]）中：
-
-```
-RewriteRule "^(/assets\.pdf$)" "http://192.168.0.101$1"  [R,L]
-```
-
-其中`$1`是与括号中的正则表达式匹配的任何内容的占位符。
-
-现在保存更改，不要忘记重新启动Apache，让我们看看当我们打开192.168.0.100/assets.pdf，尝试访问assets.pdf时会发生什么：
-
-**建议阅读：** [25有用的网站的'.htaccess'技巧] [5]
-
-在下面我们就可以看到，为192.168.0.100上的assets.pdf所做的请求实际上是由192.168.0.101处理的。
-
-```
-# tail -n 1 /var/log/apache2/access.log
-```
-[
- ![Check Apache Logs](http://www.tecmint.com/wp-content/uploads/2016/11/Check-Apache-Logs.png) 
-][6]
-
-检查Apache日志
-
-在本文中，我们讨论了如何对已移动到其他服务器的资源进行重定向。 总而言之，我强烈建议你看看[mod_rewrite][7]指南和[Apache重定向指南][8]，以供将来参考。
-
-一如既往那样，如果您对本文有任何疑虑，请随时使用下面的评论栏回复。 我们期待你的回音！
-
---------------------------------------------------------------------------------
-
-作者简介：Gabriel Cánepa是来自阿根廷圣路易斯Villa Mercedes的GNU/Linux系统管理员和Web开发人员。 他在一家全球领先的消费品公司工作，非常高兴使用FOSS工具来提高他日常工作领域的生产力。
-
------------
-
-via: http://www.tecmint.com/redirect-website-url-from-one-server-to-different-server/
-
-作者：[Gabriel Cánepa][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/gacanepa/
-[1]:http://www.tecmint.com/redirection-with-mod_rewrite-in-apache/
-[2]:http://www.tecmint.com/mod_rewrite-redirect-requests-based-on-browser/
-[3]:http://www.tecmint.com/apache-performance-tuning/
-[4]:http://www.tecmint.com/tag/htaccess/
-[5]:http://www.tecmint.com/apache-htaccess-tricks/
-[6]:http://www.tecmint.com/wp-content/uploads/2016/11/Check-Apache-Logs.png
-[7]:http://mod-rewrite-cheatsheet.com/
-[8]:https://httpd.apache.org/docs/2.4/rewrite/remapping.html
diff --git a/translated/tech/20161206 How to Find Recent or Today’s Modified Files in Linux.md b/translated/tech/20161206 How to Find Recent or Today’s Modified Files in Linux.md
deleted file mode 100644
index f77e55014b..0000000000
--- a/translated/tech/20161206 How to Find Recent or Today’s Modified Files in Linux.md	
+++ /dev/null
@@ -1,119 +0,0 @@
-如何在Linux中找出最近或今天被修改的文件
-============================================================
-
-在本文中，我们将解释两个简单的[命令行小贴士][5]，它可以帮你列出今天的所有文件。
-
-Linux用户在命令行上遇到的常见问题之一是[定位具有特定名称的文件][6]，当你知道真实的文件名时可能会容易得多。
-
-但是，假设你忘记了在白天早些时候创建的文件的名称（在你包含了数百个文件的`home`文件夹中），但你有急用。
-
-下面用不同的方式只[列出所有你今天创建或修改的文件][7]（直接或间接）。
-
-1.使用[ls命令][8]，你只能按如下所示在你的home文件夹中列出今天的文件，其中：
-
-1. `-a` - 列出所有文件，包括隐藏文件
-2. `-l` - 启用长列表格式
-3. `--time-style = FORMAT` - 显示指定FORMAT的时间
-4. `+％D` - 以％m/％d/％y格式显示/使用日期
-
-```
-# ls  -al --time-style=+%D | grep 'date +%D'
-```
-[
- ![Find Recent Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Recent-Files-in-Linux.png) 
-][9]
-
-在Linux中找出最近的文件
-
-In addition, you can [sort the resultant list alphabetically][10] by including the `-X` flag:
-此外，你使用可以`-X`标志来[按字母顺序对结果排序][10]：
-
-```
-# ls -alX --time-style=+%D | grep 'date +%D'
-```
-
-你也可以使用`-S`标志来基于大小（大的优先）来排序：
-
-```
-# ls -alS --time-style=+%D | grep 'date +%D'
-```
-
-2. 另外使用[find命令][11]会更灵活，并且提供比ls更多的选项，用于以下相同的目的。
-
-1. `-maxdepth`级别用于指定要执行搜索操作的起点（在这个情况下为当前目录）下的搜索层级（按子目录）。
-2. `-newerXY`，如果有问题的文件的时间戳X比引用文件的时间戳Y更新，那么这个就能用了。 X和Y表示以下任何字母：
-     1. a - 文件引用的访问时间
-     2. B - 文件引用的创建时间
-     3. c - 文件引用的inode状态改变时间
-     4.m - 文件引用的修改时间
-     5. t - 引用直接解释为一个时间
-
-下面的命令意味着只有在2016-12-06修改的文件将被找出：
-
-```
-# find . -maxdepth 1 -newermt "2016-12-06"
-```
-[
- ![Find Today's Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Files-in-Linux.png) 
-][12]
-
-在Linux中找出今天的文件
-
-重要：使参考上面的[find命令][13]中正确的日期格式，一旦你使用了错误的格式，你会得到如下错误：
-
-```
-# find . -maxdepth 1 -newermt "12-06-2016"
-find: I cannot figure out how to interpret '12-06-2016' as a date or time
-```
-
-或者使用下面正确的格式：
-
-```
-# find . -maxdepth 1 -newermt "12/06/2016"
-或者
-# find . -maxdepth 1 -newermt "12/06/16"
-```
-[
- ![Find Todays Modified Files in Linux](http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Modified-Files.png) 
-][14]
-
-在Linux中找出今天修改的文件
-
-你可以在我们的下面一系列文章中获得`ls`和`find`命令的更多使用信息。
-
-1. [用15例子的掌握Linux ‘ls’ 命令][1]
-2. [对Linux用户有用的7个奇怪的技巧][2]
-3. [用35个例子掌握Linux ‘find’ 命令][3]
-4. [在Linux中使用扩展查找多个文件名的方法][4]
-
-在本文中，我们解释了如何使用ls和find命令帮助只列出今天的文件。 使用以下反馈栏向我们发送有关该主题的任何问题或意见。 你也可以提醒我们其他可以用于这个目的的命令。
-
---------------------------------------------------------------------------------
-
-作者简介：Aaron Kili是一名Linux和F.O.S.S的爱好者，将来的Linux系统管理员、网站开发人员，目前是TecMint的内容创作者，他喜欢用电脑工作，并坚信分享知识。
-
-------------------
-
-via: http://www.tecmint.com/find-recent-modified-files-in-linux/
-
-作者：[Aaron Kili][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/aaronkili/
-[1]:http://www.tecmint.com/15-basic-ls-command-examples-in-linux/
-[2]:http://www.tecmint.com/linux-ls-command-tricks/
-[3]:http://www.tecmint.com/35-practical-examples-of-linux-find-command/
-[4]:http://www.tecmint.com/linux-find-command-to-search-multiple-filenames-extensions/
-[5]:http://www.tecmint.com/tag/linux-tricks/
-[6]:http://www.tecmint.com/linux-find-command-to-search-multiple-filenames-extensions/
-[7]:http://www.tecmint.com/sort-ls-output-by-last-modified-date-and-time/
-[8]:http://www.tecmint.com/tag/linux-ls-command/
-[9]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Recent-Files-in-Linux.png
-[10]:http://www.tecmint.com/sort-command-linux/
-[11]:http://www.tecmint.com/35-practical-examples-of-linux-find-command/
-[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Files-in-Linux.png
-[13]:http://www.tecmint.com/find-directory-in-linux/
-[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Find-Todays-Modified-Files.png
diff --git a/translated/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md b/translated/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md
new file mode 100644
index 0000000000..9013125450
--- /dev/null
+++ b/translated/tech/20161207 Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4.md	
@@ -0,0 +1,218 @@
+Manage Samba4 AD Domain Controller DNS and Group Policy from Windows – Part 4
+============================================================
+在 Windows 系统下管理 Samba4 AD 域管制器 DNS 和组策略（四）
+
+接着前一篇教程写的关于[使用 Windows 10 系统的 RSAT 工具来管理 Samba4 活动目录架构][4]，在这篇文章中我们将学习如何使用微软 DNS 管理器远程管理我们的 Samba AD 域控制器的 DNS 服务器，如何创建 DNS 记录，如何创建反向查找区域以及如何通过组策略管理工具来创建域策略。
+
+#### 需求
+
+1、 [在 Ubuntu16.04 系统上使用 Samba4 软件来创建活动目录架构（一）][1]
+2、 [在 Linux 命令行下管理 Samba4 AD 架构（二）][2]
+3、 [使用 Windows 10 系统的 RSAT 工具来管理 Samba4 活动目录架构 （三）][3]
+
+### 第 1 步：管理 Samba DNS 服务器
+
+Samba4 AD DC 使用内部的 DNS 解析模块，该模块在初始化域提供的过程中被创建完成（如果 BIND9 DLZ 模块未特定使用的情况下）。
+
+Samba4 内部的 DNS 域模块支持 AD 域控制器所必须的基本功能。有两种方式来管理域 DNS 服务器，直接在命令行下通过 samba-tool 接口来管理，或者使用已加入域的微软工作站中的 RSAT DNS 管理器远程进行管理。
+
+在这篇文章中，我们使用第二种方式来进行管理，因为这种方式很直观，也不容易出错。
+
+1、要使用 RSAT 工具来管理域控制器上的 DNS 服务器，在 Windows 机器上，打开控制面板 -> 系统和安全 -> 管理工具，然后运行 DNS 管理器工具。
+
+当打开这个工具时，它会询问你将要连接到哪台正在运行的 DNS 服务器。选择使用下面的计算机，输入域名（IP 地址或 FQDN 地址都可以使用），勾选‘现在连接到指定计算机’，然后单击 OK 按钮以开启 Samba DNS 服务。
+
+[
+ ![Connect Samba4 DNS on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Connect-Samba4-DNS-on-Windows.png) 
+][5]
+
+在 Windows 系统上连接 Samba4 DNS 服务器
+
+2、为了添加一条 DNS 记录（比如我们添加一条指向 LAN 网关的记录 ‘A'），打开 DNS 管理器，找到域正向查找区，在右侧单击右键选择新的主机（’A‘ 或 ’AAA‘）。
+
+[
+ ![Add DNS A Record on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-A-Record.png) 
+][6]
+
+在 Windows 下添加一条 DNS 记录
+
+3、在打开的新主机窗口界面，输入 DNS 服务器的主机名和 IP 地址。 DNS 管理器工具会自动填写完成 FQDN 地址。填写完成后，点击添加主机按钮，之后会弹出一个新的窗口提示你 DNS A 记录已经创建完成。
+
+确保你添加的 DNS A 记录是你们网络中的资源[已配置静态 IP][7]。不要为那些从 DHCP 服务器自动获取 IP 地址或者经常变换 IP 地址的主机添加 DNS A 记录。
+
+[
+ ![Configure Samba Host on Windows](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Host-on-Windows.png) 
+][8]
+
+在 Windows 系统下配置 Samba 主机
+
+要更新一条 DNS 记录只需要双击那条记录，然后输入更改原因即可。要删除一条记录时，只需要在这条记录上单击右键，选择从菜单删除即可。
+
+同样的方式，你也可以为你的域添加其它类型的 DNS 记录，比如说 CNAME 记录（也称为 DNS 别名记录），MX 记录（在邮件服务器上非常有用）或者其它类型的记录（SPE、TXT、SRVetc类型）。
+
+### 第 2 步：创建反向查找区域
+
+默认情况下， Samba4 AD DC 不会自动为你的域添加一个反向查找区域和 PTR 记录，因为这些类型的记录对于域控制器的正常工作来说是无关紧要的。
+
+相反，DNS 反向区和 PTR 记录在一些重要的网络服务中显得非常有用，比如邮件服务，因为这些类型的记录可以用于验证客户端请求服务的身份。
+
+实际上， PTR 记录的功能与标准的 DNS 记录功能相反。客户端知道资源的 IP 地址，然后去查询 DNS 服务器来识别出已注册的 DNS 名字。
+
+4、要创建 Samba AD DC 的反向查找区域，打开 DNS 管理器，在左侧反向查找区域目录上单击右键，然后选择菜单中的新区域。
+
+[
+ ![Create Reverse Lookup DNS Zone](http://www.tecmint.com/wp-content/uploads/2016/12/Create-Reverse-Lookup-DNS-Zone.png) 
+][9]
+
+创建 DNS 反向查找区域
+
+5、下一步，单击下一步按钮，然后从区域类型向导中选择主区域。
+[
+ ![Select DNS Zone Type](http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-Zone-Type.png) 
+][10]
+
+选择 DNS  区域类型
+
+6、下一步，在 AD 区域复制范围中选择复制到该域里运行在域控制器上的所有的 DNS 服务器，选择 IPv4 反向查找区域然后单击下一步继续。
+
+[
+ ![Select DNS for Samba Domain Controller](http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-for-Samba-Domain-Controller.png) 
+][11]
+
+为 Samba 域控制器选择 DNS 服务器
+
+[
+ ![Add Reverse Lookup Zone Name](http://www.tecmint.com/wp-content/uploads/2016/12/Add-Reverse-Lookup-Zone-Name.png) 
+][12]
+
+添加反向查找区域名
+
+7、下一步，在网络ID 框中输入你的 LAN IP 地址，然后单击下一步继续。
+
+资源在这个区域内添加的所有 PTR 记录仅指向 192.168.1.0/24 网络段。如果你想要为一个不在该网段中的服务器创建一个 PTR 记录（比如邮件服务器位于 10.0.0.0/24 这个网段的时候），那么你还得为那个网段创建一个新的反向查找区域。
+
+[
+ ![Add IP Address of Reverse Lookup DNS Zone](http://www.tecmint.com/wp-content/uploads/2016/12/Add-IP-Address-of-Reverse-DNS-Zone.png) 
+][13]
+
+添加 DNS 反向查找区域的 IP 地址
+
+8、在下一个截图中选择仅允许安全的动态更新，单击下一步继续，最后单击完成按钮以完成反向查找区域的创建。
+
+[
+ ![Enable Secure Dynamic Updates](http://www.tecmint.com/wp-content/uploads/2016/12/Enable-Secure-Dynamic-Updates.png) 
+][14]
+
+启用安全动态更新
+
+[
+ ![New DNS Zone Summary](http://www.tecmint.com/wp-content/uploads/2016/12/New-DNS-Zone-Summary.png) 
+][15]
+
+新 DNS 区域概述
+
+9、此时，你已经为你的域环境创建完成了一个有效的 DNS 反向查找区域。为了在这个区域中添加一个 PTR 记录，在右侧右键单击，选择为网络资源创建一个 PTR 记录。
+
+这个时候，我们已经为网关创建了一个指向。为了测试这条记录对于客户端是否添加正确和工作正常，打开命令行提示符执行 nslookup 查询资源名，再执行另外一条命令查询 IP  地址。
+
+两个查询都应该为你的 DNS 资源返回正确的结果。
+
+```
+nslookup gate.tecmint.lan
+nslookup 192.168.1.1
+ping gate
+```
+[
+ ![Add DNS PTR Record and Query PTR](http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-PTR-Record-and-Query.png) 
+][16]
+
+添加及查询 PTR 记录
+### 第 3 步：管理域控制策略
+
+10、域控制器最重要的作用就是集中控制系统资源及安全。使用域控制器的域组策略功能很容易实现这些类型的任务。
+
+遗憾的是，在 Samba 域控制器上唯一用来编辑或管理组策略的方法是通过微软的 RSAT GPM 工具。
+
+在下面的实例中，我们将看到通过组策略来实现在 Samba 域环境中为域用户创建一种交互式的登录方式是多么的简单。
+
+要访问组策略控制台，打开控制面板 -> 系统和安全 -> 管理工具，然后打开组策略管理控制台。
+
+展开你的域下面的目录，在默认组策略上右键，选择菜单中的编辑，将出现一个新的窗口。
+
+[
+ ![Manage Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Manage-Samba-Domain-Group-Policy.png) 
+][17]
+
+管理 Samba 域组策略
+
+11、在组策略管理编辑器窗口中，进入到电脑配置 -> 组策略 -> Windows 设置 -> 安全设置 -> 本地策略 -> 安全选项，你将在右侧看到一个新的选项列表。
+
+在右侧查询并编辑你的定制化设置，参考下图中的两条设置内容。
+
+[
+ ![Configure Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Domain-Group-Policy.png) 
+][18]
+
+配置 Samba 域组策略
+
+12、这两个条目编辑完成后，关闭所有窗口，打开 CMD 窗口，执行以下命令来强制应用组策略。
+
+```
+gpupdate /force
+```
+[
+ ![Update Samba Domain Group Policy](http://www.tecmint.com/wp-content/uploads/2016/12/Update-Samba-Domain-Group-Policy.png) 
+][19]
+
+更新 Samba  域组策略
+
+13、最后，重启你的电脑，当你准备登录进入系统的时候，你就会看到登录提示生效了。
+[
+ ![Samba4 AD Domain Controller Logon Banner](http://www.tecmint.com/wp-content/uploads/2016/12/Samba4-Domain-Controller-User-Login.png) 
+][20]
+
+Samba4 AD 域控制器登录提示
+
+就写到这里吧！组策略是一个操作起来很繁琐和很谨慎的主题，在管理系统的过程中你得非常的小心。还有，注意你设置的组策略不会以任何方式应用到已加入域的 Linux 系统中。
+
+------
+
+作者简介：我是一个电脑迷，开源软件及 Linux 系统爱好者，有近4年的 Linux 桌面和服务器系统及 bash 编程经验。
+
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/
+
+作者：[Matei Cezar ][a]
+译者：[rusking](https://github.com/rusking)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/cezarmatei/
+[1]:http://www.tecmint.com/install-samba4-active-directory-ubuntu/
+[2]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/
+[3]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
+[4]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
+[5]:http://www.tecmint.com/wp-content/uploads/2016/12/Connect-Samba4-DNS-on-Windows.png
+[6]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-A-Record.png
+[7]:http://www.tecmint.com/set-add-static-ip-address-in-linux/
+[8]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Host-on-Windows.png
+[9]:http://www.tecmint.com/wp-content/uploads/2016/12/Create-Reverse-Lookup-DNS-Zone.png
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-Zone-Type.png
+[11]:http://www.tecmint.com/wp-content/uploads/2016/12/Select-DNS-for-Samba-Domain-Controller.png
+[12]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-Reverse-Lookup-Zone-Name.png
+[13]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-IP-Address-of-Reverse-DNS-Zone.png
+[14]:http://www.tecmint.com/wp-content/uploads/2016/12/Enable-Secure-Dynamic-Updates.png
+[15]:http://www.tecmint.com/wp-content/uploads/2016/12/New-DNS-Zone-Summary.png
+[16]:http://www.tecmint.com/wp-content/uploads/2016/12/Add-DNS-PTR-Record-and-Query.png
+[17]:http://www.tecmint.com/wp-content/uploads/2016/12/Manage-Samba-Domain-Group-Policy.png
+[18]:http://www.tecmint.com/wp-content/uploads/2016/12/Configure-Samba-Domain-Group-Policy.png
+[19]:http://www.tecmint.com/wp-content/uploads/2016/12/Update-Samba-Domain-Group-Policy.png
+[20]:http://www.tecmint.com/wp-content/uploads/2016/12/Samba4-Domain-Controller-User-Login.png
+[21]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
+[22]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
+[23]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
+[24]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#
+[25]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/#comments
diff --git a/translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 3.md b/translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 3.md
deleted file mode 100644
index e743c1b86b..0000000000
--- a/translated/tech/20161215 Building an Email Server on Ubuntu Linux - Part 3.md	
+++ /dev/null
@@ -1,221 +0,0 @@
-在Ubuntu上搭建一台Email服务器（四）
-============================================================
-
-### [mail-server.jpg][2]
-
- ![Mail server](https://www.linux.com/sites/lcom/files/styles/rendered_file/public/mail-server.jpg?itok=Ox1SCDsV "Mail server") 
-本系列的第四部分我们将详细介绍在Dovecot和Postfix中设置虚拟用户。以[Creative Commons Zero][2]Pixabay方式授权发布
-
-欢迎回来，我热心的Linux系统管理员们！ 在本系列的[第一部分][3]和[第二部分][4]中，我们学习了如何将Postfix和Dovecot组合在一起，搭建一个不错的IMAP和POP3邮件服务器。 现在我们将学习设置虚拟用户，以便我们可以管理所有在Dovecot中的用户。
-
-### 抱歉还不能配置SSL
-
-我知道我答应教你们如何设置一个正确的受SSL保护的服务器。 不幸的是，我低估了这个话题的范围。 所以，我会下个月再写一个全面的教程。
-
-对于今天，在本系列的最后一部分中，我们将详细介绍如何在Dovecot和Postfix中设置虚拟用户和邮箱。 在你看来这是有点奇怪，所以我尽量让下面的例子是简单点。我们将使用纯文件和纯文本来进行身份验证。 你也可以选择使用数据库后端和很好的加密认证形式，具体请参阅文末链接了解有关这些的更多信息。
-
-### 虚拟用户
-
-You want virtual users on your email server and not Linux system users. Using Linux system users does not scale, and it exposes their logins, and your Linux server, to unnecessary risk. Setting up virtual users requires editing configuration files in both Postfix and Dovecot. We'll start with Postfix. First, we'll start with a clean, simplified `/etc/postfix/main.cf`. Move your original `main.cf` out of the way and create a new clean one with these contents:
-你希望电子邮件服务器上的是虚拟用户而不是Linux系统用户。使用Linux系统用户不能扩展，并且它们会暴露登录账号以及会给你的服务器带来不必要的风险。 设置虚拟用户需要在Postfix和Dovecot中编辑配置文件。我们将从Postfix开始。首先，我们将从一个干净、简单的`/etc /postfix/main.cf`开始。移动你原始的`main.cf`到别处，创建一个新的干净的文件：
-
-```
-
-compatibility_level=2
-smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu/GNU)
-biff = no
-append_dot_mydomain = no
-
-myhostname = localhost
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = $myhostname
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 192.168.0.0/24
-mailbox_size_limit = 0
-recipient_delimiter = +
-inet_interfaces = all
-
-virtual_mailbox_domains = /etc/postfix/vhosts.txt
-virtual_mailbox_base = /home/vmail
-virtual_mailbox_maps = hash:/etc/postfix/vmaps.txt
-virtual_minimum_uid = 1000
-virtual_uid_maps = static:5000
-virtual_gid_maps = static:5000
-virtual_transport = lmtp:unix:private/dovecot-lmtp0
-```
-
-你或许可以直接拷贝这份文件除了`mynetworks`的参数`192.168.0.0/24`，它反映了你的本地子网掩码。
-
-接下来，创建用户和组`vmail`，它会拥有你的虚拟邮箱。虚拟邮箱存在 `vmail`的家目录下。
-
-```
-
-$ sudo groupadd -g 5000 vmail
-$ sudo useradd -m -u 5000 -g 5000 -s /bin/bash vmail
-```
-
-接下来重新加载Postfix配置：
-
-```
-
-$ sudo postfix reload
-[sudo] password for carla: 
-postfix/postfix-script: refreshing the Postfix mail system
-```
-
-### Dovecot虚拟用户
-
-我们会使用Dovecot的`lmtp`协议来连接到Postfix。你可以这样安装：
-
-```
-
-$ sudo apt-get install dovecot-lmtpd
-```
-
-`main.cf`的最后一行参考`lmtp`。复制这个例子`/etc/dovecot/dovecot.conf`来替换已存在的文件。再说一次，我们只使用这个文件，而不是`/etc/dovecot/conf.d`内的所有文件。
-
-```
-
-protocols = imap pop3 lmtp
-log_path = /var/log/dovecot.log
-info_log_path = /var/log/dovecot-info.log
-ssl = no
-disable_plaintext_auth = no
-mail_location = maildir:~/.Mail
-pop3_uidl_format = %g
-auth_verbose = yes
-auth_mechanisms = plain
-
-passdb {
-  driver = passwd-file
-  args = /etc/dovecot/passwd
-}
-
-userdb {
-  driver = static
-  args = uid=vmail gid=vmail home=/home/vmail/studio/%u
-}
-
-service lmtp {
- unix_listener /var/spool/postfix/private/dovecot-lmtp {
-   group = postfix
-   mode = 0600
-   user = postfix
-  }
-}
-
-protocol lmtp {
-  postmaster_address = postmaster@studio
-}
-service lmtp {
-  user = vmail
-}
-```
-
-最后，你快可以创建一个含有用户和密码的文件 `/etc/dovecot/passwd`。对于纯文本验证，我们只需要用户的完整邮箱地址和密码：
-
-```
-
-alrac@studio:{PLAIN}password
-layla@studio:{PLAIN}password
-fred@studio:{PLAIN}password
-molly@studio:{PLAIN}password
-benny@studio:{PLAIN}password
-```
-
-Dovecot虚拟用户独立于Postfix虚拟用户，因此你需要管理Dovecot中的用户。保存所有的设置并重启Postfix和Dovecot：
-
-```
-
-$ sudo service postfix restart
-$ sudo service dovecot restart
-```
-
-现在让我们使用较旧的telnet来看下Dovecot是否设置正确了。
-
-```
-
-$ telnet studio 110
-Trying 127.0.1.1...
-Connected to studio.
-Escape character is '^]'.
-+OK Dovecot ready.
-user molly@studio
-+OK
-pass password
-+OK Logged in.
-quit
-+OK Logging out.
-Connection closed by foreign host.
-```
-
-现在一切都好！让我们用`mail`测试发送消息给我们的用户。确保使用用户的电子邮箱地址而不只是用户名。
-
-```
-
-$ mail benny@studio
-Subject: hello and welcome!
-Please enjoy your new mail account!
-.
-```
-
-最后一行的点是发送消息。让我们看下它是否到达了正确的邮箱。
-
-```
-
-$ sudo ls -al /home/vmail/studio/benny@studio/.Mail/new
-total 16
-drwx------ 2 vmail vmail 4096 Dec 14 12:39 .
-drwx------ 5 vmail vmail 4096 Dec 14 12:39 ..
--rw------- 1 vmail vmail  525 Dec 14 12:39 1481747995.M696591P5790.studio,S=525,W=540
-```
-
-找到了。这是一封我们可以阅读的纯文本文件：
-
-```
-$ less 1481747995.M696591P5790.studio,S=525,W=540
-Return-Path: <carla@localhost>
-Delivered-To: benny@studio
-Received: from localhost
-        by studio (Dovecot) with LMTP id V01ZKRuuUVieFgAABiesew
-        for <benny@studio>; Wed, 14 Dec 2016 12:39:55 -0800
-Received: by localhost (Postfix, from userid 1000)
-        id 9FD9CA1F58; Wed, 14 Dec 2016 12:39:55 -0800 (PST)
-Date: Wed, 14 Dec 2016 12:39:55 -0800
-To: benny@studio
-Subject: hello and welcome!
-User-Agent: s-nail v14.8.6
-Message-Id: <20161214203955.9FD9CA1F58@localhost>
-From: carla@localhost (carla)
-
-Please enjoy your new mail account!
-```
-
-你还可以使用telnet进行测试，如本系列前面部分所述，并在你最喜欢的邮件客户端中设置帐户，如Thunderbird，Claws-Mail或KMail。
-
-### 故障排查
-
-当它不工作时，请检查日志文件（请参阅配置示例），然后运行`journalctl -xe`。 这时应该就会给你提供输入错误、已卸载的包和可以谷歌的字词了。
-
-### 接下来？
-
-假设你的LAN名称服务配置正确，你现在有一台很好用的LAN邮件服务器。 显然以纯文本发送消息不是最佳的，并且对于Internet邮件也是绝对否定的。 请参阅[Dovecot SSL配置][5]和[Postfix TLS支持][6]。 [VirtualUserFlatFilesPostfix][7]涵盖TLS和数据库后端。并记得看即将到来的SSL指南。这次我说的是真的。
-
---------------------------------------------------------------------------------
-
-via: https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-part-3
-
-作者：[ CARLA SCHRODER][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.linux.com/users/cschroder
-[1]:https://www.linux.com/licenses/category/creative-commons-zero
-[2]:https://www.linux.com/files/images/mail-serverjpg
-[3]:https://www.linux.com/learn/how-build-email-server-ubuntu-linux
-[4]:https://www.linux.com/learn/sysadmin/building-email-server-ubuntu-linux-part-2
-[5]:http://wiki.dovecot.org/SSL/DovecotConfiguration
-[6]:http://www.postfix.org/TLS_README.html
-[7]:http://www.postfix.org/TLS_README.html
diff --git a/translated/tech/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md b/translated/tech/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md
deleted file mode 100644
index 56f39e0046..0000000000
--- a/translated/tech/20161216 sshpass -An Excellent Tool for Non-Interactive SSH Login – Never Use on Production Server.md	
+++ /dev/null
@@ -1,158 +0,0 @@
-sshpass：一个很棒的无交互SSH登录工具 - 不要在生产服务器上使用
-============================================================
-
-在大多数情况下，Linux系统管理员使用SSH通过密码或[无密码SSH登录][1]或基于密钥的SSH身份验证登录到远程Linux服务器。
-
-如果你想自动在SSH中提供密码和用户名怎么办？这是可以用sshpass了。
-
-sshpass是一个简单、轻量级的命令行工具，使我们能够向命令提示符本身提供密码（非交互式密码验证），以便可以通过[cron调度器][2]执行自动化的shell脚本进行备份。
-
-ssh直接使用TTY访问，以确保密码是用户键盘输入的。 sshpass在专门的tty中运行ssh，以误导它相信它是从用户接收到的密码。
-
-重要：使用sshpass被认为是最不安全的，因为它通过简单的“ps”命令就可在命令行上显示所有系统用户的密码。我强烈建议使用[SSH无密码身份验证][3]。
-
-### 在Linux中安装sshpass
-
-在基于RedHat/CentOS的系统中，首先需要[启用Epel仓库][4]并使用[yum命令安装][5]它。
-
-```
-# yum install sshpass
-# dnf install sshpass    [On Fedora 22+ versions]
-```
-
-在Debian/Ubuntu和它的衍生版中，你可以使用[apt-get命令][6]来安装。
-
-```
-$ sudo apt-get install sshpass
-```
-
-另外你也可以从最新的源码安装sshpass，首先下载源码并从tar文件中解压出内容：
-
-```
-$ wget http://sourceforge.net/projects/sshpass/files/latest/download -O sshpass.tar.gz
-$ tar -xvf sshpass.tar.gz
-$ cd sshpass-1.06
-$ ./configure
-# sudo make install 
-```
-
-### 如何在Linux中使用sshpass
-
-sshpass与ssh一起使用，可以使用下面的命令查看sshpass的使用使用选项的完整描述：
-
-```
-$ sshpass -h
-```
-sshpass Help
-```
-Usage: sshpass [-f|-d|-p|-e] [-hV] command parameters
--f filename   Take password to use from file
--d number     Use number as file descriptor for getting password
--p password   Provide password as argument (security unwise)
--e            Password is passed as env-var "SSHPASS"
-With no parameters - password will be taken from stdin
--h            Show help (this screen)
--V            Print version information
-At most one of -f, -d, -p or -e should be used
-```
-
-正如我之前提到的，sshpass在用于脚本时才更可靠及更有用，考虑下面的示例命令。
-
-使用用户名和密码登录到远程Linux ssh服务器（10.42.0.1），并如图所示[检查文件系统磁盘使用情况] [7]。
-
-```
-$ sshpass -p 'my_pass_here' ssh aaronkilik@10.42.0.1 'df -h' 
-```
-
-重要提示：此处，密码在命令行中提供，实际上不安全，不建议使用此选项。
-
-[
- ![sshpass - Linux Remote Login via SSH](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Linux-Remote-Login.png) 
-][8]
-
-sshpass – 使用SSH远程登录Linux
-
-但是，为了防止在屏幕上显示密码，可以使用`-e`标志，并输入密码作为SSHPASS环境变量的值，如下所示：
-
-```
-$ export SSHPASS='my_pass_here'
-$ echo $SSHPASS
-$ sshpass -e ssh aaronkilik@10.42.0.1 'df -h' 
-```
-[
- ![sshpass - Hide Password in Prompt](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Hide-Password-in-Prompt.png) 
-][9]
-
-sshpass – 在终端中隐藏密码
-
-注意：在上面的示例中，SSHPASS环境变量仅用于临时目的，并将在重新启动后删除。
-
-要永久设置SSHPASS环境变量，打开/etc/profile文件，并在文件开头输入export语句：
-
-```
-export SSHPASS='my_pass_here'
-```
-
-保存文件并退出，接着运行下面的命令使更改生效：
-
-```
-$ source /etc/profile 
-```
-
-另一方面，你也可以使用`-f'标志，并把密码放在一个文件中。 这样，您可以从文件中读取密码，如下所示：
-
-```
-$ sshpass -f password_filename ssh aaronkilik@10.42.0.1 'df -h'
-```
-[
- ![sshpass - Supply Password File to Login](http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Provide-Password-File.png) 
-][10]
-
-sshpass – 在登录时提供密码文件
-
-你也可以使用sshpass[使用scp传输文件][11]或者[使用rsync备份/同步文件][12]，如下所示：
-
-```
-------- Transfer Files Using SCP ------- 
-$ scp -r /var/www/html/example.com --rsh="sshpass -p 'my_pass_here' ssh -l aaronkilik" 10.42.0.1:/var/www/html
-------- Backup or Sync Files Using Rsync -------
-$ rsync --rsh="sshpass -p 'my_pass_here' ssh -l aaronkilik" 10.42.0.1:/data/backup/ /backup/
-```
-
-更多的用法，我建议你阅读一下sshpass的man页面，输入：
-
-```
-$ man sshpass
-```
-
-在本文中，我们解释了sshpass是一个启用非交互式密码验证的简单工具。 虽然这个工具可能是有帮助的，但是强烈建议使用更安全的ssh公钥认证机制。
-
-请在下面的评论栏写下任何问题或评论，以便可以进一步讨论。
-
---------------------------------------------------------------------------------
-
-作者简介：Aaron Kili is a Linux and F.O.S.S enthusiast, an upcoming Linux SysAdmin, web developer, and currently a content creator for TecMint who loves working with computers and strongly believes in sharing knowledge.
-
------------
-
-via: http://www.tecmint.com/sshpass-non-interactive-ssh-login-shell-script-ssh-password/
-
-作者：[Aaron Kili][a]
-译者：[geekpi](https://github.com/geekpi)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:http://www.tecmint.com/author/aaronkili/
-[1]:http://www.tecmint.com/ssh-passwordless-login-using-ssh-keygen-in-5-easy-steps/
-[2]:http://www.tecmint.com/11-cron-scheduling-task-examples-in-linux/
-[3]:http://www.tecmint.com/ssh-passwordless-login-using-ssh-keygen-in-5-easy-steps/
-[4]:http://www.tecmint.com/how-to-enable-epel-repository-for-rhel-centos-6-5/
-[5]:http://www.tecmint.com/20-linux-yum-yellowdog-updater-modified-commands-for-package-mangement/
-[6]:http://www.tecmint.com/useful-basic-commands-of-apt-get-and-apt-cache-for-package-management/
-[7]:http://www.tecmint.com/how-to-check-disk-space-in-linux/
-[8]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Linux-Remote-Login.png
-[9]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Hide-Password-in-Prompt.png
-[10]:http://www.tecmint.com/wp-content/uploads/2016/12/sshpass-Provide-Password-File.png
-[11]:http://www.tecmint.com/scp-commands-examples/
-[12]:http://www.tecmint.com/rsync-local-remote-file-synchronization-commands/
diff --git a/translated/tech/20161220 How Linux got to be Linux Test driving 1993-2003 distros.md b/translated/tech/20161220 How Linux got to be Linux Test driving 1993-2003 distros.md
new file mode 100644
index 0000000000..0b395c4c37
--- /dev/null
+++ b/translated/tech/20161220 How Linux got to be Linux Test driving 1993-2003 distros.md	
@@ -0,0 +1,246 @@
+How Linux got to be Linux: Test driving 1993-2003 distros
+============================================================
+Linux 系统的成长之路：试用 1993-2003 年之间的 Linux 老版本系统
+
+### 让我们一起来回顾 Linux 早期版本的美好时光
+
+ ![How Linux got to be Linux: Test driving 1993-2003 distros](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/car-penguin-drive-linux-yellow.png?itok=ueZE5mph "How Linux got to be Linux: Test driving 1993-2003 distros") 
+
+图片来源：
+
+互联网档案馆[书籍][7][图片][8]。 Opensource.com. CC BY-SA 4.0 编辑引用。
+
+开源软件最擗独特性的一点就是它永远不会真正的走到 EOL （生命的终点）。它们的磁盘镜像文件大都可以在网上找到，并且使用它们也不需要经过任何授权，因此，我们可以返回去找到那些老版本的 Linux 系统，并在虚拟机中安装它们，这都是很容易做到的，通过回顾那些珍贵的系统画面，让我们来回顾 Linux 系统这么多年来所发生的翻天覆地的变化。
+
+我们使用 Slackware 1.01 版本系统来开始这段旅程，该系统差不多 20 年以前就在 **comp.os.linux.announce** 新闻组中发布出来了。
+
+### Slackware 1.01 版本系统 （ 1993 年）
+
+ ![slackware 1.0 screenshot](https://opensource.com/sites/default/files/slack1.png "slackware 1.0 screenshot") 
+
+Slackware 1.01
+使用 Slackware 1.01 系统最爽的是在 Qemu 模拟器软件 [2014 系列][9] 中有一个预先制作好的镜像文件，因此你可以不用手动去执行安装任务（这样美好的事情已经不存在了）。其引导启动命令如下：
+
+```
+ $ qemu-kvm -m 16M -drive if=ide,format=qcow2,file=slackware.qcow2 \
+ -netdev user,id=slirp -device ne2k_isa,netdev=slirp \
+ -serial stdio -redir tcp:22122::22
+```
+
+在 1993 年那个版本的 Linux 系统中，很多东西都跟我们所想像的一样。所有常用的基本命令，比如 'ls' 和 'cd' 命令的使用方式，以及所有的基本工具（`gawk` ， `cut` ， `diff` ， `perl`，当然还有 [Volkerding][10] 最喜欢的 'elvis‘ 工具）现在都在使用，而且也包含在如今的 Linux 系统中，但是仍然有一小部分东西让我感到惊讶。当你尝试使用 tab 补全命令方式来列出上百个文件时， ’BASH' 会非常友好的提示用户确认，并且那些查看压缩文件的工具（比如 ‘zless' 和 ’zmore' 以及 'zcat'）已经在使用了。很多方面都比我中要好得多，总之，该系统给人的感觉就是超级现代化。
+
+不过，该系统没有软件包管理的相关概念。所有软件的安装和卸载都得手动完成，也不能查询出已安装的软件包。
+
+总的来说， Slackware 1.01 系统感觉更像是一个非常现代化的 UNIX 系统，或者更恰当的是，它给人的感觉就是一个 Linux 用户在操作一个现代化的 UNIX 系统。很多东西都非常熟悉，但是也不尽相同。在 1993 年发布的操作系统中，并不是所有东西都跟你想像的一样。
+
+### Debian 0.91 版本系统（ 1994 年）
+
+为了尝试 Debian 0.91 版本系统，我使用的是 [Ibiblio 数字档案][11] 网站下载的软盘镜像文件，该系统一开始在 1994 年发布出来。启动命令如下：
+
+```
+ $ gunzip bootdsk.gz basedsk1.gz basedsk2.gz
+ $ qemu-system-i386 -M pc -m 64 -boot order=ac,menu=on \
+   -drive file=bootdisk,if=floppy,format=raw \
+   -drive file=debian.raw,if=ide,format=raw \
+   -device ne2k_isa,netdev=slirp \
+   -serial msmouse -vga std \
+   -redir tcp:22122::22 \
+   -netdev user,id=slirp
+```
+
+从 Debian 0.91 的启动磁盘启动后进入到一个简洁的 shell 界面，有很清晰的提示信息告诉你下一步将要执行的操作。
+
+安装过程进行得非常顺利。从磁盘分区，写入 ext2 文件系统到分区，到显示图形菜单操作界面要经过 7 个步骤，之后开始复制 'basedsk' 镜像文件。这里使用的是以最小化方式来安装 Debian 系统，跟大家在安装自己的 Linux 系统过程中的很多步骤都非常相似。
+
+Debian 系统因其自身的包管理器而出名，但是在早期的版本中只是多一些提示功能而已。有 ‘dpkg' 命令，但它是一个基于交互式菜单的系统——一种看似很笨拙的‘雕虫小技’，有多个层次的可选菜单，并且自然地附带了几个可用软件包。
+
+尽管如此，你也可以感受到其简便的设计理念。你只需下载三个软盘镜像文件，最后合成一个可启动的系统，然后就可以使用一个简单的文本菜单来安装更多的东西。我由衷的明白了为什么 Debain 系统如此受欢迎的原因。
+
+### Jurix/S.u.S.E. 系统（ 1996 年）
+
+ ![Jurix install screen](https://opensource.com/sites/default/files/jurix_install.png "Jurix install screen") 
+
+安装 Jurix 系统
+
+Jurix 系统是 SUSE 系统的前身， Jurix 使用二进制的 '.tgz' 软件包组织到类似 Slackware 安装包结构的目录中，其安装包本身也跟 Slackware 的安装包很相似。
+
+```
+ $ qemu-system-i386 -M pc -m 1024 \
+   -boot order=ac,menu=on \
+   -drive \
+    file=jurix/install,if=floppy,format=raw \
+   -drive file=jurix.img,if=ide \
+   -drive file=pkg.raw,if=ide,format=raw \
+   -device ne2k_isa,netdev=slirp \
+   -serial msmouse -vga std \
+   -redir tcp:22122::22 \
+   -netdev user,id=slirp
+```
+
+
+因为我不是特意去寻找最早期的版本， Jurix 系统是找到的第一个’感觉‘十分像是打算给用户使用的有图形界面的 Linux 发行版。 [XFree86][12] 图形桌面环境已默认安装了，如果你不打算使用该工具，选择退出该环境即可。
+
+比如 `/usr/lib/X11/XF86Config` （该文件变成 `Xorg.conf` ）这个配置文件已经存在了，这让我在使用 GUI 前完成了 90% 的工作，但是我花费了一整个周末的时间来调试 `vsync` ， `hsync` ， 和 `ramdac` 界面颜色的过程中却不小心把 `Xorg.conf` 这个配置文件给覆盖了，最后我完全放弃了。
+
+在 Jurix 系统上安装软件包也非常简单；找到源路径下的 '.tgz' 文件，然后运行一个常用的 ‘tar' 命令： ` $ su -c 'tar xzvf foo.tgz -C /'` 该软件包就会被解压到 root 分区，并准备好使用了。我刚开始的时候使用几个之前未用过的软件包来安装测试，发现操作也很简单、快速且非常可靠。
+
+### SUSE 5.1 版本系统（ 1998 年）
+
+ ![suse install](https://opensource.com/sites/default/files/suse5fvwm.png "suse install") 
+
+在 SuSE 5.1 系统上运行 FVWM 窗口管理器
+
+我是使用 1998 年在 Maryland 一家软件商店里买的 InfoMagic CD-ROM 光驱来安装 SUSE 5.1 系统的。其引导启动命令如下：
+
+```
+ $ qemu-system-i386 -M pc-0.10 -m 64 \
+   -boot order=ad,menu=on \
+   -drive file=floppy.raw,if=floppy,format=raw \
+   -cdrom /dev/sr0 \
+   -drive file=suse5.raw,if=ide,format=raw \
+   -vga cirrus -serial msmouse
+```
+
+安装过程相对于前边几次来说要复杂得多。 YasT 工具在软盘和 CD-ROM 光驱之间阻止了配置文件的生成和设置，还需要重启好多次，在重启了好几次后我才反应过来是我操作顺序不当导致的问题。在安装过程中，我就规犯了两次同样的错，我只是习惯了 YasT 工具的安装方式，到第三次才顺利的安装成功，这对于一个 Linux 用户将来的成长来说是一个很大的教训及经验。
+
+我使用 SUSE 5.1 的主要目的就是体验其 GUI 桌面环境。配置的过程已经很熟悉了，使用几个漂亮的图形界面工具（包括一个很好用的 `XF86Setup` 前端界面配置工具）来测试和调试鼠标及显示器问题。我用了一个小时不到的时间就调试好 GUI 界面，并正常运行起来，其中大部分时间是耽搁在查询 Qemu 工具可以处理哪种颜色方案的虚拟显卡。
+
+可选用的桌面环境包括  `fvwm` ， `fvwm2` 和 `ctwm`。我使用的是 ’fvwm' ，并且运行得也正常。我发现 `tkDesk` 这个文件管理器组合包跟 Ubuntu 系统 `Unity` 的启动栏非常的相似。
+
+使用该系统总的来说还是非常令人愉快的，一旦成功安装了桌面环境并正常运行起来， SUSE 5.1 可以说是取得了令人瞩目的成功。
+
+### Red Hat 6.0 版本系统（ 1999 年）
+
+ ![Red Hat 1999](https://opensource.com/sites/default/files/redhat6_gimp_0.png "Red Hat 1999") 
+
+在 Red Hat 6 系统上运行 GIMP 1.x 图像处理程序
+
+下一个系统 Red Hat 6.0 安装盘我刚好家里有。不是 RHEL 6.0 —— 而是 Red Hat 6.0 。，这是一个在 RHEL 或 Fedora 系统出现之前商店里就有卖的桌面版系统。这个安装盘是是我在 1999 年 6 月份买的。
+其引导启动命令如下：
+
+```
+ $ qemu-system-i386 -M pc-0.10 -m 512 \
+   -boot order=ad,menu=on \
+   -drive file=redhat6.raw,if=ide,format=raw \
+   -serial msmouse -netdev user,id=slirp \
+   -vga cirrus -cdrom /dev/sr0
+```
+
+整个安装过程由系统引导安装，并且速度非常快。无论是选择什么系统安装包（按 **工作站**， **服务器**， 及 **自定义** 进行分组 ），磁盘分区，或者是启动安装，你都没必要离开安装过程的安全模式。
+
+Red Hat 6 包括一个 `xf86config` 应用程序来一步步指导你完成 X 配置工作，尽管它有一些很奇怪的模拟鼠标的选项，但是之后 X 宣称这没啥意义。它比手动修改 Xf86Config 配置文件要容易得多，但是要正确无误的配置好 X 环境也不是一个简单的工作。
+
+Red Hat 6 绑定的桌面环境还是 GNOME ，但是这个窗口管理器只是一个早期的 [雏形][13] ，它同样也提供了主要的声卡服务进程。`Xdm` 和 `gdm` 也作为登录管理器包含在其中，因此普通用户没有权限也可以登录到系统中并启动或者关闭 X 桌面进程，这在多用户系统中是非常重要的。
+
+它不包含一些主要的应用程序；也没有 'gedit' 工具，没有重要的统一办公应用程序，更没有软件包管理器。有 ‘GnoRPM' 工具，这是一个图形界面的 RPM 包管理工具，用于查看及删除软件包，这个工具跟 ’yum' 或 ’PackageKit‘ 工具非常类似，还有基于图形界面的文件编辑器 ’gnotepad+‘ （尽管没有 Emacs 工具）。
+
+总的来说，桌面环境在使用上也是非常直观的。跟后边实现的 GNOME 桌面环境不同，这个早期版本的在屏幕底部一有个面板，其中有一个应用程序菜单和启动图标，在中间位置有个虚拟桌面控制器。我无法想象其它操作系统的用户在使用这个桌面环境时会有多么的不习惯。
+
+Red Hat 6 对于 Linux 系统来说是一个巨大的进步，很明显 Linux 系统正向着成为一个适用的桌面系统方向发展。
+
+### Mandrake 8.0 版本系统（ 2001 年）
+
+ ![Mandrake 8.0 installer](https://opensource.com/sites/default/files/mandrake8.png "Mandrake 8.0 installer") 
+
+Mandrake: Linux 系统的一个转折点
+
+Mandrake 8.0 于 2001 年发布，这已经可以跟 Apple OS 9.2 和 Windows ME 系统相提并论了。
+
+我反而觉得老版本的系统才更安全一些。
+
+其引导启动命令如下：
+```
+ $ qemu-system-i386 \
+   -M pc-0.10 -m 2048 \
+   -boot order=ad,menu=on \
+   -drive file=mandrake8.qcow2 \
+   -usb -net nic,model=rtl8139 \
+   -netdev user,id=slirp \
+   -vga cirrus \
+   -cdrom mandrake-8.0-i386.iso
+```
+
+我一直觉得 Red Hat 系统的安装过程非常棒了，但是 Mandrake 的安装过程更是让人喜出望外。它非常友好，并且在继续下一步之前还给用户一个测试配置文件的机会，易用高效，使用起来非常令人惊奇。我也不用导入自己的 `XF86Config` 配置文件，因为 Mandrake 的安装程序会自动完成该任务。
+
+ ![Mandrake install](https://opensource.com/sites/default/files/mandrake8install_new.png "Mandrake install") 
+
+Mandrake 8.0 系统的安装程序
+
+实际上，使用 Mandrake 系统跟使用其它已安装了桌面环境系统的感受基本相同。让我很惊奇是的它们在操作体验上如此的相似。我相信，即使这个时候我在使用 Mandrake 系统的过程中遇到一些问题，以我自己的技术能力甚至是一个技术水平一般的年轻人也很容易解决。它的界面非常直观，帮助文档也很有用，并且软件包管理起来也很容易，只是那个时候人们还不习惯直接到网上下载他们需要的任何软件包来安装。
+
+### Fedora 1 版本系统（ 2003 年）
+
+ ![Fedora Core install](https://opensource.com/sites/default/files/fedora1.png "Fedora Core install") 
+
+基于 Red Hat 的 Fedora 系统 
+
+新 Fedora Core 版本系统于 2003 年发布。 Fedora Core 基于 Red Hat 系统，它的主要目的是在 Red Hat 企业版（ RHEL ）成为该公司旗舰产品之前继续带动 Linux 桌面版系统的发展。
+
+
+启动老版本的 Fedora COre 1 系统也没啥特别的地方：
+
+```
+ $ qemu-system-i386 -M pc \
+   -m 2048 -boot order=ac,menu=on \
+   -drive file=fedora1.qcow2 -usb \
+   -net nic,model='rtl8139' -netdev user \
+   -vga cirrus -cdrom fedora-1-i386-cd1.iso
+```
+
+安装 Fedora Core 同样简单容易； Fedora 和 Red Hat 系统在之后的 9 年中使用同样的安装包。它同样使用简单易用的图形化界面。
+
+ ![Fedora Anaconda](https://opensource.com/sites/default/files/fedora1anaconda.png "Fedora Anaconda") 
+Anaconda GUI 界面
+
+使用 Fedora Core 系统的体验跟 Red Hat 6 或 7 版本没多少区别。 GNOME 图形界面很漂亮，有各种独立的配置程序助手，并且界面展示都非常的整洁和专业。
+
+桌面上的 Start Here 图标指导用户前往三个位置：应用程序目录，首选项面板和系统设置。 一个红帽的图标表示应用程序菜单，而下边的 GNOME 面板里包括所有最新的 Linux 应用程序启动器，包括 OpenOffice 办公组件和 mozilla 浏览器。
+
+### 展望未来
+
+在 2000 左右， Linux 系统已经发展得很好并取得了巨大的进步。桌面环境前所未有的更加精致美观，有各种可用的应用程序，安装过程比其它操作操作更简易更高效。事实上，从 2000 年以来，用户和系统之间的关系更加紧密，即使到现在也没发生根本上的改变。当然还有一些更新和改善，以及数量惊人的创新方面的变化。
+
+让我们来了解一下各个 Linux 系统项目上的演变:
+
+*   Mandrake 系统后来更名为 Mandriva，如今为 [Mageia][1] ；
+*   Fedora Core 随后改为 [Fedora][2] ；
+*   [Ubuntu][3] 脱胎于 [Debian][4] 并且，它让 “Linux" 成为一个家喻户晓的词汇；
+*   Valve 公司开发的 [SteamOS][5] 成为其官方游戏平台；
+*   [Slackware][6] 现如今仍在平稳发展。
+
+无论你是一个 Linux 新手，还是一个技术精湛的 Linux 老用户，上面的大多数截图都构成了让 Linux 系统被记入历史的一本传记。很高兴今天我们能够回顾成为世界上最大的开源项目之一的 Linux 系统是如何发展壮大起来的。更重要的是，每一次想到自己也是 Linux 开源世界中的一员我们就无比激动，把握现在，展望未来。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/penguinmedallion200x200.png?itok=ROQSR50J)
+
+Seth Kenlon —— Seth Kenlon 是一位独立多媒体艺术家，开源文化倡导者， Unix 极客。他还是 Slackware 多媒体产品项目的维护人员之一，官网：http://slackermedia.ml 。
+
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/16/12/yearbook-linux-test-driving-distros
+
+作者：[Seth Kenlon][a]
+译者：[rusking](https://github.com/rusking)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/seth
+[1]:http://mageia.org/
+[2]:http://fedoraproject.org/
+[3]:http://ubuntu.com/
+[4]:http://debian.org/
+[5]:http://store.steampowered.com/steamos
+[6]:http://slackware.com/
+[7]:https://www.flickr.com/photos/internetarchivebookimages/14746482994/in/photolist-ot6zCN-odgbDq-orm48o-otifuv-otdyWa-ouDjnZ-otGT2L-odYVqY-otmff7-otGamG-otnmSg-rxnhoq-orTmKf-otUn6k-otBg1e-Gm6FEf-x4Fh64-otUcGR-wcXsxg-tLTN9R-otrWYV-otnyUE-iaaBKz-ovcPPi-ovokCg-ov4pwM-x8Tdf1-hT5mYr-otb75b-8Zk6XR-vtefQ7-vtehjQ-xhhN9r-vdXhWm-xFBgtQ-vdXdJU-vvTH6R-uyG5rH-vuZChC-xhhGii-vvU5Uv-vvTNpB-vvxqsV-xyN2Ai-vdXcFw-vdXuNC-wBMhes-xxYmxu-vdXxwS-vvU8Zt
+[8]:https://www.flickr.com/photos/internetarchivebookimages/14774719031/in/photolist-ovAie2-otPK99-xtDX7p-tmxqWf-ow3i43-odd68o-xUPaxW-yHCtWi-wZVsrD-DExW5g-BrzB7b-CmMpC9-oy4hyF-x3UDWA-ow1m4A-x1ij7w-tBdz9a-tQMoRm-wn3tdw-oegTJz-owgrs2-rtpeX1-vNN6g9-owemNT-x3o3pX-wiJyEs-CGCC4W-owg22q-oeT71w-w6PRMn-Ds8gyR-x2Aodm-owoJQm-owtGp9-qVxppC-xM3Gw7-owgV5J-ou9WEs-wihHtF-CRmosE-uk9vB3-wiKdW6-oeGKq3-oeFS4f-x5AZtd-w6PNuv-xgkofr-wZx1gJ-EaYPED-oxCbFP
+[9]:http://www.qemu-advent-calendar.org/2014
+[10]:http://www.slackware.com/~volkerdi/
+[11]:https://ibiblio.org/pub/historic-linux/distributions/debian-0.91/debian-0.91/dist
+[12]:http://www.xfree86.org/
+[13]:http://enlightenment.org/
+[^]: 
\ No newline at end of file
diff --git a/translated/tech/20161221 Living Android without Kotlin.md b/translated/tech/20161221 Living Android without Kotlin.md
new file mode 100644
index 0000000000..4f28c8ecd5
--- /dev/null
+++ b/translated/tech/20161221 Living Android without Kotlin.md	
@@ -0,0 +1,243 @@
+没有Kotlin(Android)生活
+============================================================
+
+![](https://cdn-images-1.medium.com/max/2000/1*Fd349rzh3XWwSbCP2IV7zA.jpeg)
+
+> 开始投入一件事比远离它更容易。 — Donald Rumsfeld
+
+没有Kotlin的生活就像在触摸板上玩魔兽争霸3。购买鼠标很简单，但如果你的新雇主不想让你在生产中使用Kotlin，你该怎么办？
+
+下面有一些选择。
+*  与你的产品负责人争取获得使用Kotlin的权利。
+*  使用Kotlin并且不告诉其他人因为你知道最好的东西是只适合你的。
+*  擦掉你的眼泪，自豪地使用Java。
+
+想象一下，你在和产品负责人的斗争中失败，作为一个专业的工程师，在没有任何人的允许下你将不会去依靠和使用时髦的技术。我知道这听起来非常恐怖，特别当你已经品尝到Kotlin的好处但是又没有失去你的希望。
+
+在文章接下来的部分，我想简短地描述一些Kotlin的特征，使你通过一些知名的工具和库，可以应用到你的Android里的Java代码中去。对于Kotlin和Java一个基本的认识是需要的。
+
+### 数据类
+
+你真的已经喜欢上Kotlin的数据类，不是吗？对于你来说，得到`equals()`, `hashCode()`, `toString()` 和 `copy()`这些类是很容易的。具体来说，`data`关键字还会按照声明顺序生成对应于属性的`componentN()`函数。 它们用于构造声明。
+```
+data class Person(val name: String)
+val (riddle) = Person("Peter")
+println(riddle)
+```
+
+你知道什么会被打印吗？确信它不会是从`Person` 类的`toString()` 返回的值。这是构造声明的作用，它赋值从`name`到`riddle`。使用园括号`(riddle)`编译器知道它必须使用构造声明机制。
+
+
+```
+val (riddle): String = Person("Peter").component1()
+println(riddle) // prints Peter
+view raw
+```
+
+>这个代码没有编译。它就是展示了构造声明怎么工作的。
+
+正如你可以看到`data`关键字是一个超级有用的语言特性，所以你能做什么把它带到你的Java世界？ 使用注释处理器并修改抽象语法树。 如果你想更深入，请阅读文章末尾列出的文章（Project Lombok— Trick Explained）。
+
+使用项目Lombok你可以实现几乎相同的功能，`data`关键字提供。 不幸的是，没有办法进行构造声明。
+
+```
+import lombok.Data;
+
+@Data class Person {
+    final String name;
+}
+```
+
+
+`@ Data`注解生成`equals（）`，`hashCode（）`和`toString（）`。 此外，它为所有字段创建getters，为所有非最终字段创建setters，并为所有必填字段（finalals）创建构造函数。 值得注意的是，Lombok仅用于编译，因此库代码不会添加到您的最终的.apk。
+
+### Lambda表达式
+
+Android工程师有一个非常艰难的生活，因为Android中缺乏Java 8的特性，而且其中之一是lambda表达式。 Lambdas是很棒的，因为它们为你减少了成吨的样板。 你可以在回调和流中使用它们。 在Kotlin中，lambda表达式是内置的，它们看起来比它们在Java中看起来好多了。 此外，lambda的字节码可以直接插入到调用方法的字节码中，因此方法计数不会增加。 它可以使用内联函数。
+
+```
+button.setOnClickListener { println("Hello World") }
+```
+最近Google宣布在Android中支持Java 8的特性，由于Jack编译器，你可以在你的代码中使用lambdas。还要提及的是，它们在API 23或者更低的级别都可用。
+
+```
+button.setOnClickListener(view -> System.out.println("Hello World!"));
+```
+
+怎样使用它们？就只用添加下面几行到你的` build.gradle `文件中。
+
+
+```
+defaultConfig {
+    jackOptions {
+        enabled true
+    }
+}
+
+compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+}
+```
+
+如果你不是一个Jack编译器的粉丝，或则你由于一些原因不能使用它，这里有一个不同的解决方案提供给你。Retrolambda项目允许你使用Java 7，6或者5上的lambda表达式来运行Java 8的代码，下面是设置过程。
+```
+dependencies {
+    classpath 'me.tatarka:gradle-retrolambda:3.4.0'
+}
+
+apply plugin: 'me.tatarka.retrolambda'
+
+compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+}
+```
+正如我前面提到的，在Kotlin下的lambdas内联函数不增加方法计数，但是如何在Jack或者Retrolambda下使用它们？ 显然，它们不是免费的，隐藏的成本如下。
+
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*H7h2MB2auMslMkdaDtqAfg.png) 
+
+### 数据操作
+
+
+Kotlin引入了高阶函数作为流的替代。 当您必须将一组数据转换为另一组数据或过滤集合时，它们非常有用。
+
+```
+fun foo(persons: MutableList<Person>) {
+    persons.filter { it.age >= 21 }
+           .filter { it.name.startsWith("P") }
+           .map { it.name }
+           .sorted()
+           .forEach(::println)
+}
+
+data class Person(val name: String, val age: Int)
+```
+
+Streams也由Google使用Jack编译器提供。 不幸的是，Jack不使用Lombok，因为它在编译代码时跳过生成中间的`.class`文件，而Lombok依赖于这些文件。
+
+
+```
+void foo(List<Person> persons) {
+    persons.stream()
+           .filter(it -> it.getAge() >= 21)
+           .filter(it -> it.getName().startsWith("P"))
+           .map(Person::getName)
+           .sorted()
+           .forEach(System.out::println);
+}
+
+class Person {
+    final private String name;
+    final private int age;
+
+    public Person(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    String getName() { return name; }
+    int getAge() { return age; }
+}
+```
+
+这太好了以至于不是真的，所以在哪里捉住？ 悲伤的是，流从API 24 \可用。谷歌做的不错，但为什么广泛的应用程序有` minSdkVersion = 24 `？
+
+幸运的是，Android平台有一个很好的开源社区提供许多很棒的库。Lightweight-Stream-API是其中的一个，它包含基于Java 7及以下版本的迭代器的流实现。
+
+```
+import lombok.Data;
+import com.annimon.stream.Stream;
+
+void foo(List<Person> persons) {
+    Stream.of(persons)
+          .filter(it -> it.getAge() >= 21)
+          .filter(it -> it.getName().startsWith("P"))
+          .map(Person::getName)
+          .sorted()
+          .forEach(System.out::println);
+}
+
+@Data class Person {
+    final String name;
+    final int age;
+}
+```
+
+上面的例子结合了Lombok，Retrolambda和Lightweight-Stream-API，它看起来几乎和Kotlin一样好，不是。 使用静态工厂方法允许您将任何Iterable转换为流，并对其应用lambdas，就像Java 8流一样。 将静态调用` Stream.of(persons) `包装为Iterable类型的扩展函数是完美的，但是Java不支持它。
+
+### 扩展功能
+
+扩展机制提供了向类添加功能而无需继承它的能力。 这个众所周知的概念非常适合Android世界，这就是Kotlin在社区很受欢迎的原因。
+
+有没有技术或魔术将扩展功能添加到你的Java工具箱？ 由于Lombok，你可以使用它们作为一个实验功能。 根据Lombok文档的说明，他们想把它从实验状态移出，没有或微小的变化很快。 让我们重构最后一个样例，并将` Stream.of(persons) `包装成扩展函数。
+
+
+```
+import lombok.Data;
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(Streams.class)
+public class Foo {
+    void foo(List<Person> persons) {
+        persons.toStream()
+               .filter(it -> it.getAge() >= 21)
+               .filter(it -> it.getName().startsWith("P"))
+               .map(Person::getName)
+               .sorted()
+               .forEach(System.out::println);
+    }
+}
+
+@Data class Person {
+    final String name;
+    final int age;
+}
+
+class Streams {
+    static <T> Stream<T> toStream(List<T> list) {
+        return Stream.of(list);
+    }
+}
+```
+
+所有的方法是`public`，`static`，并且至少有一个参数的类型不是原始的，被认为是扩展方法。 `@ ExtensionMethod`注解允许你指定一个包含你的扩展函数的类。 而不是使用一个`.class`对象，你也可以传递数组。
+
+* * *
+
+我完全知道我的一些想法是非常有争议的，特别是Lombok，我也知道，有很多的库，可以使你的生活更轻松。请不要犹豫在评论里分享你的经验。干杯!
+
+
+ ![](https://cdn-images-1.medium.com/max/800/1*peB9mmElOn6xwR3eH0HXXA.png) 
+
+
+
+---------------------------------
+
+作者简介：
+
+![](https://cdn-images-1.medium.com/fit/c/60/60/1*l7_L6VCKzkOm0gq4Kplnkw.jpeg)
+
+Coder and professional dreamer @ Grid Dynamics
+
+--------------------------------------------------------------------------------
+
+via: https://hackernoon.com/living-android-without-kotlin-db7391a2b170#.q95i5232f
+
+作者：[Piotr Ślesarew][a]
+译者：[DockerChen](https://github.com/DockerChen)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://hackernoon.com/@piotr.slesarew?source=post_header_lockup
+[1]:http://jakewharton.com/exploring-java-hidden-costs/
+[2]:https://medium.com/u/8ddd94878165
+[3]:https://projectlombok.org/index.html
+[4]:https://github.com/aNNiMON/Lightweight-Stream-API
+[5]:https://github.com/orfjackal/retrolambda
+[6]:http://notatube.blogspot.com/2010/11/project-lombok-trick-explained.html
+[7]:http://notatube.blogspot.com/2010/11/project-lombok-trick-explained.html
+[8]:https://twitter.com/SliskiCode
diff --git a/translated/tech/20161223 Best 4 Command Line Download Managers-Accelerators for Linux.md b/translated/tech/20161223 Best 4 Command Line Download Managers-Accelerators for Linux.md
new file mode 100644
index 0000000000..3e0c65781b
--- /dev/null
+++ b/translated/tech/20161223 Best 4 Command Line Download Managers-Accelerators for Linux.md	
@@ -0,0 +1,109 @@
+Linux 下 4 个最好的命令行下载管理器/加速器
+============================================================
+
+我们经常由于不同需求使用下载管理器从互联网下载文件，这是对我和其他人的主要贡献者之一。我们都想要一个超级快速的下载管理器来完成下载尽可能多的任务，以便我们可以节省时间来进一步地工作。这里有很多可以加速下载的下载管理器和加速器可用（GUI和CLI）。
+
+所有的下载工具做着同样的任务，但它们的处理和功能是不同的，单线程和多线程、交互和非交互。 在这里，我们将列出四个最好的我们日常工作使用的命令行下载加速器，。
+
+#### #1 Aria2
+
+[Aria2][1]是一个用于 Linux、Windows 和 Mac OSX 的轻量级多协议和多来源的命令行下载管理器/实用程序。它支持HTTP/HTTPS、FTP、SFTP、BitTorrent 和 Metalink。aria2 可以通过内置的 JSON-RPC 和 XML-RPC 接口操作。
+
+它支持多线程，并使用多个源/协议下载文件，它可以真的加速你的下载，并尽可能完成下载。
+
+它非常轻量级，不需要太多的内存和 CPU。我们可以使用它作为 BitTorrent 客户端，因为它有所有你想要的 BitTorrent 客户端的功能。
+
+#### Aria2 功能
+
+*   HTTP/HTTPS GET支持
+*   HTTP 代理支持
+*   支持 HTTP BASIC 认证
+*	HTTP 代理认证支持
+*   FTP 支持（主动、被动模式）
+*   FTP 通过 HTTP 代理（GET 命令或隧道）
+*   分段下载
+*   Cookie 支持
+*   它可以作为守护进程运行。
+*   BitTorrent 协议支持与快速扩展。
+*   在含有多个文件的 torrent 中的选择性下载
+*   Metalink 版本 3.0 支持（HTTP/FTP/BitTorrent）。
+*   限制下载/上传速度
+
+有关 Aria2 的进一步用法，请参阅以下文章。
+
+[如何在Linux中安装和使用 Aria2][2]
+
+#### #2 Axel
+
+[Axel][3] 是一个轻量级下载程序，它如其他加速器那样做着同样的事情。它为一个文件打开多个连接，每个连接下载单独的文件片段以更快地完成下载。
+
+Axel 支持 HTTP、HTTPS、FTP和 FTPS 协议。它也可以使用多个镜像下载单个文件。 所以，Axel 可以加速下载高达40％（大约，我个人认为）。 它非常轻量级，因为没有依赖和使用非常少的CPU和RAM。
+
+Axel 使用一个单线程将所有数据直接下载到目标文件。
+
+注意：没有选项可以在单条命令中下载两个文件
+
+有关 Axel 的更多使用，请参阅以下文章。
+
+[如何在 Linux 中安装和使用 Axel][4]
+
+#### #3 Wget
+
+[wget][5]（以前称为 Geturl）是一个免费的、开源的命令行下载程序，它使用HTTP、HTTPS 和 FTP 这些最广泛使用的Internet协议检索文件。它是一个非交互式命令行工具并且它的名称是从万维网派生的并获取的。
+
+wget 相比其他工具处理得相当好，即使它不支持多线程和包括后台工作、递归下载、多个文件下载、恢复下载、非交互式下载和大文件下载等功能。
+
+默认情况下，所有的Linux发行版都包含 wget，所以我们可以从官方仓库轻松安装，也可以安装到 windows 和 Mac 操作系统。
+
+wget 已被设计为可在慢速或不稳定的网络连接下保持鲁棒性，如果由于网络问题下载失败，它将继续重试，直到整个文件下载完成。如果服务器支持重新获取，它将指示服务器从中断的地方继续下载。
+
+#### wget 功能
+
+*   可以使用 REST 和 RANGE 恢复中止的下载
+*   可以使用文件名通配符和递归镜像目录
+*   为许多不同语言的基于NLS的消息文件
+*   可选将下载的文档中的绝对链接转换为相对链接，以便下载的文档可以在本地链接到彼此
+*   可在大多数类 UNIX 操作系统以及 Microsoft Windows 上运行
+*   支持 HTTP 代理
+*   支持 HTTP cookie
+*   支持持久 HTTP 连接
+*   无人值守/后台操作
+*   使用本地文件时间戳来确定是否需要在镜像时重新下载文档
+
+有关 wget 的进一步用法，请参阅以下文章。
+
+[如何在 Linux 中安装和使用 wget][6]
+
+#### #4 Curl
+
+[curl][7]类似于 wget，但是不支持多线程，但令人惊讶的是，与 wget 相比，它的下载速度更快。
+
+curl 是一个使用支持的协议（DICT、FILE、FTP、FTPS、GOPHER、HTTP、HTTPS、IMAP、IMAPS、LDAP、LDAPS、POP3、POP3S、RTMP、RTSP、SCP、SFTP、SMTP、SMTPS、TELNET和TFTP）传输数据到服务器上或传输到本地的工具。
+
+该命令旨在无需用户交互即可工作。此外，curl 支持代理、用户身份验证、FTP 上传、HTTP POST、SSL 连接、Cookie、恢复文件传输、Metalink 等。curl 由 libcurl 为所有相关传输功能提供支持。
+
+如果指定的 URL 没有 `protocol://` 前缀，curl 将尝试猜测你可能需要什么协议。例如，以 “ftp.” 开头的主机名 curl 将假定你要使用FTP。如果没有找到特定的协议，那么默认为HTTP。
+
+参考下面的文章来进一步使用 curl。
+
+[如何在 Linux 中安装和使用 curl] [8]
+
+--------------------------------------------------------------------------------
+
+via: http://www.2daygeek.com/best-4-command-line-download-managers-accelerators-for-linux/
+
+作者：[Magesh Maruthamuthu][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.2daygeek.com/author/magesh/
+[1]:https://aria2.github.io/
+[2]:http://www.2daygeek.com/aria2-command-line-download-utility-tool/
+[3]:https://axel.alioth.debian.org/
+[4]:http://www.2daygeek.com/axel-command-line-downloader-accelerator-for-linux/
+[5]:https://www.gnu.org/software/wget/
+[6]:http://www.2daygeek.com/wget-command-line-download-utility-tool/
+[7]:https://curl.haxx.se/
+[8]:http://www.2daygeek.com/curl-command-line-download-manager/
diff --git a/translated/tech/20161227 The Dos and Donts of Writing Test cases in Android.md b/translated/tech/20161227 The Dos and Donts of Writing Test cases in Android.md
new file mode 100644
index 0000000000..d6df221b5d
--- /dev/null
+++ b/translated/tech/20161227 The Dos and Donts of Writing Test cases in Android.md	
@@ -0,0 +1,170 @@
+编写 android 测试单元该做的和不该做的事
+============================================================
+
+在本文中, 我将根据我的实际经验，为大家阐述一个编写测试用例的最佳实践。在本文中我将使用 Espresso 编码, 但是它们可以用到单元和 instrumentation 测试当中。基于以上目的, 我们来研究一个新闻程序.
+
+> 以下内容纯属虚构，如有雷同纯属巧合:P
+
+一个新闻 APP 应该会有以下这些 <ruby>活动<rt>activities</rt></ruby>。
+
+*   语言选择 - 当用户第一次打开软件, 他必须至少选择一种语言。选择后，选项保存在共享偏好中，用户跳转到新闻列表 activity。
+*   新闻列表 - 当用户来到新闻列表 activity，将发送一个包含语言参数的请求到服务器，并将服务器返回的内容显示在 recycler view 上（包含有新闻列表的 id _news_list_）。 如果共享偏好中未存语言参数，或者服务器没有返回一个成功消息, 就会弹出一个错误对话框并且 recycler view 将不可见。如果用户只选择了一种语言，新闻列表 activity 有个 “Change your Language” 的按钮,或者如果用户选择多种语言，则按钮为 “Change your Languages” 。 ( 我对天发誓这是一个虚构的 APP 软件)
+*   新闻细节 - 如同名字所述, 当用户点选新闻列表项时将启动这个 activity。
+
+这个 APP 功能已经足够,，让我们深入研究下为新闻列表 activity 编写的测试用例。 这是我第一次写的代码。
+
+```
+/*
+    Click on the first news item.
+    It should open NewsDetailActivity
+     */
+    @Test
+    public void testClickOnAnyNewsItem() {
+        onView(allOf(withId(R.id.news_list), isDisplayed())).perform(RecyclerViewActions
+                .actionOnItemAtPosition(1, click()));
+        intended(hasComponent(NewsDetailsActivity.class.getName()));
+    }
+
+
+  /**
+   * To test the correct text on the button
+   */
+  @Test
+  public void testChangeLanguageFeature() {
+    int count = UserPreferenceUtil.getSelectedLanguagesCount();
+    if (count == 1) {
+      onView(withText("Choose your Language")).check(matches(isDisplayed()));
+    } else if (count > 1) {
+      onView(withText("Choose your Languages")).check(matches(isDisplayed()));
+    }
+ ?}
+```
+
+#### 仔细想想测试什么。
+
+在第一个测试用例 _testClickOnAnyNewsItem()_， 如果服务器没有返回成功信息，测试用例将会返回失败，因为 recycler view 是不可见的。但是这个测试用例的目的并非如此。 **不管该用例为 PASS 还是 FAIL，它的最低要求是 recycler view 总是可见的,** 如果因某种原因，recycler view 不可见，那么测试用例不应视为 FAILED。正确的测试代码应该像下面这个样子。
+
+```
+ /*
+  Click on any news item.
+  It should open NewsDetailActivity
+   */
+  @Test
+  public void testClickOnAnyNewsItem() {
+    try {
+            /*To test this case, we need to have recyclerView present. If we don't have the
+            recyclerview present either due to the presence of error_screen, then we should consider
+            this test case successful. The test case should be unsuccesful only when we click on a
+            news item and it doesn't open NewsDetail activity
+            */
+      ViewInteraction viewInteraction = onView(withId(R.id.news_list));
+      viewInteraction.check(matches(isDisplayed()));
+    } catch (NoMatchingViewException e) {
+      return;
+    } catch (AssertionFailedError e) {
+      return;
+    }
+    //在这里我们确信，news_list的 recyclerview 对用户是可见的。
+    onView(allOf(withId(R.id.news_list), isDisplayed())).perform(RecyclerViewActions
+        .actionOnItemAtPosition(1, click()));
+    intended(hasComponent(NewsDetailsActivity.class.getName()));
+  }
+}
+
+```
+#### 一个测试用例本身应该是完整的
+
+当我开始测试, 我通常按如下顺序测试 activities:
+
+*   语音选择
+
+*   新闻列表
+
+*   新闻细节
+
+因为我首先测试语音选择 activity，在测试 NewsList activity 之前，总有一种语音已经是选择好了的。但是当我先测试新闻列表 activity 时，测试用例开始返回错误信息。原因很简单 - 没有选择语言，recycler view 不会显示。**注意, 测试用例的执行顺序不能影响测试结果。** 因此在运行测试用例之前, 语言选项必须是保存在共享偏好中的。在本例中，测试用例独立于语言选择 activity 的测试。
+
+```
+@Rule
+  public ActivityTestRule activityTestRule =
+      new ActivityTestRule(TopicsActivity.class, false, false);
+  
+  /*
+  Click on any news item.
+  It should open NewsDetailActivity
+   */
+  @Test
+  public void testClickOnAnyNewsItem() {
+    UserPreferenceUtil.saveUserPrimaryLanguage("english");
+    Intent intent = new Intent();
+    activityTestRule.launchActivity(intent);
+    try {
+      ViewInteraction viewInteraction = onView(withId(R.id.news_list));
+      viewInteraction.check(matches(isDisplayed()));
+    } catch (NoMatchingViewException e) {
+      return;
+    } catch (AssertionFailedError e) {
+      return;
+    }
+    onView(allOf(withId(R.id.news_list), isDisplayed())).perform(RecyclerViewActions
+        .actionOnItemAtPosition(1, click()));
+    intended(hasComponent(NewsDetailsActivity.class.getName()));
+ ?}
+```
+#### 在测试用例中避免使用条件代码。
+
+现在在第二个测试用例 _testChangeLanguageFeature()_中，我们获取到用户选择语言的个数, 基于这个数目，我们写了 if-else 条件来进行测试。 但是 if-else 条件应该写在你的代码当中，而不是测试代码里。每一个条件应该单独测试。 因此, 在本例中, 不是只写一条测试用例，而是要写如下两个测试用例。
+
+```
+/**
+   * To test the correct text on the button when only one language is selected.
+   */
+  @Test
+  public void testChangeLanguageFeatureForSingeLanguage() {
+    //Other initializations
+    UserPreferenceUtil.saveSelectedLanguagesCount(1);
+    Intent intent = new Intent();
+    activityTestRule.launchActivity(intent);
+      onView(withText("Choose your Language")).check(matches(isDisplayed()));
+  }
+
+  /**
+   * To test the correct text on the button when more than one language is selected.
+   */
+  @Test
+  public void testChangeLanguageFeatureForMultipleLanguages() {
+    //Other initializations
+    UserPreferenceUtil.saveSelectedLanguagesCount(5); //Write anything greater than 1.
+    Intent intent = new Intent();
+    activityTestRule.launchActivity(intent);
+    onView(withText("Choose your Languages")).check(matches(isDisplayed()));
+  }
+
+```
+#### 测试用例应该独立于外部因素
+
+在大多数应用中，我们与外部网络或者数据库进行交互。一个测试用例运行时可以向服务器发送一个请求，并获取成功或失败的返回信息。但是不能因从服务器获取到失败信息，就认为测试用例没有通过。这样想这个问题 - 如果测试用例失败，然后我们修改客户端代码，以便测试用例通过。 但是在本例中, 我们要在客户端进行任何更改吗？- **NO**。
+
+但是你应该也无法完全避免要测试网络请求和响应。由于服务器是一个外部代理，我们可以设想一个场景，发送一些可能导致程序崩溃的错误响应。因此, 你写的测试用例应该覆盖所有可能来自服务器的响应，甚至包括服务器决不会发出的响应。这样可以覆盖所有代码，并能保证应用可以处理所有响应，而不会崩溃。
+
+
+> 正确的编写测试用例与编写这些测试代码同等重要。
+
+感谢你阅读此文章。希望对测试用例写的更好有所帮助。你可以在 [LinkedIn][1] 上联系我。还可以[在这里][2]阅读我的其他文章。
+
+获取更多资讯请关注_[Mindorks][3]_, 我们发新文章时您将获得通知。
+
+--------------------------------------------------------------------------------
+
+via: https://blog.mindorks.com/the-dos-and-don-ts-of-writing-test-cases-in-android-70f1b5dab3e1#.lfilq9k5e
+
+作者：[Anshul Jain][a]
+译者：[kokialoves](https://github.com/kokialoves)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://blog.mindorks.com/@anshuljain?source=post_header_lockup
+[1]:http://www.linkedin.com/in/anshul-jain-b7082573
+[2]:https://medium.com/@anshuljain
+[3]:https://blog.mindorks.com/
diff --git a/translated/tech/20161229 5 Most Promising New Linux Distributions to Look Forward in 2017.md b/translated/tech/20161229 5 Most Promising New Linux Distributions to Look Forward in 2017.md
new file mode 100644
index 0000000000..dd9dede486
--- /dev/null
+++ b/translated/tech/20161229 5 Most Promising New Linux Distributions to Look Forward in 2017.md	
@@ -0,0 +1,121 @@
+2017 年最值得期待的 5 个新 Linux 发行版
+============================================================
+
+如果你经常光顾 [Distrowatch][1] 网站，你会发现每一年的 Linux 系统流行度排行榜几乎都没啥变化。
+
+排在前十名的一直都是那几个发行版，其它一些发行版也许现在还在排行榜中，到下一年年底就有可能不在了。
+
+关于 Distrowatch 的一个大家很不了解的功能叫做[候选列表][2]，它包括以下类型的发行版：
+
+- 还未进行评审
+- 组件缺失或有缺陷
+- 相关的英文资料不够丰富
+- 该项目好像都没人进行维护
+
+其它一些非常具有潜力，但是还未被评审的 Linux 系统发行版也是值得大家去关注的。注意，由于 Distrowatch 网站暂时没时间或人力去评审这些新的发行版，因此它们可能永远无法进入网站首页排名。
+
+因此，我们将会跟大家分享下 **2017** 年最具潜力的 **5** 个新的 Linux 发行版系统，并且会对它们做一些简单的介绍。
+
+由于 Linux 系统的生态圈都非常活跃，你可以期待着这篇文章后续的不断更新，或许在下一年中它将完全大变样了。
+
+尽管如此，咱们还是来看下这些新系统吧！
+
+### 1\. SemicodeOS 操作系统
+
+[SemicodeOS 操作系统][3] 是一个专为程序员和 Web 开发人员设计的 Linux 发行版。它包括所有的开箱即用的代码编译器，[各种文本编辑器][4]，[最流行的编程语言的 IDE 环境][5]，以及团队协作编程工具。
+
+即使你不是程序员或者开发人员，但是期望成为他们中的一员，SemicodeOS 系统自带的 Scratch IDE 工具可以在你起步时给以指引。尽管该系统还处于测试阶段，但是我相信这个基于 Sudan 的 Linux 发行版在接下来的一年中将会让 Linux 开源社区变得更加丰富多彩。
+
+你可以通过其官网了解更多的详细信息。
+
+[
+ ![Semicode Linux Distro](http://www.tecmint.com/wp-content/uploads/2016/12/Semicode-Linux-Distro.png) 
+][6]
+
+*Semicode Linux 操作系统*
+
+### 2\. EnchantmentOS 操作系统
+
+[EnchantmentOS][7] 操作系统是一个基于 Xubuntu 16.04 的发行版，它包括一些经过特别挑选的对内存要求较低的应用程序。这无论对新老设备来说都是一个不错的选择。
+
+它同样遵循 Xubuntu 系统的长期支持周期，并且旨在提供可靠和安全的 Linux 应用软件。除此这外，即便是对非技术人员，其内置的应用程序也都非常地简单易用。
+
+还有， EnchantmentOS 系统即使从 USB 存储设备启动时也表现出超强的性能，这一点是其创建者引以为豪的。
+
+[
+ ![EnchantmentOS](http://www.tecmint.com/wp-content/uploads/2016/12/EnchantmentOS.jpg) 
+][8]
+
+*EnchantmentOS 操作系统*
+
+### 3\. Escuelas Linux 操作系统
+
+[Escuelas Linux 操作系统][9]（在西班牙语中是 ”Linux 学校“ 的意思）是一个基于 Bodhi 的 Linux 发行版，它主要是为中小学教育而设计的，它包括各种各样的与教育相关的应用软件。请忽略其西班牙语名字，它也提供全英语支持。
+
+Escuelas Linux 系统其它方面的特性就是它使用的是轻量级桌面环境，低内存和低存储空间要求。其官网宣称，该系统只需要 300 MB 的内存和 20 GB 的硬盘存储空间就可以完美运行。
+
+[
+ ![Escuelas Linux](http://www.tecmint.com/wp-content/uploads/2016/12/escuelaslinux.png) 
+][10]
+
+*Escuelas Linux 操作系统*
+
+### 4\. OviOS 操作系统
+
+与前面几个 Linux 发行版截然不同的是，[OviOS 操作系统][11] 并不是一个多用途的操作系统。相反，它被描述为企业级存储操作系统，虽然它不基于任何发行版，但是完全与 Linux 标准库（LSB）相兼容。
+
+你可以把 OviOS 系统作为一种功能强大的存储设备，它能够处理 iSCSI，NFS，SMB 或者是 FTP 服务，除此之外，最新版的 OviOs 系统还能实现复制及高可用性。因此，你还在等什么呢？赶紧去试用一下吧。
+
+[
+ ![OviOS](http://www.tecmint.com/wp-content/uploads/2016/12/ovios.png) 
+][12]
+
+*OviOS 操作系统*
+
+### 5\. <ruby>开放式网络 Linux 操作系统<rt>Open Network Linux</rt></ruby>
+
+[ONL][13] 操作系统（简称）是一个基于 Debian 的发行版，而且（就像 OviOs 操作系统一样），它也不是一个多用途的操作系统。
+
+如果你是一名网络管理员，你应该为找到这个操作系统而感到庆幸（如果你之前不知道的话），你可以把 ONL 系统应用于裸交换机设备上，替换原有的昂贵且需要授权的操作系统。
+
+值得注意的是， ONL 操作系统因其包含各种各样的开箱即用的软件而出名，并且这些软件都是与面向网络的裸设备相关的。你准备好去尝试了吗？
+
+##### 总结
+
+你应该注意到所有这些发行版在最近几个月内都已经提交给 Distrowatch 网站进行评审了。如果你对其中一些比较感兴趣，可以查看 [候选列表][14] 页面，单击发行版名称旁边的 **推荐** 按钮。你所做的操作将会推动 Distrowatch 网站安排相关人员对该系统进行评审。
+
+像往常一样，如果你对这篇文章有任何问题或建议，请随意提出来。请通过下面的评论区随时与我们进行交流。我们非常期待你的参与！
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/d9d14c5b51331864398e6288cb0c2091?s=128&d=blank&r=g)
+
+Gabriel Cánepa 来自 Argentina ， San Luis ， Villa Mercedes ，他是一名 GNU/Linux 系统管理员和网站开发工程师。目前在一家世界领先的消费品公司工作，在日常工作中，他非常善于使用 FOSS 工具来提高公司在各个领域的生产率。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/new-linux-distributions-2017/
+
+作者：[Gabriel Cánepa][a]
+译者：[rusking](https://github.com/rusking)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/gacanepa/
+[1]:http://distrowatch.com/
+[2]:http://distrowatch.com/dwres.php?resource=links#new
+[3]:http://www.semicodeos.com/
+[4]:http://www.tecmint.com/best-open-source-linux-text-editors/
+[5]:http://www.tecmint.com/best-linux-ide-editors-source-code-editors/
+[6]:http://www.tecmint.com/wp-content/uploads/2016/12/Semicode-Linux-Distro.png
+[7]:http://enchantment.sourceforge.net/
+[8]:http://www.tecmint.com/wp-content/uploads/2016/12/EnchantmentOS.jpg
+[9]:https://escuelaslinux.sourceforge.io/
+[10]:http://www.tecmint.com/wp-content/uploads/2016/12/escuelaslinux.png
+[11]:http://www.ovios.org/
+[12]:http://www.tecmint.com/wp-content/uploads/2016/12/ovios.png
+[13]:http://www.opennetlinux.org/
+[14]:http://distrowatch.com/dwres.php?resource=links#new
diff --git a/translated/tech/20161230 Hot programming trends in 2016.md b/translated/tech/20161230 Hot programming trends in 2016.md
new file mode 100644
index 0000000000..7d58a90134
--- /dev/null
+++ b/translated/tech/20161230 Hot programming trends in 2016.md	
@@ -0,0 +1,82 @@
+2016 年的编程趋势
+============================================================
+
+### 回顾年度最热门的 AI 项目语言、新语言和更多编程趋势。
+
+ ![Top programming trends in 2016](https://opensource.com/sites/default/files/styles/image-full-size/public/u23316/climb-top-bridge-yearbook_red.png?itok=YITYmpoR "Top programming trends in 2016") 
+图片提供： 
+
+[Museum of Photographic Arts][6]. 由 Opensource.com 修改。 CC BY-SA 4.0
+
+技术在不断前进 - 可能不总是向前，但总是在变动。即使对于那些关注趋势及其对程序员的影响的人来说，确切地了解技术的方向也是一个挑战。当我与我的同事，Kelsey Hightower 和 Scott Hanselman，和我们的非常棒的编程委员会，以塑造来年的[OSCON] [7]（O'Reilly 开放源码公约 ），我清楚地看到开源编程趋势总是出现在秋天。我们获得的建议和关注特定主题的数字被证明是开源世界热门趋势的良好指标。以下是我们在 2016 年看到的顶级编程趋势的概述。
+
+### 语言驱动 AI
+
+在 20 世纪 90 年代的人工智能冬季，人工智能随着计算能力的提升再次出现，它一直影响我们如何构建软件。机器学习、深度学习、自然语言处理和汽车语音识别覆盖了世界各地 - 从 GitHub 的项目和工作岗位，到新公司成立背后的原因，以及清除我们杂乱的台面上的空间（嘿，Alexa！）。是的，即使像 OSCON 这样的会议都处处提及 AI。虽然计算能力的可用性已经铺平了道路，所有关于 AI 的开源已经引起了行业广泛开放的创新和竞争。谷歌的 [TensorFlow][8]、[OpenAI][9] 和 [Apache Spark][10]领导的强大框架，但也有较小的球员，如 [Nervana][11] 的 [Neon][12] 和 [Theano][13]。
+
+AI 的兴起如何影响软件开发者的前景？好了，现在是了解 Python 的好时机 - 它的敏捷性和流行性与数据工程师和科学家使它成为最流行的AI编程语言，其次是R、Java和Scala。
+
+### 容器和 Go 的结合就像花生、黄油和果冻
+
+[Go 1.0 发布][14]于 2012 年 3 月。紧接着 [Docker][15] 在一年后发布，[Kubernetes][16] 在另外一年后发布。总之，Go 并不是如我们所知的那样专为基础设施的未来而设计的，但 Go 似乎是为了填充编程世界的一个主要的空洞。对于一个高度联网的世界，一个必须拥有一流并发性的世界而言，Go 是以 Java 或 C++ 永远不会存在的方式专门写的。如果你在做这些事或者类似的事，你应该至少在 Go 世界的尖端，因为它正在发展中，它将会被使用多年，并成为许多程序的骨干。
+
+### Swift 超越了 Apple 的生态系统
+
+Swift 是[ Apple 在 2015 年发布不就之后就开源的][17]。Swift 已经成为 iOS 和 Mac OS X 开发人员的热门话题。这种语言很容易理解因此很快流行起来，并且它比它要取代的语言 - Objective-C 和 C++ 赢得了一个[更安全的声誉][18]。在[ JavaScript 框架][19]和其他新语言的世界中 Swift 的成功如何成功仍有待观察，但如果它继续获得苹果忠实用户的欢迎，Swift 将有机会成为伟大的网络世界中有望成功的竞争者和超越者。
+
+### Java 8 vs 使用 JVM 的函数式语言
+
+Java 8 的函数式能力（即引入 Lambdas ）的出现使得 JVM 语言（如 Scala 和 Clojure）上榜单了。最近，很大程度上由于 Apache Spark 的增长使得 Scala 有一点小爆发。因为长期的和新的开发人员一起都来关注 Java 8 所带来的东西，至少在那一刻，Scala 和 Clojure 似乎被搁置。Java 现在能够解决并发和大数据关心的事，这些其他编程语言专门为满足这些要求已经做了多年。在 2017 年，OSCON 几乎缺乏 Scala 和 Clojure 的提案，不是因为设计，但似乎潜在发言者没有什么兴趣提交提案。
+
+### 新兴语言
+
+和往常一样，世上总是有更多的新兴语言，旨在把事情做得更好，它们可以做到从前的语言出现时没有的需求，或者开始只是疯狂思想，最终改变了我们对编程的看法。今年有五种语言即将进入大时代：Rust、Elixir、Elm、Kotlin和 Perl 6。
+
+这 5 个会给行业带来什么？
+
+* [Rust][1]：兼顾速度和一定安全的系统编程语言。
+* [Elixir][2]：函数式、动态和容错，适用于那些规模越来越大的应用程序。
+* [Elm][3]：更多函数式的乐趣，使用 JavaScript，学习成为一种乐趣。
+* [Kotlin][4]：这一个是为使用 Java 和 JVM 的人设计的语言 - 静态类型、安全，我提到Java兼容？
+* [Perl 6] [5]：它还活着！Perl 6 碰巧是一种新的语言，它胜在富有表现力和功能丰富。
+
+时间会告诉他们是否会如约发布。尝试他们，为他们贡献，成为未来的一部分！
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/_mts0602.jpg?itok=7cSl2h8C)
+
+Rachel Roumeliotis - O'Reilly Media，Inc.的战略内容总监，领导了一个编辑团队，其涵盖各种各样的编程主题，从全栈 web 开发到企业中的开源到新兴的编程语言。她是 OSCON，O'Reilly软件架构会议和 Fluent 的编程主席。 她从事技术出版工作超过10年，获得许多领域的内容，包括移动编程、UX、计算机安全。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/16/12/yearbook-top-programming-trends-2016
+
+作者：[Rachel Roumeliotis][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/rroumeliotis
+[1]:https://www.rust-lang.org/en-US/
+[2]:http://elixir-lang.org/
+[3]:http://elm-lang.org/
+[4]:https://kotlinlang.org/
+[5]:https://perl6.org/
+[6]:https://www.flickr.com/photos/mopa1/5710937421/in/photolist-9GE3Ji-6tCkcs-otWCnW-wkkhM8-tm7Nah-7vwJ3Q-68HXuT-oruzry-7Dnhxt-oeUiuj-otcNUW-oyfLei-i1n1f6-owqxpT-i8RyRi-owbQS4-ovnJwp-otgwsB-qtFP4G-i1yVzD-i9cB9K-i1Db76-8eHe5n-i8VwCo-oupp7X-ouCYj2-i7VHNV-qrLEpj-ou6mGD-otHdws-55Bcba-ba4NaZ-owr9WM-r5rFgN-i1As83-i9e17E-of1nLV-ocbpqf-occJbg-oeZBT4-oujeML-obZjTD-oePhsw-odkejY-5ohHHH-odjBfU-odkSVS-otTy9e-obWKAc-ouXqVQ
+[7]:http://conferences.oreilly.com/oscon/oscon-tx
+[8]:https://www.tensorflow.org/
+[9]:https://openai.com/blog/
+[10]:http://spark.apache.org/
+[11]:https://www.nervanasys.com/
+[12]:https://github.com/NervanaSystems/neon
+[13]:https://github.com/benanne/nervana_theano
+[14]:https://blog.golang.org/go-version-1-is-released
+[15]:https://opensource.com/resources/what-docker
+[16]:https://opensource.com/resources/what-is-kubernetes
+[17]:https://opensource.com/life/15/12/most-likely-succeed-2016
+[18]:http://www.infoworld.com/article/2920333/mobile-development/swift-vs-objective-c-10-reasons-the-future-favors-swift.html
+[19]:https://opensource.com/article/16/11/15-javascript-frameworks-libraries
diff --git a/translated/tech/20170103 4 hot skills for Linux pros in 2017.md b/translated/tech/20170103 4 hot skills for Linux pros in 2017.md
new file mode 100644
index 0000000000..9ffca45289
--- /dev/null
+++ b/translated/tech/20170103 4 hot skills for Linux pros in 2017.md	
@@ -0,0 +1,62 @@
+2017 年 4 个 Linux 热门技能
+============================================================
+
+### 你在新的一年里需要刷哪些技能？
+
+ ![4 hot skills for Linux pros in 2017](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/lightbulb-idea-think-yearbook-lead.png?itok=56ovNk8n "4 hot skills for Linux pros in 2017") 
+
+图片提供：[Internet Archive Book Images][1]。由 Opensource.com 修改。 CC BY-SA 4.0
+
+成为 Linux 专家的一个问题是专家定义在不断变化。当我进入 Linux 世界的时候，要被认为是一个 _Linux 专家_，你需要能够编译自己的内核。天啊，如果你想在笔记本电脑上使用 Linux，即便你只是_用户_，你也必须编译一个自定义内核。 如今编译自己的内核通常是浪费时间。这不是说它并不重要，但在开源世界，我们建立在他人的成功基础之上，而 Linux 发行版为我们提供了运行良好的内核。虽然不总是那么剧烈变化，但对 IT 专业人员的需求每年都在变化。
+
+下面是 2017 年 Linux 专业人员的四个重要技能：
+
+### 1\. 安全
+
+我不是在讨论安全专家或安全顾问。这些职位和服务当然很重要，但是随着连接的设备渗透到我们生活的每一个方面，我们需要在我们做出的每一个决定中有[安全][2]意识。今年，我的妻子和我买了一台洗衣机和一台冰箱，它们都配备了蓝牙。黑客攻入我的漂洗系统的想法可能看起来很傻，但这都是潜在的攻击点。
+
+当激活工作、家庭或我们的口袋中的任何系统时，我们应该考虑它们可能引发的安全问题。而且因为像联网烤面包机这样的物品不太可能及时获得固件升级，我们需要按照平凡的设备可能遭到破坏的思路来设计其余的系统。相比以前任何时候，我们更需要考虑来自防火墙内的攻击。不要让你的文件服务器被你的搅拌器破坏！
+
+### 2\. DevOps
+
+[DevOps][3] 不再是一个新概念。在过去两三年里，我们一直鼓励员工学习 DevOps，以便他们能够在员工队伍中取得成功。这是个好建议，但这并不意味着我们应该完全依赖自动化工具来完成我们的工作。Chef、Puppet、Ansible、Salt Stack 及类似的工具是美好的，但我们需要了解背后发生了什么，所以当发生一些不可避免的错误，我们应该知道如何解决它。
+
+使用 DevOps 的程序方法来计算，我们仍然需要能够维护、修复和理解在代码层下运行的系统的人。没有 Linux 专家，云计算将是一个可怕的地方，即使那个云在你自己的机房里。
+
+### 3\. 开发
+
+作为系统管理员，20 年来，我从来没有时间学习编程。这听起来可能是一个借口，但这是事实。我所有的开发技能就是基本的脚本编写，以帮助我更快工作。不过，那些日子已经结束了。虽然我们需要在 DevOps 世界中拥有系统管理技能，但我们还需要系统管理员拥有编程技能。
+
+如果你是一个像我一样的老练的系统管理员，你可能已经采用 DevOps 并每天使用它。如果你真的想要胜过他人，你需要学习如何以编程方式解决问题，并且不认为 Chef 或 Puppet 代码只是配置文件。 每个 IT 专业人员都需要至少掌握编程概念，因为 DevOps 代码至少在某种程度上抽象了 IT 的每个方面。
+
+### 4\. 软技能
+
+通常，我们在准备职业生涯时所考虑的最后一件事是所谓的 *软技能* - 社交和沟通技巧 - 但是他们可能是最有可能决定你的成功的技能。无论你正在寻找一份新工作，还是试图适应当前职业生涯的变化，软技能是至关重要的。
+
+划分 IT 各个领域的线是交错的，并且良好的沟通能力使得这些模糊的线成为一个优点，而不是绊脚石。我们正生活在一个开发人员围绕着服务器，而运维团队编写 Ruby 代码来维护服务器农场的世界里。这些都是 IT 中的大胆的新思想，如果人们不能在不同部门间很好的沟通，工作场所将迅速有敌对气氛。此外，IT 人员总是需要与其他业务领域的人员进行有效沟通。而且，现在比以往有更大的需求。
+
+
+你计划在 2017 年里添加什么到你的技能中？在评论栏中让我们知道吧。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/Shawn%20Powers%20350%20x%20250%20px_2.jpg?itok=6n0E_-Z2)
+
+Shawn Powers - 自 2009 年起是 CBT Nuggets (www.cbtnuggets.com) 的一名 IT 训练员，专于 Linux、Chef 及为大规模网络集成多个平台。他在 2016 年 12 月发布了一个在线高级 Linux 认证课程（LPIC-2）。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/yearbook-4-hot-skills-linux-pros-2017
+
+作者：[Shawn Powers][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/shawnpowers
+[1]:https://www.flickr.com/photos/internetarchivebookimages/14758810172/in/photolist-oubL5m-ocu2ck-odJwF4-oeq1na-odgZbe-odcugD-w7KHtd-owgcWd-oucGPe-oud585-rgBDNf-obLoQH-oePNvs-osVgEq-othPLM-obHcKo-wQR3KN-oumGqG-odnCyR-owgLg3-x2Zeyq-hMMxbq-oeRzu1-oeY49i-odumMM-xH4oJo-odrT31-oduJr8-odX8B3-obKG8S-of1hTN-ovhHWY-ow7Scj-ovfm7B-ouu1Hj-ods7Sg-qwgw5G-oeYz5D-oeXqFZ-orx8d5-hKPN4Q-ouNKch-our8E1-odvGSH-oweGTn-ouJNQQ-ormX8L-od9XZ1-roZJPJ-ot7Wf4
+[2]:https://opensource.com/tags/security
+[3]:https://opensource.com/tags/devops
diff --git a/translated/tech/20170103 5 things to watch in Go programming in 2017.md b/translated/tech/20170103 5 things to watch in Go programming in 2017.md
new file mode 100644
index 0000000000..fba1fee8d4
--- /dev/null
+++ b/translated/tech/20170103 5 things to watch in Go programming in 2017.md	
@@ -0,0 +1,107 @@
+2017 年 Go 语言编程值得关注的 5 点
+============================================================
+
+### 今年像动态插件，serverless 的 Go 以及 HTTP/2 这些创新对你的开发意味着什么？
+
+Go 1.8 将于下个月发布，它将有几个新功能，包括：
+
+* [HTTP/2 Push] [1]
+* [HTTP 服务器平滑关闭] [2]
+* [插件] [3]
+* [缺省 GOPATH] [4]
+
+这些新功能的影响力取决于你和开发团队如何使用 Go。 自从 Go 1.0 于 2012 年发布以来，其简单性、并发性和内置支持使其保持[普及度][9]不断增长，所以“Go 擅长什么”的答案一直在增长。
+
+这里我会提供一些想法，从即将到来的版本及 Go 世界最近其它吸引我的地方。这不是一个详尽的列表，所以请[让我知道][10]你认为在 2017 年 Go 还会发生哪些重要的事。
+
+### Go 的超级可部署性 + 插件 = 容器、任何东西？
+
+下个月计划发布的 [1.8 版本][11]，我已经与几个人交谈过添加动态插件 - 这是为了加载在编译时不是程序一部分的共享库的代码 - 会如何影响像容器之类的事物。 动态插件使容器中的高并发微服务变得更加简单。 你可以轻松地加载插件作为外部进程，同时具备在容器中微服务的所有好处：保护你的主进程不会崩溃，并且没有任何东西会搞乱你的内存空间。 对插件的动态支持应该是在 Go 中使用容器的福音。
+
+_关于专家现场 Go 培训，请注册_[ _Go Beyond the Basics_][12]_。_
+
+### 跨平台支持仍在吸引开发人员
+
+在 Go 开源之后的 7 年里，它已被全球采用。[Daniel Whitenack][13] 是一名数据科学家和工程师，他为 Jupyter 维护 Go 内核，告诉我最近他[在西伯利亚做数据科学和 Go 语言培训][14]，（是的，在西伯利亚！数据科学和Go - 之后再细讲一下...）并 “很惊讶地看到那里 Go 社区是如此活跃和积极。” 人们将继续采取 Go 用于项目的另一个很大的原因是交叉编译，对此，几个 Go 专家解释说[这在 Go 1.5 版本中更容易了][15]。来自其他语言（如 Python）的开发人员应该发现，在没有 VM 的目标平台上，能够为多个操作系统构建捆绑的、可以部署的应用程序是在 Go 中工作的关键。
+
+在 1.8 版本中对跨平台的支持，再加上[编译时间 15％ 的速度提高][16]，你就可以看到为什么 Go 是初创公司最喜欢的语言。
+
+*有兴趣了解 Go 的基础知识吗？查看 [Go 基础学习路径][17] 让 O’Reilly 专家来带你开始。*
+
+###  Go 解释器在开发中：再见 Read-Eval-Print-Loop
+
+有一些真正的聪明人正在做一个 [Go 解释器][18]，我一定会持续关注它。如你所知的那样，有几个 Read-Eval-Print-Loop（REPL）的解决方案可以用来评估表达式并确保代码按预期工作，但这些方法通常意味着容忍不便的事项，或费力从几个方案中找到一个适合你的案例。有一个健壮、一致的解释器就太好了，一旦我了解到更多，我会告诉你们。
+
+
+*在开发中使用 Go 复杂特性？观看 O'Reilly 的视频训练 [中级 Go ][19]*。
+
+### Go 的 serverless - 会是什么样子？
+
+是的，现在围绕 serverless 架构有很多炒作，也就是功能即服务（FaaS）。但有时候也有些模糊，那么关于 Go 的 serverless 发生了什么？我们能在今年看到一个 Go 语言原生支持的 serverless 服务么？
+
+AWS Lambda 是最知名的 serverless 提供商，但 Google 最近还推出了 [Google Cloud Functions][20]。这两个 FaaS 解决方案使你可以在不管理服务器的情况下运行代码，你的代码存储在别人为你管理的服务器集群上，并且仅在触发事件调用它时运行。AWS Lambda 目前支持 JavaScript、Python 和 Java，还可以启动 Go、Ruby 和 bash 进程。 Google Cloud Functions 只支持 JavaScript，但很可能不久将支持 Java 和 Python。许多物联网设备已经使用 serverless 方案，随着 Go 越来越多地被创业公司采用，serverless 似乎是一个可能的增长点，所以我在关注这些 serverless 解决方案中 Go 的开发情况。
+
+已经有[几个框架][25]可以支持 AWS Lambdas：
+
+* [λGordon][5] - 使用 CloudFormation 创建、连接及部署 AWS Lambdas
+* [Apex][6] - 构建、部署及管理 AWS Lambda 函数
+* [Sparta][7] - AWS Lambda 微服务的 Go 框架
+
+还有一个 AWS Lambda 替代品支持 Go：
+
+* [Iron.io][8]：建立在 Docker 和 Go 之上;语言不可知;支持 Golang、Python、Ruby、PHP 和 .NET
+
+*有关 serverless 架构的更多信息，请观看 Mike Roberts 在旧金山 O'Reilly 软件架构会议上的演讲主题：[_serverless介绍_][22]。*
+
+### 数据科学中的 Go
+
+我在本文开头暗示了这一点：也许令人惊讶的是很多人都在使用 Go 进行数据科学和机器学习。关于它是否适合还有一些争论，但基于像[ Gopher 学院在 2016 年 12月][23]的年度文章那样，你会注意到 30 篇文章中至少有 4 篇是关于机器学习或分布式数据处理，这些都在发生。
+
+我之前关于 Go 的易部署性的观点可能是数据科学家使用 Go 的一个关键原因：他们可以更轻松地在可读以及可用于生产的应用程序中向他人展示数据模型。与此相结合的是 Go 的广泛使用（正如我前面提到的，它正变得越来越流行！），而且有数据专家创建“可用并且与其它程序兼容”的程序。任何使用 Go 构建的应用数据科学家会在公司其他部分使用相同的语言，或者至少非常适合现代架构。
+
+*更多关于 Go 的数据科学，Daniel Whitenack 写了一个很好的概述，解释了如何使用它： [Data Science Gophers][24]。*
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://cdn-images-1.medium.com/fit/c/60/60/1*MFGykrfk6_HjkJzePBtaMw.png)
+
+O'Reilly Media 的监督编辑，与编辑团队合作，涵盖各种各样的编程主题。
+
+--------------------------------------------------------------------------------
+
+via: https://medium.com/@sconant/5-things-to-watch-in-go-programming-in-2017-39cd7a7e58e3#.8t4to5jr1
+
+作者：[Susan Conant][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://medium.com/@sconant?source=footer_card
+[1]:https://beta.golang.org/doc/go1.8#h2push
+[2]:https://beta.golang.org/doc/go1.8#http_shutdown
+[3]:https://beta.golang.org/doc/go1.8#plugin
+[4]:https://beta.golang.org/doc/go1.8#gopath
+[5]:https://github.com/jorgebastida/gordon
+[6]:https://github.com/apex/apex
+[7]:http://gosparta.io/
+[8]:https://www.iron.io/
+[9]:https://github.com/golang/go/wiki/GoUsers
+[10]:https://twitter.com/SuConant
+[11]:https://beta.golang.org/doc/go1.8
+[12]:https://www.safaribooksonline.com/live-training/courses/go-beyond-the-basics/0636920065357/
+[13]:https://www.oreilly.com/people/1ea0c-daniel-whitenack
+[14]:https://devfest.gdg.org.ru/en/
+[15]:https://medium.com/@rakyll/go-1-5-cross-compilation-488092ba44ec#.7s7sxmc4h
+[16]:https://beta.golang.org/doc/go1.8#compiler
+[17]:http://shop.oreilly.com/category/learning-path/go-fundamentals.do
+[18]:https://github.com/go-interpreter
+[19]:http://shop.oreilly.com/product/0636920047513.do
+[20]:https://cloud.google.com/functions/docs/
+[21]:https://github.com/SerifAndSemaphore/go-serverless-list
+[22]:https://www.safaribooksonline.com/library/view/oreilly-software-architecture/9781491976142/video288473.html?utm_source=oreilly&utm_medium=newsite&utm_campaign=5-things-to-watch-in-go-programming-body-text-cta
+[23]:https://blog.gopheracademy.com/series/advent-2016/
+[24]:https://www.oreilly.com/ideas/data-science-gophers
+[25]:https://github.com/SerifAndSemaphore/go-serverless-list
diff --git a/translated/tech/20170104 50 ways to avoid getting hacked in 2017 copy.md b/translated/tech/20170104 50 ways to avoid getting hacked in 2017 copy.md
new file mode 100644
index 0000000000..f0dcdd6251
--- /dev/null
+++ b/translated/tech/20170104 50 ways to avoid getting hacked in 2017 copy.md	
@@ -0,0 +1,194 @@
+2017年系统免遭黑客侵袭的50种方法
+============================================================
+
+### Paul Simon 概括了“与爱人分手的50法”，而这里，我们提供了提高系统安全性的50种方法。
+
+ ![secure your systems](https://opensource.com/sites/default/files/styles/image-full-size/public/images/business/rh_003601_05_mech_osyearbook2016_security_cc.png?itok=VNmpz6K- "secure your systems") 
+
+图片来自： 
+
+Opensource.com
+
+当我还是小孩子，耳畔萦绕着流行歌[与爱人分手的50法][3]（Paul Simon）。当我渐渐地长大，突然受歌的启发，收集了50种方法，免得你——门内汉和门外汉——遭受黑客侵袭啊：
+### "你刚刚从后头溜出去了，杰克"
+
+1\. 备份你的数据。如果你不幸被勒索软件光顾，那么你就不用付出任何代价，因为你做了备份。
+
+2\. 当你需要在公共场所为你的手机充电，那就使用[sysncstop][4]吧，或者你也可以用你的备份电池。
+
+3\. 利用好你的审计子系统，里头有好多很酷的工具可以帮助你监控系统。如果你确实遭到了入侵，那么审计系统也许就可以告诉你发生了什么，以及攻击者做了些什么。
+
+4\. 说到日志，把日志分流到集中式服务器上总是一个不错的想法，因为如果某个黑客侵入你的系统里，他首先要攻击的就是日志系统以便隐藏他的踪迹。构建一个好的入侵检测系统来监控日志，这对于防范黑客也很有帮助。
+
+### "做份新的计划吧，斯坦"
+
+5\. 以强制模式运行 SELinux（见 [stopdisablingselinux.com][5]）。没想到它会花费我这么长时间来达到那个目的？ SELinux 可以防止 0 day 漏洞的升级。当 [Shell Shock][6] 漏洞出现的时候，SELinux是曾唯一的防护手段。
+
+6\. 如果可能，在 [SELinux 沙盒][7]中运行应用程序吧——在容器冷却前，它还是个容器。同时，请遵循 [Flatpack][8] 开发，这个工具很快会开发沙盒功能。
+
+7\. 不要安装或者使用 Flash。Firefox 不再支持它了，同时也希望大多数 web 服务器正在远离它。
+
+8\. 使用 [定义的 SELinux 用户][9]来控制它们在系统中所做的事。如果你正运行着一台共享登陆的系统，设置用户为 **guest_t**。
+
+### "你不必害羞，罗伊"
+
+9\. 利用 [systemd 工具][10]来帮助你提升系统安全。大多数系统攻击是通过监听网络上的服务来实现的，而 Systemd 提供了一些很棒的方法来锁定服务。例如，使用 **[PrivateTmp=yes][1]** 。Privatemp 利用挂载命名空间来为服务器的 **/tmp** 设置一个私有的 **tmpfs** 挂载，这可以阻止被入侵的服务访问到主机 **/tmp** 中的内容，以及潜在的针对基于监听 **/tmp** 的服务的系统其它剩余部分的攻击。 
+
+10. **InaccessibleDirectories=/home** 是一个 systemd 单元的标记，它使用挂载命名空间来从服务视图中消除 **/home**（或者其它任何目录），这会使得被入侵的服务攻击内容更为困难。
+
+11. **ReadOnlyDirectories=/var** 是另外一个 systemd 单元的标记，它使用挂载命名空间来将目录内容变成只读模式。你可能总是应该以**只读模式**运行 **/usr** 。这可以阻止一个被入侵的应用程序重写二进制文件，因为那可以在下次服务重启时，保持服务被入侵状态。
+
+12\. 降低服务权限（**CapabilityBoundingSet=CAP_CHOWN CAP_KILL**）。在内核中，特权服务被分解成一些列不同的权限。大多数服务不需要很多（如果需要），而 systemd 提供了一个简单的开关来降低服务中的这些权限。
+
+13\. 如果服务不使用网络，那么你可以使用 **PrivateNetwork=yes** 来为该服务关闭网络功能。只需在服务的单元文件中开启，就可以享受它带来的好处，关闭服务所有可能访问到的网络。黑客常常并不是真的想入侵你的机器——他只是想用它作为攻击服务器来攻击其它机器。如果服务不连上网络，那么就不会受到攻击。
+
+>控制服务可用的设备
+
+14\. 控制服务可用的设备。 Systemd 提供了 **DeviceAllow** 指针，它控制了服务可用的设备。**DeviceAllow=/dev/null rw** 将访问限制为 **/dev/null**，仅可访问该设备节点，不允许对其它任何设备节点的访问。该功能部署在设备的 cgroup 控制器顶端。
+
+15\. Systemd 系统即将迎来的一个新功能是 **[ProtectSystem Strict][2]**，该功能可以开启所有这些名命名空间以完全锁定服务运行的环境。
+
+### "刚刚重获自由"
+
+16\. 不要使用没有运行着 SELinux（[SEAndroid][11]）强制模式的手机。幸运的是，我听说目前超过 90% 的安卓手机都运行着 SEAndroid 的强制模式，这真让我高兴。现在要是我们能让那些果粉们使用 SELinux 就好了。
+
+>只从受信源安装软件。
+
+17\. 只从受信源安装软件。不要安装你从因特网找来的危险东西，对于你的手机、计算机系统、虚拟机以及容器等等也一样。
+
+18\. 我不会在我的手机上进行网上银行操作——我只在我的 Linux 计算机上做这事儿。如果黑客偷了我的信用卡，也许我就丢了那么 50 美元；而如果他黑进我的银行账户，那我丢的钱就会更多。我想我是个老古板。（滚出我的地盘。）
+
+19\. 我用我手机做的一件很酷的事情，就是设置让我的信用卡公司每次在我的信用卡记账时给我发送文本信息。那样的话，如果账号被盗，我会更快地知道。
+
+>我不会在我的手机上进行网上银行操作——我只在我的 Linux 计算机上做这事儿。
+
+20\. 当你需要安全地通讯，请使用[信号安全信息应用][12].
+
+### "搭个便车，格斯"
+
+21\. 在你的计算机系统上运行 Linux。当我第一次用一台计算机系统连上我父亲的计算机时，我就在他的系统受病毒感染前直接回家了。我回去，给他的系统安了个 Linux，而他从那以后就一直运行着它。我相信 Linux 大体上说是一个更加安全的系统，因为它的设计方式。而且我也相信这个桌面被黑的可能性也相对较小，因为用它的人相对较少。有些人或许要持反对意见了，他们会说 Windows 在过去几年中已经有了很大的改进了，但对于我而言，我仍然坚持己见。
+
+22\. 只运行那些有[安全反应团队][13]进行安全监管的发行版。企业软件及其重要。
+
+23\. 运行一个企业级内核。在容器中，单点故障往往是内核。如果你想要保证它安全，那么就使用一个企业级内核，即便它不是一个最新的版本，但这也意味着包含了最新的安全补丁。记住，最新的内核虽然带来了最新的安全补丁，但是它也带来了大量的新代码，这些代码可能存在漏洞。
+
+### "你不要说太多"
+
+24\. 大多数非法入侵都是通过社会工程学实施的——例如，电子邮件链接，web 浏览器攻击，以及电话。对于此，最好的选择是接受相关教育，并且对一切留个心眼儿。没有哪个来自尼日利亚的家伙会给你钱。美国国税局也不会打电话到你家问你要钱。如果你电子邮件收到了来自你银行的电子邮件，里面包含有到某个网站的链接，那么不要直接去点击那个链接，在 web 浏览器中输入那个地址来打开。
+
+25\. 总是把你的系统打上最新的安全补丁。已知有安全漏洞以及过时的系统的数量十分可怕，脚本小子们依赖于你**不**更新系统。
+
+>总是把你的系统打上最新的安全补丁。
+
+26\. 当连接到网络上的服务时，请始终使用 HTTPS。Chrome 和 Firefox 现在已经开启了强制模式。到 2016 年为止，那些还不支持安全通讯的网站可能就不值得你们访问。
+
+27\. 在你的容器中使用 [seccomp][14]，这会限制针对内核表面的攻击，这只是单点故障。限制什么进程可以会话。
+
+### "就把那钥匙丢下吧，李"
+
+28\. 使用 [YubiKey][15] 来存储私钥。
+
+29\. 加密你系统上的数据。至少对于笔记本而言，应该把**家目录**以及你的其它数据目录加密。几年前，我正乘坐在伦敦的地铁上，我的笔记本就成了某些人的目标——我下了车，车门关上了，而我发现我的笔记本不见了。此时，地铁已经驶出了站台。幸运的是，我把磁盘加密了。
+
+30\. 给你的所有网站用上 [Let's Encrypt][16] 吧，没有任何理由不再运行 HTTPS 了。
+
+31\. 绝不要在不同 web 服务器上使用相同的密码。虽然这个很难不落入陷阱，但是像 Let's Encrypt 这样的工具会有很大帮助。如果你使用 ssh 密钥来登陆进系统，这会更好。
+
+32\. 使用双因素认证（2FA）。密码变得无关紧要，使用 Yubieys 以及诸如此类的工具可以使得双因素认证很方便，我们都有手机。在手机中生成一个密钥，并把秘密藏在你的大脑中，总是比一个密码来得更好。
+
+33\. 网站总要我设置帐号，没有比这更激怒我的事情了——我们就不能做得更好点？对于网站密码，始终都要使用密码生成工具来生成。我是个保守派：我使用 [Password Safe][17] 来生成密码，然后剪切粘贴到 web 浏览器中。我听说，其他人使用 [LastPass][18]，或者其它整合在手机和 web 服务中的工具也用着不错。
+
+34\. 配置像 [FreeIPA][19] 之类的服务，用于身份认证。使用像 [Kerberos][20] 之类的工具来认证和授权，会使得跟踪雇员和他们对系统的访问更为简便（而且它也有很酷的加密服务）。使用活动目录也很不错，或许我有点偏颇。
+
+>如果你经常输入密码，那就使用一个容易记忆的句子，而不是一个单词。
+
+35\. 如果你经常输入密码，那就使用一个容易记忆的句子，而不是一个单词。我所偏好的用于记忆密码的方式，就是使用几个单词长度并且易于输入的词组。
+
+### "让自己自由"
+
+36\. 使用 [USBGuard][21] 来保护你的系统免遭流氓 USB 设备破坏。
+
+37\. 在过去几年中，我一直工作在容器中，让我们来说说容器的安全吧。首先，让它们在开启强制模式的 SELinux 的系统中运行。如果你的系统不支持 SELinux，那就换个支持它的版本吧。SELinux 是使用文件系统来保护容器免遭破坏的最佳工具。
+
+38\. 如果可能，在容器中跑你的服务吧。我相信，使用 [OCI Image Format][22] 和 Linux 容器技术是应用的未来。用 [runC][23]，OCID，RKT，Systemd-nspawn 等等应用来启动这些容器。虽然我常常说“容器并不包容“，但是这些服务确实在容器外运行时要比容器内好。
+
+39\. 在虚拟机中运行容器。虚拟机提供比容器更好的隔离机制，在虚拟机中跑像容器之类的东西，更加灵活有弹性，并且互相隔离。
+
+40\. 在不同的虚拟中，按不同的安全需求跑容器应用。你可以在 DMZ 中的虚拟机上跑 web 服务容器，而在 DMZ 外的虚拟机上跑数据容器。
+
+41\. 同时，记得在不同的物理机上跑需要最高安全性的虚拟机，并且抛在在容器内的不同虚拟机上（这也叫深度防护）。
+
+42\. 以[只读模式][24]跑容器。开发环境中的容器需要能够写入到 **/usr**，但是生产环境中的容器只能写入到 **tmpfs**，并且将卷挂载到容器中。
+
+43\. [降低容器权限][25]。不管是在容器中，还是在容器外，我们都以比它们所需的更多的“权限”跑它们的进程，你可以通过降低权限来让你的进程更加安全。
+
+44\. [不要以 root 身份在容器中跑进程][26]。大多数服务都不需要 root 特权，或者它们需要该权限来绑定到 < 1024 的端口，然后切换到非 root 用户。我会建议你始终以非 root 身份来跑应用。
+
+45\. 给你的容器打上最新的 CVE 补丁。使用像 OpenShift 这样的工具来构建并维护你的容器镜像是个不错的主意，因为它会在新的安全补丁出现时自动重构容器镜像。
+
+46\. 我的一个同事说“Docker 就是用来在你的主机上以 root 身份运行来在因特网的随机代码的。”从一个受信源获取软件，不要随意在 docker.io 上抓取第一个 Apache 应用。[操作系统有重要关系][27]。
+
+47\. 在一台受限的容器化优化的主机上跑生产环境容器，例如在一台[原子主机][28]上，它开启了所有安全特性，为运行中的容器而优化，带有受限的攻击表层和原子更新。有什么不喜欢那儿的吗？
+
+48\. 使用像 [OpenScap][29] 这样的工具来扫描你系统的漏洞。糟糕的是，新的漏洞总是层出不穷，所以你得时刻更新你的扫描器。（也可以看看 [atomic scan][30]，用于扫描你的容器。）
+
+49\. OpenScap 也具有扫描[安全配置][31]的功能，如 STIG（安全技术部署指南）。
+
+50\. 为你孩子收到的所有那些圣诞物联网设备设置一个特别的客户网络。我钟爱我的 Amazon Echo，还有自动化灯以及电源开关（“亚力克沙，打开圣诞灯“），但是所有这些都是由可能存在安全问题的 Linux 操作系统控制。
+
+### "一定还有着另外 50 种免遭黑客侵害的方法"
+
+你会为这个列表添加点什么呢？在下面的评论中告诉我们吧。
+
+_Josh Bressers 对本文作出贡献。_
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/walsh1.jpg?itok=JbZWFm6J)
+
+Daniel J Walsh - Daniel Walsh 已经致力于计算机安全领域将近 30 年。Dan 在 2001 年 8 月份加入 Red Hat。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/17/1/yearbook-50-ways-avoid-getting-hacked
+
+作者：[Daniel J Walsh][a]
+译者：[GOLinux](https://github.com/GOLinux)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/rhatdan
+[1]:http://danwalsh.livejournal.com/51459.html
+[2]:https://www.phoronix.com/scan.php?page=news_item&px=systemd-New-Protect-Tunables
+[3]:https://www.youtube.com/watch?v=0H5chfbcWtY
+[4]:http://syncstop.com/
+[5]:http://stopdisablingselinux.com/
+[6]:http://danwalsh.livejournal.com/71122.html
+[7]:http://danwalsh.livejournal.com/31146.html
+[8]:http://flatpak.org/
+[9]:http://danwalsh.livejournal.com/37404.html
+[10]:http://0pointer.de/blog/projects/security.html
+[11]:https://source.android.com/security/selinux/
+[12]:https://whispersystems.org/
+[13]:https://access.redhat.com/blogs/766093/posts/2695561
+[14]:https://lwn.net/Articles/656307/
+[15]:https://www.yubico.com/
+[16]:https://letsencrypt.org/
+[17]:https://pwsafe.org/
+[18]:https://www.lastpass.com/
+[19]:https://www.freeipa.org/page/Main_Page
+[20]:https://web.mit.edu/kerberos/
+[21]:https://github.com/dkopecek/usbguard
+[22]:https://www.opencontainers.org/
+[23]:https://runc.io/
+[24]:http://www.projectatomic.io/blog/2015/12/making-docker-images-write-only-in-production/
+[25]:http://rhelblog.redhat.com/2016/10/17/secure-your-containers-with-this-one-weird-trick/
+[26]:https://www.projectatomic.io/blog/2016/01/how-to-run-a-more-secure-non-root-user-container/
+[27]:https://opensource.com/16/12/yearbook-why-operating-system-matters
+[28]:https://access.redhat.com/articles/rhel-atomic-getting-started
+[29]:https://www.open-scap.org/
+[30]:https://developers.redhat.com/blog/2016/05/02/introducing-atomic-scan-container-vulnerability-detection/
+[31]:https://www.open-scap.org/security-policies/scap-security-guide/
diff --git a/translated/tech/20170104 How to change the Linux IO scheduler to fit your needs.md b/translated/tech/20170104 How to change the Linux IO scheduler to fit your needs.md
new file mode 100644
index 0000000000..045f93d101
--- /dev/null
+++ b/translated/tech/20170104 How to change the Linux IO scheduler to fit your needs.md	
@@ -0,0 +1,96 @@
+如何更改Linux I/O 调度器来满足你的需求
+============================================================
+
+为了从 Linux 服务器尽可能多地榨取性能，请了解如何更改 I/O 调度器以满足你的需求。
+
+ ![](http://tr1.cbsistatic.com/hub/i/r/2016/05/04/f765c3c7-ee08-4f3a-876a-66137ad4e6df/resize/770x/131c6931386ecf37104e8ada8d01e903/hackershero.jpg) 
+
+
+Linux I/O 调度器控制内核提交读取和写入磁盘的方式。自从 2.6 内核以来，管理员已经能够更改调度器，所以他们可以自定义他们的平台以完全适合他们的需要。
+
+有三个调度器可供选择，每个调度器都有其优点。这些调度器是：
+
+*   **CFQ（cfq）：** 许多 Linux 发行版的默认调度器;它将由进程提交的同步请求放到多个进程队列中，然后为每个队列分配时间片以访问磁盘。
+*   **Noop调度器（noop）：** 基于先入先出（FIFO）队列概念的 Linux 内核最简单的 I/O 调度器。此调度程序最适合于SSD。
+*   **截止时间调度器（deadline）：** 尝试保证请求的开始服务时间。
+
+
+当你想要利用 Linux 驱动的机器来获得最佳性能时，这可能是你所要做的事情之一。幸运的是，更改 I/O 调度器非常简单。让我告诉你怎么做。
+
+### 找出你有的调度器
+
+The first thing you need to do is find out which scheduler is handling I/O on your system. This is done from the command line, and you must know the name of your disk. For simplicity sake, I'll assume the disk is question is sda. With that information in hand, open a terminal window and issue the following command:
+你需要做的第一件事是找出哪个调度器正在处理系统上的 I/O。这是从命令行完成的，你必须知道磁盘的名称。为简单起见，我假设磁盘是 sda。使用该信息，打开终端窗口并输入以下命令：
+
+```
+cat /sys/block/sda/queue/scheduler
+```
+
+该命令的结果将显示当前运行的调度程序（**图 A**）。
+
+**图 A**
+
+ ![Figure A](http://tr3.cbsistatic.com/hub/i/2017/01/03/abba7f22-3252-4b76-91c0-bb15630fd42c/6b4a6d971202b70926b2d991e6c9afe3/schedulera.jpg) 
+
+Elementary OS Loki 运行 noop 调度器。
+
+### 更改你的调度器
+
+你可以通过两种方式更改你的调度器：即时或永久。如果你随时更改调度器，它可以恢复到默认调度器（重启后）。你可能希望首先进行即时更改，以查看哪个调度器能为你的需求带来最佳性能。
+
+说到你要即时改到 noop 调度器。 为此，输入以下命令：
+
+```
+sudo echo noop > /sys/block/hda/queue/scheduler
+```
+
+你可以将 _noop_ 更改为 _cfq_  或 _deadline_。
+
+此更改可以在不重新启动计算机的情况下完成。 一旦更改，I/O 调度器将会切换，（希望）你能看到性能提高（再说一次，根据你的需要而定）。
+
+如果要将调度器更改为永久，则必须在 GRUB 配置文件中执行此操作。 为此，请输入 sudo nano /etc/default/grub，然后修改下面的行：
+
+```
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+```
+
+到
+
+```
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash elevator=noop"
+```
+
+同样，你可以改变 noop 到任何你需要的调度器。如果你用的是即时修改，则不必重新启动以使新调度器生效。
+
+这些就是修改调度器的方法了。
+
+### 做出明智的选择
+
+你应该做研究，找出什么调度器最适合你的特殊情况。要了解每个调度器的更多信息，请查看这些 Wiki 页面：[CFS][7]、[Noop][8]和 [Deadline][9]。
+
+
+--------------------------------------------------------------------------------
+
+via: http://www.techrepublic.com/article/how-to-change-the-linux-io-scheduler-to-fit-your-needs/
+
+作者：[Jack Wallen ][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.techrepublic.com/meet-the-team/us/jack-wallen/
+[1]:http://www.techrepublic.com/article/why-the-earliest-open-source-licenses-are-still-the-most-relevant/
+[2]:http://www.techrepublic.com/article/raspberry-pi-in-2017-new-boards-new-oses-and-more/
+[3]:http://www.techrepublic.com/article/open-source-predictions-for-2017/
+[4]:http://www.techrepublic.com/newsletters/
+[5]:http://www.techrepublic.com/article/how-to-change-the-linux-io-scheduler-to-fit-your-needs/#postComments
+[6]:http://www.techrepublic.com/article/open-source-predictions-for-2017/
+[7]:https://en.wikipedia.org/wiki/Completely_Fair_Scheduler
+[8]:https://en.wikipedia.org/wiki/Noop_scheduler
+[9]:https://en.wikipedia.org/wiki/Deadline_scheduler
+[10]:http://intent.cbsi.com/redir?tag=medc-content-top-leaderboard&siteId=11&rsid=cbsitechrepublicsite&pagetype=article&sl=en&sc=us&topicguid=0aed1ce4-8606-11e2-a661-024c619f5c3d&assetguid=b1120b55-9a41-4a43-b0c6-23f7beb58c5b&assettype=content_article&ftag_cd=LGN3588bd2&devicetype=desktop&viewguid=d21156e0-d86f-11e6-85ae-35117859b3ea&q=&ctype=docids;promo&cval=33159110;7205&ttag=&ursuid=&bhid=&destUrl=http%3A%2F%2Fwww.techrepublic.com%2Fresource-library%2Fwhitepapers%2Fthe-web-developer-bootcamp%2F%3Fpromo%3D7205%26ftag%3DLGN3588bd2%26cval%3Dcontent-top-leaderboard
+[11]:http://intent.cbsi.com/redir?tag=medc-content-top-leaderboard&siteId=11&rsid=cbsitechrepublicsite&pagetype=article&sl=en&sc=us&topicguid=0aed1ce4-8606-11e2-a661-024c619f5c3d&assetguid=b1120b55-9a41-4a43-b0c6-23f7beb58c5b&assettype=content_article&ftag_cd=LGN3588bd2&devicetype=desktop&viewguid=d21156e0-d86f-11e6-85ae-35117859b3ea&q=&ctype=docids;promo&cval=33159110;7205&ttag=&ursuid=&bhid=&destUrl=http%3A%2F%2Fwww.techrepublic.com%2Fresource-library%2Fwhitepapers%2Fthe-web-developer-bootcamp%2F%3Fpromo%3D7205%26ftag%3DLGN3588bd2%26cval%3Dcontent-top-leaderboard
+[12]:http://www.techrepublic.com/rssfeeds/topic/data-centers/
+[13]:http://www.techrepublic.com/meet-the-team/us/jack-wallen/
+[14]:https://twitter.com/intent/user?screen_name=jlwallen
diff --git a/translated/tech/20170104 Speed up your downloads with Axel command line downloader.md b/translated/tech/20170104 Speed up your downloads with Axel command line downloader.md
new file mode 100644
index 0000000000..e50502507c
--- /dev/null
+++ b/translated/tech/20170104 Speed up your downloads with Axel command line downloader.md	
@@ -0,0 +1,329 @@
+使用 Axel 命令行下载器/加速器加速你的下载
+============================================================
+
+[Axel][7] 是一个轻量级下载程序，它和其他加速器一样，为一个文件打开多个连接，每个连接下载单独的文件片段以更快地完成下载。
+
+Axel 支持 HTTP、HTTPS、FTP和 FTPS 协议。它也可以使用多个镜像下载单个文件。所以，Axel 可以加速下载高达 40％（大约，我个人认为）。它非常轻量级，因为它没有依赖并且使用非常少的 CPU 和 RAM。
+
+Axel 使用一个单线程将所有数据直接下载到目标文件。
+
+**注意**：没有选项可以在单条命令中下载两个文件。
+
+你还可以尝试其他命令行下载管理器/加速器。
+
+*   [aria2 - 超快速下载程序] [1]
+*   [wget - 标准命令行下载程序] [2]
+*   [curl - 命令行下载程序] [3]
+*   [Linux 下的最好的 4 个命令行下载管理器/加速器] [4]
+
+大多数发行版（Debian、Ubuntu、Mint、Fedora、suse、openSUSE、Arch Linux、Manjaro、Mageia 等）都有 axel 包，所以我们可以从发行版官方仓库轻松安装。对于 CentOS/RHEL，我们需要启用 [EPEL Repository][5]。
+
+```
+[在 Debian/Ubuntu/LinuxMint 上安装 Axel]
+$ sudo apt-get install axel
+
+[在 RHEL/CentOS 上安装 Axel]
+$ sudo yum install axel
+
+[在 Fedora 上安装 Axel]
+$ sudo dnf install axel
+
+[在 openSUSE 上安装 Axel]
+$ sudo zypper install axel
+
+[在 Mageia 上安装 Axel]
+$ sudo urpmi axel
+
+[在基于 Arch Linux 的发行版安装 Axel]
+$ sudo pacman -S axel
+```
+
+#### 1) 下载单个文件
+
+以下命令将从给定的 URL 下载文件并存储在当前目录中，下载文件时，我们可以看到文件的信息（建立的连接数、下载速度、下载进度、完成下载所花费的时间以及连接完成的时间）。
+
+```
+# axel https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+[  0%]  .......... .......... .......... .......... ..........  [ 146.7KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 267.0KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 373.9KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 406.9KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 487.5KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 572.6KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 650.7KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 649.3KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 718.1KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 769.3KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 838.7KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 866.0KB/s]
+Connection 0 finished
+.
+.
+[ 99%]  .......... .......... .......... .......... ..........  [5721.0KB/s]
+Connection 2 finished
+[ 99%]  .......... .......... .......... .......... ..........  [5733.4KB/s]
+Connection 1 finished
+[ 99%]  .......... .......... .......... .......... ..........  [5745.4KB/s]
+[100%]  .......... .......... .......... .......... ......
+
+Downloaded 21.6 megabytes in 3 seconds. (5755.94 KB/s)
+```
+
+#### 2) 用不同的名称保存文件
+
+要使用其他名称来保存文件，启动下载时可以添加 -o（小写）选项和文件名。这里我们使用文件名 **owncloud.tar.bz2** 来保存文件。
+
+```
+# axel -o cloud.tar.bz2 https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file cloud.tar.bz2
+Starting download
+
+[  0%]  .......... .......... .......... .......... ..........  [ 143.0KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 264.1KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 309.8KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 406.3KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 495.4KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 586.3KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 673.1KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 647.1KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 721.1KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 781.3KB/s]
+Connection 2 finished
+.
+.
+Connection 0 finished
+[ 98%]  .......... .......... .......... .......... ..........  [6221.9KB/s]
+[ 98%]  .......... .......... .....
+Connection 1 finished
+        ,,,,,,,,,, ,,,,,,,,,, ,,,,,..... .......... ..........  [6145.6KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [6159.2KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [6172.0KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [5977.9KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [5989.6KB/s]
+[100%]  .......... .......... .......... .......... ......
+
+Downloaded 21.6 megabytes in 3 seconds. (6001.05 KB/s)
+```
+
+#### 3) 限制下载速度
+
+默认 axel 以字节/秒为单位设置下载文件的最大速度。当我们的网络连接速度较慢时，可以使用此选项。只需添加 `-s` 选项，后面跟字节值。这里我们要限速 `512 KB/s` 下载一个文件。
+
+```
+# axel -s 512000 https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+[  0%]  .......... .......... .......... .......... ..........  [ 141.5KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 266.1KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 308.0KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 405.9KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 496.7KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 526.4KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 507.0KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 505.6KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 504.8KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 503.9KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 503.4KB/s]
+.
+.
+[ 99%]  .......... .......... .......... .......... ..........  [ 497.0KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [ 496.9KB/s]
+[100%]  .......... ..
+Connection 0 finished
+        ,,,,,,,,,, ,,.....
+Connection 1 finished
+Connection 3 finished
+        ,,,,,,,,,, ,,,,,,,... .......... .......... ......
+
+Downloaded 21.6 megabytes in 44 seconds. (494.54 KB/s)
+```
+
+#### 4) 限制连接数
+
+axel 默认建立 4 个连接以从不同的镜像获取文件。此外，我们可以通过使用 `-n` 选项添加更多的连接，后跟连接数 `10` 来提高下载速度。我们为了更安全新添加了八个连接，但不幸的是，它花了更多时间来下载文件。
+
+```
+# axel -n 10 https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+[  0%]  .......... .......... .......... .......... ..........  [ 140.8KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 265.7KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 305.4KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 402.1KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 496.3KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 522.1KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 567.5KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 640.5KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 710.8KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 780.5KB/s]
+.
+.
+[ 98%]  .......... .......... .......... .......... ..........  [7544.9KB/s]
+[ 98%]  .......... .......... .......... .......... ..........  [7557.9KB/s]
+[ 98%]  .......... .......... .......... .......... ..........  [7570.4KB/s]
+[ 98%]  .......... .......... .......... .......... ..........  [7495.3KB/s]
+[ 99%]  .......... .......... .......... .......... ......
+Connection 2 finished
+        ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,....  [7311.6KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [7318.9KB/s]
+[ 99%]  .......... .......... .......... .......... ..........
+Connection 9 finished
+        ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,,  [7331.0KB/s]
+[ 99%]  .......... .......... .......... ..........
+Connection 3 finished
+        ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ..........  [4300.7KB/s]
+[100%]  .......... .......... .......... .......... ......
+
+Downloaded 21.6 megabytes in 5 seconds. (4109.41 KB/s)
+```
+
+#### 5) 恢复未完成的下载
+
+axel 默认具有恢复未完成的下载的行为。Axel 在下载文件时定期更新状态文件（扩展名为 `.st`）。由于某些原因，下载中途停止了？不用担心，只要使用相同的 axel 命令，它将会检查 `file` 和 `file.st`，如果找到，它会从停止处恢复下载。
+
+```
+# axel https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+[  0%]  .......... .......... .......... .......... ..........  [ 140.8KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 265.7KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 305.4KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 402.1KB/s]
+[  0%]  .......... .......... .......... .......... ..........  [ 496.3KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 522.1KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 567.5KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 640.5KB/s]
+[  1%]  .......... .......... .......... .......... ..........  [ 710.8KB/s]
+[  2%]  .......... .......... .......... .......... ..........  [ 780.5KB/s]
+.
+.
+[ 84%]  .......... .......... .......... .......... ..........  [7100.7KB/s]
+[ 84%]  .......... .......... .......... .......... ..........  [7104.3KB/s]
+[ 84%]  .......... .......... .......... .^C
+
+Downloaded 18.3 megabytes in 2 seconds. (7009.79 KB/s)
+```
+
+上面的输出清晰地显示了在下载断开时有两个文件 `owncloud-9.0.0.tar.bz2` 和 `owncloud-9.0.0.tar.bz2.st`。当重新开始下载时，它会从停止处开始下载。
+
+```
+# ls -lh
+total 19M
+-rw------- 1 root root 22M Dec 27 08:33 owncloud-9.0.0.tar.bz2
+-rw------- 1 root root  44 Dec 27 08:33 owncloud-9.0.0.tar.bz2.st
+
+# axel https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+State file found: 19180828 bytes downloaded, 3497380 to go.
+Starting download
+
+        ,,,,,,,,,, ,,,,,,,,,, ,,,,,,,,,, ,......... ..........  [  66.5KB/s]
+[ 84%]  .......... .......... .......... .......... ..........  [ 186.0KB/s]
+[ 85%]  .......... .......... .......... .......... ..........  [ 241.7KB/s]
+[ 85%]  .......... .......... .......... .......... ..........  [ 335.6KB/s]
+[ 85%]  .......... .......... .......... .......... ..........  [ 351.5KB/s]
+[ 85%]  .......... .......... .......... .......... ..........  [ 427.1KB/s]
+[ 85%]  .......... .......... .......... .......... ..........  [ 427.4KB/s]
+[ 86%]  .......... .......... .......... .......... ..........  [ 491.5KB/s]
+.
+.
+[ 98%]  ...
+Connection 0 finished
+        ,,,....... .......... .......... .......... ..........  [2106.6KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [2140.5KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [2172.4KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [2203.2KB/s]
+[ 99%]  .......... .......... .......... .......... ..........  [2236.2KB/s]
+[100%]  .......... .......... .......... .......... ......
+
+Downloaded 3415.4 kilobytes in 1 second. (2264.93 KB/s)
+```
+
+#### 6) 不显示文件下载进度
+
+如果你不想要看到文件的下载进度，只要在 axel 命令中加入 `-q` 选项。
+
+```
+# axel -q https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+```
+
+#### 7) 替换进度条
+
+如果你不喜欢默认的进度条，你可以使用 **-a** 选项来替换进度条。
+
+```
+# axel -a https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+Initializing download: https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+[ 66%] [......0      ...1        ..........2  ...........3] [   5.8MB/s] [00:01]^C
+
+Downloaded 14.3 megabytes in 2 seconds. (5916.11 KB/s)
+```
+
+我们已经了中断上面的下载，以便在下载文件时能清楚地显示替代进度条状态。一旦文件成功下载后，你可以看到相同的输出，如下所示。
+
+```
+# axel -a https://download.owncloud.org/community/owncloud-9.0.0.tar.bz2
+File size: 22678208 bytes
+Opening output file owncloud-9.0.0.tar.bz2
+Starting download
+
+Connection 2 finished                                                          ]
+Connection 1 finished                                                          ]
+Connection 3 finished                                                          ]
+Connection 0 finished                                                          ]
+
+Downloaded 21.6 megabytes in 4 seconds. (5062.32 KB/s)
+```
+
+#### 8) 阅读更多关于 axel
+
+如果你想要了解更多关于 axel 的选项，只需要进入它的手册。
+
+```
+# man axel
+或者
+# axel --help
+```
+
+享受吧。。。)
+
+--------------------------------------------------------------------------------
+
+via: http://www.2daygeek.com/axel-command-line-downloader-accelerator-for-linux/
+
+作者：[ MAGESH MARUTHAMUTHU][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.2daygeek.com/author/magesh/
+[1]:http://www.2daygeek.com/aria2-command-line-download-utility-tool/
+[2]:http://www.2daygeek.com/wget-command-line-download-utility-tool/
+[3]:http://www.2daygeek.com/aria2-command-line-download-utility-tool/
+[4]:http://www.2daygeek.com/best-4-command-line-download-managers-accelerators-for-linux/
+[5]:http://www.2daygeek.com/install-enable-epel-repository-on-rhel-centos-scientific-linux-oracle-linux/
+[6]:http://www.2daygeek.com/author/magesh/
+[7]:https://axel.alioth.debian.org/
diff --git a/translated/tech/20170105 PhotoRec – Recover Deleted or Lost Files in Linux.md b/translated/tech/20170105 PhotoRec – Recover Deleted or Lost Files in Linux.md
new file mode 100644
index 0000000000..7de8a86bb4
--- /dev/null
+++ b/translated/tech/20170105 PhotoRec – Recover Deleted or Lost Files in Linux.md	
@@ -0,0 +1,176 @@
+在 Linux 系统下使用 PhotoRec 工具来恢复已删除或丢失的文件
+============================================================
+
+当你在系统中有意或无意地使用 'shift + delete‘ 组合键或者删除选项或是清空回收站的方式来删除一个文件时，该文件的内容并没有从硬盘（或是其它存储设备）上直接销毁。
+
+它仅仅是从系统的目录结构中被移除，然后你在删除文件的目录下就看不到该文件了，但是这个文件仍然存在你磁盘中的某个位置上。
+
+如果你有一个合适的工具和相关的专业知识，你就可以[从电脑中恢复已丢失的文件][1]。然而，随着你存储的文件越来越多，删除的文件将会被覆盖，你可能只能恢复最近删除的文件了。
+
+在这篇文章中，我们将阐明如何在 Linux 系统中使用 **Testdisk** 来恢复硬盘上已删除或丢失的文件，它是非常优秀的修复工具，随一款免费的叫做 **PhotoRec** 的工具发布。
+
+**PhoteRec** 工具用于从存储介质比如硬盘，数码相机和 cdrom 设备中恢复丢失的文件。
+
+### 在 Linux 系统中安装 TestDisk（PhotoRec）
+
+在系统中执行以下相关的命令来安装 **TestDisk**：
+
+```
+------- On Debian/Ubuntu/Linux Mint ------- 
+$ sudo apt-get install testdisk
+------- On CentOS/RHEL/Fedora ------- 
+$ sudo yum install testdisk
+------- On Fedora 22+ ------- 
+$ sudo dnf install testdisk   
+------- On Arch Linux ------- 
+$ pacman -S testdisk             
+------- On Gentoo ------- 
+$ emerge testdisk  
+```
+
+如果你的 Linux 系统仓库中没有这个安装包，可以从 [这里][2] 下载然后在 Live CD 中运行即可。
+
+这个安装包也可以在应急修复 CD 工具中找到，比如 Gparted LiveCD 、 Parted Magic 、 Ubuntu Boot CD 、 Ubuntu-Rescue-Remix 及其它工具等。
+
+安装完成之后，使用 root 账号权限打开文本窗口，启动 **PhotoRec**，并指定已删除文件的分区：
+
+```
+$ sudo photorec /dev/sda3
+```
+
+你将会看到下面的交互界面：
+
+[
+ ![PhotoRec Data Recovery Tool for Linux](http://www.tecmint.com/wp-content/uploads/2017/01/PhotoRec-Data-Recovery-Tool.png) 
+][3]
+
+*Linux 系统 PhotoRec 数据恢复工具*
+
+使用左右箭头选择菜单选项，按 Enter 键确认。要继续恢复操作，选择 `[Proceed]` 并单击 Enter。
+
+你将看到下面的界面：
+
+[
+ ![Select Partition to Proceed File Recovery](http://www.tecmint.com/wp-content/uploads/2017/01/Select-Partition-to-Proceed-File-Recovery.png) 
+][4]
+
+*选择分区进行文件恢复*
+
+ 选择 `[Options]` 来查看可用的恢复选项，如下图所示：
+
+[
+ ![Linux File Recovery Options](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-File-Recovery-Options.png) 
+][5]
+
+*Linux  系统文件恢复选项*
+
+按 `Q`  返回，在下图界面，你可以指定你想要查询并恢复的文件扩展名。因此，选择 `[File Opt]`，按 Enter 键确认。
+
+按 `s` 禁用或启用所有文件扩展名，如果你已经停止所有文件扩展，只需要使用向右箭头选择你想要恢复的文件类型即可（或者按向左箭头取消选择）。
+
+例如，我想恢复所有系统中丢失的 `.mov` 类型的文件：
+
+[
+ ![Specify Recovery File Type](http://www.tecmint.com/wp-content/uploads/2017/01/Specify-Recovery-File-Type.png) 
+][6]
+
+*指定恢复文件类型*
+
+按 `b` 键保存设置，之后你应该看到如下图所示信息。单击 Enter 键返回（或者按 `Q` 键），再按 `Q` 键返回到主界面。
+
+[
+ ![Save File Recovery Settings](http://www.tecmint.com/wp-content/uploads/2017/01/Save-File-Recovery-Settings.png) 
+][7]
+
+*保存文件恢复设置*
+
+现在选择 `[Search]` 开始文件恢复。在下图中，选择存储文件分区的文件系统类型，然后按 Enter 键。
+
+[
+ ![Select Filesystem to Recover Deleted Files](http://www.tecmint.com/wp-content/uploads/2017/01/Select-Filesystem-to-Recover-Files.png) 
+][8]
+
+*选择文件系统类型来恢复删除的文件*
+
+下一步，如下图所示，选择是仅对空闲空间还是整个分区进行分析。注意选择整个分区将会让操作过程变得更长更慢。选择合适的选项后，按 Enter 键继续。
+
+[
+ ![Choose Filesystem to Analyze](http://www.tecmint.com/wp-content/uploads/2017/01/Select-Filesystem-to-Analyze.png) 
+][9]
+
+*选择文件系统进行分析*
+
+选择一个目录用于存储将要恢复的文件，选择完成之后，按 `C` 键继续。选择不同分区的目录，以避免当更多的文件存储在这个分区时覆盖掉已删除的文件。
+
+按向左箭头返回到根分区下。
+
+[
+ ![Select Directory to Save Recovered Files](http://www.tecmint.com/wp-content/uploads/2017/01/Select-Directory-to-Save-Recovered-Files.png) 
+][10]
+
+*选择要保存恢复文件的目录*
+
+下图显示正在被恢复的指定类型的已删除文件。你可以按 Enter 键来停止操作。
+
+**注意**：在恢复的过程中，你的系统会变得很慢，很可能会卡住一段时间，请耐心等待直至恢复完成。
+
+[
+ ![Recovering Deleted Files in Linux](http://www.tecmint.com/wp-content/uploads/2017/01/Recover-Deleted-Files-in-Linux.png) 
+][11]
+
+*在 Linux 系统中恢复已删除的文件*
+
+最后， **Photorec** 工具将会显示出已恢复文件的数量及保存的路径。
+
+[
+ ![Linux File Recovery Summary](http://www.tecmint.com/wp-content/uploads/2017/01/Linux-File-Recovery-Summary.png) 
+][12]
+
+*Linux 文件恢复情况汇总*
+
+默认情况下，已恢复的文件将会以 root 账号权限保存，因此，你需要以提升权限的方式打开文件管理器来访问这些文件。
+
+使用如下命令（指定你的文件管理器）：
+
+```
+$ gksudo nemo
+or
+$ gksudo nautilus 
+```
+
+想了解更多的信息，访问 PhotoRec 官网： [http://www.cgsecurity.org/wiki/PhotoRec][13]。
+
+到此为止吧！在这篇文章中，我们阐明了使用 PhotoRec 工具来恢复磁盘中已删除或丢失文件每一个步骤。这是目前为止我使用过的最可靠和有效的恢复工具，如果你知道还有其它相似的工具，请在评论中跟大家分享。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+Aaron Kili 是一个 Linux 系统及 F.O.S.S 爱好者，即将成为一名系统管理员及 Web 开发人员，他现在是 TecMint 网站的内容创建者，他喜欢使用电脑来工作，并且他坚信分享知识是一种美德。
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/photorec-recover-deleted-lost-files-in-linux/
+
+作者：[Aaron Kili][a]
+译者：[rusking](https://github.com/rusking)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/recover-deleted-file-in-linux/
+[2]:http://www.cgsecurity.org/wiki/TestDisk_Download
+[3]:http://www.tecmint.com/wp-content/uploads/2017/01/PhotoRec-Data-Recovery-Tool.png
+[4]:http://www.tecmint.com/wp-content/uploads/2017/01/Select-Partition-to-Proceed-File-Recovery.png
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-File-Recovery-Options.png
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/Specify-Recovery-File-Type.png
+[7]:http://www.tecmint.com/wp-content/uploads/2017/01/Save-File-Recovery-Settings.png
+[8]:http://www.tecmint.com/wp-content/uploads/2017/01/Select-Filesystem-to-Recover-Files.png
+[9]:http://www.tecmint.com/wp-content/uploads/2017/01/Select-Filesystem-to-Analyze.png
+[10]:http://www.tecmint.com/wp-content/uploads/2017/01/Select-Directory-to-Save-Recovered-Files.png
+[11]:http://www.tecmint.com/wp-content/uploads/2017/01/Recover-Deleted-Files-in-Linux.png
+[12]:http://www.tecmint.com/wp-content/uploads/2017/01/Linux-File-Recovery-Summary.png
+[13]:http://www.cgsecurity.org/wiki/PhotoRec
diff --git a/translated/tech/20170106 12 Useful Commands For Filtering Text for Effective File Operations in Linux.md b/translated/tech/20170106 12 Useful Commands For Filtering Text for Effective File Operations in Linux.md
new file mode 100644
index 0000000000..262556d5d5
--- /dev/null
+++ b/translated/tech/20170106 12 Useful Commands For Filtering Text for Effective File Operations in Linux.md	
@@ -0,0 +1,378 @@
+为了在 Linux 下更有效的进行文件操作的 12 个有用的过滤文本的命令
+============================================================
+
+在这篇文章中，我们将会复习一些可以作为 Linux 中的过滤器的命令行工具。过滤器是一个程序，它从标准输入读取数据，在数据上执行一个操作，然后把输出结果输出到标准输出。
+
+出于这样的原因，它可以被用于以一种强大的方式处理信息，例如重新结构化输出以生成有用的报告，修改文件里面的文本，和其他的一些系统管理任务。
+
+说到这里，下面是 Linux 上的一些有用的文件或者文本过滤器。
+
+### 1\. Awk 命令
+
+Awk 是一个卓越的模式扫描和处理语言，它可被用于在 Linux 下构造有用的过滤器。你可以通过阅读我们的 [Awk 系列从 1 到 13][7] 来开始使用它。
+
+另外，也可以通过阅读 awk 的 man 手册来获取更多的信息和使用选项。
+
+```
+$ man awk
+```
+
+### 2\. Sed 命令
+
+sed 是一款为了过滤和转换文本的强大的流编辑器。我们已经写了两篇关于 sed 的有用的文章，你可以通过这儿来了解：
+
+1.  [如何使用 GNU ‘sed’ 命令在 Linux 下创建、编辑和处理文件][1]
+2.  [日常 Linux 系统管理员任务使用的 15 个有用的 ‘sed’ 命令小贴士和技巧][2]
+
+sed 的 man 手册已经添加控制选项和说明：
+
+```
+$ man sed
+```
+
+### 3\. Grep、 Egrep、 Fgrep、 Rgrep 命令行
+
+这些过滤器输出匹配指定模式的行。他们从一个文件或者标准输入读取行，并且输出所有匹配的行，默认输出到标准输出。
+
+注意：主要的程序是 [grep][8]，变化只是简单的类似于 [使用特殊的 grep 选项][9]，如下所示（为了向后兼容性，它们依旧被使用）：
+
+```
+$ egrep = grep -E
+$ fgrep = grep -F
+$ rgrep = grep -r  
+```
+
+下面是一些基本的 grep 命令：
+
+```
+tecmint@TecMint ~ $ grep "aaronkilik" /etc/passwd
+aaronkilik:x:1001:1001::/home/aaronkilik:
+tecmint@TecMint ~ $ cat /etc/passwd | grep "aronkilik"
+aaronkilik:x:1001:1001::/home/aaronkilik:
+```
+
+你可以阅读更多的关于 [Linux 下的 grep、 egrep 和 fgrep 的差异？][10]。
+
+### 4\. head 命令
+
+head 被用于显示文件前面的部分，默认情况下它输出前面的 10 行。你可以使用 `-n` 行标志来指定显示的行数：
+
+```
+tecmint@TecMint ~ $ head /var/log/auth.log  
+Jan  2 10:45:01 TecMint CRON[3383]: pam_unix(cron:session): session opened for user root by (uid=0)
+Jan  2 10:45:01 TecMint CRON[3383]: pam_unix(cron:session): session closed for user root
+Jan  2 10:51:34 TecMint sudo:  tecmint : TTY=unknown ; PWD=/home/tecmint ; USER=root ; COMMAND=/usr/lib/linuxmint/mintUpdate/checkAPT.py
+Jan  2 10:51:34 TecMint sudo: pam_unix(sudo:session): session opened for user root by (uid=0)
+Jan  2 10:51:39 TecMint sudo: pam_unix(sudo:session): session closed for user root
+Jan  2 10:55:01 TecMint CRON[4099]: pam_unix(cron:session): session opened for user root by (uid=0)
+Jan  2 10:55:01 TecMint CRON[4099]: pam_unix(cron:session): session closed for user root
+Jan  2 11:05:01 TecMint CRON[4138]: pam_unix(cron:session): session opened for user root by (uid=0)
+Jan  2 11:05:01 TecMint CRON[4138]: pam_unix(cron:session): session closed for user root
+Jan  2 11:09:01 TecMint CRON[4146]: pam_unix(cron:session): session opened for user root by (uid=0)
+tecmint@TecMint ~ $ head  -n 5 /var/log/auth.log  
+Jan  2 10:45:01 TecMint CRON[3383]: pam_unix(cron:session): session opened for user root by (uid=0)
+Jan  2 10:45:01 TecMint CRON[3383]: pam_unix(cron:session): session closed for user root
+Jan  2 10:51:34 TecMint sudo:  tecmint : TTY=unknown ; PWD=/home/tecmint ; USER=root ; COMMAND=/usr/lib/linuxmint/mintUpdate/checkAPT.py
+Jan  2 10:51:34 TecMint sudo: pam_unix(sudo:session): session opened for user root by (uid=0)
+Jan  2 10:51:39 TecMint sudo: pam_unix(sudo:session): session closed for user root
+```
+
+学习如何 [搭配 tail 和 cat 命令使用 head 命令][11] 以便于在 Linux 下更有效的使用。
+
+### 5\. tail 命令
+
+tail 输出一个文件的后面的部分（默认10行）。使用 `-n` 行选项来指定显示的行数。
+
+下面的命令将会输出指定文件的最后5行：
+
+```
+tecmint@TecMint ~ $ tail -n 5 /var/log/auth.log
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on 0.0.0.0 port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on :: port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Received SIGHUP; restarting.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on 0.0.0.0 port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on :: port 22.
+```
+
+另外，tail 有一个特殊的选项 `-f` ，可以 [实时查看一个文件的变化][12] （尤其是日志文件）。
+
+下面的命令将会使你能够监控指定文件的变化：
+
+```
+tecmint@TecMint ~ $ tail -f /var/log/auth.log
+Jan  6 12:58:01 TecMint sshd[1269]: Server listening on :: port 22.
+Jan  6 12:58:11 TecMint sshd[1269]: Received SIGHUP; restarting.
+Jan  6 12:58:12 TecMint sshd[1269]: Server listening on 0.0.0.0 port 22.
+Jan  6 12:58:12 TecMint sshd[1269]: Server listening on :: port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Received SIGHUP; restarting.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on 0.0.0.0 port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on :: port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Received SIGHUP; restarting.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on 0.0.0.0 port 22.
+Jan  6 13:01:27 TecMint sshd[1269]: Server listening on :: port 22.
+```
+
+通过阅读 tail 的 man 手册，获取使用手册和说明的完整列表：
+
+```
+$ man tail
+```
+
+### 6\. sort 命令
+
+sort 用于文本文件和标准输入的行进行排序。
+
+下面是一个名为 domain.list 的文件的内容： 
+
+```
+tecmint@TecMint ~ $ cat domains.list
+tecmint.com
+tecmint.com
+news.tecmint.com
+news.tecmint.com
+linuxsay.com
+linuxsay.com
+windowsmint.com
+windowsmint.com
+```
+
+你可以像这样运行一个简单的 [sort 命令][13] 来排序文件内容：
+
+```
+tecmint@TecMint ~ $ sort domains.list
+linuxsay.com
+linuxsay.com
+news.tecmint.com
+news.tecmint.com
+tecmint.com
+tecmint.com
+windowsmint.com
+windowsmint.com
+```
+
+你可以通过以下一些关于 sort 命令的有用的文章，以多种方式来使用 sort 命令。
+
+1.  [14 个关于 Linux ‘sort’ 命令的有用的示例 – 第 1 部分][3]
+2.  [7 个有趣的 Linux ‘sort’ 命令示例 – 第 2 部分][4]
+3.  [如何基于修改日期和时间来查找和排序文件][5]
+4.  [http://www.tecmint.com/sort-ls-output-by-last-modified-date-and-time/][6]
+
+### 7\. uniq 命令
+
+uniq 命令用于报告或者忽略重复行，它从标准输入过滤行，并且把结果写到标准输出。
+
+在一个输入流运行 sort 之后，你可以像下面的例子一样删除重复行。
+
+为了显示行出现的数目，使用 `-c` 选项，如果对比的时候包含 `-i` 选项的话将会忽略大小写的差异：
+
+```
+tecmint@TecMint ~ $ cat domains.list
+tecmint.com
+tecmint.com
+news.tecmint.com
+news.tecmint.com
+linuxsay.com
+linuxsay.com
+windowsmint.com
+tecmint@TecMint ~ $ sort domains.list | uniq -c 
+2 linuxsay.com
+2 news.tecmint.com
+2 tecmint.com
+1 windowsmint.com 
+```
+
+通过阅读 uniq 的 man 手册来获取进一步的使用信息和选项：
+
+```
+$ man uniq
+```
+
+### 8\. fmt 命令行
+
+fmt 是一款简单的最优的文本格式化器，它重新格式化指定文件的段落，并且打印结果到标准输出。
+
+以下是从文件 domain-list.txt 提取的内容：
+
+```
+1.tecmint.com 2.news.tecmint.com 3.linuxsay.com 4.windowsmint.com
+```
+
+为了把上面的内容重新格式化成一个标准的清单，运行下面的命令，使用 `-w` 选项是用于定义最大行宽度：
+
+```
+tecmint@TecMint ~ $ cat domain-list.txt 
+1.tecmint.com 2.news.tecmint.com 3.linuxsay.com 4.windowsmint.com
+tecmint@TecMint ~ $ fmt -w 1 domain-list.txt
+1.tecmint.com 
+2.news.tecmint.com 
+3.linuxsay.com 
+4.windowsmint.com
+```
+
+### 9\. pr 命令
+
+pr 命令转换文本文件或者标准输入之后打印出来。例如在 Debian 系统上，你可以像下面这样显示所有的安装包：
+
+```
+$ dpkg -l
+```
+
+为了组织在页面和列中准备打印的列表，发出以下命令。
+
+```
+tecmint@TecMint ~ $ dpkg -l | pr --columns 3 -l 20  
+2017-01-06 13:19                                                  Page 1
+Desired=Unknown/Install ii  adduser		ii  apg
+| Status=Not/Inst/Conf- ii  adwaita-icon-theme	ii  app-install-data
+|/ Err?=(none)/Reinst-r ii  adwaita-icon-theme- ii  apparmor
+||/ Name		ii  alsa-base		ii  apt
++++-=================== ii  alsa-utils		ii  apt-clone
+ii  accountsservice	ii  anacron		ii  apt-transport-https
+ii  acl			ii  apache2		ii  apt-utils
+ii  acpi-support	ii  apache2-bin		ii  apt-xapian-index
+ii  acpid		ii  apache2-data	ii  aptdaemon
+ii  add-apt-key		ii  apache2-utils	ii  aptdaemon-data
+2017-01-06 13:19                                                  Page 2
+ii  aptitude		ii  avahi-daemon	ii  bind9-host
+ii  aptitude-common	ii  avahi-utils		ii  binfmt-support
+ii  apturl		ii  aview		ii  binutils
+ii  apturl-common	ii  banshee		ii  bison
+ii  archdetect-deb	ii  baobab		ii  blt
+ii  aspell		ii  base-files		ii  blueberry
+ii  aspell-en		ii  base-passwd		ii  bluetooth
+ii  at-spi2-core	ii  bash		ii  bluez
+ii  attr		ii  bash-completion	ii  bluez-cups
+ii  avahi-autoipd	ii  bc			ii  bluez-obexd
+.....
+```
+
+使用的标志如下：
+
+1.  `--column` 定义在输出中创建的列数。
+2.  `-l` 指定页面的长度（默认是 66 行）。
+
+### 10\. tr 命令行
+
+这个命令从标准输入转换或者删除字符，然后输出结果到标准输出。
+
+使用 tr 的语法如下：
+
+```
+$ tr options set1 set2
+```
+
+看一下下面的例子，在第一个命令，`set1( [:upper:] )` 代表指定输入字符的大小写（所有的大写字符）。
+
+`set2([:lower:])` 代表期望结果字符的大小写。它和第二个例子做着类似的事情，转义字符 `\n` 表示在新的一行打印输出：
+
+```
+tecmint@TecMint ~ $ echo "WWW.TECMINT.COM" | tr [:upper:] [:lower:]
+www.tecmint.com
+tecmint@TecMint ~ $ echo "news.tecmint.com" | tr [:lower:] [:upper:]
+NEWS.TECMINT.COM
+```
+
+### 11\. more 命令
+
+more 命令是一个有用的文件过滤器，创建基本上用于证书的查看。它在一页中如同格式化之后那样显示文件内容，用户可以通过按 [Enter] 来显示更多的信息。
+
+你可以像这样使用它来显示大文件：
+
+```
+tecmint@TecMint ~ $ dmesg | more
+[    0.000000] Initializing cgroup subsys cpuset
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct
+[    0.000000] Linux version 4.4.0-21-generic (buildd@lgw01-21) (gcc version 5.3.1 20160413 (Ubuntu 5.3.1-14ubuntu2) ) #37-Ubuntu SMP Mon Apr 18 18:33:37 UTC 2016 (Ubuntu 4.4.0-21.37-generic
+4.4.6)
+[    0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-4.4.0-21-generic root=UUID=bb29dda3-bdaa-4b39-86cf-4a6dc9634a1b ro quiet splash vt.handoff=7
+[    0.000000] KERNEL supported cpus:
+[    0.000000]   Intel GenuineIntel
+[    0.000000]   AMD AuthenticAMD
+[    0.000000]   Centaur CentaurHauls
+[    0.000000] x86/fpu: xstate_offset[2]:  576, xstate_sizes[2]:  256
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x01: 'x87 floating point registers'
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x02: 'SSE registers'
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x04: 'AVX registers'
+[    0.000000] x86/fpu: Enabled xstate features 0x7, context size is 832 bytes, using 'standard' format.
+[    0.000000] x86/fpu: Using 'eager' FPU context switches.
+[    0.000000] e820: BIOS-provided physical RAM map:
+[    0.000000] BIOS-e820: [mem 0x0000000000000000-0x000000000009d3ff] usable
+[    0.000000] BIOS-e820: [mem 0x000000000009d400-0x000000000009ffff] reserved
+[    0.000000] BIOS-e820: [mem 0x00000000000e0000-0x00000000000fffff] reserved
+[    0.000000] BIOS-e820: [mem 0x0000000000100000-0x00000000a56affff] usable
+[    0.000000] BIOS-e820: [mem 0x00000000a56b0000-0x00000000a5eaffff] reserved
+[    0.000000] BIOS-e820: [mem 0x00000000a5eb0000-0x00000000aaabefff] usable
+--More--
+```
+
+### 12\. less 命令
+
+less 是和上面的 more 命令相反的一个命令，但是它提供了额外的特性，而且对于大文件，它会更快些。
+
+按照 more 命令相同的方式使用它：
+
+```
+tecmint@TecMint ~ $ dmesg | less
+[    0.000000] Initializing cgroup subsys cpuset
+[    0.000000] Initializing cgroup subsys cpu
+[    0.000000] Initializing cgroup subsys cpuacct
+[    0.000000] Linux version 4.4.0-21-generic (buildd@lgw01-21) (gcc version 5.3.1 20160413 (Ubuntu 5.3.1-14ubuntu2) ) #37-Ubuntu SMP Mon Apr 18 18:33:37 UTC 2016 (Ubuntu 4.4.0-21.37-generic
+4.4.6)
+[    0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-4.4.0-21-generic root=UUID=bb29dda3-bdaa-4b39-86cf-4a6dc9634a1b ro quiet splash vt.handoff=7
+[    0.000000] KERNEL supported cpus:
+[    0.000000]   Intel GenuineIntel
+[    0.000000]   AMD AuthenticAMD
+[    0.000000]   Centaur CentaurHauls
+[    0.000000] x86/fpu: xstate_offset[2]:  576, xstate_sizes[2]:  256
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x01: 'x87 floating point registers'
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x02: 'SSE registers'
+[    0.000000] x86/fpu: Supporting XSAVE feature 0x04: 'AVX registers'
+[    0.000000] x86/fpu: Enabled xstate features 0x7, context size is 832 bytes, using 'standard' format.
+[    0.000000] x86/fpu: Using 'eager' FPU context switches.
+[    0.000000] e820: BIOS-provided physical RAM map:
+[    0.000000] BIOS-e820: [mem 0x0000000000000000-0x000000000009d3ff] usable
+[    0.000000] BIOS-e820: [mem 0x000000000009d400-0x000000000009ffff] reserved
+[    0.000000] BIOS-e820: [mem 0x00000000000e0000-0x00000000000fffff] reserved
+[    0.000000] BIOS-e820: [mem 0x0000000000100000-0x00000000a56affff] usable
+[    0.000000] BIOS-e820: [mem 0x00000000a56b0000-0x00000000a5eaffff] reserved
+[    0.000000] BIOS-e820: [mem 0x00000000a5eb0000-0x00000000aaabefff] usable
+:
+```
+
+学习为什么对于在 Linux 下进行有效的文件浏览， [‘less’ 比 ‘more’ 命令更快][14]。
+
+基本上就这些了，如果你还知道其他本文没有提供的 Linux 下[有用的文本过滤命令行工具][15]，可以在下面的评论部分通知我们。
+
+--------------------------------------------------------------------------------
+
+作者简介：Aaron Kili 是一名 Linux 和 F.O.S.S 爱好者、一名未来的 Linux 系统管理员、web 开发者，并且目前是一名 TecMint 上的内容创造者，他喜欢计算机相关的工作，并且坚信知识的分享。
+
+![](http://1.gravatar.com/avatar/4e444ab611c7b8c7bcb76e58d2e82ae0?s=128&d=blank&r=g)
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/linux-file-operations-commands/
+
+作者：[Aaron Kili][a]
+译者：[yangmingming](https://github.com/yangmingming)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/aaronkili/
+[1]:http://www.tecmint.com/sed-command-to-create-edit-and-manipulate-files-in-linux/
+[2]:http://www.tecmint.com/linux-sed-command-tips-tricks/
+[3]:http://www.tecmint.com/sort-command-linux/
+[4]:http://www.tecmint.com/linux-sort-command-examples/
+[5]:http://www.tecmint.com/find-and-sort-files-modification-date-and-time-in-linux/
+[6]:http://how%20to%20sort%20output%20of%20%E2%80%98ls%E2%80%99%20command%20by%20last%20modified%20date%20and%20time/
+[7]:http://www.tecmint.com/category/awk-command/
+[8]:http://www.tecmint.com/12-practical-examples-of-linux-grep-command/
+[9]:http://www.tecmint.com/linux-grep-commands-character-classes-bracket-expressions/
+[10]:http://www.tecmint.com/difference-between-grep-egrep-and-fgrep-in-linux/
+[11]:http://www.tecmint.com/view-contents-of-file-in-linux/
+[12]:http://www.tecmint.com/fswatch-monitors-files-and-directory-changes-modifications-in-linux/
+[13]:http://www.tecmint.com/sort-command-linux/
+[14]:http://www.tecmint.com/linux-more-command-and-less-command-examples/
+[15]:http://www.tecmint.com/tag/linux-tricks/
diff --git a/translated/tech/20170109 4 open source alternatives to Trello that you can self-host.md b/translated/tech/20170109 4 open source alternatives to Trello that you can self-host.md
new file mode 100644
index 0000000000..148e8f283b
--- /dev/null
+++ b/translated/tech/20170109 4 open source alternatives to Trello that you can self-host.md	
@@ -0,0 +1,86 @@
+4 个开源的你可以自己托管的 Trello 替代品
+============================================================
+
+Trello 是一个可视团队协作平台，最近被 Atlassian 收购了，这里我说的_最近_的意思是今天，2017 年 1 月 9 日，星期一。
+
+我作为 DigitalOcean 社区作者的董事会成员之一一直在使用 Trello ，并在几天前开始使用它来管理一个非营利组织的小团队项目。这是一个很好的软件，任何团队，包括那些并不 geek 的成员，都能舒适地使用它。
+
+如果你喜欢 [Trello][6]，但现在想要一个类似的软件，你可以自己托管，或运行在自己的服务器上，我发现了四个你可以选择的工具。记住，我没有在我自己的服务器上安装其中任何一个，但从我收集的关于它们的信息上来看，我最可能使用的是 Kanboard 和 Restyaboard。
+
+这是因为它们的安装要求是熟悉的。它们的安装过程也比较简单。Restyaboard 似乎有一个更好的UI，所以它可能是我的第一个选项，虽然其中的一个要求（Elasticsearch）让我认为它对服务器的要求将比其他的更多。不管怎样，我会很快发布尝试自己托管 Kanboard 和 Restyaboard 的文章，所以请经常回来看看。
+
+在那之前，我发现 Trello 的前四个选择是：
+
+### Kanboard
+
+除此之外，Kanban 还提供与第三方工具和服务（如Amazon S3 Storage、Hipchat、Jabber、RabbitMQ、Slack等）的集成。Kanboard 可以安装在 Microsoft 操作系统上，但要在免费和开源组件上安装，你需要以下内容：
+
+*   PHP >= 5.3.9
+*   MariaDB/MySQL、Postgres 或者 Sqlite
+*   Apache 或者 Nginx
+*   CentOS 6/7、 Debian 8、 FreeBSD 10 或者 Ubuntu 14.04/16.04
+
+[相关文章：切换到软件负载平衡的五个原因] [7]
+
+从对项目的一个非常粗略的评估，UI 似乎不如本文中提到的其他工具靓丽。 如果改变主意不想自己托管，有一个你可以注册的有管理的或托管的 Kanboard。该项目的 GitHub 页面可在[https://github.com/kanboard/kanboard][8]
+
+ ![kanboard interface](http://linuxbsdos.com/wp-content/uploads/2017/01/kanboard-700x312.png "kanboard interface") 
+
+### Restyaboard
+
+有了靓丽的用户界面和从 Trello 导入数据的能力，Restyaboard 是一个非常有吸引力的 Trello 替代品。安装要求似乎也不大; 你需要以下内容以在你的服务器上安装 Restyaboard：
+
+*   PHP-FPM
+*   Postgres
+*   Nginx
+*   Elasticsearch
+
+即使有这些少数需求，使用脚本将自动在你需要的所有服务器上安装会使安装变得更简单。还有一个 AMI 用于在 Amazon AWS 上安装。对于 Docker 的粉丝，有一个非官方的 Docker 镜像可以用来运行 Restyaboard 容器。我不鼓励使用非官方 Docker 镜像运行 Docker 容器，但如果你想要试试，那会是一个选项。 项目的详细信息的 [GitHub page][9]。
+
+ ![Restyaboard project management software](http://linuxbsdos.com/wp-content/uploads/2017/01/restyaboard-646x460.png "Restyaboard project management software") 
+
+### Taiga
+
+Taiga 部署由三个组件组成 - taiga-back（后端/ api）、taiga-front-dist（前端）、taiga-events - 每个都有自己的要求。一般来说，在你的服务器上安装 Taiga 你需要以下这些：
+
+[相关文章：在带有 UEFI 固件的计算机上双引导 Fedora 25、Windows 10][10] * Python >= 3.4* PostgreSQL >= 9.3* RabbitMQ（可选，只要你不想要异步通知* gcc和开发头文件* Ruby >= 2.1（仅用于编译 sass* NodeJS >= 5.0（使用 npm、gulp和 bower 来下载依赖和编译 coffeescript）
+
+安装要求似乎比其他人多一点，所以如果这是一个问题，有一个托管平台可以免费使用。该托管平台上的额外功能是收费的。有关详细信息，请访问项目的 [GitHub页面][1]。
+
+ ![Taiga project management software](http://linuxbsdos.com/wp-content/uploads/2017/01/Taiga-700x440.jpg "Taiga project management software") 
+
+### Wekan
+
+Wekan 是用 Meteor 构建的，这是一个用于构建 web 应用程序的 JavaScript 框架，托管在 [https://github.com/wekan/wekan][2]。该项目提供了在 Heroku、Sandstorm 和经验证的 Docker 镜像上的一键安装，以便在 Docker 容器上运行它。它也可以安装在 Scalingo、IndieHosters 和 Cloudron，但我找不到部署在其他云托管提供商如 [Vultr][3] 和 [DigitalOcean][4] 上的安装说明。
+
+所以看来，你安装 Wekan 最简单的方式是使用一个支持的云托管平台。
+
+ ![Wekan project management software](http://linuxbsdos.com/wp-content/uploads/2017/01/Wekan-700x363.jpeg "Wekan project management software") 
+
+如我之前承诺的，请稍后回来看看我发布的如何在你的服务器上安装 Kanboard 和 Restyaboard 指南。
+
+### 更新
+
+刚发布这篇文章，我就遇到了[Tuleap][5]。它似乎是非常精美，但只支持 CentOS 6 和 Red Hat 6的生产环境安装。使用 Docker 支持容器化安装，但不推荐用于生产。
+
+--------------------------------------------------------------------------------
+
+via: http://linuxbsdos.com/2017/01/09/4-open-source-alternatives-to-trello-that-you-can-self-host/
+
+作者：[linuxbsdos.com][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://linuxbsdos.com
+[1]:https://github.com/taigaio/
+[2]:https://github.com/wekan/wekan
+[3]:http://www.vultr.com/?ref=6827794
+[4]:https://www.digitalocean.com/?refcode=900fe177d075
+[5]:https://www.tuleap.org/
+[6]:https://trello.com/
+[7]:http://linuxbsdos.com/2016/07/11/five-reasons-to-switch-to-software-for-load-balancing/
+[8]:https://github.com/kanboard/kanboard
+[9]:https://github.com/RestyaPlatform/board
+[10]:http://linuxbsdos.com/2016/12/01/dual-boot-fedora-25-windows-10-on-a-computer-with-uefi-firmware/
diff --git a/translated/tech/20170110 Improve your programming skills with Exercism.md b/translated/tech/20170110 Improve your programming skills with Exercism.md
new file mode 100644
index 0000000000..82a0d619f3
--- /dev/null
+++ b/translated/tech/20170110 Improve your programming skills with Exercism.md	
@@ -0,0 +1,67 @@
+使用 Exercism 提升你的编程技巧
+============================================================
+
+### 这些练习目前已经支持 33 种编程语言了。
+
+ ![Improve your programming skills with Exercism ](https://opensource.com/sites/default/files/styles/image-full-size/public/images/life/code2.png?itok=CVgC8tlK "Improve your programming skills with Exercism ") 
+>图片提供： opensource.com
+
+我们中的很多人有 2017 年的目标，将提高编程能力或学习如何编程放在第一位。虽然我们有许多资源可以访问，但练习独立于特定职业的代码开发的艺术还是需要一些规划。[Exercism.io][1] 就是为此目的而设计的一种资源。
+
+Exercism 是一个 [开源][2] 项目和服务，通过发现和协作，帮助人们提高他们的编程技能。Exercism 提供了几十种不同编程语言的练习。实践者完成每个练习，并获得反馈，从而可以从他们的同行小组的经验中学习。
+
+这里有这么多同行！ Exercism 在 2016 年留下了一些令人印象深刻的统计：
+
+* 有来自201个不同国家的参与者
+* 自 2013 年 6 月以来，29,000 名参与者提交了练习，其中仅在 2016 年就有 15,500 名参加者提交练习
+* 自 2013 年 6 月以来，15,000 名参与者就练习解决方案提供反馈，其中 2016 年有 5,500 人提供反馈
+* 每月 50,000 名访客，每周超过 12,000 名访客
+* 目前练习支持 33 种编程语言，另外 22 种语言在筹备工作中
+
+该项目为所有级别的参与者提供了一系列小小的胜利，使他们能够“即使在低水平也能发展到高度流利”，Exercism 的创始人 [Katrina Owen][3] 这样说到。Exercism  并不旨在教导学员成为一名职业程序员，但它的练习使他们对一种语言及其瑕疵有深刻的了解。这种熟悉性消除了学习者对语言的认知负担（流利），使他们能够专注于更困难的架构和最佳实践（熟练）的问题。
+
+Exercism 通过一系列练习（还有什么？）来做到这一点。程序员下载[命令行客户端][4]，检索第一个练习，添加完成练习的代码，然后提交解决方案。提交解决方案后，程序员可以研究他人的解决方案，并学习到对同一个问题不同的解决方式。更重要的是，每个解决方案都会收到来自其他参与者的反馈。
+
+反馈是 Exercism 的超级力量。鼓励所有参与者不仅接收反馈而且提供反馈。根据 Owen 说的，Exercism 的社区成员提供反馈比完成练习学到更多。她说：“这是一个强大的学习经验，你被迫发表内心感受，并检查你的假设、习惯和偏见”。她还指出，反馈可以有多种形式。
+
+欧文说：“只需进入，观察并问问题”。
+
+那些刚刚接触编程，甚至只是一种特定语言的人，可以通过质疑假设来提供有价值的反馈，同时通过协作和对话来学习。
+
+除了对新语言的 <ruby>“微课”学习<rt>bite-sized learning</rt></ruby> 之外，Exercism 本身还强烈支持和鼓励项目的新贡献者。在 [SitePoint.com][5] 的一篇文章中，欧文强调：“如果你想为开源贡献代码，你所需要的技能水平只要‘够用’即可。” Exercism 不仅鼓励新的贡献者，它还尽可能地帮助新贡献者发布他们项目中的第一个补丁。到目前为止，有近 1000 人是[ Exercism 项目][6]的贡献者。
+
+新贡献者会有大量工作让他们忙碌。 Exercism 目前正在审查[其语言轨道的健康状况][7]，目的是使所有轨道可持续并避免维护者的倦怠。它还在寻求[捐赠][8]和赞助，聘请设计师提高网站的可用性。
+
+Owen 说：“这些改进对于网站的健康以及为了 Exercism 参与者的发展是有必要的，这些变化还鼓励新贡献者加入并简化了加入的途径。” 她说：“如果我们可以重新设计，产品方面将更加可维护。。。当用户体验一团糟，华丽的代码一点用也没有”。该项目有一个非常活跃的[讨论仓库][9]，这里社区成员合作来发现最好的新方法和功能。
+
+那些想关注项目但还没有参与的人可以关注[邮件列表][10]。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](https://opensource.com/sites/default/files/styles/profile_pictures/public/pictures/vmb_helvetica_sm.png?itok=mSb3xriS)
+
+VM（Vicky）Brasseur - VM（也称为 Vicky）是技术人员、项目、流程、产品和 p^Hbusinesses 的经理。在她超过 18 年的科技行业从业中，她曾是分析师、程序员、产品经理、软件工程经理和软件工程总监。 目前，她是 Hewlett Packard Enterprise 上游开源开发团队的高级工程经理。 VM 的博客在 anonymoushash.vmbrasseur.com，tweets 在 @vmbrasseur。
+
+--------------------------------------------------------------------------------
+
+作者：[VM (Vicky) Brasseur][a]
+译者：[geekpi](https://github.com/geekpi)
+校对：[jasminepeng](https://github.com/jasminepeng)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://opensource.com/users/vmbrasseur
+[1]:http://exercism.io/
+[2]:https://github.com/exercism
+[3]:https://twitter.com/kytrinyx
+[4]:http://exercism.io/cli
+[5]:https://www.sitepoint.com/exorcise-your-newbie-demons-by-contributing-to-exercism/
+[6]:https://github.com/exercism
+[7]:http://tinyletter.com/exercism/letters/exercism-track-health-check-new-maintainers
+[8]:http://exercism.io/donate
+[9]:https://github.com/exercism/discussions/issues?page=1&q=is%3Aissue+is%3Aopen
+[10]:http://tinyletter.com/exercism/archive
+
+
diff --git a/translated/tech/20170111 Join an Additional Ubuntu DC to Samba4 AD DC for FailOver Replication – Part 5.md b/translated/tech/20170111 Join an Additional Ubuntu DC to Samba4 AD DC for FailOver Replication – Part 5.md
new file mode 100644
index 0000000000..c5bf081f63
--- /dev/null
+++ b/translated/tech/20170111 Join an Additional Ubuntu DC to Samba4 AD DC for FailOver Replication – Part 5.md	
@@ -0,0 +1,452 @@
+Join an Additional Ubuntu DC to Samba4 AD DC for FailOver Replication – Part 5
+============================================================
+将另一台 Ubuntu DC 服务器加入到 Samba4 AD DC 实现双域控主机模式——（五）
+
+这篇文章将讲解如何使用 Ubuntu 16.04 服务器版系统来创建第二台 Samba4 域控制器，并将其加入到已创建好的 Samba AD DC 林环境中，以便为一些关键的 AD DC 服务提供负载均衡及故障切换功能，尤其是为那些重要的服务，比如 DNS 服务和使用 SAM 数据库的 AD DC LDAP 模式提供这种功能。
+
+#### 需求
+
+1、  [在 Ubuntu16.04 系统上使用 Samba4 软件来创建活动目录架构（一）][1]
+
+这篇文章是 Samba4 AD DC 序列文章中的第五篇，前边几篇如下：
+
+[在 Linux 命令行下管理 Samba4 AD 架构（二）][2]
+[使用 Windows 10 系统的 RSAT 工具来管理 Samba4 活动目录架构 （三）][3]
+[在 Windows 系统下管理 Samba4 AD 域管制器 DNS 和组策略（四）][4]
+
+### 第一步：为设置 Samba4 进行初始化配置
+
+1、在开始把第二个 DC 服务器加入到 Samba4 AD DC 域环境之前，你需要注意一些初始化设置信息，首先，确保这个新系统的主机名符合命名规范要求。
+
+假设第一个域服务器的主机名叫做 ’adc1‘ ，你可以把第二个域服务器命名为 'adc2'，以保持域控制器名称的一致性。
+
+执行下面的命令来修改系统主机名：
+
+```
+# hostnamectl set-hostname adc2
+```
+
+或者你也可以手动编辑 /etc/hostname 文件，在新的一行输入你想设置的主机名。
+
+```
+# nano /etc/hostname
+```
+
+设置主机名。
+
+```
+adc2
+```
+
+2、下一步，打开本地系统解析文件并添加一个条目，包含主域控制器的 IP 地址， FQDN 名称和简写名称。如下图所示：
+
+在这篇教程中，主域控服务器的主机名为 `adc1.tecmint.lan` ，其对应的 IP 地址为 192.168.1.254 。
+
+```
+# nano /etc/hosts
+```
+
+添加如下行：
+
+```
+IP_of_main_DC		FQDN_of_main_DC 	short_name_of_main_DC
+```
+[
+ ![Set Hostname for Samba4 AD DC](http://www.tecmint.com/wp-content/uploads/2017/01/Set-Hostname-for-Samba4-AD-DC.jpg) 
+][5]
+
+为 Samba4 AD DC 服务器设置主机名
+
+3、下一步，打开 /etc/network/interfaces 配置文件并设置一个静态 IP 地址，如下图所示：
+
+注意 dns-nameservers 和 dns-search 这两个参数的值。为了能够正常解析 DNS ，需要把这两个值都设置成主 Samba4 AD DC 服务器的 IP 地址和域名。
+
+重启网卡服务以让修改的配置生效。检查 /etc/resolv.conf 文件确保该网卡上配置的这两个 DNS 的值已更新到这个文件。
+
+```
+# nano /etc/network/interfaces
+```
+
+编辑并替换你自定义的 IP 设置：
+
+```
+auto ens33
+iface ens33 inet static
+address 192.168.1.253
+netmask 255.255.255.0
+brodcast 192.168.1.1
+gateway 192.168.1.1
+dns-nameservers 192.168.1.254
+dns-search tecmint.lan
+```
+
+重启网卡服务并确认生效
+
+```
+# systemctl restart networking.service
+# cat /etc/resolv.conf
+```
+[
+ ![Configure DNS for Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-DNS-for-Samba4-AD.jpg) 
+][6]
+
+配置 Samba4 AD 服务器的 DNS
+
+当你通过简写名称（来自 FQDN 名）查询主机名时， dns-search 值将会自动把域名添加上。
+
+4、为了测试 DNS 解析是否正常，使用 ping 命令加上简写名， FQDN 名和域名进行测试，如下图所示：
+
+在所有 ping 命令的测试过程中，Samba4 AD DC DNS 服务器都应该返回主域控服务器的 IP地址。
+
+[
+ ![Verify DNS Resolution for Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-DNS-Resolution-for-Samba4-AD.png) 
+][7]
+
+验证 Samba4 AD 环境 DNS 解析是否正常
+
+5、最后你需要注意的是确保这个主机跟域控服务器时间同步。你可以通过下面的命令在系统上安装 NTP 客户端工具来实现时间同步功能：
+
+```
+# apt-get install ntpdate
+```
+
+6、假设你想手动强制本地服务器与 samba4 AD DC 服务器时间同步，使用 ntpdate 命令加上主域控服务器的主机名，如下所示：
+
+```
+# ntpdate adc1
+```
+[
+ ![Time Synchronize with Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Time-Synchronize-with-Samba4-AD.png) 
+][8]
+
+与 Samba4 AD 服务器进行时间同步
+
+### 第 2 步：安装 Samba4 必须的依赖包
+
+7、为了让 Ubuntu 16.04 系统加入到你的域中，你需要通过下面的命令从 Ubuntu 官方软件库中安装 Samba4 套件， Kerberos 客户端和其它一些重要的软件包以便将来使用：
+
+```
+# apt-get install samba krb5-user krb5-config winbind libpam-winbind libnss-winbind
+```
+[
+ ![Install Samba4 in Ubuntu](http://www.tecmint.com/wp-content/uploads/2017/01/Install-Samba4-in-Ubuntu.png) 
+][9]
+
+在 Ubuntu 系统中安装 Samba4
+
+8、在安装的过程中，你需要提供 Kerberos 域名。输入大写的域名然后按 [Enter] 键完成安装过程。
+
+[
+ ![Configure Kerberos Authentication for Samba4](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Kerberos-Authentication-for-Samba4.png) 
+][10]
+
+为 Samba4 配置 Kerberos 认证
+
+9、所有依赖包安装完成后，通过使用 kinit 命令请求一个 Kerberos 票据以验证设置是否正确。使用 klist 命令来列出已授权的 kerberos 票据信息。
+
+```
+# kinit domain-admin-user@YOUR_DOMAIN.TLD
+# klist
+```
+[
+ ![Verify Kerberos on Samba4 Domain](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Kerberos-on-Samba4-Domain.png) 
+][11]
+
+在 Samba4 域环境中验证 Kerberos
+
+### 第 3 步：以域控制器的身份加入到 Samba4 AD DC
+
+10、在把你的机器集成到 Samba4 DC 环境之前，先把系统中所有运行着的 Samba4 服务停止，并且重命名默认的 Samba 配置文件。在域控制器配置的过程中， Samba 将会创建一个新的配置文件。
+
+```
+# systemctl stop samba-ad-dc smbd nmbd winbind
+# mv /etc/samba/smb.conf /etc/samba/smb.conf.initial
+```
+
+11、在准备加入域前，先启动 samba-ad-dc 服务，之后使用域管理员账号运行 samba-tool 命令将服务器加入到域。
+
+```
+# samba-tool domain join your_domain -U "your_domain_admin"
+```
+
+加入域过程部分截图:
+
+```
+# samba-tool domain join tecmint.lan DC -U"tecmint_user"
+```
+
+##### Sample Output
+
+```
+Finding a writeable DC for domain 'tecmint.lan'
+Found DC adc1.tecmint.lan
+Password for [WORKGROUP\tecmint_user]:
+workgroup is TECMINT
+realm is tecmint.lan
+checking sAMAccountName
+Deleted CN=ADC2,CN=Computers,DC=tecmint,DC=lan
+Adding CN=ADC2,OU=Domain Controllers,DC=tecmint,DC=lan
+Adding CN=ADC2,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=tecmint,DC=lan
+Adding CN=NTDS Settings,CN=ADC2,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=tecmint,DC=lan
+Adding SPNs to CN=ADC2,OU=Domain Controllers,DC=tecmint,DC=lan
+Setting account password for ADC2$
+Enabling account
+Calling bare provision
+Looking up IPv4 addresses
+Looking up IPv6 addresses
+No IPv6 address will be assigned
+Setting up share.ldb
+Setting up secrets.ldb
+Setting up the registry
+Setting up the privileges database
+Setting up idmap db
+Setting up SAM db
+Setting up sam.ldb partitions and settings
+Setting up sam.ldb rootDSE
+Pre-loading the Samba 4 and AD schema
+A Kerberos configuration suitable for Samba 4 has been generated at /var/lib/samba/private/krb5.conf
+Provision OK for domain DN DC=tecmint,DC=lan
+Starting replication
+Schema-DN[CN=Schema,CN=Configuration,DC=tecmint,DC=lan] objects[402/1550] linked_values[0/0]
+Schema-DN[CN=Schema,CN=Configuration,DC=tecmint,DC=lan] objects[804/1550] linked_values[0/0]
+Schema-DN[CN=Schema,CN=Configuration,DC=tecmint,DC=lan] objects[1206/1550] linked_values[0/0]
+Schema-DN[CN=Schema,CN=Configuration,DC=tecmint,DC=lan] objects[1550/1550] linked_values[0/0]
+Analyze and apply schema objects
+Partition[CN=Configuration,DC=tecmint,DC=lan] objects[402/1614] linked_values[0/0]
+Partition[CN=Configuration,DC=tecmint,DC=lan] objects[804/1614] linked_values[0/0]
+Partition[CN=Configuration,DC=tecmint,DC=lan] objects[1206/1614] linked_values[0/0]
+Partition[CN=Configuration,DC=tecmint,DC=lan] objects[1608/1614] linked_values[0/0]
+Partition[CN=Configuration,DC=tecmint,DC=lan] objects[1614/1614] linked_values[28/0]
+Replicating critical objects from the base DN of the domain
+Partition[DC=tecmint,DC=lan] objects[97/97] linked_values[24/0]
+Partition[DC=tecmint,DC=lan] objects[380/283] linked_values[27/0]
+Done with always replicated NC (base, config, schema)
+Replicating DC=DomainDnsZones,DC=tecmint,DC=lan
+Partition[DC=DomainDnsZones,DC=tecmint,DC=lan] objects[45/45] linked_values[0/0]
+Replicating DC=ForestDnsZones,DC=tecmint,DC=lan
+Partition[DC=ForestDnsZones,DC=tecmint,DC=lan] objects[18/18] linked_values[0/0]
+Committing SAM database
+Sending DsReplicaUpdateRefs for all the replicated partitions
+Setting isSynchronized and dsServiceName
+Setting up secrets database
+Joined domain TECMINT (SID S-1-5-21-715537322-3397311598-55032968) as a DC
+```
+[
+ ![Join Domain to Samba4 AD DC](http://www.tecmint.com/wp-content/uploads/2017/01/Join-Domain-to-Samba4-AD-DC.png) 
+][12]
+
+把域加入到 Samba4 AD DC
+
+12、在已安装了 Samba4 套件的 Ubuntu 系统加入域之后，打开 Samba 主配置文件添加如下行：
+
+```
+# nano /etc/samba/smb.conf
+```
+
+添加以下内容到 smb.conf 配置文件中。
+
+```
+dns forwarder = 192.168.1.1
+idmap_ldb:use rfc2307 = yes
+template shell = /bin/bash
+winbind use default domain = true
+winbind offline logon = false
+winbind nss info = rfc2307
+winbind enum users = yes
+winbind enum groups = yes
+```
+
+使用你自己的 DNS 转发器 IP 地址替换掉上面的 dns forwarder ip 地址。 Samba 将会把域认证区之外的所有 DNS 解析查询转发到这个 IP 地址。
+
+13、最后，重启 samba 服务以使修改的配置生效，然后执行如下命令来检查活动目录复制功能是否正常。
+
+```
+# systemctl restart samba-ad-dc
+# samba-tool drs showrepl
+```
+[
+ ![Configure Samba4 DNS](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Samba4-DNS.png) 
+][13]
+
+配置 Samba4 DNS
+
+14、另外，还需要重命名原来的 kerberos 配置文件，并使用在加入域的过程中 Samba 生成的新配置文件 krb5.conf 替换 /etc 目录下的那个文件。
+
+Samba 生成的新配置文件在 /var/lib/samba/private 目录下。使用 Linux 的符号链接命令对该文件创建一个软链接指向 /etc 目录。
+
+```
+# mv /etc/krb6.conf /etc/krb5.conf.initial
+# ln -s /var/lib/samba/private/krb5.conf /etc/
+# cat /etc/krb5.conf
+```
+[
+ ![Configure Kerberos](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Kerberos.jpg) 
+][14]
+
+配置 Kerberos
+
+15、同样，使用 samba 的 krb5.conf 配置文件验证 Kerberos 认证是否正常。通过以下命令来请求一个管理员账号的票据并且列出已缓存的票据信息。
+
+```
+# kinit administrator
+# klist
+```
+[
+ ![Verify Kerberos Authentication with Samba](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Kerberos-Authentication-with-Samba.jpg) 
+][15]
+
+使用 Samba 验证 Kerberos 认证是否正常
+
+### 第 4 步：验证其它域服务
+
+16、你首先要做的一个测试就是验证 Samba4 DC DNS 解析服务是否正常。要验证域环境中的 DNS 解析情况，使用 host 命令查询域名，或者加上其它一些重要的 AD DNS 记录进行查询，如下图所示：
+
+每一次查询，DNS 服务器都应该返回两个 IP 地址。
+
+```
+# host your_domain.tld
+# host -t SRV _kerberos._udp.your_domain.tld  # UDP Kerberos SRV record
+# host -t SRV _ldap._tcp.your_domain.tld  # TCP LDAP SRV record
+```
+[
+ ![Verify Samba4 DC DNS](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Samba4-DC-DNS.png) 
+][16]
+
+验证 Samba4 DC DNS 
+
+17、这些 DNS 记录也可以从注册过的[已安装了 RSAT 工具的 Windows 机器][17]上查询到。打开 DNS 管理器，展开到你的域 tcp 记录，如下图所示：
+
+[
+ ![Verify DNS Records on Windows RSAT Tool](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-DNS-Records-on-Windows-RSAT-Tool.png) 
+][18]
+
+通过 Windows RSAT 工具来验证 DNS 记录
+
+18、下一个验证是检查域 LDAP 同步是否正常。使用 samba-tool 工具，在第二个域控制器上创建一个主账号，然后检查该账号是否自动同步到第一个 Samba4 AD DC 服务器上。
+
+##### On adc2:
+
+```
+# samba-tool user add test_user
+```
+
+##### On adc1:
+
+```
+# samba-tool user list | grep test_user
+```
+[
+ ![Create User Account on Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Create-User-Account-on-Samba4-AD.jpg) 
+][19]
+
+在 Samba4 AD 服务器上创建主账号
+
+[
+ ![Verify Replication on Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Replication-on-Samba4-AD.jpg) 
+][20]
+
+在 Samba4 AD 服务器上验证同步功能
+
+19、你也可以从 Microsoft AD DC 控制台创建一个账号，然后验证该账号是否都出现在两个域控服务器上。
+
+默认情况下，这个账号都应该在两个 samba 域控制器上自动创建完成。在 'adc1' 服务器上使用 wbinfo 命令查询该账号的名字。
+
+[
+ ![Create Account from Microsoft AD UC](http://www.tecmint.com/wp-content/uploads/2017/01/Create-Account-from-Microsoft-AD-UC.png) 
+][21]
+
+从 Microsoft AD UC 创建账号
+
+[
+ ![Verify Account Replication On Samba4 AD](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Account-Replication-On-Samba4-AD.png) 
+][22]
+
+在 Samba4 AD 服务器上验证账号同步功能
+
+20、实际上，打开 Windows 机器上的 AD DC 控制台，展开到域控制器，你应该看到两个已注册的 DC 服务器。
+
+[
+ ![Verify Samba4 Domain Controllers](http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Samba4-Domain-Controllers.png) 
+][23]
+
+验证 Samba4 域控制器
+
+### 第 5 步：启用 Samba4 AD DC 服务
+
+21、要启用 Samba4 AD DC 的服务 system-wide ，首先你得禁用原来的不需要的 Samba 服务，然后执行如下命令启用 samba-ad-dc 服务：
+
+```
+# systemctl disable smbd nmbd winbind
+# systemctl enable samba-ad-dc
+```
+[
+ ![Enable Samba4 AD DC Services](http://www.tecmint.com/wp-content/uploads/2017/01/Enable-Samba4-AD-DC-Services.png) 
+][24]
+
+启用 Samba4 AD DC 服务
+
+22、如果你从 Microsoft 客户端远程管理 Samba4 域控制器，或者有其它 Linux 或 Windows 机器集成到当前域中，请确保把其它机器网卡的 DNS 地址设置成 'adc2' 服务器的 IP 地址，以实现某种程序上的冗余。
+
+下图显示 Windows 和 Debian/Ubuntu 客户机的网卡配置要求。
+
+[
+ ![Configure Client to Administer Samba4 DC](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Client-to-Administer-Samba4-DC.png) 
+][25]
+
+配置 Windows 客户端来管理 Samba4 DC
+
+[
+ ![Configure Linux Client to Administer Samba4 DC](http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Linux-Client-to-Administer-Samba4-DC.png) 
+][26]
+
+配置 Linux 客户端来管理 Samba4 DC
+
+假设第一台 DC 服务器 192.168.1.254 网络不通，则调整配置文件中 DNS 服务器 IP 地址的顺序，以防止优先查询这台不可用的 DNS 服务器。
+
+最后，如果你想在 Linux 系统上使用 Samba4 活动目录账号来进行本地认证，或者为 AD LDAP 账号授予 root 权限，请查看[在 Linux 命令行下管理 Samba4 AD 架构][27] 这篇教程的 第 2 节和第 3 节。
+
+--------------------------------------------------------------------------------
+
+作者简介：
+
+![](http://1.gravatar.com/avatar/7badddbc53297b2e8ed7011cf45df0c0?s=128&d=blank&r=g)
+
+我叫 Ravi Saive，TecMint 网站博主。一个喜欢在网上分享技术知识及经验的电脑极客和 Linux 系统专家。我的大多数的服务器都运行在 Linux 开源平台上。关注我：Twitter ，Facebook 和 Google+ 。
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/join-additional-ubuntu-dc-to-samba4-ad-dc-failover-replication/
+
+作者：[Ravi Saive][a]
+译者：[rusking](https://github.com/rusking)
+校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:http://www.tecmint.com/author/admin/
+[1]:http://www.tecmint.com/install-samba4-active-directory-ubuntu/
+[2]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/
+[3]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
+[4]:http://www.tecmint.com/manage-samba4-dns-group-policy-from-windows/
+[5]:http://www.tecmint.com/wp-content/uploads/2017/01/Set-Hostname-for-Samba4-AD-DC.jpg
+[6]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-DNS-for-Samba4-AD.jpg
+[7]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-DNS-Resolution-for-Samba4-AD.png
+[8]:http://www.tecmint.com/wp-content/uploads/2017/01/Time-Synchronize-with-Samba4-AD.png
+[9]:http://www.tecmint.com/wp-content/uploads/2017/01/Install-Samba4-in-Ubuntu.png
+[10]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Kerberos-Authentication-for-Samba4.png
+[11]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Kerberos-on-Samba4-Domain.png
+[12]:http://www.tecmint.com/wp-content/uploads/2017/01/Join-Domain-to-Samba4-AD-DC.png
+[13]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Samba4-DNS.png
+[14]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Kerberos.jpg
+[15]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Kerberos-Authentication-with-Samba.jpg
+[16]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Samba4-DC-DNS.png
+[17]:http://www.tecmint.com/manage-samba4-ad-from-windows-via-rsat/
+[18]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-DNS-Records-on-Windows-RSAT-Tool.png
+[19]:http://www.tecmint.com/wp-content/uploads/2017/01/Create-User-Account-on-Samba4-AD.jpg
+[20]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Replication-on-Samba4-AD.jpg
+[21]:http://www.tecmint.com/wp-content/uploads/2017/01/Create-Account-from-Microsoft-AD-UC.png
+[22]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Account-Replication-On-Samba4-AD.png
+[23]:http://www.tecmint.com/wp-content/uploads/2017/01/Verify-Samba4-Domain-Controllers.png
+[24]:http://www.tecmint.com/wp-content/uploads/2017/01/Enable-Samba4-AD-DC-Services.png
+[25]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Client-to-Administer-Samba4-DC.png
+[26]:http://www.tecmint.com/wp-content/uploads/2017/01/Configure-Linux-Client-to-Administer-Samba4-DC.png
+[27]:http://www.tecmint.com/manage-samba4-active-directory-linux-command-line/