-
```
-它的工作方式是你编写 JSX 来描述你的 UI 应该是什么样子。像 Babel 这样的转码器将这些代码转换为一堆 `React.createElement()`调用。然后，React 库使用这些 `React.createElement()`调用来构造 DOM 元素的树状结构。对于 React 的网页视图或 React Native 的 Native 视图，它将保存在内存中。
+它的工作方式是你编写 JSX 来描述你的 UI 应该是什么样子。像 Babel 这样的转码器将这些代码转换为一堆 `React.createElement()` 调用。然后，React 库使用这些 `React.createElement()` 调用来构造 DOM 元素的树状结构。对于 React 的网页视图或 React Native 的 Native 视图，它将保存在内存中。
-React 接着会计算它如何在存储展示给用户的 UI 的内存中有效地模仿这个树。此过程称为 [reconciliation][7]。完成计算后，React会对屏幕上的真正 UI 进行更改。
+React 接着会计算它如何在展示给用户的 UI 的内存中有效地模仿这个树。此过程称为 [reconciliation][7]。完成计算后，React 会对屏幕上的真正 UI 进行更改。
-React 如何将你的 JSX 转化为描述应用 UI 的树。
+
+*React 如何将你的 JSX 转化为描述应用 UI 的树。*
你可以使用 [Babel 的在线 REPL][8] 查看当你写一些 JSX 的时候，React 的真正输出。
-使用Babel REPL 转换 JSX 为普通 JavaScript
+
+*使用Babel REPL 转换 JSX 为普通 JavaScript*
> 由于 JSX 只是 `React.createElement()` 调用的语法糖，因此可以在没有 JSX 的情况下使用 React。
-现在我们了解了所有的概念，所以我们已经准备好编写我们之前看到的作为GIF图的计数器组件。
+现在我们了解了所有的概念，所以我们已经准备好编写我们之前看到之前的 GIF 图中的计数器组件。
代码如下，我希望你已经知道了如何在我们的 playground 上渲染它。
@@ -249,20 +244,19 @@ class Counter extends React.Component {
以下是关于上述代码的一些重点。
1. JSX 使用 `驼峰命名` ，所以 `button` 的 属性是 `onClick`，不是我们在HTML中用的 `onclick`。
-
2. 绑定 `this` 是必要的，以便在回调时工作。 请参阅上面代码中的第8行和第9行。
最终的交互式代码位于[此处][9]。
-有了这个，我们已经到了 React 速成课程的结束。我希望我已经阐明了 React 如何工作以及如何使用 React 来构建更大的应用程序，使用更小和可重用的组件。
+有了这个，我们已经到了 React 速成课程的结束。我希望我已经阐明了 React 如何工作，以及如何使用 React 来构建更大的应用程序，使用更小和可重用的组件。
--------------------------------------------------------------------------------
via: https://medium.freecodecamp.org/rock-solid-react-js-foundations-a-beginners-guide-c45c93f5a923
-作者：[Rajat Saxena ][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
+作者：[Rajat Saxena][a]
+译者：[GraveAccent](https://github.com/GraveAccent)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/translated/tech/20180329 How to configure multiple websites with Apache web server.md b/published/201810/20180329 How to configure multiple websites with Apache web server.md
similarity index 78%
rename from translated/tech/20180329 How to configure multiple websites with Apache web server.md
rename to published/201810/20180329 How to configure multiple websites with Apache web server.md
index 1b11518631..bc366132c6 100644
--- a/translated/tech/20180329 How to configure multiple websites with Apache web server.md
+++ b/published/201810/20180329 How to configure multiple websites with Apache web server.md
@@ -1,12 +1,13 @@
如何使用 Apache Web 服务器配置多个站点
-
=====
+> 如何在流行而强大的 Apache Web 服务器上托管两个或多个站点。
+
在我的[上一篇文章][1]中，我解释了如何为单个站点配置 Apache Web 服务器，事实证明这很容易。在这篇文章中，我将向你展示如何使用单个 Apache 实例来服务多个站点。
-注意：我写这篇文章的环境是 Fedora 27 虚拟机，配置了 Apache 2.4.29。如果你有另一个 Fedora 的发行版，那么你使用的命令以及配置文件的位置和内容可能会有所不同。
+注意：我写这篇文章的环境是 Fedora 27 虚拟机，配置了 Apache 2.4.29。如果你用另一个发行版或不同的 Fedora 版本，那么你使用的命令以及配置文件的位置和内容可能会有所不同。
正如我之前的文章中提到的，Apache 的所有配置文件都位于 `/etc/httpd/conf` 和 `/etc/httpd/conf.d`。默认情况下，站点的数据位于 `/var/www` 中。对于多个站点，你需要提供多个位置，每个位置对应托管的站点。
@@ -14,113 +15,93 @@
使用基于名称的虚拟主机，你可以为多个站点使用一个 IP 地址。现代 Web 服务器，包括 Apache，使用指定 URL 的 `hostname` 部分来确定哪个虚拟 Web 主机响应页面请求。这仅仅需要比一个站点更多的配置。
-即使你只从单个站点开始，我也建议你将其设置为虚拟主机，这样可以在以后更轻松地添加更多站点。在本文中，我将在上一篇文章中介绍我们停止的位置，因此你需要设置原始站点，即基于名称的虚拟站点。
+即使你只从单个站点开始，我也建议你将其设置为虚拟主机，这样可以在以后更轻松地添加更多站点。在本文中，我将从上一篇文章中我们停止的地方开始，因此你需要设置原来的站点，即基于名称的虚拟站点。
-### 准备原始站点
+### 准备原来的站点
-在设置第二个站点之前，你需要为现有网站提供基于名称的虚拟主机。如果你现在没有网站，[请返回并立即创建一个][1]。
+在设置第二个站点之前，你需要为现有网站提供基于名称的虚拟主机。如果你现在没有站点，[请返回并立即创建一个][1]。
一旦你有了站点，将以下内容添加到 `/etc/httpd/conf/httpd.conf` 配置文件的底部（添加此内容是你需要对 `httpd.conf` 文件进行的唯一更改）：
+
```
-
DocumentRoot /var/www/html
-
ServerName www.site1.org
-
-
```
-这将是第一个虚拟主机节（to 校正：这里虚拟主机节不太清除），它应该保持为第一个，以使其成为默认定义。这意味着通过 IP 地址或解析为此 IP 地址但没有特定命名主机配置节的其它名称对服务器的 HTTP 访问将定向到此虚拟主机。所有其它虚拟主机配置节都应遵循此节。
+这将是第一个虚拟主机配置节，它应该保持为第一个，以使其成为默认定义。这意味着通过 IP 地址或解析为此 IP 地址但没有特定命名主机配置节的其它名称对服务器的 HTTP 访问将定向到此虚拟主机。所有其它虚拟主机配置节都应跟在此节之后。
你还需要使用 `/etc/hosts` 中的条目设置你的网站以提供名称解析。上次，我们只使用了 `localhost` 的 IP 地址。通常，这可以使用你使用的任何名称服务来完成，例如 Google 或 Godaddy。对于你的测试网站，通过在 `/etc/hosts` 中的 `localhost` 行添加一个新名称来完成此操作。添加两个网站的条目，方便你以后不需再次编辑此文件。结果如下：
+
```
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 www.site1.org www.site2.org
```
让我们将 `/var/www/html/index.html` 文件改变得更加明显一点。它应该看起来像这样（带有一些额外的文本来识别这是站点 1）：
+
```
Hello World
Web site 1.
-
```
重新启动 HTTPD 服务器，已启用对 `httpd` 配置的更改。然后，你可以从命令行使用 Lynx 文本模式查看网站。
+
```
[root@testvm1 ~]# systemctl restart httpd
-
[root@testvm1 ~]# lynx www.site1.org
- Hello World
-
- Web site 1.
-
+ Hello World
+ Web site 1.
-
Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back.
-
-Arrow keys: Up and Down to move. Right to follow a link; Left to go back.
-
+Arrow keys: Up and Down to move. Right to follow a link; Left to go back.
H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list
-
```
-你可以看到原始网站的修改内容，没有明显的错误，先按下 "Q" 键，然后按 "Y" 退出 Lynx Web 浏览器。
+你可以看到原始网站的修改内容，没有明显的错误，先按下 `Q` 键，然后按 `Y` 退出 Lynx Web 浏览器。
### 配置第二个站点
现在你已经准备好建立第二个网站。使用以下命令创建新的网站目录结构：
+
```
[root@testvm1 html]# mkdir -p /var/www/html2
-
```
注意，第二个站点只是第二个 `html` 目录，与第一个站点位于同一 `/var/www` 目录下。
-现在创建一个新的索引文件 `/var/www/html2/index.html`，其中包含以下内容（此索引文件稍有不同，以区别于原始网站）：
+现在创建一个新的索引文件 `/var/www/html2/index.html`，其中包含以下内容（此索引文件稍有不同，以区别于原来的网站）：
+
```
Hello World -- Again
Web site 2.
-
```
-在 `httpd.conf` 中为第二个站点创建一个新的配置节，并将其放在上一个虚拟主机节下面（这两个应该看起来非常相似）。此节告诉 Web 服务器在哪里可以找到第二个站点的 HTML 文件。
+在 `httpd.conf` 中为第二个站点创建一个新的配置节，并将其放在上一个虚拟主机配置节下面（这两个应该看起来非常相似）。此节告诉 Web 服务器在哪里可以找到第二个站点的 HTML 文件。
+
```
-
DocumentRoot /var/www/html2
-
ServerName www.site2.org
-
-
```
重启 HTTPD，并使用 Lynx 来查看结果。
+
```
[root@testvm1 httpd]# systemctl restart httpd
-
[root@testvm1 httpd]# lynx www.site2.org
+ Hello World -- Again
-
- Hello World -- Again
-
-
-
- Web site 2.
-
-
+ Web site 2.
-
Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back.
-
-Arrow keys: Up and Down to move. Right to follow a link; Left to go back.
-
+Arrow keys: Up and Down to move. Right to follow a link; Left to go back.
H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list
```
@@ -144,10 +125,10 @@ via: https://opensource.com/article/18/3/configuring-multiple-web-sites-apache
作者：[David Both][a]
译者：[MjSeven](https://github.com/MjSeven)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
[a]:https://opensource.com/users/dboth
-[1]:https://opensource.com/article/18/2/how-configure-apache-web-server
+[1]:https://linux.cn/article-9506-1.html
[2]:https://httpd.apache.org/docs/2.4/
diff --git a/published/20180412 A Desktop GUI Application For NPM.md b/published/201810/20180412 A Desktop GUI Application For NPM.md
similarity index 100%
rename from published/20180412 A Desktop GUI Application For NPM.md
rename to published/201810/20180412 A Desktop GUI Application For NPM.md
diff --git a/published/20180413 The df Command Tutorial With Examples For Beginners.md b/published/201810/20180413 The df Command Tutorial With Examples For Beginners.md
similarity index 100%
rename from published/20180413 The df Command Tutorial With Examples For Beginners.md
rename to published/201810/20180413 The df Command Tutorial With Examples For Beginners.md
diff --git a/published/20180522 Free Resources for Securing Your Open Source Code.md b/published/201810/20180522 Free Resources for Securing Your Open Source Code.md
similarity index 100%
rename from published/20180522 Free Resources for Securing Your Open Source Code.md
rename to published/201810/20180522 Free Resources for Securing Your Open Source Code.md
diff --git a/published/20180528 What is behavior-driven Python.md b/published/201810/20180528 What is behavior-driven Python.md
similarity index 100%
rename from published/20180528 What is behavior-driven Python.md
rename to published/201810/20180528 What is behavior-driven Python.md
diff --git a/published/20180531 How to create shortcuts in vi.md b/published/201810/20180531 How to create shortcuts in vi.md
similarity index 100%
rename from published/20180531 How to create shortcuts in vi.md
rename to published/201810/20180531 How to create shortcuts in vi.md
diff --git a/translated/tech/20180601 Download an OS with GNOME Boxes.md b/published/201810/20180601 Download an OS with GNOME Boxes.md
similarity index 65%
rename from translated/tech/20180601 Download an OS with GNOME Boxes.md
rename to published/201810/20180601 Download an OS with GNOME Boxes.md
index c625348db1..e64684343b 100644
--- a/translated/tech/20180601 Download an OS with GNOME Boxes.md
+++ b/published/201810/20180601 Download an OS with GNOME Boxes.md
@@ -1,13 +1,13 @@
-用 GNOME Boxes 下载一个镜像
+用 GNOME Boxes 下载一个操作系统镜像
======
-Boxes 是 GNOME 上的虚拟机应用。最近 Boxes 添加了一个新的特性，使得它在运行不同的 Linux 发行版时更加容易。你现在可以在 Boxes 中自动安装列表中这些发行版。该列表甚至包括红帽企业 Linux。红帽开发人员计划包括[免费订阅红帽企业版 Linux][1]。 使用[红帽开发者][2]帐户，Boxes 可以自动设置一个名为 Developer Suite 订阅的 RHEL 虚拟机。 下面是它的工作原理。
+Boxes 是 GNOME 上的虚拟机应用。最近 Boxes 添加了一个新的特性，使得它在运行不同的 Linux 发行版时更加容易。你现在可以在 Boxes 中自动安装那些发行版以及像 FreeBSD 和 FreeDOS 这样的操作系统，甚至还包括红帽企业 Linux。红帽开发者计划包括了一个[红帽企业版 Linux 的免费订阅][1]。 使用[红帽开发者][2]帐户，Boxes 可以自动设置一个名为 Developer Suite 订阅的 RHEL 虚拟机。 下面是它的工作原理。
-### 红帽企业版 Linux
+### 红帽企业版 Linux
-要创建一个红帽企业版 Linux 的虚拟机，启动 Boxes，点击新建。从源选择列表中选择下载一个镜像。在顶部，点击红帽企业版 Linux。这将会打开网址为 [developers.redhat.com][2] 的一个网络表单。使用已有的红帽开发者账号登录，或是新建一个。
+要创建一个红帽企业版 Linux 的虚拟机，启动 Boxes，点击“新建”。从源选择列表中选择“下载一个镜像”。在顶部，点击“红帽企业版 Linux”。这将会打开网址为 [developers.redhat.com][2] 的一个 Web 表单。使用已有的红帽开发者账号登录，或是新建一个。
![][3]
@@ -15,11 +15,11 @@ Boxes 是 GNOME 上的虚拟机应用。最近 Boxes 添加了一个新的特性
![][5]
-点击提交，然后就会开始下载安装磁盘镜像。下载需要的时间取决于你的网络状况。在这期间你可以去喝杯茶或者咖啡歇息一下。
+点击“提交”，然后就会开始下载安装磁盘镜像。下载需要的时间取决于你的网络状况。在这期间你可以去喝杯茶或者咖啡歇息一下。
![][6]
-等媒体下载完成（一般位于 ~/Downloads ），Boxes 会有一个快速安装的显示。填入账号和密码然后点击继续，当你确认了虚拟机的信息之后点击创建。快速安装会自动完成接下来的整个安装！（现在你可以去享受你的第二杯茶或者咖啡了）
+等介质下载完成（一般位于 `~/Downloads` ），Boxes 会有一个“快速安装”的显示。填入账号和密码然后点击“继续”，当你确认了虚拟机的信息之后点击“创建”。“快速安装”会自动完成接下来的整个安装！（现在你可以去享受你的第二杯茶或者咖啡了）
![][7]
@@ -27,7 +27,7 @@ Boxes 是 GNOME 上的虚拟机应用。最近 Boxes 添加了一个新的特性
![][9]
-等到安装结束，虚拟机会直接重启并登录到桌面。在虚拟机里，在应用菜单的系统工具一栏启动红帽订阅管理。这一步需要输入管理员密码。
+等到安装结束，虚拟机会直接重启并登录到桌面。在虚拟机里，在应用菜单的“系统工具”一栏启动“红帽订阅管理”。这一步需要输入 root 密码。
![][10]
@@ -37,13 +37,13 @@ Boxes 是 GNOME 上的虚拟机应用。最近 Boxes 添加了一个新的特性
![][12]
-现在你可以通过任何一种更新方法，像是 yum 或是 GNOME Software 进行下载和更新了。
+现在你可以通过任何一种更新方法，像是 `yum` 或是 GNOME Software 进行下载和更新了。
![][13]
### FreeDOS 或是其他
-Boxes 可以安装很多的 Linux 发行版，而不仅仅只是红帽企业版。 作为 KVM 和 qemu 的前端，Boxes 支持各种操作系统。 使用 [libosinfo][14]，Boxes 可以自动下载（在某些情况下安装）相当多不同操作系统。
+Boxes 可以安装很多操作系统，而不仅仅只是红帽企业版。 作为 KVM 和 qemu 的前端，Boxes 支持各种操作系统。使用 [libosinfo][14]，Boxes 可以自动下载（在某些情况下安装）相当多不同操作系统。
![][15]
@@ -53,13 +53,23 @@ Boxes 可以安装很多的 Linux 发行版，而不仅仅只是红帽企业版
![][17]
-### 在 Boxes 上受欢迎的操作系统
+### Boxes 上流行的操作系统
这里仅仅是一些目前在它上面比较受欢迎的选择。
-![][18]![][19]![][20]![][21]![][22]![][23]
+![][18]
-Fedora 会定期更新它的操作系统信息数据库。确保你会经常检查是否有新的操作系统选项。
+![][19]
+
+![][20]
+
+![][21]
+
+![][22]
+
+![][23]
+
+Fedora 会定期更新它的操作系统信息数据库（osinfo-db）。确保你会经常检查是否有新的操作系统选项。
--------------------------------------------------------------------------------
@@ -69,7 +79,7 @@ via: https://fedoramagazine.org/download-os-gnome-boxes/
作者：[Link Dupont][a]
选题：[lujun9972](https://github.com/lujun9972)
译者：[dianbanjiu](https://github.com/dianbanjiu)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/translated/tech/20180615 How To Rename Multiple Files At Once In Linux.md b/published/201810/20180615 How To Rename Multiple Files At Once In Linux.md
similarity index 51%
rename from translated/tech/20180615 How To Rename Multiple Files At Once In Linux.md
rename to published/201810/20180615 How To Rename Multiple Files At Once In Linux.md
index 14f16b3eb6..05916fb914 100644
--- a/translated/tech/20180615 How To Rename Multiple Files At Once In Linux.md
+++ b/published/201810/20180615 How To Rename Multiple Files At Once In Linux.md
@@ -3,11 +3,11 @@
-你可能已经知道，我们使用 mv 命令在类 Unix 操作系统中重命名或者移动文件和目录。 但是，mv 命令不支持一次重命名多个文件。 不用担心。 在本教程中，我们将学习使用 Linux 中的 “mmv” 命令一次重命名多个文件。 此命令用于在类 Unix 操作系统中使用标准通配符批量移动，复制，追加和重命名文件。
+你可能已经知道，我们使用 `mv` 命令在类 Unix 操作系统中重命名或者移动文件和目录。 但是，`mv` 命令不支持一次重命名多个文件。 不用担心。 在本教程中，我们将学习使用 Linux 中的 `mmv` 命令一次重命名多个文件。 此命令用于在类 Unix 操作系统中使用标准通配符批量移动、复制、追加和重命名文件。
### 在 Linux 中一次重命名多个文件
-mmv 程序可在基于 Debian 的系统的默认仓库中使用。 要想在 Debian，Ubuntu，Linux Mint 上安装它，请运行以下命令：
+`mmv` 程序可在基于 Debian 的系统的默认仓库中使用。 要想在 Debian、Ubuntu、Linux Mint 上安装它，请运行以下命令：
```
$ sudo apt-get install mmv
@@ -20,7 +20,7 @@ $ ls
a1.txt a2.txt a3.txt
```
-现在，你想要将所有以字母 “a” 开头的文件重命名为以 “b” 开头的。 当然，你可以在几秒钟内手动执行此操作。 但是想想你是否有数百个文件想要重命名？ 这是一个非常耗时的过程。 这时候 **mmv** 命令就很有帮助了。
+现在，你想要将所有以字母 “a” 开头的文件重命名为以 “b” 开头的。 当然，你可以在几秒钟内手动执行此操作。 但是想想你是否有数百个文件想要重命名？ 这是一个非常耗时的过程。 这时候 `mmv` 命令就很有帮助了。
要将所有以字母 “a” 开头的文件重命名为以字母 “b” 开头的，只需要运行：
@@ -33,22 +33,20 @@ $ mmv a\* b\#1
```
$ ls
b1.txt b2.txt b3.txt
-
```
-如你所见，所有以字母 “a” 开头的文件（即 a1.txt，a2.txt，a3.txt）都重命名为 b1.txt，b2.txt，b3.txt。
+如你所见，所有以字母 “a” 开头的文件（即 `a1.txt`、`a2.txt`、`a3.txt`）都重命名为 `b1.txt`、`b2.txt`、`b3.txt`。
**解释**
-在上面的例子中，第一个参数（a\\*）是 'from' 模式，第二个参数是 'to' 模式（b\\#1）。根据上面的例子，mmv 将查找任何以字母 'a' 开头的文件名，并根据第二个参数重命名匹配的文件，即 'to' 模式。我们使用通配符，例如用 '*'，'?' 和 '[]' 来匹配一个或多个任意字符。请注意，你必须避免使用通配符，否则它们将被 shell 扩展，mmv 将无法理解。
+在上面的例子中，第一个参数（`a\*`）是 “from” 模式，第二个参数是 “to” 模式（`b\#1`）。根据上面的例子，`mmv` 将查找任何以字母 “a” 开头的文件名，并根据第二个参数重命名匹配的文件，即 “to” 模式。我们可以使用通配符，例如用 `*`、`?` 和 `[]` 来匹配一个或多个任意字符。请注意，你必须转义使用通配符，否则它们将被 shell 扩展，`mmv` 将无法理解。
-'to' 模式中的 '#1' 是通配符索引。它匹配 'from' 模式中的第一个通配符。 'to' 模式中的 '#2' 将匹配第二个通配符，依此类推。在我们的例子中，我们只有一个通配符（星号），所以我们写了一个 #1。并且，哈希标志也应该被转义。此外，你也可以用引号括起模式。
+“to” 模式中的 `#1` 是通配符索引。它匹配 “from” 模式中的第一个通配符。 “to” 模式中的 `#2` 将匹配第二个通配符（如果有的话），依此类推。在我们的例子中，我们只有一个通配符（星号），所以我们写了一个 `#1`。并且，`#` 符号也应该被转义。此外，你也可以用引号括起模式。
-你甚至可以将具有特定扩展名的所有文件重命名为其他扩展名。例如，要将当前目录中的所有 **.txt** 文件重命名为 **.doc** 文件格式，只需运行：
+你甚至可以将具有特定扩展名的所有文件重命名为其他扩展名。例如，要将当前目录中的所有 `.txt` 文件重命名为 `.doc` 文件格式，只需运行：
```
$ mmv \*.txt \#1.doc
-
```
这是另一个例子。 我们假设你有以下文件。
@@ -56,16 +54,14 @@ $ mmv \*.txt \#1.doc
```
$ ls
abcd1.txt abcd2.txt abcd3.txt
-
```
-你希望在当前目录下的所有文件中将第一次出现的 **abc** 替换为 **xyz**。 你会怎么做呢？
+你希望在当前目录下的所有文件中将第一次出现的 “abc” 替换为 “xyz”。 你会怎么做呢？
很简单。
```
$ mmv '*abc*' '#1xyz#2'
-
```
请注意，在上面的示例中，模式被单引号括起来了。
@@ -75,77 +71,74 @@ $ mmv '*abc*' '#1xyz#2'
```
$ ls
xyzd1.txt xyzd2.txt xyzd3.txt
-
```
-看到没？ 文件 **abcd1.txt**，**abcd2.txt** 和 **abcd3.txt** 已经重命名为 **xyzd1.txt**，**xyzd2.txt** 和 **xyzd3.txt**。
+看到没？ 文件 `abcd1.txt`、`abcd2.txt` 和 `abcd3.txt` 已经重命名为 `xyzd1.txt`、`xyzd2.txt` 和 `xyzd3.txt`。
-mmv 命令的另一个值得注意的功能是你可以使用 **-n** 选项打印输出而不是重命名文件，如下所示。
+`mmv` 命令的另一个值得注意的功能是你可以使用 `-n` 选项打印输出而不是重命名文件，如下所示。
```
$ mmv -n a\* b\#1
a1.txt -> b1.txt
a2.txt -> b2.txt
a3.txt -> b3.txt
-
```
-这样，你可以在重命名文件之前简单地验证 mmv 命令实际执行的操作。
+这样，你可以在重命名文件之前简单地验证 `mmv` 命令实际执行的操作。
有关更多详细信息，请参阅 man 页面。
```
$ man mmv
-
```
-**更新：**
+### 更新：Thunar 文件管理器
-**Thunar 文件管理器**默认具有内置**批量重命名**选项。 如果你正在使用thunar，那么重命名文件要比使用mmv命令容易得多。
+**Thunar 文件管理器**默认具有内置**批量重命名**选项。 如果你正在使用 Thunar，那么重命名文件要比使用 `mmv` 命令容易得多。
-Thunar在大多数Linux发行版的默认仓库库中都可用。
+Thunar 在大多数 Linux 发行版的默认仓库库中都可用。
-要在基于Arch的系统上安装它，请运行：
+要在基于 Arch 的系统上安装它，请运行：
```
$ sudo pacman -S thunar
```
-在 RHEL，CentOS 上:
+在 RHEL、CentOS 上:
+
```
$ sudo yum install thunar
```
在 Fedora 上:
+
```
$ sudo dnf install thunar
-
```
在 openSUSE 上:
+
```
$ sudo zypper install thunar
-
```
-在 Debian，Ubuntu，Linux Mint 上:
+在 Debian、Ubuntu、Linux Mint 上:
+
```
$ sudo apt-get install thunar
-
```
安装后，你可以从菜单或应用程序启动器中启动批量重命名程序。 要从终端启动它，请使用以下命令：
```
$ thunar -B
-
```
-批量重命名就是这么回事。
+批量重命名方式如下。
![][1]
-单击加号，然后选择要重命名的文件列表。 批量重命名可以重命名文件的名称，文件的后缀或者同事重命名文件的名称和后缀。 Thunar 目前支持以下批量重命名：
+单击“+”，然后选择要重命名的文件列表。 批量重命名可以重命名文件的名称、文件的后缀或者同时重命名文件的名称和后缀。 Thunar 目前支持以下批量重命名：
- 插入日期或时间
- 插入或覆盖
@@ -158,9 +151,9 @@ $ thunar -B
![][2]
-选择条件后，单击**重命名文件**选项来重命名文件。
+选择条件后，单击“重命名文件”选项来重命名文件。
-你还可以通过选择两个或更多文件从 Thunar 中打开批量重命名器。 选择文件后，按F2或右键单击并选择**重命名**。
+你还可以通过选择两个或更多文件从 Thunar 中打开批量重命名器。 选择文件后，按 F2 或右键单击并选择“重命名”。
嗯，这就是本次的所有内容了。希望有所帮助。更多干货即将到来。敬请关注！
@@ -173,10 +166,10 @@ via: https://www.ostechnix.com/how-to-rename-multiple-files-at-once-in-linux/
作者：[SK][a]
选题：[lujun9972](https://github.com/lujun9972)
译者：[Flowsnow](https://github.com/Flowsnow)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
[a]: https://www.ostechnix.com/author/sk/
[1]: http://www.ostechnix.com/wp-content/uploads/2018/06/bulk-rename.png
-[2]: http://www.ostechnix.com/wp-content/uploads/2018/06/bulk-rename-1.png
\ No newline at end of file
+[2]: http://www.ostechnix.com/wp-content/uploads/2018/06/bulk-rename-1.png
diff --git a/published/20180703 Install Oracle VirtualBox On Ubuntu 18.04 LTS Headless Server.md b/published/201810/20180703 Install Oracle VirtualBox On Ubuntu 18.04 LTS Headless Server.md
similarity index 100%
rename from published/20180703 Install Oracle VirtualBox On Ubuntu 18.04 LTS Headless Server.md
rename to published/201810/20180703 Install Oracle VirtualBox On Ubuntu 18.04 LTS Headless Server.md
diff --git a/published/20180704 Setup Headless Virtualization Server Using KVM In Ubuntu 18.04 LTS.md b/published/201810/20180704 Setup Headless Virtualization Server Using KVM In Ubuntu 18.04 LTS.md
similarity index 100%
rename from published/20180704 Setup Headless Virtualization Server Using KVM In Ubuntu 18.04 LTS.md
rename to published/201810/20180704 Setup Headless Virtualization Server Using KVM In Ubuntu 18.04 LTS.md
diff --git a/published/20180709 How To Configure SSH Key-based Authentication In Linux.md b/published/201810/20180709 How To Configure SSH Key-based Authentication In Linux.md
similarity index 100%
rename from published/20180709 How To Configure SSH Key-based Authentication In Linux.md
rename to published/201810/20180709 How To Configure SSH Key-based Authentication In Linux.md
diff --git a/translated/tech/20180715 Why is Python so slow.md b/published/201810/20180715 Why is Python so slow.md
similarity index 57%
rename from translated/tech/20180715 Why is Python so slow.md
rename to published/201810/20180715 Why is Python so slow.md
index 1e6227b9e3..ac83056ae8 100644
--- a/translated/tech/20180715 Why is Python so slow.md
+++ b/published/201810/20180715 Why is Python so slow.md
@@ -1,42 +1,39 @@
为什么 Python 这么慢？
-============================================================
+==========
-Python 现在越来越火，已经迅速扩张到包括 DevOps、数据科学、web 开发、信息安全等各个领域当中。
+Python 现在越来越火，已经迅速扩张到包括 DevOps、数据科学、Web 开发、信息安全等各个领域当中。
然而，相比起 Python 扩张的速度，Python 代码的运行速度就显得有点逊色了。
-
-> 在代码运行速度方面，Java、C、C++、C＃和 Python 要如何进行比较呢？并没有一个放之四海而皆准的标准，因为具体结果很大程度上取决于运行的程序类型，而语言基准测试可以作为[衡量的一个方面][5]。
+> 在代码运行速度方面，Java、C、C++、C# 和 Python 要如何进行比较呢？并没有一个放之四海而皆准的标准，因为具体结果很大程度上取决于运行的程序类型，而语言基准测试可以作为[衡量的一个方面][5]。
-根据我这些年来进行语言基准测试的经验来看，Python 比很多语言运行起来都要慢。无论是使用 [JIT][7] 编译器的 C＃、Java，还是使用 [AOT][8] 编译器的 C、C ++，又或者是 JavaScript 这些解释型语言，Python 都[比它们运行得慢][6]。
+根据我这些年来进行语言基准测试的经验来看，Python 比很多语言运行起来都要慢。无论是使用 [JIT][7] 编译器的 C＃、Java，还是使用 [AOT][8] 编译器的 C、C++，又或者是 JavaScript 这些解释型语言，Python 都[比它们运行得慢][6]。
- 注意：对于文中的 Python ，一般指 CPython 这个官方的实现。当然我也会在本文中提到其它语言的 Python 实现。
+注意：对于文中的 “Python” ，一般指 CPython 这个官方的实现。当然我也会在本文中提到其它语言的 Python 实现。
> 我要回答的是这个问题：对于一个类似的程序，Python 要比其它语言慢 2 到 10 倍不等，这其中的原因是什么？又有没有改善的方法呢？
主流的说法有这些：
* “是全局解释器锁（GIL）的原因”
-
* “是因为 Python 是解释型语言而不是编译型语言”
-
* “是因为 Python 是一种动态类型的语言”
哪一个才是是影响 Python 运行效率的主要原因呢？
### 是全局解释器锁的原因吗？
-现在很多计算机都配备了具有多个核的 CPU ，有时甚至还会有多个处理器。为了更充分利用它们的处理能力，操作系统定义了一个称为线程的低级结构。某一个进程（例如 Chrome 浏览器）可以建立多个线程，在系统内执行不同的操作。在这种情况下，CPU 密集型进程就可以跨核心共享负载了，这样的做法可以大大提高应用程序的运行效率。
+现在很多计算机都配备了具有多个核的 CPU ，有时甚至还会有多个处理器。为了更充分利用它们的处理能力，操作系统定义了一个称为线程的低级结构。某一个进程（例如 Chrome 浏览器）可以建立多个线程，在系统内执行不同的操作。在这种情况下，CPU 密集型进程就可以跨核心分担负载了，这样的做法可以大大提高应用程序的运行效率。
-例如在我写这篇文章时，我的 Chrome 浏览器打开了 44 个线程。要知道的是，基于 POSIX 的操作系统（例如 Mac OS、Linux）和 Windows 操作系统的线程结构、API 都是不同的，因此操作系统还负责对各个线程的调度。
+例如在我写这篇文章时，我的 Chrome 浏览器打开了 44 个线程。需要提及的是，基于 POSIX 的操作系统（例如 Mac OS、Linux）和 Windows 操作系统的线程结构、API 都是不同的，因此操作系统还负责对各个线程的调度。
如果你还没有写过多线程执行的代码，你就需要了解一下线程锁的概念了。多线程进程比单线程进程更为复杂，是因为需要使用线程锁来确保同一个内存地址中的数据不会被多个线程同时访问或更改。
CPython 解释器在创建变量时，首先会分配内存，然后对该变量的引用进行计数，这称为引用计数。如果变量的引用数变为 0，这个变量就会从内存中释放掉。这就是在 for 循环代码块内创建临时变量不会增加内存消耗的原因。
-而当多个线程内共享一个变量时，CPython 锁定引用计数的关键就在于使用了 GIL，它会谨慎地控制线程的执行情况，无论同时存在多少个线程，每次只允许一个线程进行操作。
+而当多个线程内共享一个变量时，CPython 锁定引用计数的关键就在于使用了 GIL，它会谨慎地控制线程的执行情况，无论同时存在多少个线程，解释器每次只允许一个线程进行操作。
#### 这会对 Python 程序的性能有什么影响？
@@ -45,9 +42,10 @@ CPython 解释器在创建变量时，首先会分配内存，然后对该变量
但如果你通过在单进程中使用多线程实现并发，并且是 IO 密集型（例如网络 IO 或磁盘 IO）的线程，GIL 竞争的效果就很明显了。
-由 David Beazley 提供的 GIL 竞争情况图[http://dabeaz.blogspot.com/2010/01/python-gil-visualized.html][1]
-对于一个 web 应用（例如 Django），同时还使用了 WSGI，那么对这个 web 应用的每一个请求都是一个单独的 Python 进程，而且每个请求只有一个锁。同时 Python 解释器的启动也比较慢，某些 WSGI 实现还具有“守护进程模式”，[就会导致 Python 进程非常繁忙][9]。
+*由 David Beazley 提供的 GIL 竞争情况图[http://dabeaz.blogspot.com/2010/01/python-gil-visualized.html][1]*
+
+对于一个 web 应用（例如 Django），同时还使用了 WSGI，那么对这个 web 应用的每一个请求都运行一个**单独**的 Python 解释器，而且每个请求只有一个锁。同时因为 Python 解释器的启动比较慢，某些 WSGI 实现还具有“守护进程模式”，[可以使 Python 进程一直就绪][9]。
#### 其它的 Python 解释器表现如何？
@@ -57,46 +55,43 @@ CPython 解释器在创建变量时，首先会分配内存，然后对该变量
#### JavaScript 在这方面又是怎样做的呢？
-所有的 Javascript 引擎使用的都是 [mark-and-sweep 垃圾收集算法][12]，而 GIL 使用的则是 CPython 的内存管理算法。因此 JavaScript 没有 GIL，而且它是单线程的，也不需要用到 GIL， JavaScript 的事件循环和 Promise/Callback 模式实现了以异步编程的方式代替并发。在 Python 当中也有一个类似的 asyncio 事件循环。
+所有的 Javascript 引擎使用的都是 [mark-and-sweep 垃圾收集算法][12]，而 GIL 使用的则是 CPython 的内存管理算法。
+JavaScript 没有 GIL，而且它是单线程的，也不需要用到 GIL， JavaScript 的事件循环和 Promise/Callback 模式实现了以异步编程的方式代替并发。在 Python 当中也有一个类似的 asyncio 事件循环。
### 是因为 Python 是解释型语言吗？
-我经常会听到这个说法，但其实当终端上执行 `python myscript.py` 之后，CPython 会对代码进行一系列的读取、语法分析、解析、编译、解释和执行的操作。
+我经常会听到这个说法，但是这过于粗陋地简化了 Python 所实际做的工作了。其实当终端上执行 `python myscript.py` 之后，CPython 会对代码进行一系列的读取、语法分析、解析、编译、解释和执行的操作。
-如果你对这一系列过程感兴趣，也可以阅读一下我之前的文章：
+如果你对这一系列过程感兴趣，也可以阅读一下我之前的文章：[在 6 分钟内修改 Python 语言][13] 。
-[在 6 分钟内修改 Python 语言][13]
+`.pyc` 文件的创建是这个过程的重点。在代码编译阶段，Python 3 会将字节码序列写入 `__pycache__/` 下的文件中，而 Python 2 则会将字节码序列写入当前目录的 `.pyc` 文件中。对于你编写的脚本、导入的所有代码以及第三方模块都是如此。
-创建 `.pyc` 文件是这个过程的重点。在代码编译阶段，Python 3 会将字节码序列写入 `__pycache__/` 下的文件中，而 Python 2 则会将字节码序列写入当前目录的 `.pyc` 文件中。对于你编写的脚本、导入的所有代码以及第三方模块都是如此。
-
-因此，绝大多数情况下（除非你的代码是一次性的……），Python 都会解释字节码并执行。与 Java、C#.NET 相比：
+因此，绝大多数情况下（除非你的代码是一次性的……），Python 都会解释字节码并本地执行。与 Java、C#.NET 相比：
> Java 代码会被编译为“中间语言”，由 Java 虚拟机读取字节码，并将其即时编译为机器码。.NET CIL 也是如此，.NET CLR（Common-Language-Runtime）将字节码即时编译为机器码。
-既然 Python 不像 Java 和 C# 那样使用虚拟机或某种字节码，为什么 Python 在基准测试中仍然比 Java 和 C# 慢得多呢？首要原因是，.NET 和 Java 都是 JIT 编译的。
+既然 Python 像 Java 和 C# 那样都使用虚拟机或某种字节码，为什么 Python 在基准测试中仍然比 Java 和 C# 慢得多呢？首要原因是，.NET 和 Java 都是 JIT 编译的。
-即时编译（JIT）需要一种中间语言，以便将代码拆分为多个块（或多个帧）。而提前编译器（AOT）则需要确保 CPU 在任何交互发生之前理解每一行代码。
+即时（JIT）编译需要一种中间语言，以便将代码拆分为多个块（或多个帧）。而提前（AOT）编译器则需要确保 CPU 在任何交互发生之前理解每一行代码。
-JIT 本身是不会让执行速度加快的，因为它执行的仍然是同样的字节码序列。但是 JIT 会允许运行时的优化。一个优秀的 JIT 优化器会分析出程序的哪些部分会被多次执行，这就是程序中的“热点”，然后，优化器会将这些热点编译得更为高效以实现优化。
+JIT 本身不会使执行速度加快，因为它执行的仍然是同样的字节码序列。但是 JIT 会允许在运行时进行优化。一个优秀的 JIT 优化器会分析出程序的哪些部分会被多次执行，这就是程序中的“热点”，然后优化器会将这些代码替换为更有效率的版本以实现优化。
-这就意味着如果你的程序是多次地重复相同的操作时，有可能会被优化器优化得更快。而且，Java 和 C# 是强类型语言，因此优化器对代码的判断可以更为准确。
+这就意味着如果你的程序是多次重复相同的操作时，有可能会被优化器优化得更快。而且，Java 和 C# 是强类型语言，因此优化器对代码的判断可以更为准确。
-PyPy 使用了明显快于 CPython 的 JIT。更详细的结果可以在这篇性能基准测试文章中看到：
-
-[哪一个 Python 版本最快?][15]
+PyPy 使用了明显快于 CPython 的 JIT。更详细的结果可以在这篇性能基准测试文章中看到：[哪一个 Python 版本最快?][15]。
#### 那为什么 CPython 不使用 JIT 呢？
-JIT 也不是完美的，它的一个显著缺点就在于启动时间。 CPython 的启动时间已经相对比较慢，而 PyPy 比 CPython 启动还要慢 2 到 3 倍，所以 Java 虚拟机启动速度已经是出了名的慢了。.NET CLR则通过在系统启动时自启动来优化体验， 甚至还有专门运行 CLR 的操作系统。
+JIT 也不是完美的，它的一个显著缺点就在于启动时间。 CPython 的启动时间已经相对比较慢，而 PyPy 比 CPython 启动还要慢 2 到 3 倍。Java 虚拟机启动速度也是出了名的慢。.NET CLR 则通过在系统启动时启动来优化体验，而 CLR 的开发者也是在 CLR 上开发该操作系统。
-因此如果你的 Python 进程在一次启动后就长时间运行，JIT 就比较有意义了，因为代码里有“热点”可以优化。
+因此如果你有个长时间运行的单一 Python 进程，JIT 就比较有意义了，因为代码里有“热点”可以优化。
-尽管如此，CPython 仍然是通用的代码实现。设想如果使用 Python 开发命令行程序，但每次调用 CLI 时都必须等待 JIT 缓慢启动，这种体验就相当不好了。
+不过，CPython 是个通用的实现。设想如果使用 Python 开发命令行程序，但每次调用 CLI 时都必须等待 JIT 缓慢启动，这种体验就相当不好了。
-CPython 必须通过大量用例的测试，才有可能实现[将 JIT 插入到 CPython 中][17]，但这个改进工作的进度基本处于停滞不前的状态。
+CPython 试图用于各种使用情况。有可能实现[将 JIT 插入到 CPython 中][17]，但这个改进工作的进度基本处于停滞不前的状态。
-> 如果你想充分发挥 JIT 的优势，请使用PyPy。
+> 如果你想充分发挥 JIT 的优势，请使用 PyPy。
### 是因为 Python 是一种动态类型的语言吗？
@@ -113,11 +108,11 @@ a = "foo"
Python 也实现了这样的转换，但用户看不到这些转换，也不需要关心这些转换。
-变量类型不固定并不是 Python 运行慢的原因，Python 通过巧妙的设计让用户可以让各种结构变得动态：可以在运行时更改对象上的方法，也可以在运行时让模块调用新声明的值，几乎可以做到任何事。
+不用必须声明类型并不是为了使 Python 运行慢，Python 的设计是让用户可以让各种东西变得动态：可以在运行时更改对象上的方法，也可以在运行时动态添加底层系统调用到值的声明上，几乎可以做到任何事。
-但也正是这种设计使得 Python 的优化难度变得很大。
+但也正是这种设计使得 Python 的优化异常的难。
-为了证明我的观点，我使用了一个 `dtrace` 这个 Mac OS 上的系统调用跟踪工具。CPython 中没有内置 dTrace，因此必须重新对 CPython 进行编译。以下使用 Python 3.6.6 进行为例：
+为了证明我的观点，我使用了一个 Mac OS 上的系统调用跟踪工具 DTrace。CPython 发布版本中没有内置 DTrace，因此必须重新对 CPython 进行编译。以下以 Python 3.6.6 为例：
```
wget https://github.com/python/cpython/archive/v3.6.6.zip
@@ -127,22 +122,19 @@ cd v3.6.6
make
```
-这样 `python.exe` 将使用 dtrace 追踪所有代码。[Paul Ross 也作过关于 dtrace 的闪电演讲][19]。你可以下载 Python 的 dtrace 启动文件来查看函数调用、系统调用、CPU 时间、执行时间，以及各种其它的内容。
+这样 `python.exe` 将使用 DTrace 追踪所有代码。[Paul Ross 也作过关于 DTrace 的闪电演讲][19]。你可以下载 Python 的 DTrace 启动文件来查看函数调用、执行时间、CPU 时间、系统调用，以及各种其它的内容。
-`sudo dtrace -s toolkit/.d -c ‘../cpython/python.exe script.py’`
+```
+sudo dtrace -s toolkit/.d -c ‘../cpython/python.exe script.py’
+```
-`py_callflow` 追踪器显示了程序里调用的所有函数。
-
-
-
+`py_callflow` 追踪器[显示](https://cdn-images-1.medium.com/max/1600/1*Lz4UdUi4EwknJ0IcpSJ52g.gif)了程序里调用的所有函数。
那么，Python 的动态类型会让它变慢吗？
-* 类型比较和类型转换消耗的资源是比较多的，每次读取、写入或引用变量时都会检查变量的类型
-
-* Python 的动态程度让它难以被优化，因此很多 Python 的替代品都为了提升速度而在灵活性方面作出了妥协
-
-* 而 [Cython][2] 结合了 C 的静态类型和 Python 来优化已知类型的代码，它可以将[性能提升][3] 84 倍。
+* 类型比较和类型转换消耗的资源是比较多的，每次读取、写入或引用变量时都会检查变量的类型
+* Python 的动态程度让它难以被优化，因此很多 Python 的替代品能够如此快都是为了提升速度而在灵活性方面作出了妥协
+* 而 [Cython][2] 结合了 C 的静态类型和 Python 来优化已知类型的代码，它[可以将][3]性能提升 **84 倍**。
### 总结
@@ -158,7 +150,7 @@ make
Jake VDP 的优秀文章（略微过时） [https://jakevdp.github.io/blog/2014/05/09/why-python-is-slow/][21]
-Dave Beazley’s 关于 GIL 的演讲 [http://www.dabeaz.com/python/GIL.pdf][22]
+Dave Beazley 关于 GIL 的演讲 [http://www.dabeaz.com/python/GIL.pdf][22]
JIT 编译器的那些事 [https://hacks.mozilla.org/2017/02/a-crash-course-in-just-in-time-jit-compilers/][23]
@@ -169,7 +161,7 @@ via: https://hackernoon.com/why-is-python-so-slow-e5074b6fe55b
作者：[Anthony Shaw][a]
选题：[oska874][b]
译者：[HankChow](https://github.com/HankChow)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/published/20180724 75 Most Used Essential Linux Applications of 2018.md b/published/201810/20180724 75 Most Used Essential Linux Applications of 2018.md
similarity index 100%
rename from published/20180724 75 Most Used Essential Linux Applications of 2018.md
rename to published/201810/20180724 75 Most Used Essential Linux Applications of 2018.md
diff --git a/published/20180724 Building a network attached storage device with a Raspberry Pi.md b/published/201810/20180724 Building a network attached storage device with a Raspberry Pi.md
similarity index 100%
rename from published/20180724 Building a network attached storage device with a Raspberry Pi.md
rename to published/201810/20180724 Building a network attached storage device with a Raspberry Pi.md
diff --git a/published/20180803 5 Essential Tools for Linux Development.md b/published/201810/20180803 5 Essential Tools for Linux Development.md
similarity index 100%
rename from published/20180803 5 Essential Tools for Linux Development.md
rename to published/201810/20180803 5 Essential Tools for Linux Development.md
diff --git a/published/201810/20180810 How To Remove Or Disable Ubuntu Dock.md b/published/201810/20180810 How To Remove Or Disable Ubuntu Dock.md
new file mode 100644
index 0000000000..c535b92a68
--- /dev/null
+++ b/published/201810/20180810 How To Remove Or Disable Ubuntu Dock.md
@@ -0,0 +1,143 @@
+如何移除或禁用 Ubuntu Dock
+======
+
+
+
+> 如果你想用其它 dock（例如 Plank dock）或面板来替换 Ubuntu 18.04 中的 Dock，或者你想要移除或禁用 Ubuntu Dock，本文会告诉你如何做。
+
+Ubuntu Dock - 屏幕左侧栏，可用于固定应用程序或访问已安装的应用程序。使用默认的 Ubuntu 会话时，[无法][1]使用 Gnome Tweaks 禁用它（禁用无效）。但是如果你需要，还是有几种方法来摆脱它的。下面我将列出 4 种方法可以移除或禁用 Ubuntu Dock，以及每个方法的缺点（如果有的话），还有如何撤销每个方法的更改。本文还包括在没有 Ubuntu Dock 的情况下访问活动概览和已安装应用程序列表的其它方法。
+
+### 如何在没有 Ubuntu Dock 的情况下访问活动概览
+
+如果没有 Ubuntu Dock，你可能无法访问活动的或已安装的应用程序列表（可以通过单击 Dock 底部的“显示应用程序”按钮从 Ubuntu Dock 访问）。例如，如果你想使用 Plank Dock 就是这样。
+
+显然，如果你安装了 Dash to Panel 扩展来替代 Ubuntu Dock，那么还好。因为 Dash to Panel 提供了一个按钮来访问活动概览或已安装的应用程序。
+
+根据你计划用来替代 Ubuntu Dock 的软件，如果无法访问活动概览，那么你可以启用“活动概览热角”选项，只需将鼠标移动到屏幕的左上角即可打开活动概览。访问已安装的应用程序列表的另一种方法是使用快捷键：`Super + A`。
+
+如果要启用“活动概览热角”，使用以下命令：
+
+```
+gsettings set org.gnome.shell enable-hot-corners true
+```
+
+如果以后要撤销此操作并禁用该热角，那么你需要使用以下命令：
+
+```
+gsettings set org.gnome.shell enable-hot-corners false
+```
+
+你可以使用 Gnome Tweaks 应用程序（该选项位于 Gnome Tweaks 的 “Top Bar” 部分）启用或禁用“活动概览热角” 选项，可以使用以下命令进行安装它：
+
+```
+sudo apt install gnome-tweaks
+```
+
+### 如何移除或禁用 Ubuntu Dock
+
+下面你将找到 4 种摆脱 Ubuntu Dock 的方法，环境在 Ubuntu 18.04 下。
+
+#### 方法 1: 移除 Gnome Shell Ubuntu Dock 包
+
+摆脱 Ubuntu Dock 的最简单方法就是删除包。
+
+这将会从你的系统中完全移除 Ubuntu Dock 扩展，但同时也移除了 `ubuntu-desktop` 元数据包。如果你移除 `ubuntu-desktop` 元数据包，不会马上出现问题，因为它本身没有任何作用。`ubuntu-desktop ` 元数据包依赖于组成 Ubuntu 桌面的大量包。它的依赖关系不会被删除，也不会被破坏。问题是如果你以后想升级到新的 Ubuntu 版本，那么将不会安装任何新的 `ubuntu-desktop` 依赖项。
+
+为了解决这个问题，你可以在升级到较新的 Ubuntu 版本之前安装 `ubuntu-desktop` 元数据包（例如，如果你想从 Ubuntu 18.04 升级到 18.10）。
+
+如果你对此没有意见，并且想要从系统中删除 Ubuntu Dock 扩展包，使用以下命令：
+
+```
+sudo apt remove gnome-shell-extension-ubuntu-dock
+```
+
+如果以后要撤消更改，只需使用以下命令安装扩展：
+
+```
+sudo apt install gnome-shell-extension-ubuntu-dock
+```
+
+或者重新安装 `ubuntu-desktop` 元数据包（这将会安装你可能已删除的任何 `ubuntu-desktop` 依赖项，包括 Ubuntu Dock），你可以使用以下命令：
+
+```
+sudo apt install ubuntu-desktop
+```
+
+#### 方法 2：安装并使用 vanilla Gnome 会话而不是默认的 Ubuntu 会话
+
+摆脱 Ubuntu Dock 的另一种方法是安装和使用原生 Gnome 会话。安装 原生 Gnome 会话还将安装此会话所依赖的其它软件包，如 Gnome 文档、地图、音乐、联系人、照片、跟踪器等。
+
+通过安装原生 Gnome 会话，你还将获得默认 Gnome GDM 登录和锁定屏幕主题，而不是 Ubuntu 默认的 Adwaita Gtk 主题和图标。你可以使用 Gnome Tweaks 应用程序轻松更改 Gtk 和图标主题。
+
+此外，默认情况下将禁用 AppIndicators 扩展（因此使用 AppIndicators 托盘的应用程序不会显示在顶部面板上），但你可以使用 Gnome Tweaks 启用此功能（在扩展中，启用 Ubuntu appindicators 扩展）。
+
+同样，你也可以从原生 Gnome 会话启用或禁用 Ubuntu Dock，这在 Ubuntu 会话中是不可能的（使用 Ubuntu 会话时无法从 Gnome Tweaks 禁用 Ubuntu Dock）。
+
+如果你不想安装原生 Gnome 会话所需的这些额外软件包，那么这个移除 Ubuntu Dock 的这个方法不适合你，请查看其它方法。
+
+如果你对此没有意见，以下是你需要做的事情。要在 Ubuntu 中安装原生的 Gnome 会话，使用以下命令：
+
+```
+sudo apt install vanilla-gnome-desktop
+```
+
+安装完成后，重启系统。在登录屏幕上，单击用户名，单击 “Sign in” 按钮旁边的齿轮图标，然后选择 “GNOME” 而不是 “Ubuntu”，之后继续登录。
+
+
+
+如果要撤销此操作并移除原生 Gnome 会话，可以使用以下命令清除原生 Gnome 软件包，然后删除它安装的依赖项（第二条命令）：
+
+```
+sudo apt purge vanilla-gnome-desktop
+sudo apt autoremove
+```
+
+然后重新启动，并以相同的方式从 GDM 登录屏幕中选择 Ubuntu。
+
+#### 方法 3：从桌面上永久隐藏 Ubuntu Dock，而不是将其移除
+
+如果你希望永久隐藏 Ubuntu Dock，不让它显示在桌面上，但不移除它或使用原生 Gnome 会话，你可以使用 Dconf 编辑器轻松完成此操作。这样做的缺点是 Ubuntu Dock 仍然会使用一些系统资源，即使你没有在桌面上使用它，但你也可以轻松恢复它而无需安装或移除任何包。
+
+Ubuntu Dock 只对你的桌面隐藏，当你进入叠加模式（活动）时，你仍然可以看到并从那里使用 Ubuntu Dock。
+
+要永久隐藏 Ubuntu Dock，使用 Dconf 编辑器导航到 `/org/gnome/shell/extensions/dash-to-dock` 并禁用以下选项（将它们设置为 `false`）：`autohide`、`dock-fixed` 和 `intellihide`。
+
+如果你愿意，可以从命令行实现此目的，运行以下命令：
+
+```
+gsettings set org.gnome.shell.extensions.dash-to-dock autohide false
+gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed false
+gsettings set org.gnome.shell.extensions.dash-to-dock intellihide false
+```
+
+如果你改变主意了并想撤销此操作，你可以使用 Dconf 编辑器从 `/org/gnome/shell/extensions/dash-to-dock` 中启动 `autohide`、 `dock-fixed` 和 `intellihide`（将它们设置为 `true`），或者你可以使用以下这些命令：
+
+```
+gsettings set org.gnome.shell.extensions.dash-to-dock autohide true
+gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true
+gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true
+```
+
+#### 方法 4：使用 Dash to Panel 扩展
+
+[Dash to Panel][2] 是 Gnome Shell 的一个高度可配置面板，是 Ubuntu Dock 或 Dash to Dock 的一个很好的替代品（Ubuntu Dock 是从 Dash to Dock 分叉而来的）。安装和启动 Dash to Panel 扩展会禁用 Ubuntu Dock，因此你无需执行其它任何操作。
+
+你可以从 [extensions.gnome.org][3] 来安装 Dash to Panel。
+
+如果你改变主意并希望重新使用 Ubuntu Dock，那么你可以使用 Gnome Tweaks 应用程序禁用 Dash to Panel，或者通过单击以下网址旁边的 X 按钮完全移除 Dash to Panel: https://extensions.gnome.org/local/ 。
+
+--------------------------------------------------------------------------------
+
+via: https://www.linuxuprising.com/2018/08/how-to-remove-or-disable-ubuntu-dock.html
+
+作者：[Logix][a]
+选题：[lujun9972](https://github.com/lujun9972)
+译者：[MjSeven](https://github.com/MjSeven)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]:https://plus.google.com/118280394805678839070
+[1]:https://bugs.launchpad.net/ubuntu/+source/gnome-tweak-tool/+bug/1713020
+[2]:https://www.linuxuprising.com/2018/05/gnome-shell-dash-to-panel-v14-brings.html
+[3]:https://extensions.gnome.org/extension/1160/dash-to-panel/
diff --git a/published/20180813 5 of the Best Linux Educational Software and Games for Kids.md b/published/201810/20180813 5 of the Best Linux Educational Software and Games for Kids.md
similarity index 100%
rename from published/20180813 5 of the Best Linux Educational Software and Games for Kids.md
rename to published/201810/20180813 5 of the Best Linux Educational Software and Games for Kids.md
diff --git a/published/20180814 Automating backups on a Raspberry Pi NAS.md b/published/201810/20180814 Automating backups on a Raspberry Pi NAS.md
similarity index 100%
rename from published/20180814 Automating backups on a Raspberry Pi NAS.md
rename to published/201810/20180814 Automating backups on a Raspberry Pi NAS.md
diff --git a/published/20180815 How to Create M3U Playlists in Linux [Quick Tip].md b/published/201810/20180815 How to Create M3U Playlists in Linux [Quick Tip].md
similarity index 100%
rename from published/20180815 How to Create M3U Playlists in Linux [Quick Tip].md
rename to published/201810/20180815 How to Create M3U Playlists in Linux [Quick Tip].md
diff --git a/published/20180816 Add YouTube Player Controls To Your Linux Desktop With browser-mpris2 (Chrome Extension).md b/published/201810/20180816 Add YouTube Player Controls To Your Linux Desktop With browser-mpris2 (Chrome Extension).md
similarity index 100%
rename from published/20180816 Add YouTube Player Controls To Your Linux Desktop With browser-mpris2 (Chrome Extension).md
rename to published/201810/20180816 Add YouTube Player Controls To Your Linux Desktop With browser-mpris2 (Chrome Extension).md
diff --git a/published/20180817 How To Lock The Keyboard And Mouse, But Not The Screen In Linux.md b/published/201810/20180817 How To Lock The Keyboard And Mouse, But Not The Screen In Linux.md
similarity index 100%
rename from published/20180817 How To Lock The Keyboard And Mouse, But Not The Screen In Linux.md
rename to published/201810/20180817 How To Lock The Keyboard And Mouse, But Not The Screen In Linux.md
diff --git a/published/20180821 A checklist for submitting your first Linux kernel patch.md b/published/201810/20180821 A checklist for submitting your first Linux kernel patch.md
similarity index 100%
rename from published/20180821 A checklist for submitting your first Linux kernel patch.md
rename to published/201810/20180821 A checklist for submitting your first Linux kernel patch.md
diff --git a/published/201810/20180823 CLI- improved.md b/published/201810/20180823 CLI- improved.md
new file mode 100644
index 0000000000..71d3f24be6
--- /dev/null
+++ b/published/201810/20180823 CLI- improved.md
@@ -0,0 +1,298 @@
+命令行：增强版
+======
+
+我不确定有多少 Web 开发者能完全避免使用命令行。就我来说，我从 1997 年上大学就开始使用命令行了，那时的 l33t-hacker 让我着迷，同时我也觉得它很难掌握。
+
+过去这些年我的命令行本领在逐步加强，我经常会去搜寻工作中能用的更好的命令行工具。下面就是我现在使用的用于增强原有命令行工具的列表。
+
+### 怎么忽略我所做的命令行增强
+
+通常情况下我会用别名将新的增强的命令行工具覆盖原来的命令（如 `cat` 和 `ping`）。
+
+如果我需要运行原来的命令的话（有时我确实需要这么做），我会像下面这样来运行未加修改的原始命令。（我用的是 Mac，你的用法可能不一样）
+
+```
+$ \cat # 忽略叫 "cat" 的别名 - 具体解释: https://stackoverflow.com/a/16506263/22617
+$ command cat # 忽略函数和别名
+```
+
+### bat > cat
+
+`cat` 用于打印文件的内容，如果你平时用命令行很多的话，例如语法高亮之类的功能会非常有用。我首先发现了 [ccat][3] 这个有语法高亮功能的工具，然后我发现了 [bat][4]，它的功能有语法高亮、分页、行号和 git 集成。
+
+`bat` 命令也能让我在（多于一屏的）输出里使用 `/` 搜索（和用 `less` 搜索功能一样）。
+
+![Simple bat output][5]
+
+我将别名 `cat` 指到了 `bat` 命令：
+
+```
+alias cat='bat'
+```
+
+- [安装指引][4]
+
+### prettyping > ping
+
+`ping` 非常有用，当我碰到“糟了，是不是 X 挂了？/我的网不通了？”这种情况下我最先想到的工具就是它了。但是 `prettyping`（“prettyping” 可不是指“pre typing”）在 `ping` 的基础上加了友好的输出，这可让我感觉命令行友好了很多呢。
+
+![prettyping][6]
+
+我也将 `ping` 用别名链接到了 `prettyping` 命令：
+
+```
+alias ping='prettyping --nolegend'
+```
+
+- [安装指引][7]
+
+### fzf > ctrl+r
+
+在终端里，使用 `ctrl+r` 将允许你在命令历史里[反向搜索][8]使用过的命令，这是个挺好的小技巧，尽管它有点麻烦。
+
+`fzf` 这个工具相比于 `ctrl+r` 有了**巨大的**进步。它能针对命令行历史进行模糊查询，并且提供了对可能的合格结果进行全面交互式预览。
+
+
+
+除了搜索命令历史，`fzf` 还能预览和打开文件，我在下面的视频里展示了这些功能。
+
+
+
+为了这个预览的效果，我创建了一个叫 `preview` 的别名，它将 `fzf` 和前文提到的 `bat` 组合起来完成预览功能，还给上面绑定了一个定制的热键 `ctrl+o` 来打开 VS Code：
+
+```
+alias preview="fzf --preview 'bat --color \"always\" {}'"
+# 支持在 VS Code 里用 ctrl+o 来打开选择的文件
+export FZF_DEFAULT_OPTS="--bind='ctrl-o:execute(code {})+abort'"
+```
+
+- [安装指引][9]
+
+### htop > top
+
+`top` 是当我想快速诊断为什么机器上的 CPU 跑的那么累或者风扇为什么突然呼呼大做的时候首先会想到的工具。我在生产环境也会使用这个工具。讨厌的是 Mac 上的 `top` 和 Linux 上的 `top` 有着极大的不同（恕我直言，应该是差的多）。
+
+不过，`htop` 是对 Linux 上的 `top` 和 Mac 上蹩脚的 `top` 的极大改进。它增加了包括颜色输出，键盘热键绑定以及不同的视图输出，这对理解进程之间的父子关系有极大帮助。
+
+一些很容易上手的热键：
+
+* `P` —— 按 CPU 使用率排序
+* `M` —— 按内存使用排序
+* `F4` —— 用字符串过滤进程（例如只看包括 node 的进程）
+* `space` —— 锚定一个单独进程，这样我能观察它是否有尖峰状态
+
+![htop output][10]
+
+在 Mac Sierra 上 htop 有个奇怪的 bug，不过这个 bug 可以通过以 root 运行来绕过（我实在记不清这个 bug 是什么，但是这个别名能搞定它，有点讨厌的是我得每次都输入 root 密码。）：
+
+```
+alias top="sudo htop" # 给 top 加上别名并且绕过 Sierra 上的 bug
+```
+
+- [安装指引][11]
+
+### diff-so-fancy > diff
+
+我非常确定我是几年前从 Paul Irish 那儿学来的这个技巧，尽管我很少直接使用 `diff`，但我的 git 命令行会一直使用 `diff`。`diff-so-fancy` 给了我代码语法颜色和更改字符高亮的功能。
+
+![diff so fancy][12]
+
+在我的 `~/.gitconfig` 文件里我用了下面的选项来打开 `git diff` 和 `git show` 的 `diff-so-fancy` 功能。
+
+```
+[pager]
+ diff = diff-so-fancy | less --tabs=1,5 -RFX
+ show = diff-so-fancy | less --tabs=1,5 -RFX
+```
+
+- [安装指引][13]
+
+### fd > find
+
+尽管我使用 Mac，但我绝不是 Spotlight 的粉丝，我觉得它的性能很差，关键字也难记，加上更新它自己的数据库时会拖慢 CPU，简直一无是处。我经常使用 [Alfred][14]，但是它的搜索功能也不是很好。
+
+我倾向于在命令行中搜索文件，但是 `find` 的难用在于很难去记住那些合适的表达式来描述我想要的文件。（而且 Mac 上的 `find` 命令和非 Mac 的 `find` 命令还有些许不同，这更加深了我的失望。）
+
+`fd` 是一个很好的替代品（它的作者和 `bat` 的作者是同一个人）。它非常快而且对于我经常要搜索的命令非常好记。
+
+几个上手的例子：
+
+```
+$ fd cli # 所有包含 "cli" 的文件名
+$ fd -e md # 所有以 .md 作为扩展名的文件
+$ fd cli -x wc -w # 搜索 "cli" 并且在每个搜索结果上运行 `wc -w`
+```
+
+![fd output][15]
+
+- [安装指引][16]
+
+### ncdu > du
+
+对我来说，知道当前磁盘空间被什么占用了非常重要。我用过 Mac 上的 [DaisyDisk][17]，但是我觉得那个程序产生结果有点慢。
+
+`du -sh` 命令是我经常会运行的命令（`-sh` 是指结果以“汇总”和“人类可读”的方式显示），我经常会想要深入挖掘那些占用了大量磁盘空间的目录，看看到底是什么在占用空间。
+
+`ncdu` 是一个非常棒的替代品。它提供了一个交互式的界面并且允许快速的扫描那些占用了大量磁盘空间的目录和文件，它又快又准。（尽管不管在哪个工具的情况下，扫描我的 home 目录都要很长时间，它有 550G）
+
+一旦当我找到一个目录我想要“处理”一下（如删除，移动或压缩文件），我会使用 `cmd` + 点击 [iTerm2][18] 顶部的目录名字的方法在 Finder 中打开它。
+
+![ncdu output][19]
+
+还有另外[一个叫 nnn 的替代选择][20]，它提供了一个更漂亮的界面，它也提供文件尺寸和使用情况，实际上它更像一个全功能的文件管理器。
+
+我的 `du` 是如下的别名：
+
+```
+alias du="ncdu --color dark -rr -x --exclude .git --exclude node_modules"
+```
+
+选项说明：
+
+* `--color dark` 使用颜色方案
+* `-rr` 只读模式（防止误删和运行新的 shell 程序）
+* `--exclude` 忽略不想操作的目录
+
+- [安装指引][21]
+
+### tldr > man
+
+几乎所有的命令行工具都有一个相伴的手册，它可以被 `man <命令名>` 来调出，但是在 `man` 的输出里找到东西可有点让人困惑，而且在一个包含了所有的技术细节的输出里找东西也挺可怕的。
+
+这就是 TL;DR 项目（LCTT 译注：英文里“文档太长，没空去读”的缩写）创建的初衷。这是一个由社区驱动的文档系统，而且可以用在命令行上。就我现在使用的经验，我还没碰到过一个命令没有它相应的文档，你[也可以做贡献][22]。
+
+![TLDR output for 'fd'][23]
+
+一个小技巧，我将 `tldr` 的别名链接到 `help`（这样输入会快一点……）
+
+```
+alias help='tldr'
+```
+
+- [安装指引][24]
+
+### ack || ag > grep
+
+`grep` 毫无疑问是一个强力的命令行工具，但是这些年来它已经被一些工具超越了，其中两个叫 `ack` 和 `ag`。
+
+我个人对 `ack` 和 `ag` 都尝试过，而且没有非常明显的个人偏好，（也就是说它们都很棒，并且很相似）。我倾向于默认只使用 `ack`，因为这三个字符就在指尖，很好打。并且 `ack` 有大量的 `ack --bar` 参数可以使用！（你一定会体会到这一点。）
+
+`ack` 和 `ag` 默认都使用正则表达式来搜索，这非常契合我的工作，我能使用类似于 `--js` 或 `--html` 这种标识指定文件类型搜索。（尽管 `ag` 比 `ack` 在文件类型过滤器里包括了更多的文件类型。）
+
+两个工具都支持常见的 `grep` 选项，如 `-B` 和 `-A` 用于在搜索的上下文里指代“之前”和“之后”。
+
+![ack in action][25]
+
+因为 `ack` 不支持 markdown（而我又恰好写了很多 markdown），我在我的 `~/.ackrc` 文件里加了以下定制语句：
+
+```
+--type-set=md=.md,.mkd,.markdown
+--pager=less -FRX
+```
+
+- 安装指引：[ack][26]，[ag][27]
+- [关于 ack & ag 的更多信息][28]
+
+### jq > grep 及其它
+
+我是 [jq][29] 的忠实粉丝之一。当然一开始我也在它的语法里苦苦挣扎，好在我对查询语言还算有些使用心得，现在我对 `jq` 可以说是每天都要用。（不过从前我要么使用 `grep` 或者使用一个叫 [json][30] 的工具，相比而言后者的功能就非常基础了。）
+
+我甚至开始撰写一个 `jq` 的教程系列（有 2500 字并且还在增加），我还发布了一个[网页工具][31]和一个 Mac 上的应用（这个还没有发布。）
+
+`jq` 允许我传入一个 JSON 并且能非常简单的将其转变为一个使用 JSON 格式的结果，这正是我想要的。下面这个例子允许我用一个命令更新我的所有 node 依赖。（为了阅读方便，我将其分成为多行。）
+
+```
+$ npm i $(echo $(\
+ npm outdated --json | \
+ jq -r 'to_entries | .[] | "\(.key)@\(.value.latest)"' \
+))
+```
+
+上面的命令将使用 npm 的 JSON 输出格式来列出所有过期的 node 依赖，然后将下面的源 JSON 转换为：
+
+```
+{
+ "node-jq": {
+ "current": "0.7.0",
+ "wanted": "0.7.0",
+ "latest": "1.2.0",
+ "location": "node_modules/node-jq"
+ },
+ "uuid": {
+ "current": "3.1.0",
+ "wanted": "3.2.1",
+ "latest": "3.2.1",
+ "location": "node_modules/uuid"
+ }
+}
+```
+
+转换结果为：
+
+```
+node-jq@1.2.0
+uuid@3.2.1
+```
+
+上面的结果会被作为 `npm install` 的输入，你瞧，我的升级就这样全部搞定了。（当然，这里有点小题大做了。）
+
+### 很荣幸提及一些其它的工具
+
+我也在开始尝试一些别的工具，但我还没有完全掌握它们。（除了 `ponysay`，当我打开一个新的终端会话时，它就会出现。）
+
+* [ponysay][32] > `cowsay`
+* [csvkit][33] > `awk 及其它`
+* [noti][34] > `display notification`
+* [entr][35] > `watch`
+
+### 你有什么好点子吗？
+
+上面是我的命令行清单。你的呢？你有没有试着去增强一些你每天都会用到的命令呢？请告诉我，我非常乐意知道。
+
+--------------------------------------------------------------------------------
+
+via: https://remysharp.com/2018/08/23/cli-improved
+
+作者：[Remy Sharp][a]
+选题：[lujun9972](https://github.com/lujun9972)
+译者：[DavidChenLiang](https://github.com/DavidChenLiang)
+校对：[pityonline](https://github.com/pityonline), [wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://remysharp.com
+[1]: https://remysharp.com/images/terminal-600.jpg
+[2]: https://training.leftlogic.com/buy/terminal/cli2?coupon=READERS-DISCOUNT&utm_source=blog&utm_medium=banner&utm_campaign=remysharp-discount
+[3]: https://github.com/jingweno/ccat
+[4]: https://github.com/sharkdp/bat
+[5]: https://remysharp.com/images/cli-improved/bat.gif (Sample bat output)
+[6]: https://remysharp.com/images/cli-improved/ping.gif (Sample ping output)
+[7]: http://denilson.sa.nom.br/prettyping/
+[8]: https://lifehacker.com/278888/ctrl%252Br-to-search-and-other-terminal-history-tricks
+[9]: https://github.com/junegunn/fzf
+[10]: https://remysharp.com/images/cli-improved/htop.jpg (Sample htop output)
+[11]: http://hisham.hm/htop/
+[12]: https://remysharp.com/images/cli-improved/diff-so-fancy.jpg (Sample diff output)
+[13]: https://github.com/so-fancy/diff-so-fancy
+[14]: https://www.alfredapp.com/
+[15]: https://remysharp.com/images/cli-improved/fd.png (Sample fd output)
+[16]: https://github.com/sharkdp/fd/
+[17]: https://daisydiskapp.com/
+[18]: https://www.iterm2.com/
+[19]: https://remysharp.com/images/cli-improved/ncdu.png (Sample ncdu output)
+[20]: https://github.com/jarun/nnn
+[21]: https://dev.yorhel.nl/ncdu
+[22]: https://github.com/tldr-pages/tldr#contributing
+[23]: https://remysharp.com/images/cli-improved/tldr.png (Sample tldr output for fd)
+[24]: http://tldr-pages.github.io/
+[25]: https://remysharp.com/images/cli-improved/ack.png (Sample ack output with grep args)
+[26]: https://beyondgrep.com
+[27]: https://github.com/ggreer/the_silver_searcher
+[28]: http://conqueringthecommandline.com/book/ack_ag
+[29]: https://stedolan.github.io/jq
+[30]: http://trentm.com/json/
+[31]: https://jqterm.com
+[32]: https://github.com/erkin/ponysay
+[33]: https://csvkit.readthedocs.io/en/1.0.3/
+[34]: https://github.com/variadico/noti
+[35]: http://www.entrproject.org/
diff --git a/published/20180823 How To Easily And Safely Manage Cron Jobs In Linux.md b/published/201810/20180823 How To Easily And Safely Manage Cron Jobs In Linux.md
similarity index 100%
rename from published/20180823 How To Easily And Safely Manage Cron Jobs In Linux.md
rename to published/201810/20180823 How To Easily And Safely Manage Cron Jobs In Linux.md
diff --git a/published/20180824 5 cool music player apps.md b/published/201810/20180824 5 cool music player apps.md
similarity index 100%
rename from published/20180824 5 cool music player apps.md
rename to published/201810/20180824 5 cool music player apps.md
diff --git a/published/20180824 What Stable Kernel Should I Use.md b/published/201810/20180824 What Stable Kernel Should I Use.md
similarity index 100%
rename from published/20180824 What Stable Kernel Should I Use.md
rename to published/201810/20180824 What Stable Kernel Should I Use.md
diff --git a/published/20180827 4 tips for better tmux sessions.md b/published/201810/20180827 4 tips for better tmux sessions.md
similarity index 100%
rename from published/20180827 4 tips for better tmux sessions.md
rename to published/201810/20180827 4 tips for better tmux sessions.md
diff --git a/translated/tech/20180827 A sysadmin-s guide to containers.md b/published/201810/20180827 A sysadmin-s guide to containers.md
similarity index 64%
rename from translated/tech/20180827 A sysadmin-s guide to containers.md
rename to published/201810/20180827 A sysadmin-s guide to containers.md
index f1c27e41c4..6716fd3b82 100644
--- a/translated/tech/20180827 A sysadmin-s guide to containers.md
+++ b/published/201810/20180827 A sysadmin-s guide to containers.md
@@ -1,38 +1,39 @@
-写给系统管理员的容器手册
+面向系统管理员的容器手册
======
+> 你所需了解的容器如何工作的知识。
-现在人们严重地过度使用“容器”这个术语。另外，对不同的人来说，它可能会有不同的含义，这取决于上下文。
+现在人们严重过度使用了“容器”这个术语。另外，对不同的人来说，它可能会有不同的含义，这取决于上下文。
-传统的 Linux 容器只是系统上普通的进程组成的进程组。进程组之间是相互隔离的，实现方法包括：资源限制（控制组 [cgoups]）、Linux 安全限制（文件权限，基于 Capability 的安全模块，SELinux，AppArmor，seccomp 等）还有名字空间（进程 ID，网络，挂载等）。
+传统的 Linux 容器只是系统上普通的进程。一组进程与另外一组进程是相互隔离的，实现方法包括：资源限制（控制组 [cgoups]）、Linux 安全限制（文件权限，基于 Capability 的安全模块、SELinux、AppArmor、seccomp 等）还有名字空间（进程 ID、网络、挂载等）。
-如果你启动一台现代 Linux 操作系统，使用 `cat /proc/PID/cgroup` 命令就可以看到该进程是属于一个控制组的。还可以从 `/proc/PID/status` 文件中查看进程的 Capability 信息，从 `/proc/self/attr/current` 文件中查看进程的 SELinux 标签信息，从 `/proc/PID/ns` 目录下的文件查看进程所属的名字空间。因此，如果把容器定义为带有资源限制、Linux 安全限制和名字空间的进程，那么按照这个定义，Linux 操作系统上的每一个进程都在容器里。因此我们常说 [Linux 就是容器，容器就是 Linux][1]。而**容器运行时**是这样一种工具，它调整上述资源限制、安全限制和名字空间，并启动容器。
+如果你启动一台现代 Linux 操作系统，使用 `cat /proc/PID/cgroup` 命令就可以看到该进程是属于一个控制组的。还可以从 `/proc/PID/status` 文件中查看进程的 Capability 信息，从 `/proc/self/attr/current` 文件中查看进程的 SELinux 标签信息，从 `/proc/PID/ns` 目录下的文件查看进程所属的名字空间。因此，如果把容器定义为带有资源限制、Linux 安全限制和名字空间的进程，那么按照这个定义，Linux 操作系统上的每一个进程都在一个容器里。因此我们常说 [Linux 就是容器，容器就是 Linux][1]。而**容器运行时**是这样一种工具，它调整上述资源限制、安全限制和名字空间，并启动容器。
Docker 引入了**容器镜像**的概念，镜像是一个普通的 TAR 包文件，包含了：
- * **Rootfs（容器的根文件系统）：**一个目录，看起来像是操作系统的普通根目录（/），例如，一个包含 `/usr`, `/var`, `/home` 等的目录。
- * **JSON 文件（容器的配置）：**定义了如何运行 rootfs；例如，当容器启动的时候要在 rootfs 里运行什么 **command** 或者 **entrypoint**，给容器定义什么样的**环境变量**，容器的**工作目录**是哪个，以及其他一些设置。
+* **rootfs（容器的根文件系统）**：一个目录，看起来像是操作系统的普通根目录（`/`），例如，一个包含 `/usr`, `/var`, `/home` 等的目录。
+* **JSON 文件（容器的配置）**：定义了如何运行 rootfs；例如，当容器启动的时候要在 rootfs 里运行什么命令（`CMD`）或者入口（`ENTRYPOINT `），给容器定义什么样的环境变量（`ENV`），容器的工作目录（`WORKDIR `）是哪个，以及其他一些设置。
Docker 把 rootfs 和 JSON 配置文件打包成**基础镜像**。你可以在这个基础之上，给 rootfs 安装更多东西，创建新的 JSON 配置文件，然后把相对于原始镜像的不同内容打包到新的镜像。这种方法创建出来的是**分层的镜像**。
-[Open Container Initiative（开放容器计划 OCI）][2] 标准组织最终把容器镜像的格式标准化了，也就是 [OCI Image Specification（OCI 镜像规范）][3]。
+[开放容器计划][2]（OCI）标准组织最终把容器镜像的格式标准化了，也就是 [镜像规范][3]（OCI）。
用来创建容器镜像的工具被称为**容器镜像构建器**。有时候容器引擎做这件事情，不过可以用一些独立的工具来构建容器镜像。
-Docker 把这些容器镜像（**tar 包**）托管到 web 服务中，并开发了一种协议来支持从 web 拉取镜像，这个 web 服务就叫**容器仓库**。
+Docker 把这些容器镜像（**tar 包**）托管到 web 服务中，并开发了一种协议来支持从 web 拉取镜像，这个 web 服务就叫容器仓库。
**容器引擎**是能从镜像仓库拉取镜像并装载到**容器存储**上的程序。容器引擎还能启动**容器运行时**（见下图）。
-容器存储一般是**写入时复制**（COW）的分层文件系统。从容器仓库拉取一个镜像时，其中的 rootfs 首先被解压到磁盘。如果这个镜像是多层的，那么每一层都会被下载到 COW 文件系统的不同分层。 COW 文件系统保证了镜像的每一层独立存储，这最大化了多个分层镜像之间的文件共享程度。容器引擎通常支持多种容器存储类型，包括 `overlay`、`devicemapper`、`btrfs`、`aufs` 和 `zfs`。
+容器存储一般是写入时复制（COW）的分层文件系统。从容器仓库拉取一个镜像时，其中的 rootfs 首先被解压到磁盘。如果这个镜像是多层的，那么每一层都会被下载到 COW 文件系统的不同分层。 COW 文件系统保证了镜像的每一层独立存储，这最大化了多个分层镜像之间的文件共享程度。容器引擎通常支持多种容器存储类型，包括 `overlay`、`devicemapper`、`btrfs`、`aufs` 和 `zfs`。
容器引擎将容器镜像下载到容器存储中之后，需要创建一份**容器运行时配置**，这份配置是用户/调用者的输入和镜像配置的合并。例如，容器的调用者可能会调整安全设置，添加额外的环境变量或者挂载一些卷到容器中。
容器运行时配置的格式，和解压出来的 rootfs 也都被开放容器计划 OCI 标准组织做了标准化，称为 [OCI 运行时规范][4]。
-最终，容器引擎启动了一个**容器运行时**来读取运行时配置，修改 Linux 控制组、安全限制和名字空间，并执行容器命令来创建容器的 **PID 1**。至此，容器引擎已经可以把容器的标准输入/标准输出转给调用方，并控制容器了（例如，stop，start，attach）。
+最终，容器引擎启动了一个**容器运行时**来读取运行时配置，修改 Linux 控制组、安全限制和名字空间，并执行容器命令来创建容器的 **PID 1** 进程。至此，容器引擎已经可以把容器的标准输入/标准输出转给调用方，并控制容器了（例如，`stop`、`start`、`attach`）。
值得一提的是，现在出现了很多新的容器运行时，它们使用 Linux 的不同特性来隔离容器。可以使用 KVM 技术来隔离容器（想想迷你虚拟机），或者使用其他虚拟机监视器策略（例如拦截所有从容器内的进程发起的系统调用）。既然我们有了标准的运行时规范，这些工具都能被相同的容器引擎来启动。即使在 Windows 系统下，也可以使用 OCI 运行时规范来启动 Windows 容器。
@@ -45,7 +46,7 @@ via: https://opensource.com/article/18/8/sysadmins-guide-containers
作者：[Daniel J Walsh][a]
选题：[lujun9972](https://github.com/lujun9972)
译者：[belitex](https://github.com/belitex)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/published/20180827 Solve -error- failed to commit transaction (conflicting files)- In Arch Linux.md b/published/201810/20180827 Solve -error- failed to commit transaction (conflicting files)- In Arch Linux.md
similarity index 100%
rename from published/20180827 Solve -error- failed to commit transaction (conflicting files)- In Arch Linux.md
rename to published/201810/20180827 Solve -error- failed to commit transaction (conflicting files)- In Arch Linux.md
diff --git a/published/20180830 6 places to host your git repository.md b/published/201810/20180830 6 places to host your git repository.md
similarity index 100%
rename from published/20180830 6 places to host your git repository.md
rename to published/201810/20180830 6 places to host your git repository.md
diff --git a/published/20180901 5 Ways to Take Screenshot in Linux GUI and Terminal.md b/published/201810/20180901 5 Ways to Take Screenshot in Linux GUI and Terminal.md
similarity index 100%
rename from published/20180901 5 Ways to Take Screenshot in Linux GUI and Terminal.md
rename to published/201810/20180901 5 Ways to Take Screenshot in Linux GUI and Terminal.md
diff --git a/published/201810/20180901 Flameshot - A Simple, Yet Powerful Feature-rich Screenshot Tool.md b/published/201810/20180901 Flameshot - A Simple, Yet Powerful Feature-rich Screenshot Tool.md
new file mode 100644
index 0000000000..a34c575261
--- /dev/null
+++ b/published/201810/20180901 Flameshot - A Simple, Yet Powerful Feature-rich Screenshot Tool.md
@@ -0,0 +1,164 @@
+Flameshot：一个简洁但功能丰富的截图工具
+======
+
+
+
+截图是我工作的一部分，我先前使用深度截图工具来截图，深度截图是一个简单、轻量级且非常简洁的截图工具。它自带许多功能例如窗口识别、快捷键支持、图片编辑、延时截图、社交分享、智能存储以及图片清晰度调整等功能。今天我碰巧发现了另一个具备多种功能的截图工具，它就是 **Flameshot** ，一个简单但功能丰富的针对类 Unix 系统的截图工具。它简单易用，可定制并且有选项可以支持上传截图到在线图片分享网站 **imgur** 上。同时 Flameshot 有一个 CLI 版本，所以你也可以从命令行来进行截图。Flameshot 是一个完全免费且开源的工具。在本教程中，我们将看到如何安装 Flameshot 以及如何使用它来截图。
+
+### 安装 Flameshot
+
+**在 Arch Linux 上：**
+
+Flameshot 可以从 Arch LInux 的 [community] 仓库中获取。确保你已经启用了 community 仓库，然后就可以像下面展示的那样使用 pacman 来安装 Flameshot ：
+
+```
+$ sudo pacman -S flameshot
+```
+
+它也可以从 [**AUR**][1] 中获取，所以你还可以使用任意一个 AUR 帮助程序（例如 [**Yay**][2]）来在基于 Arch 的系统中安装它：
+
+```
+$ yay -S flameshot-git
+```
+
+**在 Fedora 中：**
+
+```
+$ sudo dnf install flameshot
+```
+
+在 **Debian 10+** 和 **Ubuntu 18.04+** 中，可以使用 APT 包管理器来安装它：
+
+```
+$ sudo apt install flameshot
+```
+
+**在 openSUSE 上：**
+
+```
+$ sudo zypper install flameshot
+```
+
+在其他的 Linux 发行版中，可以从源代码编译并安装它。编译过程中需要 **Qt version 5.3** 以及 **GCC 4.9.2** 或者它们的更高版本。
+
+### 使用
+
+可以从菜单或者应用启动器中启动 Flameshot。在 MATE 桌面环境，它通常可以在 “Applications -> Graphics” 下找到。
+
+一旦打开了它，你就可以在系统面板中看到 Flameshot 的托盘图标。
+
+**注意：**
+
+假如你使用 Gnome 桌面环境，为了能够看到系统托盘图标，你需要安装 [TopIcons][3] 扩展。
+
+在 Flameshot 托盘图标上右击，你便会看到几个菜单项，例如打开配置窗口、信息窗口以及退出该应用。
+
+要进行截图，只需要点击托盘图标就可以了。接着你将看到如何使用 Flameshot 的帮助窗口。选择一个截图区域，然后敲回车键便可以截屏了，点击右键便可以看到颜色拾取器，再敲空格键便可以查看屏幕侧边的面板。你可以使用鼠标的滚轮来增加或者减少指针的宽度。
+
+Flameshot 自带一系列非常好的功能，例如：
+
+* 可以进行手写
+* 可以划直线
+* 可以画长方形或者圆形框
+* 可以进行长方形区域选择
+* 可以画箭头
+* 可以对要点进行标注
+* 可以添加文本
+* 可以对图片或者文字进行模糊处理
+* 可以展示图片的尺寸大小
+* 在编辑图片是可以进行撤销和重做操作
+* 可以将选择的东西复制到剪贴板
+* 可以保存选区
+* 可以离开截屏
+* 可以选择另一个 app 来打开图片
+* 可以上传图片到 imgur 网站
+* 可以将图片固定到桌面上
+
+下面是一个示例的视频：
+
+
+
+### 快捷键
+
+Frameshot 也支持快捷键。在 Flameshot 的托盘图标上右击并点击 “Information” 窗口便可以看到在 GUI 模式下所有可用的快捷键。下面是在 GUI 模式下可用的快捷键清单：
+
+| 快捷键 | 描述 |
+|------------------------|------------------------------|
+| `←`、`↓`、`↑`、`→` | 移动选择区域 1px |
+| `Shift` + `←`、`↓`、`↑`、`→` | 将选择区域大小更改 1px |
+| `Esc` | 退出截图 |
+| `Ctrl` + `C` | 复制到粘贴板 |
+| `Ctrl` + `S` | 将选择区域保存为文件 |
+| `Ctrl` + `Z` | 撤销最近的一次操作 |
+| 鼠标右键 | 展示颜色拾取器 |
+| 鼠标滚轮 | 改变工具的宽度 |
+
+边按住 `Shift` 键并拖动选择区域的其中一个控制点将会对它相反方向的控制点做类似的拖放操作。
+
+### 命令行选项
+
+Flameshot 也支持一系列的命令行选项来延时截图和保存图片到自定义的路径。
+
+要使用 Flameshot GUI 模式，运行：
+
+```
+$ flameshot gui
+```
+
+要使用 GUI 模式截屏并将你选取的区域保存到一个自定义的路径，运行：
+
+```
+$ flameshot gui -p ~/myStuff/captures
+```
+
+要延时 2 秒后打开 GUI 模式可以使用：
+
+```
+$ flameshot gui -d 2000
+```
+
+要延时 2 秒并将截图保存到一个自定义的路径（无 GUI）可以使用：
+
+```
+$ flameshot full -p ~/myStuff/captures -d 2000
+```
+
+要截图全屏并保存到自定义的路径和粘贴板中使用：
+
+```
+$ flameshot full -c -p ~/myStuff/captures
+```
+
+要在截屏中包含鼠标并将图片保存为 PNG 格式可以使用：
+
+```
+$ flameshot screen -r
+```
+
+要对屏幕 1 进行截屏并将截屏复制到粘贴板中可以运行：
+
+```
+$ flameshot screen -n 1 -c
+```
+
+你还需要什么功能呢？Flameshot 拥有几乎截屏的所有功能：添加注释、编辑图片、模糊处理或者对要点做高亮等等功能。我想：在我找到它的最佳替代品之前，我将一直使用 Flameshot 来作为我当前的截图工具。请尝试一下它，你不会失望的。
+
+好了，这就是今天的全部内容了。后续将有更多精彩内容，请保持关注！
+
+Cheers!
+
+--------------------------------------------------------------------------------
+
+via: https://www.ostechnix.com/flameshot-a-simple-yet-powerful-feature-rich-screenshot-tool/
+
+作者：[SK][a]
+选题：[lujun9972](https://github.com/lujun9972)
+译者：[FSSlc](https://github.com/FSSlc)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.ostechnix.com/author/sk/
+[1]: https://aur.archlinux.org/packages/flameshot-git
+[2]: https://www.ostechnix.com/yay-found-yet-another-reliable-aur-helper/
+[3]: https://extensions.gnome.org/extension/1031/topicons/
diff --git a/published/20180906 How To Limit Network Bandwidth In Linux Using Wondershaper.md b/published/201810/20180906 How To Limit Network Bandwidth In Linux Using Wondershaper.md
similarity index 100%
rename from published/20180906 How To Limit Network Bandwidth In Linux Using Wondershaper.md
rename to published/201810/20180906 How To Limit Network Bandwidth In Linux Using Wondershaper.md
diff --git a/published/20180907 How to Use the Netplan Network Configuration Tool on Linux.md b/published/201810/20180907 How to Use the Netplan Network Configuration Tool on Linux.md
similarity index 100%
rename from published/20180907 How to Use the Netplan Network Configuration Tool on Linux.md
rename to published/201810/20180907 How to Use the Netplan Network Configuration Tool on Linux.md
diff --git a/published/20180910 How To List An Available Package Groups In Linux.md b/published/201810/20180910 How To List An Available Package Groups In Linux.md
similarity index 100%
rename from published/20180910 How To List An Available Package Groups In Linux.md
rename to published/201810/20180910 How To List An Available Package Groups In Linux.md
diff --git a/translated/tech/20180912 How to build rpm packages.md b/published/201810/20180912 How to build rpm packages.md
similarity index 58%
rename from translated/tech/20180912 How to build rpm packages.md
rename to published/201810/20180912 How to build rpm packages.md
index 8506184294..16a04f80a6 100644
--- a/translated/tech/20180912 How to build rpm packages.md
+++ b/published/201810/20180912 How to build rpm packages.md
@@ -1,19 +1,19 @@
-如何构建rpm包
+如何构建 RPM 包
======
-节省跨多个主机安装文件和脚本的时间和精力。
+> 节省跨多个主机安装文件和脚本的时间和精力。
-自20多年前我开始使用 Linux 以来，我已经使用过基于 rpm 的软件包管理器在 Red Hat 和 Fedora Linux系统上安装软件。我使用过 **rpm** 程序本身，还有 **yum** 和 **DNF** ，用于在我的 Linux 主机上安装和更新软件包，DNF 是 yum 的一个紧密后代。 yum 和 DNF 工具是 rpm 实用程序的包装器，它提供了其他功能，例如查找和安装包依赖项的功能。
+自20多年前我开始使用 Linux 以来，我已经使用过基于 rpm 的软件包管理器在 Red Hat 和 Fedora Linux 系统上安装软件。我使用过 `rpm` 程序本身，还有 `yum` 和 `dnf` ，用于在我的 Linux 主机上安装和更新软件包，`dnf` 是 `yum` 的一个近亲。 `yum` 和 `dnf` 工具是 `rpm` 实用程序的包装器，它提供了其他功能，例如查找和安装包依赖项的功能。
-多年来，我创建了许多 Bash 脚本，其中一些脚本具有单独的配置文件，我希望在大多数新计算机和虚拟机上安装这些脚本。这也能解决安装所有这些软件包需要花费大量时间的难题，因此我决定通过创建一个 rpm 软件包来自动执行该过程，我可以将其复制到目标主机并将所有这些文件安装在适当的位置。虽然 **rpm** 工具以前用于构建 rpm 包，但该功能已被删除，并且创建了一个新工具来构建新的 rpm。
+多年来，我创建了许多 Bash 脚本，其中一些脚本具有单独的配置文件，我希望在大多数新计算机和虚拟机上安装这些脚本。这也能解决安装所有这些软件包需要花费大量时间的难题，因此我决定通过创建一个 rpm 软件包来自动执行该过程，我可以将其复制到目标主机并将所有这些文件安装在适当的位置。虽然 `rpm` 工具以前用于构建 rpm 包，但该功能已被删除，并且创建了一个新工具来构建新的 rpm。
-当我开始这个项目时，我发现很少有关于创建 rpm 包的信息，但我找到了一本书，名为《Maximum RPM》，这本书才帮我弄明白了。这本书现在已经过时了，我发现的绝大多数信息都是如此。它也已经绝版，使用复印件需要花费数百美元。[Maximum RPM][1] 的在线版本是免费提供的，并保持最新。 [RPM 网站][2]还有其他网站的链接，这些网站上有很多关于 rpm 的文档。其他的信息往往是简短的，显然都是假设你已经对该过程有了很多了解。
+当我开始这个项目时，我发现很少有关于创建 rpm 包的信息，但我找到了一本书，名为《Maximum RPM》，这本书才帮我弄明白了。这本书现在已经过时了，我发现的绝大多数信息都是如此。它也已经绝版，用过的副本也需要花费数百美元。[Maximum RPM][1] 的在线版本是免费提供的，并保持最新。该 [RPM 网站][2]还有其他网站的链接，这些网站上有很多关于 rpm 的文档。其他的信息往往是简短的，显然都是假设你已经对该过程有了很多了解。
-此外，我发现的每个文档都假定代码需要在开发环境中从源代码编译。我不是开发人员。我是一个系统管理员，我们系统管理员有不同的需求，因为我们不需要或者我们不应该为了管理任务而去编译代码;我们应该使用 shell 脚本。所以我们没有源代码，因为它需要被编译成二进制可执行文件。我们拥有的是一个也是可执行的源代码。
+此外，我发现的每个文档都假定代码需要在开发环境中从源代码编译。我不是开发人员。我是一个系统管理员，我们系统管理员有不同的需求，因为我们不需要或者我们不应该为了管理任务而去编译代码；我们应该使用 shell 脚本。所以我们没有源代码，因为它需要被编译成二进制可执行文件。我们拥有的源代码也应该是可执行的。
-在大多数情况下，此项目应作为非 root 用户执行。 Rpm 包永远不应该由 root 用户构建，而只能由非特权普通用户构建。我将指出哪些部分应该以 root 身份执行，哪些部分应由非 root，非特权用户执行。
+在大多数情况下，此项目应作为非 root 用户执行。 rpm 包永远不应该由 root 用户构建，而只能由非特权普通用户构建。我将指出哪些部分应该以 root 身份执行，哪些部分应由非 root，非特权用户执行。
### 准备
@@ -37,7 +37,7 @@ passwd: all authentication tokens updated successfully.
[root@testvm1 ~]#
```
-构建 rpm 包需要 `rpm-build` 包，该包可能尚未安装。 现在以 root 身份安装它。 请注意，此命令还将安装多个依赖项。 数量可能会有所不同，具体取决于主机上已安装的软件包； 它在我的测试虚拟机上总共安装了17个软件包，这是非常小的。
+构建 rpm 包需要 `rpm-build` 包，该包可能尚未安装。 现在以 root 身份安装它。 请注意，此命令还将安装多个依赖项。 数量可能会有所不同，具体取决于主机上已安装的软件包； 它在我的测试虚拟机上总共安装了 17 个软件包，这是非常小的。
```
dnf install -y rpm-build
@@ -49,15 +49,15 @@ dnf install -y rpm-build
wget https://github.com/opensourceway/how-to-rpm/raw/master/utils.tar
```
-此 tar 包包含将由最终 rpm 程序安装的所有文件和 Bash 脚本。 还有一个完整的 spec 文件，你可以使用它来构建 rpm。 我们将详细介绍 spec 文件的每个部分。
+此 tar 包包含将由最终 `rpm` 程序安装的所有文件和 Bash 脚本。 还有一个完整的 spec 文件，你可以使用它来构建 rpm。 我们将详细介绍 spec 文件的每个部分。
-作为普通学生 student，使用你的家目录作为当前工作目录（pwd），解压缩 tar 包。
+作为普通学生 student，使用你的家目录作为当前工作目录（`pwd`），解压缩 tar 包。
```
[student@testvm1 ~]$ cd ; tar -xvf utils.tar
```
-使用 `tree` 命令验证~/development 的目录结构和包含的文件，如下所示：
+使用 `tree` 命令验证 `~/development` 的目录结构和包含的文件，如下所示：
```
[student@testvm1 ~]$ tree development/
@@ -77,13 +77,13 @@ development/
[student@testvm1 ~]$
```
-`mymotd` 脚本创建一个发送到标准输出的“当日消息”数据流。 `create_motd` 脚本运行 `mymotd` 脚本并将输出重定向到 /etc/motd 文件。 此文件用于向使用SSH远程登录的用户显示每日消息。
+`mymotd` 脚本创建一个发送到标准输出的“当日消息”数据流。 `create_motd` 脚本运行 `mymotd` 脚本并将输出重定向到 `/etc/motd` 文件。 此文件用于向使用 SSH 远程登录的用户显示每日消息。
-`die` 脚本是我自己的脚本，它将 `kill` 命令包装在一些代码中，这些代码可以找到与指定字符串匹配的运行程序并将其终止。 它使用 `kill -9` 来确保kill命令一定会执行。
+`die` 脚本是我自己的脚本，它将 `kill` 命令包装在一些代码中，这些代码可以找到与指定字符串匹配的运行程序并将其终止。 它使用 `kill -9` 来确保 `kill` 命令一定会执行。
-`sysdata` 脚本可以显示有关计算机硬件，还有已安装的 Linux 版本，所有已安装的软件包以及硬盘驱动器元数据的数万行数据。 我用它来记录某个时间点的主机状态。 我以后可以用它作为参考。 我曾经这样做是为了维护我为客户安装的主机记录。
+`sysdata` 脚本可以显示有关计算机硬件，还有已安装的 Linux 版本，所有已安装的软件包以及硬盘驱动器元数据等数万行数据。 我用它来记录某个时间点的主机状态。 我以后可以用它作为参考。 我曾经这样做是为了维护我为客户安装的主机记录。
-你可能需要将这些文件和目录的所有权更改为 student:student 。 如有必要，使用以下命令执行此操作：
+你可能需要将这些文件和目录的所有权更改为 `student:student` 。 如有必要，使用以下命令执行此操作：
```
chown -R student:student development
@@ -104,11 +104,11 @@ chown -R student:student development
└── SRPMS
```
-我们不会创建 rpmbuild/RPMS/X86_64 目录，因为对于64位编译的二进制文件这是特定于体系结构的。 我们有 shell 脚本，不是特定于体系结构的。 实际上，我们也不会使用 SRPMS 目录，它将包含编译器的源文件。
+我们不会创建 `rpmbuild/RPMS/X86_64` 目录，因为它是特定于体系结构编译的 64 位二进制文件。 我们有 shell 脚本，不是特定于体系结构的。 实际上，我们也不会使用 `SRPMS` 目录，它将包含编译器的源文件。
### 检查 spec 文件
-每个 spec 文件都有许多部分，其中一些部分可能会被忽视或省略，取决于 rpm 构建的具体情况。 这个特定的 spec 文件不是工作所需的最小文件的示例，但它是一个很好的包含不需要编译的文件的中等复杂 spec 文件的例子。 如果需要编译，它将在`构建`部分中执行，该部分在此 spec 文件中省略掉了，因为它不是必需的。
+每个 spec 文件都有许多部分，其中一些部分可能会被忽视或省略，取决于 rpm 构建的具体情况。 这个特定的 spec 文件不是工作所需的最小文件的示例，但它是一个包含不需要编译的文件的中等复杂 spec 文件的很好例子。 如果需要编译，它将在 `%build` 部分中执行，该部分在此 spec 文件中省略掉了，因为它不是必需的。
#### 前言
@@ -139,40 +139,46 @@ BuildRoot: ~/rpmbuild/
# rpmbuild --target noarch -bb utils.spec
```
-`rpmbuild` 程序会忽略注释行。我总是喜欢在本节中添加注释，其中包含创建包所需的 `rpmbuild` 命令的确切语法。摘要标签是包的简短描述。 Name，Version 和 Release 标签用于创建 rpm 文件的名称，如utils-1.00-1.rpm 中所示。通过增加发行版号码和版本号，你可以创建 rpm 包去更新旧版本的。
+`rpmbuild` 程序会忽略注释行。我总是喜欢在本节中添加注释，其中包含创建包所需的 `rpmbuild` 命令的确切语法。
-许可证标签定义了发布包的许可证。我总是使用 GPL 的一个变体。指定许可证对于澄清包中包含的软件是开源的这一事实非常重要。这也是我将许可证和 GPL 语句包含在将要安装的文件中的原因。
+`Summary` 标签是包的简短描述。
-URL 通常是项目或项目所有者的网页。在这种情况下，它是我的个人网页。
+`Name`、`Version` 和 `Release` 标签用于创建 rpm 文件的名称，如 `utils-1.00-1.rpm`。通过增加发行版号码和版本号，你可以创建 rpm 包去更新旧版本的。
-Group 标签很有趣，通常用于 GUI 应用程序。 Group 标签的值决定了应用程序菜单中的哪一组图标将包含此包中可执行文件的图标。与 Icon 标签（我们此处未使用）一起使用时，Group 标签允许添加图标和所需信息用于将程序启动到应用程序菜单结构中。
+`License` 标签定义了发布包的许可证。我总是使用 GPL 的一个变体。指定许可证对于澄清包中包含的软件是开源的这一事实非常重要。这也是我将 `License` 和 `GPL` 语句包含在将要安装的文件中的原因。
-Packager 标签用于指定负责维护和创建包的人员或组织。
+`URL` 通常是项目或项目所有者的网页。在这种情况下，它是我的个人网页。
-Requires 语句定义此 rpm 包的依赖项。每个都是包名。如果其中一个指定的软件包不存在，DNF 安装实用程序将尝试在 /etc/yum.repos.d 中定义的某个已定义的存储库中找到它，如果存在则安装它。如果 DNF 找不到一个或多个所需的包，它将抛出一个错误，指出哪些包丢失并终止。
+`Group` 标签很有趣，通常用于 GUI 应用程序。 `Group` 标签的值决定了应用程序菜单中的哪一组图标将包含此包中可执行文件的图标。与 `Icon` 标签（我们此处未使用）一起使用时，`Group` 标签允许在应用程序菜单结构中添加用于启动程序的图标和所需信息。
-BuildRoot 行指定顶级目录，`rpmbuild` 工具将在其中找到 spec 文件，并在构建包时在其中创建临时目录。完成的包将存储在我们之前指定的noarch子目录中。注释显示了构建此程序包的命令语法，包括定义了目标体系结构的 `–target noarch` 选项。因为这些是Bash脚本，所以它们与特定的CPU架构无关。如果省略此选项，则构建将选用正在执行构建的CPU的体系结构。
+`Packager` 标签用于指定负责维护和创建包的人员或组织。
+
+`Requires` 语句定义此 rpm 包的依赖项。每个都是包名。如果其中一个指定的软件包不存在，DNF 安装实用程序将尝试在 `/etc/yum.repos.d` 中定义的某个已定义的存储库中找到它，如果存在则安装它。如果 DNF 找不到一个或多个所需的包，它将抛出一个错误，指出哪些包丢失并终止。
+
+`BuildRoot` 行指定顶级目录，`rpmbuild` 工具将在其中找到 spec 文件，并在构建包时在其中创建临时目录。完成的包将存储在我们之前指定的 `noarch` 子目录中。
+
+注释显示了构建此程序包的命令语法，包括定义了目标体系结构的 `–target noarch` 选项。因为这些是 Bash 脚本，所以它们与特定的 CPU 架构无关。如果省略此选项，则构建将选用正在执行构建的 CPU 的体系结构。
`rpmbuild` 程序可以针对许多不同的体系结构，并且使用 `--target` 选项允许我们在不同的体系结构主机上构建特定体系结构的包，其具有与执行构建的体系结构不同的体系结构。所以我可以在 x86_64 主机上构建一个用于 i686 架构的软件包，反之亦然。
如果你有自己的网站，请将打包者的名称更改为你自己的网站。
-#### 描述
+#### 描述部分（`%description`）
-spec 文件的 `描述` 部分包含 rpm 包的描述。 它可以很短，也可以包含许多信息。 我们的 `描述` 部分相当简洁。
+spec 文件的 `%description` 部分包含 rpm 包的描述。 它可以很短，也可以包含许多信息。 我们的 `%description` 部分相当简洁。
```
%description
A collection of utility scripts for testing RPM creation.
```
-#### 准备
+#### 准备部分（`%prep`）
-`准备` 部分是在构建过程中执行的第一个脚本。 在安装程序包期间不会执行此脚本。
+`%prep` 部分是在构建过程中执行的第一个脚本。 在安装程序包期间不会执行此脚本。
-这个脚本只是一个 Bash shell 脚本。 它准备构建目录，根据需要创建用于构建的目录，并将相应的文件复制到各自的目录中。 这将包括完整编译作为构建的一部分所需的源。
+这个脚本只是一个 Bash shell 脚本。 它准备构建目录，根据需要创建用于构建的目录，并将相应的文件复制到各自的目录中。 这将包括作为构建的一部分的完整编译所需的源代码。
-$RPM_BUILD_ROOT 目录表示已安装系统的根目录。 在 $RPM_BUILD_ROOT 目录中创建的目录是实时文件系统中的绝对路径，例如 /user/local/share/utils，/usr/local/bin 等。
+`$RPM_BUILD_ROOT` 目录表示已安装系统的根目录。 在 `$RPM_BUILD_ROOT` 目录中创建的目录是真实文件系统中的绝对路径，例如 `/user/local/share/utils`、`/usr/local/bin` 等。
对于我们的包，我们没有预编译源，因为我们的所有程序都是 Bash 脚本。 因此，我们只需将这些脚本和其他文件复制到已安装系统的目录中。
@@ -193,11 +199,11 @@ cp /home/student/development/utils/spec/* $RPM_BUILD_ROOT/usr/local/share/utils
exit
```
-请注意，本节末尾的 exit 语句是必需的。
+请注意，本节末尾的 `exit` 语句是必需的。
-#### 文件
+#### 文件部分（`%files`）
-spec 文件的这一部分定义了要安装的文件及其在目录树中的位置。 它还指定了要安装的每个文件的文件属性以及所有者和组所有者。 文件权限和所有权是可选的，但我建议明确设置它们以消除这些属性在安装时不正确或不明确的任何可能性。 如果目录尚不存在，则会在安装期间根据需要创建目录。
+spec 文件的 `%files` 这一部分定义了要安装的文件及其在目录树中的位置。 它还指定了要安装的每个文件的文件属性（`%attr`）以及所有者和组所有者。 文件权限和所有权是可选的，但我建议明确设置它们以消除这些属性在安装时不正确或不明确的任何可能性。 如果目录尚不存在，则会在安装期间根据需要创建目录。
```
%files
@@ -205,13 +211,13 @@ spec 文件的这一部分定义了要安装的文件及其在目录树中的位
%attr(0644, root, root) /usr/local/share/utils/*
```
-#### 安装前
+#### 安装前（`%pre`）
-在我们的实验室项目的 spec 文件中，此部分为空。 这将放置那些需要 rpm 安装前执行的脚本。
+在我们的实验室项目的 spec 文件中，此部分为空。 这应该放置那些需要 rpm 中的文件安装前执行的脚本。
-#### 安装后
+#### 安装后（`%post`）
-spec 文件的这一部分是另一个 Bash 脚本。 这个在安装文件后运行。 此部分几乎可以是你需要或想要的任何内容，包括创建文件，运行系统命令以及重新启动服务以在进行配置更改后重新初始化它们。 我们的 rpm 包的 `安装后` 脚本执行其中一些任务。
+spec 文件的这一部分是另一个 Bash 脚本。 这个在文件安装后运行。 此部分几乎可以是你需要或想要的任何内容，包括创建文件、运行系统命令以及重新启动服务以在进行配置更改后重新初始化它们。 我们的 rpm 包的 `%post` 脚本执行其中一些任务。
```
%post
@@ -236,11 +242,11 @@ fi
此脚本中包含的注释应明确其用途。
-#### 卸载后
+#### 卸载后（`%postun`）
-此部分包含将在卸载 rpm 软件包后运行的脚本。 使用 rpm 或 DNF 删除包会删除文件部分中列出的所有文件，但它不会删除安装后部分创建的文件或链接，因此我们需要在本节中处理。
+此部分包含将在卸载 rpm 软件包后运行的脚本。 使用 `rpm` 或 `dnf` 删除包会删除文件部分中列出的所有文件，但它不会删除安装后部分创建的文件或链接，因此我们需要在本节中处理。
-此脚本通常由清理任务组成，只是清除以前由rpm安装的文件，但rpm本身无法完成清除。 对于我们的包，它包括删除 `安装后` 脚本创建的链接并恢复 motd 文件的已保存原件。
+此脚本通常由清理任务组成，只是清除以前由 `rpm` 安装的文件，但 rpm 本身无法完成清除。 对于我们的包，它包括删除 `%post` 脚本创建的链接并恢复 motd 文件的已保存原件。
```
%postun
@@ -254,9 +260,9 @@ then
fi
```
-#### 清理
+#### 清理（`%clean`）
-这个 Bash 脚本在 rpm 构建过程之后开始清理。 下面 `清理` 部分中的两行删除了 `rpm-build` 命令创建的构建目录。 在许多情况下，可能还需要额外的清理。
+这个 Bash 脚本在 rpm 构建过程之后开始清理。 下面 `%clean` 部分中的两行删除了 `rpm-build` 命令创建的构建目录。 在许多情况下，可能还需要额外的清理。
```
%clean
@@ -264,9 +270,9 @@ rm -rf $RPM_BUILD_ROOT/usr/local/bin
rm -rf $RPM_BUILD_ROOT/usr/local/share/utils
```
-#### 更新日志
+#### 变更日志（`%changelog`）
-此可选的文本部分包含 rpm 及其包含的文件的更改列表。 最新的更改记录在本部分顶部。
+此可选的文本部分包含 rpm 及其包含的文件的变更列表。最新的变更记录在本部分顶部。
```
%changelog
@@ -280,20 +286,20 @@ rm -rf $RPM_BUILD_ROOT/usr/local/share/utils
### 构建 rpm
-spec 文件必须位于 rpmbuild 目录树的 SPECS 目录中。 我发现最简单的方法是创建一个指向该目录中实际 spec 文件的链接，以便可以在开发目录中对其进行编辑，而无需将其复制到 SPECS 目录。 将 SPECS 目录设为当前工作目录，然后创建链接。
+spec 文件必须位于 `rpmbuild` 目录树的 `SPECS` 目录中。 我发现最简单的方法是创建一个指向该目录中实际 spec 文件的链接，以便可以在开发目录中对其进行编辑，而无需将其复制到 `SPECS` 目录。 将 `SPECS` 目录设为当前工作目录，然后创建链接。
```
cd ~/rpmbuild/SPECS/
ln -s ~/development/spec/utils.spec
```
-运行以下命令以构建 rpm 。 如果没有错误发生，只需要花一点时间来创建 rpm 。
+运行以下命令以构建 rpm。 如果没有错误发生，只需要花一点时间来创建 rpm。
```
rpmbuild --target noarch -bb utils.spec
```
-检查 ~/rpmbuild/RPMS/noarch 目录以验证新的 rpm 是否存在。
+检查 `~/rpmbuild/RPMS/noarch` 目录以验证新的 rpm 是否存在。
```
[student@testvm1 ~]$ cd rpmbuild/RPMS/noarch/
@@ -305,7 +311,7 @@ total 24
### 测试 rpm
-以 root 用户身份安装 rpm 以验证它是否正确安装并且文件是否安装在正确的目录中。 rpm 的确切名称将取决于你在 Preamble 部分中标签的值，但如果你使用了示例中的值，则 rpm 名称将如下面的示例命令所示：
+以 root 用户身份安装 rpm 以验证它是否正确安装并且文件是否安装在正确的目录中。 rpm 的确切名称将取决于你在前言部分中标签的值，但如果你使用了示例中的值，则 rpm 名称将如下面的示例命令所示：
```
[root@testvm1 ~]# cd /home/student/rpmbuild/RPMS/noarch/
@@ -318,9 +324,9 @@ Updating / installing...
1:utils-1.0.0-1 ################################# [100%]
```
-检查 /usr/local/bin 以确保新文件存在。 你还应验证是否已创建 /etc/cron.daily 中的 create_motd 链接。
+检查 `/usr/local/bin` 以确保新文件存在。 你还应验证是否已创建 `/etc/cron.daily` 中的 `create_motd` 链接。
-使用 `rpm -q --changelog utils` 命令查看更改日志。 使用 `rpm -ql utils` 命令（在 `ql`中为小写 L ）查看程序包安装的文件。
+使用 `rpm -q --changelog utils` 命令查看更改日志。 使用 `rpm -ql utils` 命令（在 `ql` 中为小写 `L` ）查看程序包安装的文件。
```
[root@testvm1 noarch]# rpm -q --changelog utils
@@ -356,11 +362,11 @@ Requires: badrequire
构建包并尝试安装它。 显示什么消息？
-我们使用 `rpm` 命令来安装和删除 `utils` 包。 尝试使用 yum 或 DNF 安装软件包。 你必须与程序包位于同一目录中，或指定程序包的完整路径才能使其正常工作。
+我们使用 `rpm` 命令来安装和删除 `utils` 包。 尝试使用 `yum` 或 `dnf` 安装软件包。 你必须与程序包位于同一目录中，或指定程序包的完整路径才能使其正常工作。
### 总结
-在这里看一下创建 rpm 包的基础知识，我们没有涉及很多标签和很多部分。 下面列出的资源可以提供更多信息。 构建 rpm 包并不困难；你只需要正确的信息。 我希望这对你有所帮助——我花了几个月的时间来自己解决问题。
+在这篇对创建 rpm 包的基础知识的概览中，我们没有涉及很多标签和很多部分。 下面列出的资源可以提供更多信息。 构建 rpm 包并不困难；你只需要正确的信息。 我希望这对你有所帮助——我花了几个月的时间来自己解决问题。
我们没有涵盖源代码构建，但如果你是开发人员，那么从这一点开始应该是一个简单的步骤。
@@ -368,9 +374,9 @@ Requires: badrequire
### 资料
-- Edward C. Baily，Maximum RPM，Sams著，于2000年，ISBN 0-672-31105-4
-- Edward C. Baily，[Maximum RPM][1]，更新在线版本
-- [RPM文档][4]：此网页列出了 rpm 的大多数可用在线文档。 它包括许多其他网站的链接和有关 rpm 的信息。
+- Edward C. Baily，《Maximum RPM》，Sams 出版于 2000 年，ISBN 0-672-31105-4
+- Edward C. Baily，《[Maximum RPM][1]》，更新在线版本
+- [RPM 文档][4]：此网页列出了 rpm 的大多数可用在线文档。 它包括许多其他网站的链接和有关 rpm 的信息。
--------------------------------------------------------------------------------
@@ -379,7 +385,7 @@ via: https://opensource.com/article/18/9/how-build-rpm-packages
作者：[David Both][a]
选题：[lujun9972](https://github.com/lujun9972)
译者：[Flowsnow](https://github.com/Flowsnow)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
@@ -387,4 +393,4 @@ via: https://opensource.com/article/18/9/how-build-rpm-packages
[1]: http://ftp.rpm.org/max-rpm/
[2]: http://rpm.org/index.html
[3]: http://www.both.org/?p=960
-[4]: http://rpm.org/documentation.html
\ No newline at end of file
+[4]: http://rpm.org/documentation.html
diff --git a/published/20180913 ScreenCloud- The Screenshot-- App.md b/published/201810/20180913 ScreenCloud- The Screenshot-- App.md
similarity index 100%
rename from published/20180913 ScreenCloud- The Screenshot-- App.md
rename to published/201810/20180913 ScreenCloud- The Screenshot-- App.md
diff --git a/published/20180915 Backup Installed Packages And Restore Them On Freshly Installed Ubuntu.md b/published/201810/20180915 Backup Installed Packages And Restore Them On Freshly Installed Ubuntu.md
similarity index 100%
rename from published/20180915 Backup Installed Packages And Restore Them On Freshly Installed Ubuntu.md
rename to published/201810/20180915 Backup Installed Packages And Restore Them On Freshly Installed Ubuntu.md
diff --git a/published/20180915 Linux vs Mac- 7 Reasons Why Linux is a Better Choice than Mac.md b/published/201810/20180915 Linux vs Mac- 7 Reasons Why Linux is a Better Choice than Mac.md
similarity index 100%
rename from published/20180915 Linux vs Mac- 7 Reasons Why Linux is a Better Choice than Mac.md
rename to published/201810/20180915 Linux vs Mac- 7 Reasons Why Linux is a Better Choice than Mac.md
diff --git a/published/20180917 4 scanning tools for the Linux desktop.md b/published/201810/20180917 4 scanning tools for the Linux desktop.md
similarity index 100%
rename from published/20180917 4 scanning tools for the Linux desktop.md
rename to published/201810/20180917 4 scanning tools for the Linux desktop.md
diff --git a/published/20180917 Getting started with openmediavault- A home NAS solution.md b/published/201810/20180917 Getting started with openmediavault- A home NAS solution.md
similarity index 100%
rename from published/20180917 Getting started with openmediavault- A home NAS solution.md
rename to published/201810/20180917 Getting started with openmediavault- A home NAS solution.md
diff --git a/published/20180918 Linux firewalls- What you need to know about iptables and firewalld.md b/published/201810/20180918 Linux firewalls- What you need to know about iptables and firewalld.md
similarity index 100%
rename from published/20180918 Linux firewalls- What you need to know about iptables and firewalld.md
rename to published/201810/20180918 Linux firewalls- What you need to know about iptables and firewalld.md
diff --git a/published/20180918 Top 3 Python libraries for data science.md b/published/201810/20180918 Top 3 Python libraries for data science.md
similarity index 100%
rename from published/20180918 Top 3 Python libraries for data science.md
rename to published/201810/20180918 Top 3 Python libraries for data science.md
diff --git a/published/20180919 Host your own cloud with Raspberry Pi NAS.md b/published/201810/20180919 Host your own cloud with Raspberry Pi NAS.md
similarity index 100%
rename from published/20180919 Host your own cloud with Raspberry Pi NAS.md
rename to published/201810/20180919 Host your own cloud with Raspberry Pi NAS.md
diff --git a/published/20180919 How Writing Can Expand Your Skills and Grow Your Career.md b/published/201810/20180919 How Writing Can Expand Your Skills and Grow Your Career.md
similarity index 100%
rename from published/20180919 How Writing Can Expand Your Skills and Grow Your Career.md
rename to published/201810/20180919 How Writing Can Expand Your Skills and Grow Your Career.md
diff --git a/published/20180919 Linux Has a Code of Conduct and Not Everyone is Happy With it.md b/published/201810/20180919 Linux Has a Code of Conduct and Not Everyone is Happy With it.md
similarity index 100%
rename from published/20180919 Linux Has a Code of Conduct and Not Everyone is Happy With it.md
rename to published/201810/20180919 Linux Has a Code of Conduct and Not Everyone is Happy With it.md
diff --git a/published/20180920 8 Python packages that will simplify your life with Django.md b/published/201810/20180920 8 Python packages that will simplify your life with Django.md
similarity index 100%
rename from published/20180920 8 Python packages that will simplify your life with Django.md
rename to published/201810/20180920 8 Python packages that will simplify your life with Django.md
diff --git a/published/20180920 WinWorld - A Large Collection Of Defunct OSs, Software And Games.md b/published/201810/20180920 WinWorld - A Large Collection Of Defunct OSs, Software And Games.md
similarity index 100%
rename from published/20180920 WinWorld - A Large Collection Of Defunct OSs, Software And Games.md
rename to published/201810/20180920 WinWorld - A Large Collection Of Defunct OSs, Software And Games.md
diff --git a/published/20180921 Clinews - Read News And Latest Headlines From Commandline.md b/published/201810/20180921 Clinews - Read News And Latest Headlines From Commandline.md
similarity index 100%
rename from published/20180921 Clinews - Read News And Latest Headlines From Commandline.md
rename to published/201810/20180921 Clinews - Read News And Latest Headlines From Commandline.md
diff --git a/published/201810/20180921 Control your data with Syncthing- An open source synchronization tool.md b/published/201810/20180921 Control your data with Syncthing- An open source synchronization tool.md
new file mode 100644
index 0000000000..4f68ff5b0d
--- /dev/null
+++ b/published/201810/20180921 Control your data with Syncthing- An open source synchronization tool.md
@@ -0,0 +1,107 @@
+使用开源同步工具 Syncthing 控制你的数据
+======
+> 决定如何存储和共享您的个人信息。
+
+
+
+如今，我们的一些最重要的财产 —— 从家人和朋友的照片和视频到财务和医疗文件 —— 都是数据。即便是云存储服务的迅猛发展，我们仍有对隐私和个人数据缺乏控制的担忧。从棱镜监控计划到谷歌[让 APP 开发者扫描你的个人邮件][1]，这些新闻的报道应该会让我们对我们个人信息的安全性有所顾虑。
+
+[Syncthing][2] 可以让你放下心来。它是一款开源的点对点文件同步工具，可以运行在 Linux、Windows、Mac、Android 和其他（抱歉，没有iOS）。Syncthing 使用自定的协议，叫[块交换协议](3)。简而言之，Syncting 能让你无需拥有服务器来跨设备同步数据。
+
+在这篇文章中，我将解释如何在 Linux 电脑和安卓手机之间安装和同步文件。
+
+### Linux
+
+Syncting 在大多数流行的发行版都能下载。Fedora 28 包含其最新版本。
+
+要在 Fedora 上安装 Syncthing，你能在软件中心搜索，或者执行以下命令：
+
+```
+sudo dnf install syncthing syncthing-gtk
+```
+
+一旦安装好后，打开它。你将会看到一个助手帮你配置 Syncthing。点击 “Next” 直到它要求配置 WebUI。最安全的选项是选择“Listen on localhost”。那将会禁止 Web 界面并且阻止未经授权的用户。
+
+![Syncthing in Setup WebUI dialog box][5]
+
+*Syncthing 安装时的 WebUI 对话框*
+
+关闭对话框。现在 Syncthing 安装好了。现在可以分享文件夹，连接一台设备开始同步了。但是，让我们用你其它的客户端继续。
+
+### Android
+
+Syncthing 在 Google Play 和 F-Droid 应用商店都能下载。
+
+
+
+安装应用程序后，会显示欢迎界面。给 Syncthing 授予你设备存储的权限。你可能会被要求为了此应用程序而禁用电池优化。这样做是安全的，因为我们将优化应用程序，使其仅在插入电源并连接到无线网络时同步。
+
+点击主菜单图标来到“Settings”，然后是“Run Conditions”（运行条件）。点击“Always run in the background, Run only when charging”（总是在后台运行，仅在充电时运行）和“Run only on wifi”（仅在 WIFI 下运行）。现在你的安卓客户端已经准备好与你的设备交换文件。
+
+Syncting 中有两个重要的概念需要记住：文件夹和设备。文件夹是你想要分享的，但是你必须有一台设备来分享。 Syncthing 允许你用不同的设备分享独立的文件夹。设备是通过交换设备的 ID 来添加的。设备 ID 是在 Syncting 首次启动时创建的一个唯一的密码安全标识符。
+
+### 连接设备
+
+现在让我们连接你的 Linux 机器和你的 Android 客户端。
+
+在您的 Linux 计算机中，打开 Syncting，单击“Settings”图标，然后单击“Show ID”，就会显示一个二维码。
+
+在你的安卓手机上，打开 Syncthing。在主界面上，点击“Devices”页后点击 “+” 。在第一个区域内点击二维码符号来启动二维码扫描。
+
+将你手机的摄像头对准电脑上的二维码。设备 ID 字段将由您的桌面客户端设备 ID 填充。起一个适合的名字并保存。因为添加设备有两种方式，现在你需要在电脑客户端上确认你想要添加安卓手机。你的电脑客户端可能会花上好几分钟来请求确认。当提示确认时，点击“Add”。
+
+
+
+在“New Device”窗口，你能确认并配置一些关于你设备的选项，像是“Device Name”和“Addresses”。如果你在地址那一栏选择 “dynamic” （动态），客户端将会自动探测设备的 IP 地址，但是你想要保持住某一个 IP 地址，你能将该地址填进这一栏里。如果你已经创建了文件夹（或者在这之后），你也能与新设备分享这个文件夹。
+
+
+
+你的电脑和安卓设备已经配对，可以交换文件了。(如果你有多台电脑或手机，只需重复这些步骤。)
+
+### 分享文件夹
+
+既然您想要同步的设备之间已经连接，现在是时候共享一个文件夹了。您可以在电脑上共享文件夹，添加了该文件夹中的设备将获得一份副本。
+
+若要共享文件夹，请转至“Settings”并单击“Add Shared Folder”（添加共享文件夹）：
+
+
+
+在下一个窗口中，输入要共享的文件夹的信息：
+
+
+
+你可以使用任何你想要的标签。“Folder ID”将随机生成，用于识别客户端之间的文件夹。在“Path”里，点击“Browse”就能定位到你想要分享的文件夹。如果你想 Syncthing 监控文件夹的变化（例如删除、新建文件等），点击“Monitor filesystem for changes”（监控文件系统变化）。
+
+记住，当你分享一个文件夹，在其他客户端的任何改动都将会反映到每一台设备上。这意味着如果你在其他电脑和手机设备之间分享了一个包含图片的文件夹，在这些客户端上的改动都会同步到每一台设备。如果这不是你想要的，你能让你的文件夹“Send Only”（只是发送）给其他客户端，但是其他客户端的改动都不会被同步。
+
+完成后，转至“Share with Devices”（与设备共享）页并选择要与之同步文件夹的主机。
+
+您选择的所有设备都需要接受共享请求；您将在设备上收到通知。
+
+正如共享文件夹时一样，您必须配置新的共享文件夹：
+
+
+
+同样，在这里您可以定义任何标签，但是 ID 必须匹配每个客户端。在文件夹选项中，选择文件夹及其文件的位置。请记住，此文件夹中所做的任何更改都将反映到文件夹所允许同步的每个设备上。
+
+这些是连接设备和与 Syncting 共享文件夹的步骤。开始复制可能需要几分钟时间，这取决于您的网络设置或您是否不在同一网络上。
+
+Syncting 提供了更多出色的功能和选项。试试看，并把握你数据的控制权。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/9/take-control-your-data-syncthing
+
+作者：[Michael Zamot][a]
+选题：[lujun9972](https://github.com/lujun9972)
+译者：[ypingcn](https://github.com/ypingcn)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://opensource.com/users/mzamot
+[1]: https://gizmodo.com/google-says-it-doesnt-go-through-your-inbox-anymore-bu-1827299695
+[2]: https://syncthing.net/
+[3]: https://docs.syncthing.net/specs/bep-v1.html
+[4]: /file/410191
+[5]: https://opensource.com/sites/default/files/uploads/syncthing1.png
diff --git a/published/20180924 A Simple, Beautiful And Cross-platform Podcast App.md b/published/201810/20180924 A Simple, Beautiful And Cross-platform Podcast App.md
similarity index 100%
rename from published/20180924 A Simple, Beautiful And Cross-platform Podcast App.md
rename to published/201810/20180924 A Simple, Beautiful And Cross-platform Podcast App.md
diff --git a/published/20180924 How To Find Out Which Port Number A Process Is Using In Linux.md b/published/201810/20180924 How To Find Out Which Port Number A Process Is Using In Linux.md
similarity index 100%
rename from published/20180924 How To Find Out Which Port Number A Process Is Using In Linux.md
rename to published/201810/20180924 How To Find Out Which Port Number A Process Is Using In Linux.md
diff --git a/published/201810/20180924 Why Linux users should try Rust.md b/published/201810/20180924 Why Linux users should try Rust.md
new file mode 100644
index 0000000000..9dde3f40c2
--- /dev/null
+++ b/published/201810/20180924 Why Linux users should try Rust.md
@@ -0,0 +1,166 @@
+为什么 Linux 用户应该试一试 Rust
+======
+> 在 Linux 系统上安装 Rust 编程语言可能是你近年来所做的最有价值的事情之一。
+
+
+
+Rust 是一种相当年轻和现代的编程语言，具有许多使其非常灵活而及其安全的功能。数据显示它正在变得非常受欢迎，连续三年（[2016][1]、[2017][2] 和 [2018][3]）在 Stack Overflow 开发者调查中获得“最受喜爱的编程语言”的第一名。
+
+Rust 也是开源语言的一种，它具有一系列特殊的功能，使得它可以适应许多不同的编程项目。 它最初源于 2006 年 Mozilla 员工的个人项目，几年后（2009 年）被 Mozilla 选为特别项目，然后在 2010 年宣布供公众使用。
+
+Rust 程序运行速度极快，可防止段错误，并能保证线程安全。这些属性使该语言极大地吸引了专注于应用程序安全性的开发人员。Rust 也是一种非常易读的语言，可用于从简单程序到非常大而复杂的项目。
+
+Rust 优点：
+
+ * 内存安全 —— Rust 不会受到悬空指针、缓冲区溢出或其他与内存相关的错误的影响。它提供内存安全，无回收垃圾。
+ * 通用 —— Rust 是适用于任何类型编程的语言
+ * 快速 —— Rust 在性能上与 C / C++ 相当，但具有更好的安全功能。
+ * 高效 —— Rust 是为了便于并发编程而构建的。
+ * 面向项目 —— Rust 具有内置的依赖关系和构建管理系统 Cargo。
+ * 得到很好的支持 —— Rust 有一个令人印象深刻的[支持社区][4]。
+
+Rust 还强制执行 RAII（资源获取初始化）。这意味着当一个对象超出范围时，将调用其析构函数并释放其资源，从而提供防止资源泄漏的屏蔽。它提供了功能抽象和一个很棒的[类型系统][5]，并具有速度和数学健全性。
+
+简而言之，Rust 是一种令人印象深刻的系统编程语言，具有其它大多数语言所缺乏的功能，使其成为 C、C++ 和 Objective-C 等多年来一直被使用的语言的有力竞争者。
+
+### 安装 Rust
+
+安装 Rust 是一个相当简单的过程。
+
+```
+$ curl https://sh.rustup.rs -sSf | sh
+```
+
+安装 Rust 后，使用 `rustc --version` 或 `which` 命令显示版本信息。
+
+```
+$ which rustc
+rustc 1.27.2 (58cc626de 2018-07-18)
+$ rustc --version
+rustc 1.27.2 (58cc626de 2018-07-18)
+```
+
+### Rust 入门
+
+Rust 即使是最简单的代码也与你之前使用过的语言输入的完全不同。
+
+```
+$ cat hello.rs
+fn main() {
+ // Print a greeting
+ println!("Hello, world!");
+}
+```
+
+在这些行中，我们正在设置一个函数（`main`），添加一个描述该函数的注释，并使用 `println` 语句来创建输出。您可以使用下面显示的命令编译然后运行程序。
+
+```
+$ rustc hello.rs
+$ ./hello
+Hello, world!
+```
+
+另外，你也可以创建一个“项目”（通常仅用于比这个更复杂的程序！）来保持代码的有序性。
+
+```
+$ mkdir ~/projects
+$ cd ~/projects
+$ mkdir hello_world
+$ cd hello_world
+```
+
+请注意，即使是简单的程序，一旦编译，就会变成相当大的可执行文件。
+
+```
+$ ./hello
+Hello, world!
+$ ls -l hello*
+-rwxrwxr-x 1 shs shs 5486784 Sep 23 19:02 hello <== executable
+-rw-rw-r-- 1 shs shs 68 Sep 23 15:25 hello.rs
+```
+
+当然，这只是一个开始且传统的“Hello, world!” 程序。 Rust 语言具有一系列可帮助你快速进入高级编程技能的功能。
+
+### 学习 Rust
+
+![rust programming language book cover][6]
+
+*No Starch Press*
+
+Steve Klabnik 和 Carol Nichols 的《[Rust 编程语言][7]》 （2018）一书提供了学习 Rust 的最佳方法之一。 这本书由核心开发团队的两名成员撰写，可从 [No Starch Press][7] 出版社获得纸制书或者从 [rust-lang.org][8] 获得电子书。它已经成为 Rust 开发者社区中的参考书。
+
+在所涉及的众多主题中，你将了解这些高级主题：
+
+ * 所有权和 borrowing
+ * 安全保障
+ * 测试和错误处理
+ * 智能指针和多线程
+ * 高级模式匹配
+ * 使用 Cargo（内置包管理器）
+ * 使用 Rust 的高级编译器
+
+#### 目录
+
+- 前言（Nicholas Matsakis 和 Aaron Turon 编写）
+- 致谢
+- 介绍
+- 第 1 章：新手入门
+- 第 2 章：猜谜游戏
+- 第 3 章：通用编程概念
+- 第 4 章：了解所有权
+- 第 5 章：结构
+- 第 6 章：枚举和模式匹配
+- 第 7 章：模块
+- 第 8 章：常见集合
+- 第 9 章：错误处理
+- 第 10 章：通用类型、特征和生命周期
+- 第 11 章：测试
+- 第 12 章：输入/输出项目
+- 第 13 章：迭代器和闭包
+- 第 14 章：关于货物和 Crates.io 的更多信息
+- 第 15 章：智能指针
+- 第 16 章：并发
+- 第 17 章：Rust 是面向对象的吗？
+- 第 18 章：模式
+- 第 19 章：关于生命周期的更多信息
+- 第 20 章：高级类型系统功能
+- 附录 A：关键字
+- 附录 B：运算符和符号
+- 附录 C：可衍生的特征
+- 附录 D：宏
+- 索引
+
+《[Rust 编程语言][7]》 将你从基本安装和语言语法带到复杂的主题，例如模块、错误处理、crates（与其他语言中的 “library”
+ 或“package”同义），模块（允许你将你的代码分配到 crate 本身），生命周期等。
+
+可能最重要的是，本书可以让您从基本的编程技巧转向构建和编译复杂、安全且非常有用的程序。
+
+### 结束
+
+如果你已经准备好用一种非常值得花时间和精力学习并且越来越受欢迎的语言进行一些严肃的编程，那么 Rust 是一个不错的选择！
+
+加入 [Facebook][9] 和 [LinkedIn][10] 上的 Network World 社区，评论最重要的话题。
+
+--------------------------------------------------------------------------------
+
+
+via: https://www.networkworld.com/article/3308162/linux/why-you-should-try-rust.html
+
+作者：[Sandra Henry-Stocker][a]
+选题：[lujun9972](https://github.com/lujun9972)
+译者：[way-ww](https://github.com/way-ww)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.networkworld.com/author/Sandra-Henry_Stocker/
+[1]: https://insights.stackoverflow.com/survey/2016#technology-most-loved-dreaded-and-wanted
+[2]: https://insights.stackoverflow.com/survey/2017#technology-most-loved-dreaded-and-wanted-languages
+[3]: https://insights.stackoverflow.com/survey/2018#technology-most-loved-dreaded-and-wanted-languages
+[4]: https://www.rust-lang.org/en-US/community.html
+[5]: https://doc.rust-lang.org/reference/type-system.html
+[6]: https://images.idgesg.net/images/article/2018/09/rust-programming-language_book-cover-100773679-small.jpg
+[7]: https://nostarch.com/Rust
+[8]: https://doc.rust-lang.org/book/2018-edition/index.html
+[9]: https://www.facebook.com/NetworkWorld/
+[10]: https://www.linkedin.com/company/network-world
diff --git a/published/20180925 Hegemon - A Modular System Monitor Application Written In Rust.md b/published/201810/20180925 Hegemon - A Modular System Monitor Application Written In Rust.md
similarity index 100%
rename from published/20180925 Hegemon - A Modular System Monitor Application Written In Rust.md
rename to published/201810/20180925 Hegemon - A Modular System Monitor Application Written In Rust.md
diff --git a/published/20180925 How to Boot Ubuntu 18.04 - Debian 9 Server in Rescue (Single User mode) - Emergency Mode.md b/published/201810/20180925 How to Boot Ubuntu 18.04 - Debian 9 Server in Rescue (Single User mode) - Emergency Mode.md
similarity index 100%
rename from published/20180925 How to Boot Ubuntu 18.04 - Debian 9 Server in Rescue (Single User mode) - Emergency Mode.md
rename to published/201810/20180925 How to Boot Ubuntu 18.04 - Debian 9 Server in Rescue (Single User mode) - Emergency Mode.md
diff --git a/published/20180925 How to Replace one Linux Distro With Another in Dual Boot -Guide.md b/published/201810/20180925 How to Replace one Linux Distro With Another in Dual Boot -Guide.md
similarity index 100%
rename from published/20180925 How to Replace one Linux Distro With Another in Dual Boot -Guide.md
rename to published/201810/20180925 How to Replace one Linux Distro With Another in Dual Boot -Guide.md
diff --git a/published/20180926 3 open source distributed tracing tools.md b/published/201810/20180926 3 open source distributed tracing tools.md
similarity index 100%
rename from published/20180926 3 open source distributed tracing tools.md
rename to published/201810/20180926 3 open source distributed tracing tools.md
diff --git a/published/20180926 An introduction to swap space on Linux systems.md b/published/201810/20180926 An introduction to swap space on Linux systems.md
similarity index 100%
rename from published/20180926 An introduction to swap space on Linux systems.md
rename to published/201810/20180926 An introduction to swap space on Linux systems.md
diff --git a/published/20180926 CPU Power Manager - Control And Manage CPU Frequency In Linux.md b/published/201810/20180926 CPU Power Manager - Control And Manage CPU Frequency In Linux.md
similarity index 100%
rename from published/20180926 CPU Power Manager - Control And Manage CPU Frequency In Linux.md
rename to published/201810/20180926 CPU Power Manager - Control And Manage CPU Frequency In Linux.md
diff --git a/published/20180926 How to use the Scikit-learn Python library for data science projects.md b/published/201810/20180926 How to use the Scikit-learn Python library for data science projects.md
similarity index 100%
rename from published/20180926 How to use the Scikit-learn Python library for data science projects.md
rename to published/201810/20180926 How to use the Scikit-learn Python library for data science projects.md
diff --git a/published/20180927 5 cool tiling window managers.md b/published/201810/20180927 5 cool tiling window managers.md
similarity index 100%
rename from published/20180927 5 cool tiling window managers.md
rename to published/201810/20180927 5 cool tiling window managers.md
diff --git a/published/20180927 How To Find And Delete Duplicate Files In Linux.md b/published/201810/20180927 How To Find And Delete Duplicate Files In Linux.md
similarity index 100%
rename from published/20180927 How To Find And Delete Duplicate Files In Linux.md
rename to published/201810/20180927 How To Find And Delete Duplicate Files In Linux.md
diff --git a/published/20180927 How to Use RAR files in Ubuntu Linux.md b/published/201810/20180927 How to Use RAR files in Ubuntu Linux.md
similarity index 100%
rename from published/20180927 How to Use RAR files in Ubuntu Linux.md
rename to published/201810/20180927 How to Use RAR files in Ubuntu Linux.md
diff --git a/published/20180928 10 handy Bash aliases for Linux.md b/published/201810/20180928 10 handy Bash aliases for Linux.md
similarity index 100%
rename from published/20180928 10 handy Bash aliases for Linux.md
rename to published/201810/20180928 10 handy Bash aliases for Linux.md
diff --git a/published/20180928 A Free And Secure Online PDF Conversion Suite.md b/published/201810/20180928 A Free And Secure Online PDF Conversion Suite.md
similarity index 100%
rename from published/20180928 A Free And Secure Online PDF Conversion Suite.md
rename to published/201810/20180928 A Free And Secure Online PDF Conversion Suite.md
diff --git a/published/20180928 How to Install Popcorn Time on Ubuntu 18.04 and Other Linux Distributions.md b/published/201810/20180928 How to Install Popcorn Time on Ubuntu 18.04 and Other Linux Distributions.md
similarity index 100%
rename from published/20180928 How to Install Popcorn Time on Ubuntu 18.04 and Other Linux Distributions.md
rename to published/201810/20180928 How to Install Popcorn Time on Ubuntu 18.04 and Other Linux Distributions.md
diff --git a/published/20180930 Creator of the World Wide Web is Creating a New Decentralized Web.md b/published/201810/20180930 Creator of the World Wide Web is Creating a New Decentralized Web.md
similarity index 100%
rename from published/20180930 Creator of the World Wide Web is Creating a New Decentralized Web.md
rename to published/201810/20180930 Creator of the World Wide Web is Creating a New Decentralized Web.md
diff --git a/published/20181001 16 iptables tips and tricks for sysadmins.md b/published/201810/20181001 16 iptables tips and tricks for sysadmins.md
similarity index 100%
rename from published/20181001 16 iptables tips and tricks for sysadmins.md
rename to published/201810/20181001 16 iptables tips and tricks for sysadmins.md
diff --git a/published/20181001 How to Install Pip on Ubuntu.md b/published/201810/20181001 How to Install Pip on Ubuntu.md
similarity index 100%
rename from published/20181001 How to Install Pip on Ubuntu.md
rename to published/201810/20181001 How to Install Pip on Ubuntu.md
diff --git a/published/20181002 How use SSH and SFTP protocols on your home network.md b/published/201810/20181002 How use SSH and SFTP protocols on your home network.md
similarity index 100%
rename from published/20181002 How use SSH and SFTP protocols on your home network.md
rename to published/201810/20181002 How use SSH and SFTP protocols on your home network.md
diff --git a/published/20181003 Introducing Swift on Fedora.md b/published/201810/20181003 Introducing Swift on Fedora.md
similarity index 100%
rename from published/20181003 Introducing Swift on Fedora.md
rename to published/201810/20181003 Introducing Swift on Fedora.md
diff --git a/published/20181003 Tips for listing files with ls at the Linux command line.md b/published/201810/20181003 Tips for listing files with ls at the Linux command line.md
similarity index 100%
rename from published/20181003 Tips for listing files with ls at the Linux command line.md
rename to published/201810/20181003 Tips for listing files with ls at the Linux command line.md
diff --git a/translated/tech/20181004 PyTorch 1.0 Preview Release- Facebook-s newest Open Source AI.md b/published/201810/20181004 PyTorch 1.0 Preview Release- Facebook-s newest Open Source AI.md
similarity index 100%
rename from translated/tech/20181004 PyTorch 1.0 Preview Release- Facebook-s newest Open Source AI.md
rename to published/201810/20181004 PyTorch 1.0 Preview Release- Facebook-s newest Open Source AI.md
diff --git a/published/20181005 Open Source Logging Tools for Linux.md b/published/201810/20181005 Open Source Logging Tools for Linux.md
similarity index 100%
rename from published/20181005 Open Source Logging Tools for Linux.md
rename to published/201810/20181005 Open Source Logging Tools for Linux.md
diff --git a/published/20181008 Python at the pump- A script for filling your gas tank.md b/published/201810/20181008 Python at the pump- A script for filling your gas tank.md
similarity index 100%
rename from published/20181008 Python at the pump- A script for filling your gas tank.md
rename to published/201810/20181008 Python at the pump- A script for filling your gas tank.md
diff --git a/published/201810/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md b/published/201810/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md
new file mode 100644
index 0000000000..b14c45ded7
--- /dev/null
+++ b/published/201810/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md
@@ -0,0 +1,277 @@
+重启和关闭 Linux 系统的 6 个终端命令
+======
+
+在 Linux 管理员的日程当中，有很多需要执行的任务，其中就有系统的重启和关闭。
+
+对于 Linux 管理员来说，重启和关闭系统是其诸多风险操作中的一例，有时候，由于某些原因，这些操作可能无法挽回，他们需要更多的时间来排查问题。
+
+在 Linux 命令行模式下我们可以执行这些任务。很多时候，由于熟悉命令行，Linux 管理员更倾向于在命令行下完成这些任务。
+
+重启和关闭系统的 Linux 命令并不多，用户需要根据需要，选择合适的命令来完成任务。
+
+以下所有命令都有其自身特点，并允许被 Linux 管理员使用.
+
+**建议阅读：**
+
+- [查看系统/服务器正常运行时间的 11 个方法][1]
+- [Tuptime 一款为 Linux 系统保存历史记录、统计运行时间工具][2]
+
+系统重启和关闭之始，会通知所有已登录的用户和进程。当然，如果使用了时间参数，系统将拒绝新的用户登入。
+
+执行此类操作之前，我建议您坚持复查，因为您只能得到很少的提示来确保这一切顺利。
+
+下面陈列了一些步骤：
+
+* 确保您拥有一个可以处理故障的控制台，以防之后可能会发生的问题。 VMWare 可以访问虚拟机，而 IPMI、iLO 和 iDRAC 可以访问物理服务器。
+* 您需要通过公司的流程，申请修改或故障的执行权直到得到许可。
+* 为安全着想，备份重要的配置文件，并保存到其他服务器上.
+* 验证日志文件（提前检查）
+* 和相关团队交流，比如数据库管理团队，应用团队等。
+* 通知数据库和应用服务人员关闭服务，并得到确定答复。
+* 使用适当的命令复盘操作，验证工作。
+* 最后，重启系统。
+* 验证日志文件，如果一切顺利，执行下一步操作，如果发现任何问题，对症排查。
+* 无论是回退版本还是运行程序，通知相关团队提出申请。
+* 对操作做适当守候，并将预期的一切正常的反馈给团队
+
+使用下列命令执行这项任务。
+
+* `shutdown`、`halt`、`poweroff`、`reboot` 命令：用来停机、重启或切断电源
+* `init` 命令：是 “initialization” 的简称，是系统启动的第一个进程。
+* `systemctl` 命令：systemd 是 Linux 系统和服务器的管理程序。
+
+### 方案 1：如何使用 shutdown 命令关闭和重启 Linux 系统
+
+`shutdown` 命令用于断电或重启本地和远程的 Linux 机器。它为高效完成作业提供多个选项。如果使用了时间参数，系统关闭的 5 分钟之前，会创建 `/run/nologin` 文件，以确保后续的登录会被拒绝。
+
+通用语法如下：
+
+```
+# shutdown [OPTION] [TIME] [MESSAGE]
+```
+
+运行下面的命令来立即关闭 Linux 机器。它会立刻杀死所有进程，并关闭系统。
+
+```
+# shutdown -h now
+```
+
+* `-h`：如果不特指 `-halt` 选项，这等价于 `-poweroff` 选项。
+
+另外我们可以使用带有 `-halt` 选项的 `shutdown` 命令来立即关闭设备。
+
+```
+# shutdown --halt now
+或者
+# shutdown -H now
+```
+
+* `-H, --halt`：停止设备运行
+
+另外我们可以使用带有 `poweroff` 选项的 `shutdown` 命令来立即关闭设备。
+
+```
+# shutdown --poweroff now
+或者
+# shutdown -P now
+```
+
+* `-P, --poweroff`：切断电源（默认）。
+
+如果您没有使用时间选项运行下面的命令，它将会在一分钟后执行给出的命令。
+
+```
+# shutdown -h
+Shutdown scheduled for Mon 2018-10-08 06:42:31 EDT, use 'shutdown -c' to cancel.
+
+root@2daygeek.com#
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 06:41:31 EDT):
+
+The system is going down for power-off at Mon 2018-10-08 06:42:31 EDT!
+```
+
+其他的登录用户都能在中断中看到如下的广播消息：
+
+```
+[daygeek@2daygeek.com ~]$
+Broadcast message from root@2daygeek.com (Mon 2018-10-08 06:41:31 EDT):
+
+The system is going down for power-off at Mon 2018-10-08 06:42:31 EDT!
+```
+
+对于使用了 `-halt` 选项：
+
+```
+# shutdown -H
+Shutdown scheduled for Mon 2018-10-08 06:37:53 EDT, use 'shutdown -c' to cancel.
+
+root@2daygeek.com#
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 06:36:53 EDT):
+
+The system is going down for system halt at Mon 2018-10-08 06:37:53 EDT!
+```
+
+对于使用了 `-poweroff` 选项：
+
+```
+# shutdown -P
+Shutdown scheduled for Mon 2018-10-08 06:40:07 EDT, use 'shutdown -c' to cancel.
+
+root@2daygeek.com#
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 06:39:07 EDT):
+
+The system is going down for power-off at Mon 2018-10-08 06:40:07 EDT!
+```
+
+可以在您的终端上敲击 `shutdown -c` 选项取消操作。
+
+```
+# shutdown -c
+
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 06:39:09 EDT):
+
+The system shutdown has been cancelled at Mon 2018-10-08 06:40:09 EDT!
+```
+
+其他的登录用户都能在中断中看到如下的广播消息：
+
+```
+[daygeek@2daygeek.com ~]$
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 06:41:35 EDT):
+
+The system shutdown has been cancelled at Mon 2018-10-08 06:42:35 EDT!
+```
+
+添加时间参数，如果你想在 `N` 秒之后执行关闭或重启操作。这里，您可以为所有登录用户添加自定义广播消息。例如，我们将在五分钟后重启设备。
+
+```
+# shutdown -r +5 "To activate the latest Kernel"
+Shutdown scheduled for Mon 2018-10-08 07:13:16 EDT, use 'shutdown -c' to cancel.
+
+[root@vps138235 ~]#
+Broadcast message from root@vps.2daygeek.com (Mon 2018-10-08 07:08:16 EDT):
+
+To activate the latest Kernel
+The system is going down for reboot at Mon 2018-10-08 07:13:16 EDT!
+```
+
+运行下面的命令立即重启 Linux 机器。它会立即杀死所有进程并且重新启动系统。
+
+```
+# shutdown -r now
+```
+
+* `-r, --reboot`： 重启设备。
+
+### 方案 2：如何通过 reboot 命令关闭和重启 Linux 系统
+
+`reboot` 命令用于关闭和重启本地或远程设备。`reboot` 命令拥有两个实用的选项。
+
+它能够优雅的关闭和重启设备（就好像在系统菜单中惦记重启选项一样简单）。
+
+执行不带任何参数的 `reboot` 命令来重启 Linux 机器。
+
+```
+# reboot
+```
+
+执行带 `-p` 参数的 `reboot` 命令来关闭 Linux 机器电源。
+
+```
+# reboot -p
+```
+
+* `-p, --poweroff`：调用 `halt` 或 `poweroff` 命令，切断设备电源。
+
+执行带 `-f` 参数的 `reboot` 命令来强制重启 Linux 设备（这类似按压机器上的电源键）。
+
+```
+# reboot -f
+```
+
+* `-f, --force`：立刻强制中断，切断电源或重启。
+
+### 方案 3：如何通过 init 命令关闭和重启 Linux 系统
+
+`init`（“initialization” 的简写）是系统启动的第一个进程。
+
+它将会检查 `/etc/inittab` 文件并决定 linux 运行级别。同时，允许用户在 Linux 设备上执行关机或重启操作. 这里存在从 `0` 到 `6` 的七个运行等级。
+
+**建议阅读：**
+
+- [如何检查 Linux 上所有运行的服务][3]
+
+执行以下 `init` 命令关闭系统。
+
+```
+# init 0
+```
+
+* `0`： 停机 – 关闭系统。
+
+运行下面的 `init` 命令重启设备：
+
+```
+# init 6
+```
+
+* `6`：重启 – 重启设备。
+
+### 方案 4：如何通过 halt 命令关闭和重启 Linux 系统
+
+`halt` 命令用来切断电源或关闭远程 Linux 机器或本地主机。
+中断所有进程并关闭 cpu。
+
+```
+# halt
+```
+
+### 方案 5：如何通过 poweroff 命令关闭和重启 Linux 系统
+
+`poweroff` 命令用来切断电源或关闭远程 Linux 机器或本地主机。 `poweroff` 很像 `halt`，但是它可以关闭设备硬件（灯和其他 PC 上的其它东西）。它会给主板发送 ACPI 指令，然后信号发送到电源，切断电源。
+
+```
+# poweroff
+```
+
+### 方案 6：如何通过 systemctl 命令关闭和重启 Linux 系统
+
+systemd 是一款适用于所有主流 Linux 发型版的全新 init 系统和系统管理器，而不是传统的 SysV init 系统。
+
+systemd 兼容与 SysV 和 LSB 初始化脚本。它能够替代 SysV init 系统。systemd 是内核启动的第一个进程，并持有序号为 1 的进程 PID。
+
+**建议阅读：**
+
+- [chkservice – 一款终端下系统单元管理工具][4]
+
+它是一切进程的父进程，Fedora 15 是第一个适配安装 systemd （替代了 upstart）的发行版。
+
+`systemctl` 是命令行下管理 systemd 守护进程和服务的主要工具（如 `start`、`restart`、`stop`、`enable`、`disable`、`reload` & `status`）。
+
+systemd 使用 .service 文件而不是 SysV init 使用的 bash 脚本。 systemd 将所有守护进程归与自身的 Linux cgroups 用户组下，您可以浏览 `/cgroup/systemd` 文件查看该系统层次等级。
+
+```
+# systemctl halt
+# systemctl poweroff
+# systemctl reboot
+# systemctl suspend
+# systemctl hibernate
+```
+
+--------------------------------------------------------------------------------
+
+via: https://www.2daygeek.com/6-commands-to-shutdown-halt-poweroff-reboot-the-linux-system/
+
+作者：[Prakash Subramanian][a]
+选题：[lujun9972][b]
+译者：[cyleft](https://github.com/cyleft)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.2daygeek.com/author/prakash/
+[b]: https://github.com/lujun9972
+[1]: https://www.2daygeek.com/11-methods-to-find-check-system-server-uptime-in-linux/
+[2]: https://www.2daygeek.com/tuptime-a-tool-to-report-the-historical-and-statistical-running-time-of-linux-system/
+[3]: https://www.2daygeek.com/how-to-check-all-running-services-in-linux/
+[4]: https://www.2daygeek.com/chkservice-a-tool-for-managing-systemd-units-from-linux-terminal/
diff --git a/translated/tech/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md b/published/201810/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md
similarity index 76%
rename from translated/tech/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md
rename to published/201810/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md
index 46d3dc8885..1a732b0c9f 100644
--- a/translated/tech/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md
+++ b/published/201810/20181009 Convert Screenshots of Equations into LaTeX Instantly With This Nifty Tool.md
@@ -1,6 +1,7 @@
用这个漂亮的工具将方程式截图迅速转换为 LaTeX
======
-**Mathpix 是一个漂亮的小工具，它允许你截取复杂数学方程式的截图，并立即将其转换为 LaTeX 可编辑文本。**
+
+> Mathpix 是一个漂亮的小工具，它允许你截取复杂数学方程式的截图，并立即将其转换为 LaTeX 可编辑文本。
![Mathpix converts math equations images into LaTeX][1]
@@ -10,15 +11,11 @@
[Mathpix][3] 是一个在这方面可以帮助你的小工具。
-假设你正在阅读带有数学方程式的文档。如果你想在[LaTeX 文档][4]中使用这些方程，你需要使用你的 LaTeX 技能和有充足的时间。
+假设你正在阅读带有数学方程式的文档。如果你想在 [LaTeX 文档][4]中使用这些方程，你需要使用你的 LaTeX 技能，并且得有充足的时间。
-但是 Mathpix 为您解决了这个问题。使用 Mathpix，你截取数学方程式的截图，它会立即为你提供 LaTeX 代码。然后，你可以在你[最喜欢的 LaTeX 编辑器] [2]中使用此代码。
+但是 Mathpix 为您解决了这个问题。使用 Mathpix，你可以截取数学方程式的截图，它会立即为你提供 LaTeX 代码。然后，你可以在你[最喜欢的 LaTeX 编辑器] [2]中使用此代码。
-请参阅以下视频中的 Mathpix 使用：
-
-
-
-[视频来源][5]：Reddit 用户 [kaitlinmcunningham][6]
+请参阅[该视频](https://itsfoss.com/wp-content/uploads/2018/10/mathpix.mp4)中的 Mathpix 使用方式。（[视频来源][5]：Reddit 用户 [kaitlinmcunningham][6]）
不是超酷吗？我想编写 LaTeX 文档最困难的部分是那些复杂的方程式。对于像我这样懒人，Mathpix 是天赐之物。
@@ -32,14 +29,13 @@ Mathpix 适用于 Linux、macOS、Windows 和 iOS。暂时还没有 Android 应
```
sudo snap install mathpix-snipping-tool
-
```
-使用 Mathpix 很简单。安装后，打开该工具。你会在顶部面板中找到它。你可以使用键盘快捷键 Ctrl+Alt+M 开始使用 Mathpix 截图。
+使用 Mathpix 很简单。安装后，打开该工具。你会在顶部面板中找到它。你可以使用键盘快捷键 `Ctrl+Alt+M` 开始使用 Mathpix 截图。
它会立即将方程图片转换为 LaTeX 代码。代码将被复制到剪贴板中，然后你可以将其粘贴到 LaTeX 编辑器中。
-Mathpix 的光学字符识别技术[正在被][9]许多公司像 [WolframAlpha][10]、微软、谷歌等公司用于在处理数学符号时提升工具的图像识别能力。
+Mathpix 的光学字符识别技术[正在被][9]像 [WolframAlpha][10]、微软、谷歌等许多公司用于在处理数学符号时提升工具的图像识别能力。
总而言之，它对学生和学者来说是一个很棒的工具。它是免费使用的，我非常希望它是一个开源工具。但我们无法在生活中得到一切，不是么？
@@ -52,7 +48,7 @@ via: https://itsfoss.com/mathpix/
作者：[Abhishek Prakash][a]
选题：[lujun9972][b]
译者：[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/20181009 How To Create And Maintain Your Own Man Pages.md b/published/201810/20181009 How To Create And Maintain Your Own Man Pages.md
similarity index 100%
rename from published/20181009 How To Create And Maintain Your Own Man Pages.md
rename to published/201810/20181009 How To Create And Maintain Your Own Man Pages.md
diff --git a/published/20181010 Cloc - Count The Lines Of Source Code In Many Programming Languages.md b/published/201810/20181010 Cloc - Count The Lines Of Source Code In Many Programming Languages.md
similarity index 100%
rename from published/20181010 Cloc - Count The Lines Of Source Code In Many Programming Languages.md
rename to published/201810/20181010 Cloc - Count The Lines Of Source Code In Many Programming Languages.md
diff --git a/translated/tech/20181010 Design faster web pages, part 1- Image compression.md b/published/201810/20181010 Design faster web pages, part 1- Image compression.md
similarity index 72%
rename from translated/tech/20181010 Design faster web pages, part 1- Image compression.md
rename to published/201810/20181010 Design faster web pages, part 1- Image compression.md
index a34af65920..4a2933e67a 100644
--- a/translated/tech/20181010 Design faster web pages, part 1- Image compression.md
+++ b/published/201810/20181010 Design faster web pages, part 1- Image compression.md
@@ -1,13 +1,13 @@
-设计更快的网页——第一部分：图片压缩
+设计更快的网页（一）：图片压缩
======
-很多 Web 开发者都希望做出加载速度很快的网页。在移动设备浏览占比越来越大的背景下，使用响应式设计使得网站在小屏幕下看起来更漂亮只是其中一个方面。Browser Calories 可以展示网页的加载时间——这不单单关系到用户，还会影响到通过加载速度来进行评级的搜索引擎。这个系列的文章介绍了如何使用 Fedora 提供的工具来给网页“瘦身”。
+很多 Web 开发者都希望做出加载速度很快的网页。在移动设备浏览占比越来越大的背景下，使用响应式设计使得网站在小屏幕下看起来更漂亮只是其中一个方面。Browser Calories 可以展示网页的加载时间 —— 这不单单关系到用户，还会影响到通过加载速度来进行评级的搜索引擎。这个系列的文章介绍了如何使用 Fedora 提供的工具来给网页“瘦身”。
### 准备工作
-在你开始缩减网页之前，你需要明确核心问题所在。为此，你可以使用 [Browserdiet][1]. 这是一个浏览器插件，适用于 Firefox, Opera, Chrome 和其它浏览器。它会对打开的网页进行性能分析，这样你就可以知道应该从哪里入手来缩减网页。
+在你开始缩减网页之前，你需要明确核心问题所在。为此，你可以使用 [Browserdiet][1]. 这是一个浏览器插件，适用于 Firefox、Opera、 Chrome 和其它浏览器。它会对打开的网页进行性能分析，这样你就可以知道应该从哪里入手来缩减网页。
然后，你需要一些用来处理的页面。下面的例子是针对 [getferoda.org][2] 的测试截图。一开始，它看起来非常简单，也符合响应式设计。
@@ -17,43 +17,39 @@
### Web 优化
-网页中包含 281 KB 的 JavaScript 文件，203 KB 的 CSS 文件，还有 1.2 MB 的图片。我们先从最严重的问题——图片开始入手。为了解决问题，你需要的工具集有 GIMP, ImageMagick 和 optipng. 你可以使用如下命令轻松安装它们：
+网页中包含 281 KB 的 JavaScript 文件、203 KB 的 CSS 文件，还有 1.2 MB 的图片。我们先从最严重的问题 —— 图片开始入手。为了解决问题，你需要的工具集有 GIMP、ImageMagick 和 optipng. 你可以使用如下命令轻松安装它们：
```
sudo dnf install gimp imagemagick optipng
-
```
比如，我们先拿到这个 6.4 KB 的[文件][4]：
![][4]
-首先，使用 file 命令来获取这张图片的一些基本信息：
+首先，使用 `file` 命令来获取这张图片的一些基本信息：
```
$ file cinnamon.png
cinnamon.png: PNG image data, 60 x 60, 8-bit/color RGBA, non-interlaced
-
```
这张只由白色和灰色构成的图片使用 8 位 / RGBA 模式来存储。这种方式并没有那么高效。
-使用 GIMP，你可以为这张图片设置一个更合适的颜色模式。在 GIMP 中打开 cinnamon.png. 然后，在“图片 > 模式”菜单中将其设置为“灰度模式”。将这张图片以 PNG 格式导出。导出时使用压缩因子 9，导出对话框中的其它配置均使用默认选项。
+使用 GIMP，你可以为这张图片设置一个更合适的颜色模式。在 GIMP 中打开 `cinnamon.png`。然后，在“图片 > 模式”菜单中将其设置为“灰度模式”。将这张图片以 PNG 格式导出。导出时使用压缩因子 9，导出对话框中的其它配置均使用默认选项。
```
$ file cinnamon.png
cinnamon.png: PNG image data, 60 x 60, 8-bit gray+alpha, non-interlaced
-
```
-输出显示，现在这个文件现在处于 8 位 / 灰阶+aplha 模式。文件大小从 6.4 KB 缩小到了 2.8 KB. 这已经是原来大小的 43.75% 了。但是，我们能做的还有很多！
+输出显示，现在这个文件现在处于 8 位 / 灰阶 + aplha 模式。文件大小从 6.4 KB 缩小到了 2.8 KB. 这已经是原来大小的 43.75% 了。但是，我们能做的还有很多！
你可以使用 ImageMagick 工具来查看这张图片的更多信息。
```
$ identify cinnamon2.png
cinnamon.png PNG 60x60 60x60+0+0 8-bit Grayscale Gray 2831B 0.000u 0:00.000
-
```
它告诉你，这个文件的大小为 2831 字节。我们回到 GIMP，重新导出文件。在导出对话框中，取消存储时间戳和 alpha 通道色值，来让文件更小一点。现在文件输出显示：
@@ -61,12 +57,11 @@ cinnamon.png PNG 60x60 60x60+0+0 8-bit Grayscale Gray 2831B 0.000u 0:00.000
```
$ identify cinnamon.png
cinnamon.png PNG 60x60 60x60+0+0 8-bit Grayscale Gray 2798B 0.000u 0:00.000
-
```
-下面，用 optipng 来无损优化你的 PNG 图片。具有相似功能的工具有很多，包括 **advdef**（这是 advancecomp 的一部分），**pngquant** 和 **pngcrush**。
+下面，用 `optipng` 来无损优化你的 PNG 图片。具有相似功能的工具有很多，包括 `advdef`（这是 advancecomp 的一部分），`pngquant` 和 `pngcrush`。
-对你的文件运行 optipng. 注意，这个操作会覆盖你的原文件：
+对你的文件运行 `optipng`。 注意，这个操作会覆盖你的原文件：
```
$ optipng -o7 cinnamon.png
@@ -85,25 +80,22 @@ Selecting parameters:
Output IDAT size = 1920 bytes (800 bytes decrease)
Output file size = 2012 bytes (800 bytes = 28.45% decrease)
-
```
--o7 选项处理起来最慢，但最终效果最好。于是你又将文件缩小了 800 字节，现在它只有 2012 字节了。
+`-o7` 选项处理起来最慢，但最终效果最好。于是你又将文件缩小了 800 字节，现在它只有 2012 字节了。
要压缩文件夹下的所有 PNG，可以使用这个命令：
```
$ optipng -o7 -dir= *.png
-
```
--dir 选项用来指定输出文件夹。如果不加这个选项，optipng 会覆盖原文件。
+`-dir` 选项用来指定输出文件夹。如果不加这个选项，`optipng` 会覆盖原文件。
### 选择正确的文件格式
当涉及到在互联网中使用的图片时，你可以选择：
-
+ [JPG 或 JPEG][9]
+ [GIF][10]
+ [PNG][11]
@@ -112,27 +104,24 @@ $ optipng -o7 -dir= *.png
+ [JPG 2000 或 JP2][14]
+ [SVG][15]
-
JPG-LS 和 JPG 2000 没有得到广泛使用。只有一部分数码相机支持这些格式，所以我们可以忽略它们。aPNG 是动态的 PNG 格式，也没有广泛使用。
-可以通过更改压缩率或者使用其它文件格式来节省下更多字节。我们无法在 GIMP 中应用第一种方法，因为现在的图片已经使用了最高的压缩率了。因为我们的图片中不再包含 [aplha 通道][5]，你可以使用 JPG 类型来替代 PNG. 现在，使用默认值：90% 质量——你可以将它减小至 85%，但这样会导致可见的叠影。这样又省下一些字节：
+可以通过更改压缩率或者使用其它文件格式来节省下更多字节。我们无法在 GIMP 中应用第一种方法，因为现在的图片已经使用了最高的压缩率了。因为我们的图片中不再包含 [aplha 通道][5]，你可以使用 JPG 类型来替代 PNG。 现在，使用默认值：90% 质量 —— 你可以将它减小至 85%，但这样会导致可见的叠影。这样又省下一些字节：
```
$ identify cinnamon.jpg
cinnamon.jpg JPEG 60x60 60x60+0+0 8-bit sRGB 2676B 0.000u 0:00.000
-
```
只将这张图转成正确的色域，并使用 JPG 作为文件格式，就可以将它从 23 KB 缩小到 12.3 KB，减少了近 50%.
-
#### PNG vs JPG: 质量和压缩率
那么，剩下的文件我们要怎么办呢？除了 Fedora “风味”图标和四个特性图标之外，此方法适用于所有其他图片。我们能够处理的图片都有一个白色的背景。
PNG 和 JPG 的一个主要区别在于，JPG 没有 alpha 通道。所以，它没有透明度选项。如果你使用 JPG 并为它添加白色背景，你可以将文件从 40.7 KB 缩小至 28.3 KB.
-现在又有了四个可以处理的图片：背景图。对于灰色背景，你可以再次使用灰阶模式。对更大的图片，我们就可以节省下更多的空间。它从 216.2 KB 缩小到了 51 KB——基本上只有原图的 25% 了。整体下来，你把这些图片从 481.1 KB 缩小到了 191.5 KB——只有一开始的 39.8%.
+现在又有了四个可以处理的图片：背景图。对于灰色背景，你可以再次使用灰阶模式。对更大的图片，我们就可以节省下更多的空间。它从 216.2 KB 缩小到了 51 KB —— 基本上只有原图的 25% 了。整体下来，你把这些图片从 481.1 KB 缩小到了 191.5 KB —— 只有一开始的 39.8%.
#### 质量 vs 大小
@@ -144,7 +133,7 @@ PNG 和 JPG 的另外一个区别在于质量。PNG 是一种无损压缩光栅
![][6]
-你将一开始 1.2 MB 的图片体积缩小到了 488.9 KB. 只需通过 optipng 进行优化，就可以达到之前体积的三分之一。这可能使得页面更快地加载。不过，要是使用蜗牛到超音速来对比，这个速度还没到达赛车的速度呢！
+你将一开始 1.2 MB 的图片体积缩小到了 488.9 KB. 只需通过 `optipng` 进行优化，就可以达到之前体积的三分之一。这可能使得页面更快地加载。不过，要是使用蜗牛到超音速来对比，这个速度还没到达赛车的速度呢！
最后，你可以在 [Google Insights][7] 中查看结果，例如：
@@ -160,7 +149,7 @@ via: https://fedoramagazine.org/design-faster-web-pages-part-1-image-compression
作者：[Sirko Kemter][a]
选题：[lujun9972][b]
译者：[StdioA](https://github.com/StdioA)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/published/201810/20181010 How To List The Enabled-Active Repositories In Linux.md b/published/201810/20181010 How To List The Enabled-Active Repositories In Linux.md
new file mode 100644
index 0000000000..727f1f7c54
--- /dev/null
+++ b/published/201810/20181010 How To List The Enabled-Active Repositories In Linux.md
@@ -0,0 +1,278 @@
+如何列出在 Linux 上已启用/激活的仓库
+======
+
+有很多方法可以列出在 Linux 已启用的仓库。我们将在下面展示给你列出已激活仓库的简便方法。这有助于你知晓你的系统上都启用了哪些仓库。一旦你掌握了这些信息，你就可以添加任何之前还没有准备启用的仓库了。
+
+举个例子，如果你想启用 epel 仓库，你需要先检查它是否已经启用了。这篇教程将会帮助你做这件事情。
+
+### 什么是仓库？
+
+存储特定程序软件包的中枢位置就是一个软件仓库。
+
+所有的 Linux 发行版都在维护自己的仓库，而且允许用户下载并安装这些软件包到他们的机器上。
+
+每个仓库提供者都提供了一套包管理工具，用以管理他们的仓库，比如搜索、安装、更新、升级、移除等等。
+
+大多数 Linux 发行版都作为免费软件，除了 RHEL 和 SUSE，要访问他们的仓库你需要先购买订阅。
+
+**建议阅读：**
+
+- [在 Linux 上，如何通过 DNF/YUM 设置管理命令添加、启用、关闭一个仓库][1]
+- [在 Linux 上如何按大小列出已安装的包][2]
+- [在 Linux 上如何列出升级的包][3]
+- [在 Linux 上如何查看一个特定包安装/升级/更新/移除/清除的日期][4]
+- [在 Linux 上如何查看一个包的详细信息][5]
+- [在你的 Linux 发行版上如何查看一个包是否可用][6]
+- [在 Linux 如何列出可用的软件包组][7]
+- [Newbies corner —— 一个图形化的 Linux 包管理的前端工具][8]
+- [Linux 专家须知，命令行包管理 & 使用列表][9]
+
+### 在 RHEL/CentOS 上列出已启用的库
+
+RHEL 和 CentOS 系统使用的是 RPM 包管理，所以我们可以使用 Yum 包管理器查看这些信息。
+
+YUM 意即 “Yellowdog Updater,Modified”，它是一个开源的包管理器的命令行前端，用于基于 RPM 的系统上，例如 RHEL 和 CentOS。
+
+YUM 是获取、安装、删除、查询和管理来自发行版仓库和其他第三方库的 RPM 包的主要工具。
+
+**建议阅读：** [在 RHEL/CentOS 系统上用 YUM 命令管理包][10]
+
+基于 RHEL 的系统主要提供以下三个主要的仓库。这些仓库是默认启用的。
+
+* **base**：它包含了所有的核心包和基础包。
+* **extras**：它向 CentOS 提供了不破坏上游兼容性或更新基本组件的额外功能。这是一个上游仓库，还有额外的 CentOS 包。
+* **updates**：它提供了 bug 修复包、安全包和增强包。
+
+```
+# yum repolist
+或者
+# yum repolist enabled
+```
+
+```
+Loaded plugins: fastestmirror
+Determining fastest mirrors
+ * epel: ewr.edge.kernel.org
+repo id repo name status
+!base/7/x86_64 CentOS-7 - Base 9,911
+!epel/x86_64 Extra Packages for Enterprise Linux 7 - x86_64 12,687
+!extras/7/x86_64 CentOS-7 - Extras 403
+!updates/7/x86_64 CentOS-7 - Updates 1,348
+repolist: 24,349
+```
+
+### 如何列出 Fedora 上已启用的包
+
+DNF 意即 “Dandified yum”。我们可以说 DNF 是下一代的 yum 包管理器，使用了 hawkey/libsolv 作为后端。自从 Fedroa 18 开始，Aleš Kozumplík 就开始开发 DNF，最终在 Fedora 22 上实现/发布。
+
+Fedora 22 及之后的系统上都使用 DNF 安装、升级、搜索和移除包。它可以自动解决依赖问题，并使包的安装过程平顺没有任何麻烦。
+
+因为 Yum 许多长时间未解决的问题，现在 Yum 已经被 DNF 所替代。你问为什么他没有给 Yum 打补丁。Aleš Kozumplík 解释说修补在技术上太困难了，而 YUM 团队无法立即承受这些变更，还有其他的问题，YUM 是 56k 行代码，而 DNF 是 29k 行代码。因此，除了分叉之外，别无选择。
+
+**建议阅读：** [在 Fedora 上使用 DNF 管理软件][11]
+
+Fedora 主要提供下面两个主仓库。这些库将被默认启用。
+
+* **fedora**：它包括所有的核心包和基础包。
+* **updates**：它提供了来自稳定发行版的 bug 修复包、安全包和增强包。
+
+```
+# dnf repolist
+或者
+# dnf repolist enabled
+```
+
+```
+Last metadata expiration check: 0:02:56 ago on Wed 10 Oct 2018 06:12:22 PM IST.
+repo id repo name status
+docker-ce-stable Docker CE Stable - x86_64 6
+*fedora Fedora 26 - x86_64 53,912
+home_mhogomchungu mhogomchungu's Home Project (Fedora_25) 19
+home_moritzmolch_gencfsm Gnome Encfs Manager (Fedora_25) 5
+mystro256-gnome-redshift Copr repo for gnome-redshift owned by mystro256 6
+nodesource Node.js Packages for Fedora Linux 26 - x86_64 83
+rabiny-albert Copr repo for albert owned by rabiny 3
+*rpmfusion-free RPM Fusion for Fedora 26 - Free 536
+*rpmfusion-free-updates RPM Fusion for Fedora 26 - Free - Updates 278
+*rpmfusion-nonfree RPM Fusion for Fedora 26 - Nonfree 202
+*rpmfusion-nonfree-updates RPM Fusion for Fedora 26 - Nonfree - Updates 95
+*updates Fedora 26 - x86_64 - Updates
+```
+
+### 如何列出 Debian/Ubuntu 上已启用的仓库
+
+基于 Debian 的系统使用的是 APT/APT-GET 包管理，因此我们可以使用 APT/APT-GET 包管理器去获取该信息。
+
+APT 意即 “Advanced Packaging Tool”，它取代了 `apt-get`，就像 DNF 取代 Yum 一样。 它具有丰富的命令行工具，在一个命令（`apt`）中包含了所有功能，如 `apt-cache`、`apt-search`、`dpkg`、`apt-cdrom`、`apt-config`、`apt-key` 等，还有其他几个独特的功能。 例如，我们可以通过 APT 轻松安装 .dpkg 软件包，而我们无法通过 APT-GET 获得和包含在 APT 命令中类似的功能。 由于 APT-GET 中未能解决的问题，APT 取代了 APT-GET。
+
+apt-get 是一个强大的命令行工具，它用以自动下载和安装新的软件包、升级已存在的软件包、更新包索引列表、还有升级整个基于 Debian 的系统。
+
+```
+# apt-cache policy
+Package files:
+ 100 /var/lib/dpkg/status
+ release a=now
+ 500 http://ppa.launchpad.net/peek-developers/stable/ubuntu artful/main amd64 Packages
+ release v=17.10,o=LP-PPA-peek-developers-stable,a=artful,n=artful,l=Peek stable releases,c=main,b=amd64
+ origin ppa.launchpad.net
+ 500 http://ppa.launchpad.net/notepadqq-team/notepadqq/ubuntu artful/main amd64 Packages
+ release v=17.10,o=LP-PPA-notepadqq-team-notepadqq,a=artful,n=artful,l=Notepadqq,c=main,b=amd64
+ origin ppa.launchpad.net
+ 500 http://dl.google.com/linux/chrome/deb stable/main amd64 Packages
+ release v=1.0,o=Google, Inc.,a=stable,n=stable,l=Google,c=main,b=amd64
+ origin dl.google.com
+ 500 https://download.docker.com/linux/ubuntu artful/stable amd64 Packages
+ release o=Docker,a=artful,l=Docker CE,c=stable,b=amd64
+ origin download.docker.com
+ 500 http://security.ubuntu.com/ubuntu artful-security/multiverse amd64 Packages
+ release v=17.10,o=Ubuntu,a=artful-security,n=artful,l=Ubuntu,c=multiverse,b=amd64
+ origin security.ubuntu.com
+ 500 http://security.ubuntu.com/ubuntu artful-security/universe amd64 Packages
+ release v=17.10,o=Ubuntu,a=artful-security,n=artful,l=Ubuntu,c=universe,b=amd64
+ origin security.ubuntu.com
+ 500 http://security.ubuntu.com/ubuntu artful-security/restricted i386 Packages
+ release v=17.10,o=Ubuntu,a=artful-security,n=artful,l=Ubuntu,c=restricted,b=i386
+ origin security.ubuntu.com
+.
+.
+ origin in.archive.ubuntu.com
+ 500 http://in.archive.ubuntu.com/ubuntu artful/restricted amd64 Packages
+ release v=17.10,o=Ubuntu,a=artful,n=artful,l=Ubuntu,c=restricted,b=amd64
+ origin in.archive.ubuntu.com
+ 500 http://in.archive.ubuntu.com/ubuntu artful/main i386 Packages
+ release v=17.10,o=Ubuntu,a=artful,n=artful,l=Ubuntu,c=main,b=i386
+ origin in.archive.ubuntu.com
+ 500 http://in.archive.ubuntu.com/ubuntu artful/main amd64 Packages
+ release v=17.10,o=Ubuntu,a=artful,n=artful,l=Ubuntu,c=main,b=amd64
+ origin in.archive.ubuntu.com
+Pinned packages:
+
+```
+
+### 如何在 openSUSE 上列出已启用的仓库
+
+openSUSE 使用 zypper 包管理，因此我们可以使用 zypper 包管理获得更多信息。
+
+Zypper 是 suse 和 openSUSE 发行版的命令行包管理。它用于安装、更新、搜索、移除包和管理仓库，执行各种查询等。Zypper 以 ZYpp 系统管理库（libzypp）作为后端。
+
+**建议阅读：** [在 openSUSE 和 suse 系统上使用 Zypper 命令管理包][12]
+
+```
+# zypper repos
+
+# | Alias | Name | Enabled | GPG Check | Refresh
+--+-----------------------+-----------------------------------------------------+---------+-----------+--------
+1 | packman-repository | packman-repository | Yes | (r ) Yes | Yes
+2 | google-chrome | google-chrome | Yes | (r ) Yes | Yes
+3 | home_lazka0_ql-stable | Stable Quod Libet / Ex Falso Builds (openSUSE_42.1) | Yes | (r ) Yes | No
+4 | repo-non-oss | openSUSE-leap/42.1-Non-Oss | Yes | (r ) Yes | Yes
+5 | repo-oss | openSUSE-leap/42.1-Oss | Yes | (r ) Yes | Yes
+6 | repo-update | openSUSE-42.1-Update | Yes | (r ) Yes | Yes
+7 | repo-update-non-oss | openSUSE-42.1-Update-Non-Oss | Yes | (r ) Yes | Yes
+```
+
+列出仓库及 URI。
+
+```
+# zypper lr -u
+
+# | Alias | Name | Enabled | GPG Check | Refresh | URI
+--+-----------------------+-----------------------------------------------------+---------+-----------+---------+---------------------------------------------------------------------------------
+1 | packman-repository | packman-repository | Yes | (r ) Yes | Yes | http://ftp.gwdg.de/pub/linux/packman/suse/openSUSE_Leap_42.1/
+2 | google-chrome | google-chrome | Yes | (r ) Yes | Yes | http://dl.google.com/linux/chrome/rpm/stable/x86_64
+3 | home_lazka0_ql-stable | Stable Quod Libet / Ex Falso Builds (openSUSE_42.1) | Yes | (r ) Yes | No | http://download.opensuse.org/repositories/home:/lazka0:/ql-stable/openSUSE_42.1/
+4 | repo-non-oss | openSUSE-leap/42.1-Non-Oss | Yes | (r ) Yes | Yes | http://download.opensuse.org/distribution/leap/42.1/repo/non-oss/
+5 | repo-oss | openSUSE-leap/42.1-Oss | Yes | (r ) Yes | Yes | http://download.opensuse.org/distribution/leap/42.1/repo/oss/
+6 | repo-update | openSUSE-42.1-Update | Yes | (r ) Yes | Yes | http://download.opensuse.org/update/leap/42.1/oss/
+7 | repo-update-non-oss | openSUSE-42.1-Update-Non-Oss | Yes | (r ) Yes | Yes | http://download.opensuse.org/update/leap/42.1/non-oss/
+```
+
+通过优先级列出仓库。
+
+```
+# zypper lr -p
+
+# | Alias | Name | Enabled | GPG Check | Refresh | Priority
+--+-----------------------+-----------------------------------------------------+---------+-----------+---------+---------
+1 | packman-repository | packman-repository | Yes | (r ) Yes | Yes | 99
+2 | google-chrome | google-chrome | Yes | (r ) Yes | Yes | 99
+3 | home_lazka0_ql-stable | Stable Quod Libet / Ex Falso Builds (openSUSE_42.1) | Yes | (r ) Yes | No | 99
+4 | repo-non-oss | openSUSE-leap/42.1-Non-Oss | Yes | (r ) Yes | Yes | 99
+5 | repo-oss | openSUSE-leap/42.1-Oss | Yes | (r ) Yes | Yes | 99
+6 | repo-update | openSUSE-42.1-Update | Yes | (r ) Yes | Yes | 99
+7 | repo-update-non-oss | openSUSE-42.1-Update-Non-Oss | Yes | (r ) Yes | Yes | 99
+```
+
+### 如何列出 Arch Linux 上已启用的仓库
+
+基于 Arch Linux 的系统使用 pacman 包管理，因此我们可以使用 pacman 包管理获取这些信息。
+
+pacman 意即 “package manager utility”。pacman 是一个命令行实用程序，用以安装、构建、移除和管理 Arch Linux 包。pacman 使用 libalpm （Arch Linux 包管理库）作为后端去进行这些操作。
+
+**建议阅读：** [在基于 Arch Linux的系统上使用 Pacman命令管理包][13]
+
+```
+# pacman -Syy
+:: Synchronizing package databases...
+ core 132.6 KiB 1524K/s 00:00 [############################################] 100%
+ extra 1859.0 KiB 750K/s 00:02 [############################################] 100%
+ community 3.5 MiB 149K/s 00:24 [############################################] 100%
+ multilib 182.7 KiB 1363K/s 00:00 [############################################] 100%
+```
+
+### 如何使用 INXI Utility 列出 Linux 上已启用的仓库
+
+inix 是 Linux 上检查硬件信息非常有用的工具，还提供很多的选项去获取 Linux 上的所有硬件信息，我从未在 Linux 上发现其他有如此效用的程序。它由 locsmif 分叉自古老而古怪的 infobash。
+
+inix 是一个可以快速显示硬件信息、CPU、硬盘、Xorg、桌面、内核、GCC 版本、进程、内存使用和很多其他有用信息的程序，还使用于论坛技术支持和调试工具上。
+
+这个实用程序将会显示所有发行版仓库的数据信息，例如 RHEL、CentOS、Fedora、Debain、Ubuntu、LinuxMint、ArchLinux、openSUSE、Manjaro等。
+
+**建议阅读：** [inxi – 一个在 Linux 上检查硬件信息的好工具][14]
+
+```
+# 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
+```
+
+--------------------------------------------------------------------------------
+
+via: https://www.2daygeek.com/how-to-list-the-enabled-active-repositories-in-linux/
+
+作者：[Prakash Subramanian][a]
+选题：[lujun9972][b]
+译者：[dianbanjiu](https://github.com/dianbanjiu)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.2daygeek.com/author/prakash/
+[b]: https://github.com/lujun9972
+[1]: https://www.2daygeek.com/how-to-add-enable-disable-a-repository-dnf-yum-config-manager-on-linux/
+[2]: https://www.2daygeek.com/how-to-list-installed-packages-by-size-largest-on-linux/
+[3]: https://www.2daygeek.com/how-to-view-list-the-available-packages-updates-in-linux/
+[4]: https://www.2daygeek.com/how-to-view-a-particular-package-installed-updated-upgraded-removed-erased-date-on-linux/
+[5]: https://www.2daygeek.com/how-to-view-detailed-information-about-a-package-in-linux/
+[6]: https://www.2daygeek.com/how-to-search-if-a-package-is-available-on-your-linux-distribution-or-not/
+[7]: https://www.2daygeek.com/how-to-list-an-available-package-groups-in-linux/
+[8]: https://www.2daygeek.com/list-of-graphical-frontend-tool-for-linux-package-manager/
+[9]: https://www.2daygeek.com/list-of-command-line-package-manager-for-linux/
+[10]: https://www.2daygeek.com/yum-command-examples-manage-packages-rhel-centos-systems/
+[11]: https://www.2daygeek.com/dnf-command-examples-manage-packages-fedora-system/
+[12]: https://www.2daygeek.com/zypper-command-examples-manage-packages-opensuse-system/
+[13]: https://www.2daygeek.com/pacman-command-examples-manage-packages-arch-linux-system/
+[14]: https://www.2daygeek.com/inxi-system-hardware-information-on-linux/
diff --git a/published/20181011 A Front-end For Popular Package Managers.md b/published/201810/20181011 A Front-end For Popular Package Managers.md
similarity index 100%
rename from published/20181011 A Front-end For Popular Package Managers.md
rename to published/201810/20181011 A Front-end For Popular Package Managers.md
diff --git a/published/20181011 Getting started with Minikube- Kubernetes on your laptop.md b/published/201810/20181011 Getting started with Minikube- Kubernetes on your laptop.md
similarity index 100%
rename from published/20181011 Getting started with Minikube- Kubernetes on your laptop.md
rename to published/201810/20181011 Getting started with Minikube- Kubernetes on your laptop.md
diff --git a/published/20181012 Command line quick tips- Reading files different ways.md b/published/201810/20181012 Command line quick tips- Reading files different ways.md
similarity index 100%
rename from published/20181012 Command line quick tips- Reading files different ways.md
rename to published/201810/20181012 Command line quick tips- Reading files different ways.md
diff --git a/published/20181012 Happy birthday, KDE- 11 applications you never knew existed.md b/published/201810/20181012 Happy birthday, KDE- 11 applications you never knew existed.md
similarity index 100%
rename from published/20181012 Happy birthday, KDE- 11 applications you never knew existed.md
rename to published/201810/20181012 Happy birthday, KDE- 11 applications you never knew existed.md
diff --git a/translated/tech/20181012 How To Lock Virtual Console Sessions On Linux.md b/published/201810/20181012 How To Lock Virtual Console Sessions On Linux.md
similarity index 53%
rename from translated/tech/20181012 How To Lock Virtual Console Sessions On Linux.md
rename to published/201810/20181012 How To Lock Virtual Console Sessions On Linux.md
index 5eb290442f..acfea7e185 100644
--- a/translated/tech/20181012 How To Lock Virtual Console Sessions On Linux.md
+++ b/published/201810/20181012 How To Lock Virtual Console Sessions On Linux.md
@@ -3,7 +3,7 @@
-当你在共享系统上工作时，你可能不希望其他用户在你的控制台中悄悄地看你在做什么。如果是这样，我知道有个简单的技巧来锁定自己的会话，同时仍然允许其他用户在其他虚拟控制台上使用该系统。要感谢 **Vlock**（**V** irtual Console **lock**），这是一个命令行程序，用于锁定 Linux 控制台上的一个或多个会话。如有必要，你可以锁定整个控制台并完全禁用虚拟控制台切换功能。Vlock 对于有多个用户访问控制台的共享 Linux 系统特别有用。
+当你在共享的系统上工作时，你可能不希望其他用户偷窥你的控制台中看你在做什么。如果是这样，我知道有个简单的技巧来锁定自己的会话，同时仍然允许其他用户在其他虚拟控制台上使用该系统。要感谢 **Vlock**（**V**irtual Console **lock**），这是一个命令行程序，用于锁定 Linux 控制台上的一个或多个会话。如有必要，你可以锁定整个控制台并完全禁用虚拟控制台切换功能。Vlock 对于有多个用户访问控制台的共享 Linux 系统特别有用。
### 安装 Vlock
@@ -12,96 +12,94 @@
在 Debian、Ubuntu、Linux Mint 上，运行以下命令来安装 Vlock：
```
- $ sudo apt-get install vlock
+$ sudo apt-get install vlock
```
在 Fedora 上：
```
- $ sudo dnf install vlock
+$ sudo dnf install vlock
```
在 RHEL、CentOS 上：
```
- $ sudo yum install vlock
+$ sudo yum install vlock
```
-### 在Linux上锁定虚拟控制台会话
+### 在 Linux 上锁定虚拟控制台会话
Vlock 的一般语法是：
```
- vlock [ -acnshv ] [ -t ] [ plugins... ]
+vlock [ -acnshv ] [ -t ] [ plugins... ]
```
这里：
- * **a** – 锁定所有虚拟控制台会话，
- * **c** – 锁定当前虚拟控制台会话，
- * **n** – 在锁定所有会话之前切换到新的空控制台，
- * **s** – 禁用 SysRq 键机制，
- * **t** – 指定屏保插件的超时时间，
- * **h** – 显示帮助，
- * **v** – 显示版本。
-
-
+* `a` —— 锁定所有虚拟控制台会话，
+* `c` —— 锁定当前虚拟控制台会话，
+* `n` —— 在锁定所有会话之前切换到新的空控制台，
+* `s` —— 禁用 SysRq 键机制，
+* `t` —— 指定屏保插件的超时时间，
+* `h` —— 显示帮助，
+* `v` —— 显示版本。
让我举几个例子。
-**1\. 锁定当前控制台会话**
+#### 1、 锁定当前控制台会话
在没有任何参数的情况下运行 Vlock 时，它默认锁定当前控制台会话 （TYY）。要解锁会话，你需要输入当前用户的密码或 root 密码。
```
- $ vlock
+$ vlock
```
-你还可以使用 **-c** 标志来锁定当前的控制台会话。
+你还可以使用 `-c` 标志来锁定当前的控制台会话。
```
- $ vlock -c
+$ vlock -c
```
-请注意，此命令仅锁定当前控制台。你可以按 **ALT+F2** 切换到其他控制台。有关在 TTY 之间切换的更多详细信息，请参阅以下指南。
+请注意，此命令仅锁定当前控制台。你可以按 `ALT+F2` 切换到其他控制台。有关在 TTY 之间切换的更多详细信息，请参阅以下指南。
此外，如果系统有多个用户，则其他用户仍可以访问其各自的 TTY。
-**2\. 锁定所有控制台会话**
+#### 2、 锁定所有控制台会话
要同时锁定所有 TTY 并禁用虚拟控制台切换功能，请运行：
```
- $ vlock -a
+$ vlock -a
```
同样，要解锁控制台会话，只需按下回车键并输入当前用户的密码或 root 用户密码。
请记住，**root 用户可以随时解锁任何 vlock 会话**，除非在编译时禁用。
-**3\. 在锁定所有控制台之前切换到新的虚拟控制台**
+#### 3、 在锁定所有控制台之前切换到新的虚拟控制台
-在锁定所有控制台之前，还可以使 Vlock 从 X 会话切换到新的空虚拟控制台。为此，请使用 **-n** 标志。
+在锁定所有控制台之前，还可以使 Vlock 从 X 会话切换到新的空虚拟控制台。为此，请使用 `-n` 标志。
```
- $ vlock -n
+$ vlock -n
```
-**4\. 禁用 SysRq 机制**
+#### 4、 禁用 SysRq 机制
-你也许知道，魔术 SysRq 键机制允许用户在系统死机时执行某些操作。因此，用户可以使用 SysRq 解锁控制台。为了防止这种情况，请传递 **-s** 选项以禁用 SysRq 机制。请记住，这只适用于有 **-a** 选项的时候。
+你也许知道，魔术 SysRq 键机制允许用户在系统死机时执行某些操作。因此，用户可以使用 SysRq 解锁控制台。为了防止这种情况，请传递 `-s` 选项以禁用 SysRq 机制。请记住，这个选项只适用于有 `-a` 选项的时候。
```
- $ vlock -sa
+$ vlock -sa
```
有关更多选项及其用法，请参阅帮助或手册页。
```
- $ vlock -h
- $ man vlock
+$ vlock -h
+$ man vlock
```
Vlock 可防止未经授权的用户获得控制台访问权限。如果你在为 Linux 寻找一个简单的控制台锁定机制，那么 Vlock 值得一试！
@@ -111,7 +109,6 @@ Vlock 可防止未经授权的用户获得控制台访问权限。如果你在
干杯!
-
--------------------------------------------------------------------------------
via: https://www.ostechnix.com/how-to-lock-virtual-console-sessions-on-linux/
@@ -119,7 +116,7 @@ via: https://www.ostechnix.com/how-to-lock-virtual-console-sessions-on-linux/
作者：[SK][a]
选题：[lujun9972][b]
译者：[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/20181013 How to Install GRUB on Arch Linux (UEFI).md b/published/201810/20181013 How to Install GRUB on Arch Linux (UEFI).md
similarity index 100%
rename from published/20181013 How to Install GRUB on Arch Linux (UEFI).md
rename to published/201810/20181013 How to Install GRUB on Arch Linux (UEFI).md
diff --git a/published/20181015 How To Browse And Read Entire Arch Wiki As Linux Man Pages.md b/published/201810/20181015 How To Browse And Read Entire Arch Wiki As Linux Man Pages.md
similarity index 100%
rename from published/20181015 How To Browse And Read Entire Arch Wiki As Linux Man Pages.md
rename to published/201810/20181015 How To Browse And Read Entire Arch Wiki As Linux Man Pages.md
diff --git a/translated/tech/20181015 Running Linux containers as a non-root with Podman.md b/published/201810/20181015 Running Linux containers as a non-root with Podman.md
similarity index 50%
rename from translated/tech/20181015 Running Linux containers as a non-root with Podman.md
rename to published/201810/20181015 Running Linux containers as a non-root with Podman.md
index 627ed291e4..39726c677e 100644
--- a/translated/tech/20181015 Running Linux containers as a non-root with Podman.md
+++ b/published/201810/20181015 Running Linux containers as a non-root with Podman.md
@@ -3,64 +3,64 @@
-Linux容器是有由 Linux 内核提供的具有特定隔离功能的进程 - 包括文件系统、进程和网络隔离。容器有助于实现可移植性 - 应用可以在容器镜像中与其依赖项一起分发，并可在几乎任何有容器运行时的 Linux 系统上运行。
+Linux 容器是由 Linux 内核所提供的具有特定隔离功能的进程 —— 包括文件系统、进程和网络的隔离。容器有助于实现可移植性 —— 应用可以在容器镜像中与其依赖项一起分发，并可在几乎任何有容器运行时环境的 Linux 系统上运行。
-虽然容器技术存在了很长时间，但 Linux 容器是由 Docker 广泛推广。 “Docker” 这个词可以指几个不同的东西，包括容器技术和工具，周围的社区，或者 Docker Inc. 公司。但是，在本文中，我将用来指管理 Linux 容器的技术和工具。
+虽然容器技术存在了很长时间，但 Linux 容器是由 Docker 而得到了广泛推广。 “Docker” 这个词可以指几个不同的东西，包括容器技术和工具，周围的社区，或者 Docker Inc. 公司。但是，在本文中，我将用来指管理 Linux 容器的技术和工具。
### 什么是 Docker
-[Docker][1] 是一个以 root 身份在你的系统上运行的守护程序，它利用 Linux 内核的功能来管理正在运行的容器。除了运行容器之外，它还可以轻松管理容器镜像 - 与容器托管交互、存储映像、管理容器版本等。它基本上支持运行单个容器所需的所有操作。
+[Docker][1] 是一个以 root 身份在你的系统上运行的守护程序，它利用 Linux 内核的功能来管理正在运行的容器。除了运行容器之外，它还可以轻松管理容器镜像 —— 与容器注册库交互、存储映像、管理容器版本等。它基本上支持运行单个容器所需的所有操作。
但即使 Docker 是管理 Linux 容器的一个非常方便的工具，它也有两个缺点：它是一个需要在你的系统上运行的守护进程，并且需要以 root 权限运行，这可能有一定的安全隐患。然而，Podman 在解决这两个问题。
### Podman 介绍
-[Podman][2] 是一个容器运行时，提供与 Docker 非常相似的功能。正如已经提示的那样，它不需要在你的系统上运行任何守护进程，并且它也可以在没有 root 权限的情况下运行。让我们看看使用 Podman 运行 Linux 容器的一些示例。
+[Podman][2] 是一个容器运行时环境，提供与 Docker 非常相似的功能。正如已经提示的那样，它不需要在你的系统上运行任何守护进程，并且它也可以在没有 root 权限的情况下运行。让我们看看使用 Podman 运行 Linux 容器的一些示例。
#### 使用 Podman 运行容器
其中一个最简单的例子可能是运行 Fedora 容器，在命令行中打印 “Hello world!”：
```
- $ podman run --rm -it fedora:28 echo "Hello world!"
+$ podman run --rm -it fedora:28 echo "Hello world!"
```
使用通用 Dockerfile 构建镜像的方式与 Docker 相同：
```
- $ cat Dockerfile
- FROM fedora:28
- RUN dnf -y install cowsay
+$ cat Dockerfile
+FROM fedora:28
+RUN dnf -y install cowsay
- $ podman build . -t hello-world
- ... output omitted ...
+$ podman build . -t hello-world
+... output omitted ...
- $ podman run --rm -it hello-world cowsay "Hello!"
+$ podman run --rm -it hello-world cowsay "Hello!"
```
-为了构建容器，Podman 在后台调用另一个名为 Buildah 的工具。你可以阅读最近一篇[关于使用 Buildah 构建容器镜像的文章][3] - 它不仅仅是使用典型的 Dockerfile。
+为了构建容器，Podman 在后台调用另一个名为 Buildah 的工具。你可以阅读最近一篇[关于使用 Buildah 构建容器镜像的文章][3] —— 它不仅仅是使用典型的 Dockerfile。
-除了构建和运行容器外，Podman 还可以与容器托管进行交互。要登录容器托管，例如广泛使用的 Docker Hub，请运行：
+除了构建和运行容器外，Podman 还可以与容器托管进行交互。要登录容器注册库，例如广泛使用的 Docker Hub，请运行：
```
- $ podman login docker.io
+$ podman login docker.io
```
-为了推送我刚刚构建的镜像，我只需打上标记来代表特定的容器托管，然后直接推送它。
+为了推送我刚刚构建的镜像，我只需打上标记来代表特定的容器注册库，然后直接推送它。
```
- $ podman -t hello-world docker.io/asamalik/hello-world
- $ podman push docker.io/asamalik/hello-world
+$ podman -t hello-world docker.io/asamalik/hello-world
+$ podman push docker.io/asamalik/hello-world
```
-顺便说一下，你是否注意到我如何以非 root 用户身份运行所有内容？此外，我的系统上没有运行大的守护进程！
+顺便说一下，你是否注意到我如何以非 root 用户身份运行所有内容？此外，我的系统上没有运行又大又重的守护进程！
#### 安装 Podman
-Podman 默认在 [Silverblue][4] 上提供 - 一个基于容器的工作流的新一代 Linux 工作站。要在任何 Fedora 版本上安装它，只需运行：
+Podman 默认在 [Silverblue][4] 上提供 —— 一个基于容器的工作流的新一代 Linux 工作站。要在任何 Fedora 版本上安装它，只需运行：
```
- $ sudo dnf install podman
+$ sudo dnf install podman
```
--------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ via: https://fedoramagazine.org/running-containers-with-podman/
作者：[Adam Šamalík][a]
选题：[lujun9972][b]
译者：[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/translated/tech/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md b/published/201810/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md
similarity index 77%
rename from translated/tech/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md
rename to published/201810/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md
index ad720ac79d..44c273d3a0 100644
--- a/translated/tech/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md
+++ b/published/201810/20181016 Turn Your Old PC into a Retrogaming Console with Lakka Linux.md
@@ -1,6 +1,6 @@
使用 Lakka Linux 将你的旧 PC 变成复古游戏主机
======
-**如果你有一台吃灰的旧计算机，你可以用 Lakka Linux 将它变成像 PlayStation 那样的复古游戏主机。**
+> 如果你有一台吃灰的旧计算机，你可以用 Lakka Linux 将它变成像 PlayStation 那样的复古游戏主机。
你可能已经了解[专门用于复活旧计算机的 Linux 发行版][1]。但是你知道有个 Linux 发行版专门是为了将旧电脑变成复古游戏主机创建的么？
@@ -12,8 +12,7 @@
Lakka 提供类似的界面和类似的体验。我稍后会谈到“体验”。先看一下界面。
-
-Lakka 复古游戏界面
+[Lakka 复古游戏界面](https://itsfoss.com/wp-content/uploads/2018/10/lakka-linux-gaming-console.webm)
### Lakka：为复古游戏而生的 Linux 发行版
@@ -27,20 +26,18 @@ Lakka 是轻量级的，你可以将它安装在大多数老系统或单板计
它支持大量的模拟器。你只需要在系统上下载 ROM，Lakka 将从这些 ROM 运行游戏。你可以在[这里][6]找到支持的模拟器和硬件列表。
-它通过器顺滑的图形界面让你能够在许多计算机和主机上运行经典游戏。设置也是统一的，因此可以一劳永逸地完成配置。
+它通过其顺滑的图形界面让你能够在许多计算机和主机上运行经典游戏。设置也是统一的，因此可以一劳永逸地完成配置。
让我总结一下 Lakka 的主要特点：
- * RetroArch 中与 PlayStation 类似的界面
- * 支持许多复古游戏模拟器
- * 支持最多 5 名玩家在同一系统上玩游戏
- * 存档允许你随时保存游戏中的进度
- * 你可以使用各种图形过滤器改善旧游戏的外表
- * 你可以通过网络加入多人游戏
- * 开箱即用支持 XBOX360、Dualshock 3 和 8bitdo 等多种游戏手柄
- * 连接到 [RetroAchievements] [7] 获取奖杯和徽章
-
-
+* RetroArch 中与 PlayStation 类似的界面
+* 支持许多复古游戏模拟器
+* 支持最多 5 名玩家在同一系统上玩游戏
+* 存档允许你随时保存游戏中的进度
+* 你可以使用各种图形过滤器改善旧游戏的外表
+* 你可以通过网络加入多人游戏
+* 开箱即用支持 XBOX360、Dualshock 3 和 8bitdo 等多种游戏手柄
+* 连接到 [RetroAchievements] [7] 获取奖杯和徽章
### 获取 Lakka
@@ -50,7 +47,7 @@ Lakka 是轻量级的，你可以将它安装在大多数老系统或单板计
[项目的 FAQ 部分][8]回答了常见的疑问，所以如有任何其他的问题，请参考它。
-[获取 Lakka][9]
+- [获取 Lakka][9]
你喜欢复古游戏吗？你使用什么模拟器？你以前用过 Lakka 吗？在评论区与我们分享你的观点。
@@ -61,7 +58,7 @@ via: https://itsfoss.com/lakka-retrogaming-linux/
作者：[Abhishek Prakash][a]
选题：[lujun9972][b]
译者：[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/) 荣誉推出
@@ -75,4 +72,4 @@ via: https://itsfoss.com/lakka-retrogaming-linux/
[6]: http://www.lakka.tv/powerful/
[7]: https://retroachievements.org/
[8]: http://www.lakka.tv/doc/FAQ/
-[9]; http://www.lakka.tv/disclaimer/
+[9]: http://www.lakka.tv/disclaimer/
diff --git a/published/201810/20181018 MidnightBSD Hits 1.0- Checkout What-s New.md b/published/201810/20181018 MidnightBSD Hits 1.0- Checkout What-s New.md
new file mode 100644
index 0000000000..4ff1d767e4
--- /dev/null
+++ b/published/201810/20181018 MidnightBSD Hits 1.0- Checkout What-s New.md
@@ -0,0 +1,71 @@
+MidnightBSD 发布 1.0！
+======
+
+几天前，Lucas Holt 宣布发布 MidnightBSD 1.0。让我们快速看一下这个新版本中包含的内容。
+
+### 什么是 MidnightBSD？
+
+![MidnightBSD][1]
+
+[MidnightBSD][2] 是 FreeBSD 的一个分支。Lucas 创建了 MightnightBSD，这成为桌面用户和 BSD 新手的一个选择。他想创造一个能让人们快速体验 BSD 桌面的东西。他认为其他发行版过于关注服务器市场。
+
+### MidnightBSD 1.0 中有什么？
+
+根据[发布说明][3]（[视频](https://www.youtube.com/embed/-rlk2wFsjJ4)），1.0 中的大部分工作都是更新基础系统，改进包管理器和更新工具。新版本与 FreeBSD 10-Stable 兼容。
+
+Mports（MidnightBSD 的包管理系统）已经升级支持使用一个命令安装多个包。`mport upgrade` 命令已经修复。Mports 现在会跟踪已弃用和过期的包。它还引入了新的包格式。
+
+其他变化包括：
+
+ * 现在支持 [ZFS][4] 作为启动文件系统。以前，ZFS 只能用于附加存储。
+ * 支持 NVME SSD。
+ * AMD Ryzen 和 Radeon 的支持得到了改善。
+ * Intel、Broadcom 和其他驱动程序已更新。
+ * 已从 FreeBSD 移植 bhyve 支持。
+ * 传感器框架已被删除，因为它导致锁定问题。
+ * 删除了 Sudo 并用 OpenBSD 中的 [doas][5] 替换。
+ * 增加了对 Microsoft hyper-v 的支持。
+
+### 升级之前
+
+如果你当前是 MidnightBSD 的用户或正在考虑尝试新版本，那么还是再等一会。Lucas 目前正在重建软件包以支持新的软件包格式和工具。他还计划在未来几个月内升级软件包和移植桌面环境。他目前正致力于移植 Firefox 52 ESR，因为它是最后一个不需要 Rust 的版本。他还希望将更新版本的 Chromium 移植到 MidnightBSD。我建议关注 MidnightBSD 的 [Twitter][6]。
+
+### 0.9 怎么回事？
+
+你可能注意到 MidnightBSD 的先前版本是 0.8.6。你现在可能想知道“为什么跳到 1.0”？根据 Lucas 的说法，他在开发 0.9 时遇到了几个问题。事实上，他重试好几次。他最终采用与 0.9 分支不同的方式，并变成了 1.0。有些软件包在 0.* 系列也有问题。
+
+### 需要帮助
+
+目前，MidnightBSD 项目几乎是 Lucas Holt 一个人的作品。这是其发展缓慢的主要原因。如果你有兴趣帮忙，可以通过 [Twitter][6] 与他联系。
+
+在[发布公告视频][7]中。Lucas 说他遇到了上游项目接受补丁的问题。他们似乎认为 MidnightBSD 太小了。这通常意味着他必须从头开始移植应用。
+
+### 想法
+
+我对劣势者有一个想法。在我接触的所有 BSD 中，这个外号最适合 MidnightBSD。一个人想要创建一个轻松的桌面体验。当前只有一个其他的 BSD 在尝试做相似的事情：Project Trident。我想这是 BSD 成功的真正的阻碍。Linux 成功是因为人们可以快速容易地安装它。希望 MidnightBSD 为 BSD 做到这一点，但是还有很长的路要走。
+
+你有没有用过 MidnightBSD？如果没有，你最喜欢的 BSD 是什么？我们应该涵盖哪些其他 BSD 主题？请在下面的评论中告诉我们。
+
+如果你觉得这篇文章有趣，请花一点时间在社交媒体，Hacker News 或 [Reddit][8] 上分享它。
+
+--------------------------------------------------------------------------------
+
+via: https://itsfoss.com/midnightbsd-1-0-release/
+
+作者：[John Paul][a]
+选题：[lujun9972][b]
+译者：[geekpi](https://github.com/geekpi)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://itsfoss.com/author/john/
+[b]: https://github.com/lujun9972
+[1]: https://4bds6hergc-flywheel.netdna-ssl.com/wp-content/uploads/2018/10/midnightbsd-wallpaper.jpeg
+[2]: https://www.midnightbsd.org/
+[3]: https://www.midnightbsd.org/notes/
+[4]: https://itsfoss.com/what-is-zfs/
+[5]: https://man.openbsd.org/doas
+[6]: https://twitter.com/midnightbsd
+[7]: https://www.youtube.com/watch?v=-rlk2wFsjJ4
+[8]: http://reddit.com/r/linuxusersgroup
diff --git a/published/201810/20181018 Understanding Linux Links- Part 1.md b/published/201810/20181018 Understanding Linux Links- Part 1.md
new file mode 100644
index 0000000000..ecfb777cd9
--- /dev/null
+++ b/published/201810/20181018 Understanding Linux Links- Part 1.md
@@ -0,0 +1,135 @@
+理解 Linux 链接（一）
+======
+> 链接是可以将文件和目录放在你希望它们放在的位置的另一种方式。
+
+
+
+除了 `cp` 和 `mv` 这两个我们在[本系列的前一部分][1]中详细讨论过的，链接是可以将文件和目录放在你希望它们放在的位置的另一种方式。它的优点是可以让你同时在多个位置显示一个文件或目录。
+
+如前所述，在物理磁盘这个级别上，文件和目录之类的东西并不真正存在。文件系统是为了方便人类使用，将它们虚构出来。但在磁盘级别上，有一个名为分区表的东西，它位于每个分区的开头，然后数据分散在磁盘的其余部分。
+
+虽然有不同类型的分区表，但是在分区开头的那个表包含的数据将映射每个目录和文件的开始和结束位置。分区表的就像一个索引：当从磁盘加载文件时，操作系统会查找表中的条目，分区表会告诉文件在磁盘上的起始位置和结束位置。然后磁盘头移动到起点，读取数据，直到它到达终点，您看：这就是你的文件。
+
+### 硬链接
+
+硬链接只是分区表中的一个条目，它指向磁盘上的某个区域，表示该区域**已经被分配给文件**。换句话说，硬链接指向已经被另一个条目索引的数据。让我们看看它是如何工作的。
+
+打开终端，创建一个实验目录并进入：
+
+```
+mkdir test_dir
+cd test_dir
+```
+
+使用 [touch][1] 创建一个文件：
+
+```
+touch test.txt
+```
+
+为了获得更多的体验（？），在文本编辑器中打开 `test.txt` 并添加一些单词。
+
+现在通过执行以下命令来建立硬链接：
+
+```
+ln test.txt hardlink_test.txt
+```
+
+运行 `ls`，你会看到你的目录现在包含两个文件，或者看起来如此。正如你之前读到的那样，你真正看到的是完全相同的文件的两个名称： `hardlink_test.txt` 包含相同的内容，没有填充磁盘中的任何更多空间（可以尝试使用大文件来测试），并与 `test.txt` 使用相同的 inode：
+
+```
+$ ls -li *test*
+16515846 -rw-r--r-- 2 paul paul 14 oct 12 09:50 hardlink_test.txt
+16515846 -rw-r--r-- 2 paul paul 14 oct 12 09:50 test.txt
+```
+
+`ls` 的 `-i` 选项显示一个文件的 “inode 数值”。“inode” 是分区表中的信息块，它包含磁盘上文件或目录的位置、上次修改的时间以及其它数据。如果两个文件使用相同的 inode，那么无论它们在目录树中的位置如何，它们在实际上都是相同的文件。
+
+### 软链接
+
+软链接，也称为符号链接，它与硬链接是不同的：软链接实际上是一个独立的文件，它有自己的 inode 和它自己在磁盘上的小块地方。但它只包含一小段数据，将操作系统指向另一个文件或目录。
+
+你可以使用 `ln` 的 `-s` 选项来创建一个软链接：
+
+```
+ln -s test.txt softlink_test.txt
+```
+
+这将在当前目录中创建软链接 `softlink_test.txt`，它指向 `test.txt`。
+
+再次执行 `ls -li`，你可以看到两种链接的不同之处：
+
+```
+$ ls -li
+total 8
+16515846 -rw-r--r-- 2 paul paul 14 oct 12 09:50 hardlink_test.txt
+16515855 lrwxrwxrwx 1 paul paul 8 oct 12 09:50 softlink_test.txt -> test.txt
+16515846 -rw-r--r-- 2 paul paul 14 oct 12 09:50 test.txt
+```
+
+`hardlink_test.txt` 和 `test.txt` 包含一些文本并且*字面上*占据相同的空间。它们使用相同的 inode 数值。与此同时，`softlink_test.txt` 占用少得多，并且具有不同的 inode 数值，将其标记为完全不同的文件。使用 `ls` 的 `-l` 选项还会显示软链接指向的文件或目录。
+
+### 为什么要用链接？
+
+它们适用于**带有自己环境的应用程序**。你的 Linux 发行版通常不会附带你需要应用程序的最新版本。以优秀的 [Blender 3D][2] 设计软件为例，Blender 允许你创建 3D 静态图像以及动画电影，人人都想在自己的机器上拥有它。问题是，当前版本的 Blender 至少比任何发行版中的自带的高一个版本。
+
+幸运的是，[Blender 提供可以开箱即用的下载][3]。除了程序本身之外，这些软件包还包含了 Blender 需要运行的复杂的库和依赖框架。所有这些数据和块都在它们自己的目录层次中。
+
+每次你想运行 Blender，你都可以 `cd` 到你下载它的文件夹并运行：
+
+```
+./blender
+```
+
+但这很不方便。如果你可以从文件系统的任何地方，比如桌面命令启动器中运行 `blender` 命令会更好。
+
+这样做的方法是将 `blender` 可执行文件链接到 `bin/` 目录。在许多系统上，你可以通过将其链接到文件系统中的任何位置来使 `blender` 命令可用，就像这样。
+
+```
+ln -s /path/to/blender_directory/blender /home//bin
+```
+
+你需要链接的另一个情况是**软件需要过时的库**。如果你用 `ls -l` 列出你的 `/usr/lib` 目录，你会看到许多软链接文件一闪而过。仔细看看，你会看到软链接通常与它们链接到的原始文件具有相似的名称。你可能会看到 `libblah` 链接到 `libblah.so.2`，你甚至可能会注意到 `libblah.so.2` 相应链接到原始文件 `libblah.so.2.1.0`。
+
+这是因为应用程序通常需要安装比已安装版本更老的库。问题是，即使新版本仍然与旧版本（通常是）兼容，如果程序找不到它正在寻找的版本，程序将会出现问题。为了解决这个问题，发行版通常会创建链接，以便挑剔的应用程序**相信**它找到了旧版本，实际上它只找到了一个链接并最终使用了更新的库版本。
+
+有些是和**你自己从源代码编译的程序**相关。你自己编译的程序通常最终安装在 `/usr/local` 下，程序本身最终在 `/usr/local/bin` 中，它在 `/usr/local/bin` 目录中查找它需要的库。但假设你的新程序需要 `libblah`，但 `libblah` 在 `/usr/lib` 中，这就是所有其它程序都会寻找到它的地方。你可以通过执行以下操作将其链接到 `/usr/local/lib`：
+
+```
+ln -s /usr/lib/libblah /usr/local/lib
+```
+
+或者如果你愿意，可以 `cd` 到 `/usr/local/lib`：
+
+```
+cd /usr/local/lib
+```
+
+然后使用链接：
+
+```
+ln -s ../lib/libblah
+```
+
+还有几十个案例证明软链接是有用的，当你使用 Linux 更熟练时，你肯定会发现它们，但这些是最常见的。下一次，我们将看一些你需要注意的链接怪异。
+
+通过 Linux 基金会和 edX 的免费 [“Linux 简介”][4]课程了解有关 Linux 的更多信息。
+
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/blog/intro-to-linux/2018/10/linux-links-part-1
+
+作者：[Paul Brown][a]
+选题：[lujun9972][b]
+译者：[MjSeven](https://github.com/MjSeven)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.linux.com/users/bro66
+[b]: https://github.com/lujun9972
+[1]: https://www.linux.com/blog/2018/8/linux-beginners-moving-things-around
+[2]: https://www.blender.org/
+[3]: https://www.blender.org/download/
+[4]: https://training.linuxfoundation.org/linux-courses/system-administration-training/introduction-to-linux
diff --git a/published/201810/20181019 How to use Pandoc to produce a research paper.md b/published/201810/20181019 How to use Pandoc to produce a research paper.md
new file mode 100644
index 0000000000..3ccbc8df1c
--- /dev/null
+++ b/published/201810/20181019 How to use Pandoc to produce a research paper.md
@@ -0,0 +1,335 @@
+用 Pandoc 生成一篇调研论文
+======
+
+> 学习如何用 Markdown 管理章节引用、图像、表格以及更多。
+
+
+
+这篇文章对于使用 [Markdown][1] 语法做一篇调研论文进行了一个深度体验。覆盖了如何创建和引用章节、图像（用 Markdown 和 [LaTeX][2]）和参考书目。我们也讨论了一些棘手的案例和为什么使用 LaTex 是一个正确的做法。
+
+### 调研
+
+调研论文一般包括对章节、图像、表格和参考书目的引用。[Pandoc][3] 本身并不能交叉引用这些，但是它能够利用 [pandoc-crossref][4] 过滤器来完成自动编号和章节、图像、表格的交叉引用。
+
+让我们从重写原本以 LaTax 撰写的 [一个教育调研报告的例子][5] 开始，然后用 Markdown（和一些 LaTax）、Pandoc 和 Pandoc-crossref 重写。
+
+#### 添加并引用章节
+
+要想章节被自动编号，必须使用 Markdown H1 标题编写。子章节使用 H2-H4 子标题编写（通常不需要更多级别了）。例如一个章节的标题是 “Implementation”，写作 `# Implementation {#sec: implementation}`，然后 Pandoc 会把它转化为 `3. Implementation `（或者转换为相应的章节编号）。`Implementation` 这个标题使用了 H1 并且声明了一个 `{#sec: implementation}` 的标签，这是作者用于引用该章节的标签。要想引用一个章节，输入 `@` 符号并跟上对应章节标签，使用方括号括起来即可： `[@ sec:implementation]`
+
+[在这篇论文中][5], 我们发现了下面这个例子：
+
+```
+we lack experience (consistency between TAs, [@sec:implementation]).
+```
+
+Pandoc 转换：
+
+```
+we lack experience (consistency between TAs, Section 4).
+```
+
+章节被自动编号（这在本文最后的 `Makefile` 当中说明）。要创建无编号的章节，输入章节的标题并在最后添加 `{-}`。例如：`### Designing a game for maintainability {-}` 就以标题 “Designing a game for maintainability”，创建了一个无标号的章节。
+
+#### 添加并引用图像
+
+添加并引用一个图像，跟添加并引用一个章节和添加一个 Markdown 图片很相似：
+
+```
+{#fig:scatter-matrix}
+```
+
+上面这一行是告诉 Pandoc，有一个标有 Scatterplot matrix 的图像以及这张图片路径是 `data/scatterplots/RScatterplotMatrix2.png`。`{#fig:scatter-matrix}` 表明了用于引用该图像的名字。
+
+这里是从一篇论文中进行图像引用的例子：
+
+```
+The boxes "Enjoy", "Grade" and "Motivation" ([@fig:scatter-matrix]) ...
+```
+
+Pandoc 产生如下输出：
+
+```
+The boxes "Enjoy", "Grade" and "Motivation" (Fig. 1) ...
+```
+
+#### 添加及引用参考书目
+
+大多数调研报告都把引用放在一个 BibTeX 的数据库文件中。在这个例子中，该文件被命名为 [biblio.bib][6]，它包含了论文中所有的引用。下面是这个文件的样子：
+
+```
+@inproceedings{wrigstad2017mastery,
+ Author = {Wrigstad, Tobias and Castegren, Elias},
+ Booktitle = {SPLASH-E},
+ Title = {Mastery Learning-Like Teaching with Achievements},
+ Year = 2017
+}
+
+@inproceedings{review-gamification-framework,
+ Author = {A. Mora and D. Riera and C. Gonzalez and J. Arnedo-Moreno},
+ Publisher = {IEEE},
+ Booktitle = {2015 7th International Conference on Games and Virtual Worlds
+ for Serious Applications (VS-Games)},
+ Doi = {10.1109/VS-GAMES.2015.7295760},
+ Keywords = {formal specification;serious games (computing);design
+ framework;formal design process;game components;game design
+ elements;gamification design frameworks;gamification-based
+ solutions;Bibliographies;Context;Design
+ methodology;Ethics;Games;Proposals},
+ Month = {Sept},
+ Pages = {1-8},
+ Title = {A Literature Review of Gamification Design Frameworks},
+ Year = 2015,
+ Bdsk-Url-1 = {http://dx.doi.org/10.1109/VS-GAMES.2015.7295760}
+}
+
+...
+```
+
+第一行的 `@inproceedings{wrigstad2017mastery,` 表明了出版物 的类型（`inproceedings`），以及用来指向那篇论文的标签（`wrigstad2017mastery`）。
+
+引用这篇题为 “Mastery Learning-Like Teaching with Achievements” 的论文, 输入：
+
+```
+the achievement-driven learning methodology [@wrigstad2017mastery]
+```
+
+Pandoc 将会输出：
+
+```
+the achievement- driven learning methodology [30]
+```
+
+这篇论文将会产生像下面这样被标号的参考书目：
+
+
+
+引用文章的集合也很容易：只要引用使用分号 `;` 分隔开被标记的参考文献就可以了。如果一个引用有两个标签 —— 例如： `SEABORN201514` 和 `gamification-leaderboard-benefits`—— 像下面这样把它们放在一起引用：
+
+```
+Thus, the most important benefit is its potential to increase students' motivation
+and engagement [@SEABORN201514;@gamification-leaderboard-benefits].
+```
+
+Pandoc 将会产生：
+
+```
+Thus, the most important benefit is its potential to increase students’ motivation
+and engagement [26, 28]
+```
+
+### 问题案例
+
+一个常见的问题是所需项目与页面不匹配。不匹配的部分会自动移动到它们认为合适的地方，即便这些位置并不是读者期望看到的位置。因此在图像或者表格接近于它们被提及的地方时，我们需要调节一下那些元素放置的位置，使得它们更加易于阅读。为了达到这个效果，我建议使用 `figure` 这个 LaTeX 环境参数，它可以让用户控制图像的位置。
+
+我们看一个上面提到的图像的例子：
+
+```
+{#fig:scatter-matrix}
+```
+
+然后使用 LaTeX 重写：
+
+```
+\begin{figure}[t]
+\includegraphics{data/scatterplots/RScatterplotMatrix2.png}
+\caption{\label{fig:matrix}Scatterplot matrix}
+\end{figure}
+```
+
+在 LaTeX 中，`figure` 环境参数中的 `[t]` 选项表示这张图用该位于该页的最顶部。有关更多选项，参阅 [LaTex/Floats, Figures, and Captions][7] 这篇 Wikibooks 的文章。
+
+### 产生一篇论文
+
+到目前为止，我们讲了如何添加和引用（子）章节、图像和参考书目，现在让我们重温一下如何生成一篇 PDF 格式的论文。要生成 PDF，我们将使用 Pandoc 生成一篇可以被构建成最终 PDF 的 LaTeX 文件。我们还会讨论如何以 LaTeX，使用一套自定义的模板和元信息文件生成一篇调研论文，以及如何将 LaTeX 文档编译为最终的 PDF 格式。
+
+很多会议都提供了一个 .cls 文件或者一套论文应有样式的模板；例如，它们是否应该使用两列的格式以及其它的设计风格。在我们的例子中，会议提供了一个名为 `acmart.cls` 的文件。
+
+作者通常想要在他们的论文中包含他们所属的机构，然而，这个选项并没有包含在默认的 Pandoc 的 LaTeX 模板（注意，可以通过输入 `pandoc -D latex` 来查看 Pandoc 模板）当中。要包含这个内容，找一个 Pandoc 默认的 LaTeX 模板，并添加一些新的内容。将这个模板像下面这样复制进一个名为 `mytemplate.tex` 的文件中：
+
+```
+pandoc -D latex > mytemplate.tex
+```
+
+默认的模板包含以下代码：
+
+```
+$if(author)$
+\author{$for(author)$$author$$sep$ \and $endfor$}
+$endif$
+$if(institute)$
+\providecommand{\institute}[1]{}
+\institute{$for(institute)$$institute$$sep$ \and $endfor$}
+$endif$
+```
+
+因为这个模板应该包含作者的联系方式和电子邮件地址，在其他一些选项之间，我们更新这个模板以添加以下内容（我们还做了一些其他的更改，但是因为文件的长度，就没有包含在此处）：
+
+```
+latex
+$for(author)$
+ $if(author.name)$
+ \author{$author.name$}
+ $if(author.affiliation)$
+ \affiliation{\institution{$author.affiliation$}}
+ $endif$
+ $if(author.email)$
+ \email{$author.email$}
+ $endif$
+ $else$
+ $author$
+ $endif$
+$endfor$
+```
+要让这些更改起作用，我们还应该有下面的文件：
+
+* `main.md` 包含调研论文
+* `biblio.bib` 包含参考书目数据库
+* `acmart.cls` 我们使用的文档的集合
+* `mytemplate.tex` 是我们使用的模板文件（代替默认的）
+
+让我们添加论文的元信息到一个 `meta.yaml` 文件：
+
+```
+---
+template: 'mytemplate.tex'
+documentclass: acmart
+classoption: sigconf
+title: The impact of opt-in gamification on `\\`{=latex} students' grades in a software design course
+author:
+- name: Kiko Fernandez-Reyes
+ affiliation: Uppsala University
+ email: kiko.fernandez@it.uu.se
+- name: Dave Clarke
+ affiliation: Uppsala University
+ email: dave.clarke@it.uu.se
+- name: Janina Hornbach
+ affiliation: Uppsala University
+ email: janina.hornbach@fek.uu.se
+bibliography: biblio.bib
+abstract: |
+ An achievement-driven methodology strives to give students more control over their learning with enough flexibility to engage them in deeper learning. (more stuff continues)
+
+include-before: |
+ \` ``{=latex}
+ \copyrightyear{2018}
+ \acmYear{2018}
+ \setcopyright{acmlicensed}
+ \acmConference[MODELS '18 Companion]{ACM/IEEE 21th International Conference on Model Driven Engineering Languages and Systems}{October 14--19, 2018}{Copenhagen, Denmark}
+ \acmBooktitle{ACM/IEEE 21th International Conference on Model Driven Engineering Languages and Systems (MODELS '18 Companion), October 14--19, 2018, Copenhagen, Denmark}
+ \acmPrice{XX.XX}
+ \acmDOI{10.1145/3270112.3270118}
+ \acmISBN{978-1-4503-5965-8/18/10}
+
+ \begin{CCSXML}
+
+
+ 10010405.10010489
+ Applied computing~Education
+ 500
+
+
+ \end{CCSXML}
+
+ \ccsdesc[500]{Applied computing~Education}
+
+ \keywords{gamification, education, software design, UML}
+ \` ``
+figPrefix:
+ - "Fig."
+ - "Figs."
+secPrefix:
+ - "Section"
+ - "Sections"
+...
+```
+
+这个元信息文件使用 LaTeX 设置下列参数：
+
+* `template` 指向使用的模板（`mytemplate.tex`）
+* `documentclass` 指向使用的 LaTeX 文档集合（`acmart`）
+* `classoption` 是在 `sigconf` 的案例中，指向这个类的选项
+* `title` 指定论文的标题
+* `author` 是一个包含例如 `name`、`affiliation` 和 `email` 的地方
+* `bibliography` 指向包含参考书目的文件（`biblio.bib`）
+* `abstract` 包含论文的摘要
+* `include-before` 是这篇论文的具体内容之前应该被包含的信息；在 LaTeX 中被称为 [前言][8]。我在这里包含它去展示如何产生一篇计算机科学的论文，但是你可以选择跳过
+* `figPrefix` 指向如何引用文档中的图像，例如：当引用图像的 `[@fig:scatter-matrix]` 时应该显示什么。例如，当前的 `figPrefix` 在这个例子 `The boxes "Enjoy", "Grade" and "Motivation" ([@fig:scatter-matrix])`中，产生了这样的输出：`The boxes "Enjoy", "Grade" and "Motivation" (Fig. 3)`。如果这里有很多图像，目前的设置表明它应该在图像号码旁边显示 `Figs.`
+* `secPrefix` 指定如何引用文档中其他地方提到的部分（类似之前的图像和概览）
+
+现在已经设置好了元信息，让我们来创建一个 `Makefile`，它会产生你想要的输出。`Makefile` 使用 Pandoc 产生 LaTeX 文件，`pandoc-crossref` 产生交叉引用，`pdflatex` 构建 LaTeX 为 PDF，`bibtex ` 处理引用。
+
+
+`Makefile` 已经展示如下：
+
+```
+all: paper
+
+paper:
+ @pandoc -s -F pandoc-crossref --natbib meta.yaml --template=mytemplate.tex -N \
+ -f markdown -t latex+raw_tex+tex_math_dollars+citations -o main.tex main.md
+ @pdflatex main.tex &> /dev/null
+ @bibtex main &> /dev/null
+ @pdflatex main.tex &> /dev/null
+ @pdflatex main.tex &> /dev/null
+
+clean:
+ rm main.aux main.tex main.log main.bbl main.blg main.out
+
+.PHONY: all clean paper
+```
+
+Pandoc 使用下面的标记：
+
+* `-s` 创建一个独立的 LaTeX 文档
+* `-F pandoc-crossref` 利用 `pandoc-crossref` 进行过滤
+* `--natbib` 用 `natbib` （你也可以选择 `--biblatex`）对参考书目进行渲染
+* `--template` 设置使用的模板文件
+* `-N` 为章节的标题编号
+* `-f` 和 `-t` 指定从哪个格式转换到哪个格式。`-t` 通常包含格式和 Pandoc 使用的扩展。在这个例子中，我们标明的 `raw_tex+tex_math_dollars+citations` 允许在 Markdown 中使用 `raw_tex` LaTeX。 `tex_math_dollars` 让我们能够像在 LaTeX 中一样输入数学符号，`citations` 让我们可以使用 [这个扩展][9]。
+
+要从 LaTeX 产生 PDF，按 [来自bibtex][10] 的指导处理参考书目：
+
+```
+@pdflatex main.tex &> /dev/null
+@bibtex main &> /dev/null
+@pdflatex main.tex &> /dev/null
+@pdflatex main.tex &> /dev/null
+```
+
+脚本用 `@` 忽略输出，并且重定向标准输出和错误到 `/dev/null` ，因此我们在使用这些命令的可执行文件时不会看到任何的输出。
+
+最终的结果展示如下。这篇文章的库可以在 [GitHub][11] 找到：
+
+
+
+### 结论
+
+在我看来，研究的重点是协作、思想的传播，以及在任何一个恰好存在的领域中改进现有的技术。许多计算机科学家和工程师使用 LaTeX 文档系统来写论文，它对数学提供了完美的支持。来自社会科学的研究人员似乎更喜欢 DOCX 文档。
+
+当身处不同社区的研究人员一同写一篇论文时，他们首先应该讨论一下他们将要使用哪种格式。然而如果包含太多的数学符号，DOCX 对于工程师来说不会是最简便的选择，LaTeX 对于缺乏编程经验的研究人员来说也有一些问题。就像这篇文章中展示的，Markdown 是一门工程师和社会科学家都很轻易能够使用的语言。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/9/pandoc-research-paper
+
+作者：[Kiko Fernandez-Reyes][a]
+选题：[lujun9972][b]
+译者：[dianbanjiu](https://github.com/dianbanjiu)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://opensource.com/users/kikofernandez
+[b]: https://github.com/lujun9972
+[1]: https://en.wikipedia.org/wiki/Markdown
+[2]: https://www.latex-project.org/
+[3]: https://pandoc.org/
+[4]: http://lierdakil.github.io/pandoc-crossref/
+[5]: https://dl.acm.org/citation.cfm?id=3270118
+[6]: https://github.com/kikofernandez/pandoc-examples/blob/master/research-paper/biblio.bib
+[7]: https://en.wikibooks.org/wiki/LaTeX/Floats,_Figures_and_Captions#Figures
+[8]: https://www.sharelatex.com/learn/latex/Creating_a_document_in_LaTeX#The_preamble_of_a_document
+[9]: http://pandoc.org/MANUAL.html#citations
+[10]: http://www.bibtex.org/Using/
+[11]: https://github.com/kikofernandez/pandoc-examples/tree/master/research-paper
diff --git a/translated/tech/20181010 An introduction to using tcpdump at the Linux command line.md b/published/20181010 An introduction to using tcpdump at the Linux command line.md
similarity index 81%
rename from translated/tech/20181010 An introduction to using tcpdump at the Linux command line.md
rename to published/20181010 An introduction to using tcpdump at the Linux command line.md
index 9926a2279c..8744ef5162 100644
--- a/translated/tech/20181010 An introduction to using tcpdump at the Linux command line.md
+++ b/published/20181010 An introduction to using tcpdump at the Linux command line.md
@@ -1,41 +1,41 @@
- Linux 命令行中使用 tcpdump 抓包
+在 Linux 命令行中使用 tcpdump 抓包
======
-Tcpdump 是一款灵活、功能强大的抓包工具，能有效地帮助排查网络故障问题。
+> `tcpdump` 是一款灵活、功能强大的抓包工具，能有效地帮助排查网络故障问题。
-根据我作为管理员的经验，在网络连接中经常遇到十分难以排查的故障问题。对于这类情况，tcpdump 便能派上用场。
+以我作为管理员的经验，在网络连接中经常遇到十分难以排查的故障问题。对于这类情况，`tcpdump` 便能派上用场。
-Tcpdump 是一个命令行实用工具，允许你抓取和分析经过系统的流量数据包。它通常被用作于网络故障分析工具以及安全工具。
+`tcpdump` 是一个命令行实用工具，允许你抓取和分析经过系统的流量数据包。它通常被用作于网络故障分析工具以及安全工具。
-Tcpdump 是一款强大的工具，支持多种选项和过滤规则，适用场景十分广泛。由于它是命令行工具，因此适用于在远程服务器或者没有图形界面的设备中收集数据包以便于事后分析。它可以在后台启动，也可以用 cron 等定时工具创建定时任务启用它。
+`tcpdump` 是一款强大的工具，支持多种选项和过滤规则，适用场景十分广泛。由于它是命令行工具，因此适用于在远程服务器或者没有图形界面的设备中收集数据包以便于事后分析。它可以在后台启动，也可以用 cron 等定时工具创建定时任务启用它。
-本文中，我们将讨论 tcpdump 最常用的一些功能。
+本文中，我们将讨论 `tcpdump` 最常用的一些功能。
-### 1\. 在 Linux 中安装 tcpdump
+### 1、在 Linux 中安装 tcpdump
-Tcpdump 支持多种 Linux 发行版，所以你的系统中很有可能已经安装了它。用下面的命令检查一下是否已经安装了 tcpdump：
+`tcpdump` 支持多种 Linux 发行版，所以你的系统中很有可能已经安装了它。用下面的命令检查一下是否已经安装了 `tcpdump`：
```
$ which tcpdump
/usr/sbin/tcpdump
```
-如果还没有安装 tcpdump，你可以用软件包管理器安装它。
-例如，在 CentOS 或者 Red Hat Enterprise 系统中，用如下命令安装 tcpdump：
+如果还没有安装 `tcpdump`，你可以用软件包管理器安装它。
+例如，在 CentOS 或者 Red Hat Enterprise 系统中，用如下命令安装 `tcpdump`：
```
$ sudo yum install -y tcpdump
```
-Tcpdump 依赖于 `libpcap`，该库文件用于捕获网络数据包。如果该库文件也没有安装，系统会根据依赖关系自动安装它。
+`tcpdump` 依赖于 `libpcap`，该库文件用于捕获网络数据包。如果该库文件也没有安装，系统会根据依赖关系自动安装它。
现在你可以开始抓包了。
-### 2\. 用 tcpdump 抓包
+### 2、用 tcpdump 抓包
-使用 tcpdump 抓包，需要管理员权限，因此下面的示例中绝大多数命令都是以 `sudo` 开头。
+使用 `tcpdump` 抓包，需要管理员权限，因此下面的示例中绝大多数命令都是以 `sudo` 开头。
首先，先用 `tcpdump -D` 命令列出可以抓包的网络接口：
@@ -80,7 +80,7 @@ listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes
$
```
-Tcpdump 会持续抓包直到收到中断信号。你可以按 `Ctrl+C` 来停止抓包。正如上面示例所示，`tcpdump` 抓取了超过 9000 个数据包。在这个示例中，由于我是通过 `ssh` 连接到服务器，所以 tcpdump 也捕获了所有这类数据包。`-c` 选项可以用于限制 tcpdump 抓包的数量：
+`tcpdump` 会持续抓包直到收到中断信号。你可以按 `Ctrl+C` 来停止抓包。正如上面示例所示，`tcpdump` 抓取了超过 9000 个数据包。在这个示例中，由于我是通过 `ssh` 连接到服务器，所以 `tcpdump` 也捕获了所有这类数据包。`-c` 选项可以用于限制 `tcpdump` 抓包的数量：
```
$ sudo tcpdump -i any -c 5
@@ -97,9 +97,9 @@ listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes
$
```
-如上所示，`tcpdump` 在抓取 5 个数据包后自动停止了抓包。这在有些场景中十分有用——比如你只需要抓取少量的数据包用于分析。当我们需要使用过滤规则抓取特定的数据包（如下所示）时，`-c` 的作用就十分突出了。
+如上所示，`tcpdump` 在抓取 5 个数据包后自动停止了抓包。这在有些场景中十分有用 —— 比如你只需要抓取少量的数据包用于分析。当我们需要使用过滤规则抓取特定的数据包（如下所示）时，`-c` 的作用就十分突出了。
-在上面示例中，tcpdump 默认是将 IP 地址和端口号解析为对应的接口名以及服务协议名称。而通常在网络故障排查中，使用 IP 地址和端口号更便于分析问题；用 `-n` 选项显示 IP 地址，`-nn` 选项显示端口号：
+在上面示例中，`tcpdump` 默认是将 IP 地址和端口号解析为对应的接口名以及服务协议名称。而通常在网络故障排查中，使用 IP 地址和端口号更便于分析问题；用 `-n` 选项显示 IP 地址，`-nn` 选项显示端口号：
```
$ sudo tcpdump -i any -c5 -nn
@@ -115,13 +115,13 @@ listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes
0 packets dropped by kernel
```
-如上所示，抓取的数据包中显示 IP 地址和端口号。这样还可以阻止 tcpdump 发出 DNS 查找，有助于在网络故障排查中减少数据流量。
+如上所示，抓取的数据包中显示 IP 地址和端口号。这样还可以阻止 `tcpdump` 发出 DNS 查找，有助于在网络故障排查中减少数据流量。
现在你已经会抓包了，让我们来分析一下这些抓包输出的含义吧。
-### 3\. 理解抓取的报文
+### 3、理解抓取的报文
-Tcpdump 能够抓取并解码多种协议类型的数据报文，如 TCP，UDP，ICMP 等等。虽然这里我们不可能介绍所有的数据报文类型，但可以分析下 TCP 类型的数据报文，来帮助你入门。更多有关 tcpdump 的详细介绍可以参考其 [帮助手册][1]。Tcpdump 抓取的 TCP 报文看起来如下：
+`tcpdump` 能够抓取并解码多种协议类型的数据报文，如 TCP、UDP、ICMP 等等。虽然这里我们不可能介绍所有的数据报文类型，但可以分析下 TCP 类型的数据报文，来帮助你入门。更多有关 `tcpdump` 的详细介绍可以参考其 [帮助手册][1]。`tcpdump` 抓取的 TCP 报文看起来如下：
```
08:41:13.729687 IP 192.168.64.28.22 > 192.168.64.1.41916: Flags [P.], seq 196:568, ack 1, win 309, options [nop,nop,TS val 117964079 ecr 816509256], length 372
@@ -137,7 +137,7 @@ Tcpdump 能够抓取并解码多种协议类型的数据报文，如 TCP，UDP
在源 IP 和目的 IP 之后，可以看到是 TCP 报文标记段 `Flags [P.]`。该字段通常取值如下：
-| Value | Flag Type | Description |
+| 值 | 标志类型 | 描述 |
| ----- | --------- | ----------------- |
| S | SYN | Connection Start |
| F | FIN | Connection Finish |
@@ -149,19 +149,19 @@ Tcpdump 能够抓取并解码多种协议类型的数据报文，如 TCP，UDP
接下来是该数据包中数据的序列号。对于抓取的第一个数据包，该字段值是一个绝对数字，后续包使用相对数值，以便更容易查询跟踪。例如此处 `seq 196:568` 代表该数据包包含该数据流的第 196 到 568 字节。
-接下来是 ack 值：`ack 1`。该数据包是数据发送方，ack 值为1。在数据接收方，该字段代表数据流上的下一个预期字节数据，例如，该数据流中下一个数据包的 ack 值应该是 568。
+接下来是 ack 值：`ack 1`。该数据包是数据发送方，ack 值为 1。在数据接收方，该字段代表数据流上的下一个预期字节数据，例如，该数据流中下一个数据包的 ack 值应该是 568。
接下来字段是接收窗口大小 `win 309`，它表示接收缓冲区中可用的字节数，后跟 TCP 选项如 MSS（最大段大小）或者窗口比例值。更详尽的 TCP 协议内容请参考 [Transmission Control Protocol(TCP) Parameters][2]。
-最后，`length 372`代表数据包有效载荷字节长度。这个长度和 seq 序列号中字节数值长度是不一样的。
+最后，`length 372` 代表数据包有效载荷字节长度。这个长度和 seq 序列号中字节数值长度是不一样的。
现在让我们学习如何过滤数据报文以便更容易的分析定位问题。
-### 4\. 过滤数据包
+### 4、过滤数据包
-正如上面所提，tcpdump 可以抓取很多种类型的数据报文，其中很多可能和我们需要查找的问题并没有关系。举个例子，假设你正在定位一个与 web 服务器连接的网络问题，就不必关系 SSH 数据报文，因此在抓包结果中过滤掉 SSH 报文可能更便于你分析问题。
+正如上面所提，`tcpdump` 可以抓取很多种类型的数据报文，其中很多可能和我们需要查找的问题并没有关系。举个例子，假设你正在定位一个与 web 服务器连接的网络问题，就不必关系 SSH 数据报文，因此在抓包结果中过滤掉 SSH 报文可能更便于你分析问题。
-Tcpdump 有很多参数选项可以设置数据包过滤规则，例如根据源 IP 以及目的 IP 地址，端口号，协议等等规则来过滤数据包。下面就介绍一些最常用的过滤方法。
+`tcpdump` 有很多参数选项可以设置数据包过滤规则，例如根据源 IP 以及目的 IP 地址，端口号，协议等等规则来过滤数据包。下面就介绍一些最常用的过滤方法。
#### 协议
@@ -181,7 +181,7 @@ PING opensource.com (54.204.39.132) 56(84) bytes of data.
64 bytes from ec2-54-204-39-132.compute-1.amazonaws.com (54.204.39.132): icmp_seq=1 ttl=47 time=39.6 ms
```
-回到运行 tcpdump 命令的终端中，可以看到它筛选出了 ICMP 报文。这里 tcpdump 并没有显示有关 `opensource.com`的域名解析数据包：
+回到运行 `tcpdump` 命令的终端中，可以看到它筛选出了 ICMP 报文。这里 `tcpdump` 并没有显示有关 `opensource.com` 的域名解析数据包：
```
09:34:20.136766 IP rhel75 > ec2-54-204-39-132.compute-1.amazonaws.com: ICMP echo request, id 20361, seq 1, length 64
@@ -215,7 +215,7 @@ listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes
#### 端口号
-Tcpdump 可以根据服务类型或者端口号来筛选数据包。例如，抓取和 HTTP 服务相关的数据包：
+`tcpdump` 可以根据服务类型或者端口号来筛选数据包。例如，抓取和 HTTP 服务相关的数据包：
```
$ sudo tcpdump -i any -c5 -nn port 80
@@ -303,11 +303,11 @@ listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes
该例子中我们只抓取了来自源 IP 为 `192.168.122.98` 或者 `54.204.39.132` 的 HTTP （端口号80）的数据包。使用该方法就很容易抓取到数据流中交互双方的数据包了。
-### 5\. 检查数据包内容
+### 5、检查数据包内容
-在以上的示例中，我们只按数据包头部的信息来建立规则筛选数据包，例如源地址、目的地址、端口号等等。有时我们需要分析网络连接问题，可能需要分析数据包中的内容来判断什么内容需要被发送、什么内容需要被接收等。Tcpdump 提供了两个选项可以查看数据包内容，`-X` 以十六进制打印出数据报文内容，`-A` 打印数据报文的 ASCII 值。
+在以上的示例中，我们只按数据包头部的信息来建立规则筛选数据包，例如源地址、目的地址、端口号等等。有时我们需要分析网络连接问题，可能需要分析数据包中的内容来判断什么内容需要被发送、什么内容需要被接收等。`tcpdump` 提供了两个选项可以查看数据包内容，`-X` 以十六进制打印出数据报文内容，`-A` 打印数据报文的 ASCII 值。
-例如，HTTP request 报文内容如下：
+例如，HTTP 请求报文内容如下：
```
$ sudo tcpdump -i any -c10 -nn -A port 80
@@ -379,9 +379,9 @@ E..4..@.@.....zb6.'....P....o..............
这对定位一些普通 HTTP 调用 API 接口的问题很有用。当然如果是加密报文，这个输出也就没多大用了。
-### 6\. 保存抓包数据
+### 6、保存抓包数据
-Tcpdump 提供了保存抓包数据的功能以便后续分析数据包。例如，你可以夜里让它在那里抓包，然后早上起来再去分析它。同样当有很多数据包时，显示过快也不利于分析，将数据包保存下来，更有利于分析问题。
+`tcpdump` 提供了保存抓包数据的功能以便后续分析数据包。例如，你可以夜里让它在那里抓包，然后早上起来再去分析它。同样当有很多数据包时，显示过快也不利于分析，将数据包保存下来，更有利于分析问题。
使用 `-w` 选项来保存数据包而不是在屏幕上显示出抓取的数据包：
@@ -398,7 +398,7 @@ tcpdump: listening on any, link-type LINUX_SLL (Linux cooked), capture size 2621
正如示例中所示，保存数据包到文件中时屏幕上就没有任何有关数据报文的输出，其中 `-c10` 表示抓取到 10 个数据包后就停止抓包。如果想有一些反馈来提示确实抓取到了数据包，可以使用 `-v` 选项。
-Tcpdump 将数据包保存在二进制文件中，所以不能简单的用文本编辑器去打开它。使用 `-r` 选项参数来阅读该文件中的报文内容：
+`tcpdump` 将数据包保存在二进制文件中，所以不能简单的用文本编辑器去打开它。使用 `-r` 选项参数来阅读该文件中的报文内容：
```
$ tcpdump -nn -r webserver.pcap
@@ -418,7 +418,7 @@ $
这里不需要管理员权限 `sudo` 了，因为此刻并不是在网络接口处抓包。
-你还可以使用我们讨论过的任何过滤规则来过滤文件中的内容，就像使用实时数据一样。 例如，通过执行以下命令从源 IP 地址`54.204.39.132` 检查文件中的数据包：
+你还可以使用我们讨论过的任何过滤规则来过滤文件中的内容，就像使用实时数据一样。 例如，通过执行以下命令从源 IP 地址 `54.204.39.132` 检查文件中的数据包：
```
$ tcpdump -nn -r webserver.pcap src 54.204.39.132
@@ -431,11 +431,11 @@ reading from file webserver.pcap, link-type LINUX_SLL (Linux cooked)
### 下一步做什么？
-以上的基本功能已经可以帮助你使用强大的 tcpdump 抓包工具了。更多的内容请参考 [tcpdump网页][3] 以及它的 [帮助文件][4]。
+以上的基本功能已经可以帮助你使用强大的 `tcpdump` 抓包工具了。更多的内容请参考 [tcpdump 网站][3] 以及它的 [帮助文件][4]。
-Tcpdump 命令行工具为分析网络流量数据包提供了强大的灵活性。如果需要使用图形工具来抓包请参考 [Wireshark][5]。
+`tcpdump` 命令行工具为分析网络流量数据包提供了强大的灵活性。如果需要使用图形工具来抓包请参考 [Wireshark][5]。
-Wireshark 还可以用来读取 tcpdump 保存的 `pcap` 文件。你可以使用 tcpdump 命令行在没有 GUI 界面的远程机器上抓包然后在 Wireshark 中分析数据包。
+Wireshark 还可以用来读取 `tcpdump` 保存的 pcap 文件。你可以使用 `tcpdump` 命令行在没有 GUI 界面的远程机器上抓包然后在 Wireshark 中分析数据包。
--------------------------------------------------------------------------------
@@ -444,7 +444,7 @@ via: https://opensource.com/article/18/10/introduction-tcpdump
作者：[Ricardo Gerardi][a]
选题：[lujun9972][b]
译者：[jrg](https://github.com/jrglinux)
-校对：[校对者ID](https://github.com/校对者ID)
+校对：[wxy](https://github.com/wxy)
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
diff --git a/published/20181019 How to use Pandoc to produce a research paper.md b/published/20181019 How to use Pandoc to produce a research paper.md
new file mode 100644
index 0000000000..3ccbc8df1c
--- /dev/null
+++ b/published/20181019 How to use Pandoc to produce a research paper.md
@@ -0,0 +1,335 @@
+用 Pandoc 生成一篇调研论文
+======
+
+> 学习如何用 Markdown 管理章节引用、图像、表格以及更多。
+
+
+
+这篇文章对于使用 [Markdown][1] 语法做一篇调研论文进行了一个深度体验。覆盖了如何创建和引用章节、图像（用 Markdown 和 [LaTeX][2]）和参考书目。我们也讨论了一些棘手的案例和为什么使用 LaTex 是一个正确的做法。
+
+### 调研
+
+调研论文一般包括对章节、图像、表格和参考书目的引用。[Pandoc][3] 本身并不能交叉引用这些，但是它能够利用 [pandoc-crossref][4] 过滤器来完成自动编号和章节、图像、表格的交叉引用。
+
+让我们从重写原本以 LaTax 撰写的 [一个教育调研报告的例子][5] 开始，然后用 Markdown（和一些 LaTax）、Pandoc 和 Pandoc-crossref 重写。
+
+#### 添加并引用章节
+
+要想章节被自动编号，必须使用 Markdown H1 标题编写。子章节使用 H2-H4 子标题编写（通常不需要更多级别了）。例如一个章节的标题是 “Implementation”，写作 `# Implementation {#sec: implementation}`，然后 Pandoc 会把它转化为 `3. Implementation `（或者转换为相应的章节编号）。`Implementation` 这个标题使用了 H1 并且声明了一个 `{#sec: implementation}` 的标签，这是作者用于引用该章节的标签。要想引用一个章节，输入 `@` 符号并跟上对应章节标签，使用方括号括起来即可： `[@ sec:implementation]`
+
+[在这篇论文中][5], 我们发现了下面这个例子：
+
+```
+we lack experience (consistency between TAs, [@sec:implementation]).
+```
+
+Pandoc 转换：
+
+```
+we lack experience (consistency between TAs, Section 4).
+```
+
+章节被自动编号（这在本文最后的 `Makefile` 当中说明）。要创建无编号的章节，输入章节的标题并在最后添加 `{-}`。例如：`### Designing a game for maintainability {-}` 就以标题 “Designing a game for maintainability”，创建了一个无标号的章节。
+
+#### 添加并引用图像
+
+添加并引用一个图像，跟添加并引用一个章节和添加一个 Markdown 图片很相似：
+
+```
+{#fig:scatter-matrix}
+```
+
+上面这一行是告诉 Pandoc，有一个标有 Scatterplot matrix 的图像以及这张图片路径是 `data/scatterplots/RScatterplotMatrix2.png`。`{#fig:scatter-matrix}` 表明了用于引用该图像的名字。
+
+这里是从一篇论文中进行图像引用的例子：
+
+```
+The boxes "Enjoy", "Grade" and "Motivation" ([@fig:scatter-matrix]) ...
+```
+
+Pandoc 产生如下输出：
+
+```
+The boxes "Enjoy", "Grade" and "Motivation" (Fig. 1) ...
+```
+
+#### 添加及引用参考书目
+
+大多数调研报告都把引用放在一个 BibTeX 的数据库文件中。在这个例子中，该文件被命名为 [biblio.bib][6]，它包含了论文中所有的引用。下面是这个文件的样子：
+
+```
+@inproceedings{wrigstad2017mastery,
+ Author = {Wrigstad, Tobias and Castegren, Elias},
+ Booktitle = {SPLASH-E},
+ Title = {Mastery Learning-Like Teaching with Achievements},
+ Year = 2017
+}
+
+@inproceedings{review-gamification-framework,
+ Author = {A. Mora and D. Riera and C. Gonzalez and J. Arnedo-Moreno},
+ Publisher = {IEEE},
+ Booktitle = {2015 7th International Conference on Games and Virtual Worlds
+ for Serious Applications (VS-Games)},
+ Doi = {10.1109/VS-GAMES.2015.7295760},
+ Keywords = {formal specification;serious games (computing);design
+ framework;formal design process;game components;game design
+ elements;gamification design frameworks;gamification-based
+ solutions;Bibliographies;Context;Design
+ methodology;Ethics;Games;Proposals},
+ Month = {Sept},
+ Pages = {1-8},
+ Title = {A Literature Review of Gamification Design Frameworks},
+ Year = 2015,
+ Bdsk-Url-1 = {http://dx.doi.org/10.1109/VS-GAMES.2015.7295760}
+}
+
+...
+```
+
+第一行的 `@inproceedings{wrigstad2017mastery,` 表明了出版物 的类型（`inproceedings`），以及用来指向那篇论文的标签（`wrigstad2017mastery`）。
+
+引用这篇题为 “Mastery Learning-Like Teaching with Achievements” 的论文, 输入：
+
+```
+the achievement-driven learning methodology [@wrigstad2017mastery]
+```
+
+Pandoc 将会输出：
+
+```
+the achievement- driven learning methodology [30]
+```
+
+这篇论文将会产生像下面这样被标号的参考书目：
+
+
+
+引用文章的集合也很容易：只要引用使用分号 `;` 分隔开被标记的参考文献就可以了。如果一个引用有两个标签 —— 例如： `SEABORN201514` 和 `gamification-leaderboard-benefits`—— 像下面这样把它们放在一起引用：
+
+```
+Thus, the most important benefit is its potential to increase students' motivation
+and engagement [@SEABORN201514;@gamification-leaderboard-benefits].
+```
+
+Pandoc 将会产生：
+
+```
+Thus, the most important benefit is its potential to increase students’ motivation
+and engagement [26, 28]
+```
+
+### 问题案例
+
+一个常见的问题是所需项目与页面不匹配。不匹配的部分会自动移动到它们认为合适的地方，即便这些位置并不是读者期望看到的位置。因此在图像或者表格接近于它们被提及的地方时，我们需要调节一下那些元素放置的位置，使得它们更加易于阅读。为了达到这个效果，我建议使用 `figure` 这个 LaTeX 环境参数，它可以让用户控制图像的位置。
+
+我们看一个上面提到的图像的例子：
+
+```
+{#fig:scatter-matrix}
+```
+
+然后使用 LaTeX 重写：
+
+```
+\begin{figure}[t]
+\includegraphics{data/scatterplots/RScatterplotMatrix2.png}
+\caption{\label{fig:matrix}Scatterplot matrix}
+\end{figure}
+```
+
+在 LaTeX 中，`figure` 环境参数中的 `[t]` 选项表示这张图用该位于该页的最顶部。有关更多选项，参阅 [LaTex/Floats, Figures, and Captions][7] 这篇 Wikibooks 的文章。
+
+### 产生一篇论文
+
+到目前为止，我们讲了如何添加和引用（子）章节、图像和参考书目，现在让我们重温一下如何生成一篇 PDF 格式的论文。要生成 PDF，我们将使用 Pandoc 生成一篇可以被构建成最终 PDF 的 LaTeX 文件。我们还会讨论如何以 LaTeX，使用一套自定义的模板和元信息文件生成一篇调研论文，以及如何将 LaTeX 文档编译为最终的 PDF 格式。
+
+很多会议都提供了一个 .cls 文件或者一套论文应有样式的模板；例如，它们是否应该使用两列的格式以及其它的设计风格。在我们的例子中，会议提供了一个名为 `acmart.cls` 的文件。
+
+作者通常想要在他们的论文中包含他们所属的机构，然而，这个选项并没有包含在默认的 Pandoc 的 LaTeX 模板（注意，可以通过输入 `pandoc -D latex` 来查看 Pandoc 模板）当中。要包含这个内容，找一个 Pandoc 默认的 LaTeX 模板，并添加一些新的内容。将这个模板像下面这样复制进一个名为 `mytemplate.tex` 的文件中：
+
+```
+pandoc -D latex > mytemplate.tex
+```
+
+默认的模板包含以下代码：
+
+```
+$if(author)$
+\author{$for(author)$$author$$sep$ \and $endfor$}
+$endif$
+$if(institute)$
+\providecommand{\institute}[1]{}
+\institute{$for(institute)$$institute$$sep$ \and $endfor$}
+$endif$
+```
+
+因为这个模板应该包含作者的联系方式和电子邮件地址，在其他一些选项之间，我们更新这个模板以添加以下内容（我们还做了一些其他的更改，但是因为文件的长度，就没有包含在此处）：
+
+```
+latex
+$for(author)$
+ $if(author.name)$
+ \author{$author.name$}
+ $if(author.affiliation)$
+ \affiliation{\institution{$author.affiliation$}}
+ $endif$
+ $if(author.email)$
+ \email{$author.email$}
+ $endif$
+ $else$
+ $author$
+ $endif$
+$endfor$
+```
+要让这些更改起作用，我们还应该有下面的文件：
+
+* `main.md` 包含调研论文
+* `biblio.bib` 包含参考书目数据库
+* `acmart.cls` 我们使用的文档的集合
+* `mytemplate.tex` 是我们使用的模板文件（代替默认的）
+
+让我们添加论文的元信息到一个 `meta.yaml` 文件：
+
+```
+---
+template: 'mytemplate.tex'
+documentclass: acmart
+classoption: sigconf
+title: The impact of opt-in gamification on `\\`{=latex} students' grades in a software design course
+author:
+- name: Kiko Fernandez-Reyes
+ affiliation: Uppsala University
+ email: kiko.fernandez@it.uu.se
+- name: Dave Clarke
+ affiliation: Uppsala University
+ email: dave.clarke@it.uu.se
+- name: Janina Hornbach
+ affiliation: Uppsala University
+ email: janina.hornbach@fek.uu.se
+bibliography: biblio.bib
+abstract: |
+ An achievement-driven methodology strives to give students more control over their learning with enough flexibility to engage them in deeper learning. (more stuff continues)
+
+include-before: |
+ \` ``{=latex}
+ \copyrightyear{2018}
+ \acmYear{2018}
+ \setcopyright{acmlicensed}
+ \acmConference[MODELS '18 Companion]{ACM/IEEE 21th International Conference on Model Driven Engineering Languages and Systems}{October 14--19, 2018}{Copenhagen, Denmark}
+ \acmBooktitle{ACM/IEEE 21th International Conference on Model Driven Engineering Languages and Systems (MODELS '18 Companion), October 14--19, 2018, Copenhagen, Denmark}
+ \acmPrice{XX.XX}
+ \acmDOI{10.1145/3270112.3270118}
+ \acmISBN{978-1-4503-5965-8/18/10}
+
+ \begin{CCSXML}
+
+
+ 10010405.10010489
+ Applied computing~Education
+ 500
+
+
+ \end{CCSXML}
+
+ \ccsdesc[500]{Applied computing~Education}
+
+ \keywords{gamification, education, software design, UML}
+ \` ``
+figPrefix:
+ - "Fig."
+ - "Figs."
+secPrefix:
+ - "Section"
+ - "Sections"
+...
+```
+
+这个元信息文件使用 LaTeX 设置下列参数：
+
+* `template` 指向使用的模板（`mytemplate.tex`）
+* `documentclass` 指向使用的 LaTeX 文档集合（`acmart`）
+* `classoption` 是在 `sigconf` 的案例中，指向这个类的选项
+* `title` 指定论文的标题
+* `author` 是一个包含例如 `name`、`affiliation` 和 `email` 的地方
+* `bibliography` 指向包含参考书目的文件（`biblio.bib`）
+* `abstract` 包含论文的摘要
+* `include-before` 是这篇论文的具体内容之前应该被包含的信息；在 LaTeX 中被称为 [前言][8]。我在这里包含它去展示如何产生一篇计算机科学的论文，但是你可以选择跳过
+* `figPrefix` 指向如何引用文档中的图像，例如：当引用图像的 `[@fig:scatter-matrix]` 时应该显示什么。例如，当前的 `figPrefix` 在这个例子 `The boxes "Enjoy", "Grade" and "Motivation" ([@fig:scatter-matrix])`中，产生了这样的输出：`The boxes "Enjoy", "Grade" and "Motivation" (Fig. 3)`。如果这里有很多图像，目前的设置表明它应该在图像号码旁边显示 `Figs.`
+* `secPrefix` 指定如何引用文档中其他地方提到的部分（类似之前的图像和概览）
+
+现在已经设置好了元信息，让我们来创建一个 `Makefile`，它会产生你想要的输出。`Makefile` 使用 Pandoc 产生 LaTeX 文件，`pandoc-crossref` 产生交叉引用，`pdflatex` 构建 LaTeX 为 PDF，`bibtex ` 处理引用。
+
+
+`Makefile` 已经展示如下：
+
+```
+all: paper
+
+paper:
+ @pandoc -s -F pandoc-crossref --natbib meta.yaml --template=mytemplate.tex -N \
+ -f markdown -t latex+raw_tex+tex_math_dollars+citations -o main.tex main.md
+ @pdflatex main.tex &> /dev/null
+ @bibtex main &> /dev/null
+ @pdflatex main.tex &> /dev/null
+ @pdflatex main.tex &> /dev/null
+
+clean:
+ rm main.aux main.tex main.log main.bbl main.blg main.out
+
+.PHONY: all clean paper
+```
+
+Pandoc 使用下面的标记：
+
+* `-s` 创建一个独立的 LaTeX 文档
+* `-F pandoc-crossref` 利用 `pandoc-crossref` 进行过滤
+* `--natbib` 用 `natbib` （你也可以选择 `--biblatex`）对参考书目进行渲染
+* `--template` 设置使用的模板文件
+* `-N` 为章节的标题编号
+* `-f` 和 `-t` 指定从哪个格式转换到哪个格式。`-t` 通常包含格式和 Pandoc 使用的扩展。在这个例子中，我们标明的 `raw_tex+tex_math_dollars+citations` 允许在 Markdown 中使用 `raw_tex` LaTeX。 `tex_math_dollars` 让我们能够像在 LaTeX 中一样输入数学符号，`citations` 让我们可以使用 [这个扩展][9]。
+
+要从 LaTeX 产生 PDF，按 [来自bibtex][10] 的指导处理参考书目：
+
+```
+@pdflatex main.tex &> /dev/null
+@bibtex main &> /dev/null
+@pdflatex main.tex &> /dev/null
+@pdflatex main.tex &> /dev/null
+```
+
+脚本用 `@` 忽略输出，并且重定向标准输出和错误到 `/dev/null` ，因此我们在使用这些命令的可执行文件时不会看到任何的输出。
+
+最终的结果展示如下。这篇文章的库可以在 [GitHub][11] 找到：
+
+
+
+### 结论
+
+在我看来，研究的重点是协作、思想的传播，以及在任何一个恰好存在的领域中改进现有的技术。许多计算机科学家和工程师使用 LaTeX 文档系统来写论文，它对数学提供了完美的支持。来自社会科学的研究人员似乎更喜欢 DOCX 文档。
+
+当身处不同社区的研究人员一同写一篇论文时，他们首先应该讨论一下他们将要使用哪种格式。然而如果包含太多的数学符号，DOCX 对于工程师来说不会是最简便的选择，LaTeX 对于缺乏编程经验的研究人员来说也有一些问题。就像这篇文章中展示的，Markdown 是一门工程师和社会科学家都很轻易能够使用的语言。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/9/pandoc-research-paper
+
+作者：[Kiko Fernandez-Reyes][a]
+选题：[lujun9972][b]
+译者：[dianbanjiu](https://github.com/dianbanjiu)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://opensource.com/users/kikofernandez
+[b]: https://github.com/lujun9972
+[1]: https://en.wikipedia.org/wiki/Markdown
+[2]: https://www.latex-project.org/
+[3]: https://pandoc.org/
+[4]: http://lierdakil.github.io/pandoc-crossref/
+[5]: https://dl.acm.org/citation.cfm?id=3270118
+[6]: https://github.com/kikofernandez/pandoc-examples/blob/master/research-paper/biblio.bib
+[7]: https://en.wikibooks.org/wiki/LaTeX/Floats,_Figures_and_Captions#Figures
+[8]: https://www.sharelatex.com/learn/latex/Creating_a_document_in_LaTeX#The_preamble_of_a_document
+[9]: http://pandoc.org/MANUAL.html#citations
+[10]: http://www.bibtex.org/Using/
+[11]: https://github.com/kikofernandez/pandoc-examples/tree/master/research-paper
diff --git a/published/20181022 5 tips for choosing the right open source database.md b/published/20181022 5 tips for choosing the right open source database.md
new file mode 100644
index 0000000000..9f0447086d
--- /dev/null
+++ b/published/20181022 5 tips for choosing the right open source database.md
@@ -0,0 +1,79 @@
+正确选择开源数据库的 5 个技巧
+======
+
+> 对关键应用的选择不容许丝毫错误。
+
+
+
+你或许会遇到需要选择合适的开源数据库的情况。但这无论对于开源方面的老手或是新手，都是一项艰巨的任务。
+
+在过去的几年中，采用开源技术的企业越来越多。面对这样的趋势，众多开源应用公司都纷纷承诺自己提供的解决方案能够各种问题、适应各种负载。但这些承诺不能轻信，在开源应用上的选择是重要而艰难的，尤其是数据库这种关键的应用。
+
+凭借我在 [Percona][1] 和其它公司担任 IT 专家的经验，我很幸运能够指导其他人在开源技术的选择上做出正确的决策，因为需要考虑的重要因素太多了。希望通过这篇文章能够向大家分享这方面的一些技巧。
+
+### 有一个明确的目标
+
+这一点看似简单，但在和很多人聊过 MySQL、MongoDB、PostgreSQL 之后，我觉得这一点才是最重要的。
+
+面对繁杂的开源数据库，更需要明确自己的目标。无论这个数据库是作为开发用的标准化数据库后端，抑或是用于替换遗留代码中的原有数据库，这都是一个明确的目标。
+
+目标一旦确定，就可以集中精力与开源软件的提供方商讨更多细节了。
+
+### 了解你的工作负载
+
+尽管开源数据库技术的功能越来越丰富，但这些新加入的功能都不太具有普适性。譬如 MongoDB 新增了事务的支持、MySQL 新增了 JSON 存储的功能等等。目前开源数据库的普遍趋势是不断加入新的功能，但很多人的误区却在于没有选择最适合的工具来完成自己的工作 —— 这样的人或许是一个自大的开发者，又或许是一个视野狭窄的主管 —— 最终导致公司业务上的损失。最致命的是，在业务初期，使用了不适合的工具往往也可以顺利地完成任务，但随着业务的增长，很快就会到达瓶颈，尽管这个时候还可以替换更合适的工具，但成本就比较高了。
+
+例如，如果你需要的是数据分析仓库，关系数据库可能不是一个适合的选择；如果你处理事务的应用要求严格的数据完整性和一致性，就不要考虑 NoSQL 了。
+
+### 不要重新发明轮子
+
+在过去的数十年，开源数据库技术迅速发展壮大。开源数据库从新生，到受到质疑，再到受到认可，现在已经成为很多企业生产环境的数据库。企业不再需要担心选择开源数据库技术会产生风险，因为开源数据库通常都有活跃的社区，可以为越来越多的初创公司、中型企业甚至 500 强公司提供开源数据库领域的支持和第三方工具。
+
+Battery Ventures 是一家专注于技术的投资公司，最近推出了一个用于跟踪最受欢迎开源项目的 [BOSS 指数][2] 。它提供了对一些被广泛采用的开源项目和活跃的开源项目的详细情况。其中，数据库技术毫无悬念地占据了榜单的主导地位，在前十位之中占了一半。这个 BOSS 指数对于刚接触开源数据库领域的人来说，这是一个很好的切入点。当然，开源技术的提供者也会针对很多常见的典型问题给出对应的解决方案。
+
+我认为，你想要做的事情很可能已经有人解决过了。即使这些先行者的解决方案不一定完全契合你的需求，但也可以从他们成功或失败的案例中根据你自己的需求修改得出合适的解决方案。
+
+如果你采用了一个最前沿的技术，这就是你探索的好机会了。如果你的工作负载刚好适合新的开源数据库技术，放胆去尝试吧。第一个吃螃蟹的人总是会得到意外的挑战和收获。
+
+### 先从简单开始
+
+你的数据库实际上需要达到多少个 [9][4] 的可用性？对许多公司来说，“实现高可用性”仅仅只是一个模糊的目标。当然，最常见的答案都会是“它是关键应用，我们无论多短的停机时间都是无法忍受的”。
+
+数据库环境越复杂，管理的难度就越大，成本也会越高。理论上你总可以将数据库的可用性提得更高，但代价将会是大大增加的管理难度和性能下降。所以，先从简单开始，直到有需要时再逐步扩展。
+
+例如，Booking.com 是一个有名的旅游预订网站。但少有人知的是，它使用 MySQL 作为数据库后端。 Booking.com 高级系统架构师 Nicolai Plum 曾经发表过一次[演讲][5]，讲述了他们公司使用 MySQL 数据库的历程。其中一个重点就是，在初始阶段数据库可以被配置得很简单，然后逐渐变得复杂。对于早期的数据库需求，一个简单的主从架构就足够了，但随着工作负载和数据量的增加，数据库引入了负载均衡、多个读取副本，还使用 Hadoop 进行分析。尽管如此，早期的架构仍然是非常简单的。
+
+
+
+### 有疑问，找专家
+
+如果你仍然不确定数据库选择的是否合适，可以在论坛、网站或者与软件的提供者处商讨。研究各种开源数据库是否满足自己的需求是一件很有意义的事，因为总会发现你从不知道的技术。而开源社区就是分享这些信息的地方。
+
+当你接触到开源软件和软件提供者时，有一件重要的事情需要注意。很多公司都有开放的核心业务模式，鼓励采用他们的数据库软件。你可以只接受他们的部分建议和指导，然后用你自己的能力去研究和探索替代方案。
+
+### 总结
+
+选择正确的开源数据库是一个重要的过程。很多时候，人们都会在真正理解需求之前就做出决定，这是本末倒置的。
+
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/tips-choosing-right-open-source-database
+
+作者：[Barrett Chambers][a]
+选题：[lujun9972][b]
+译者：[HankChow](https://github.com/HankChow)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://opensource.com/users/barrettc
+[b]: https://github.com/lujun9972
+[1]: https://www.percona.com/
+[2]: https://techcrunch.com/2017/04/07/tracking-the-explosive-growth-of-open-source-software/
+[3]: https://docs.aws.amazon.com/quickstart/latest/mongodb/welcome.html
+[4]: https://en.wikipedia.org/wiki/Five_nines
+[5]: https://www.percona.com/live/mysql-conference-2015/sessions/bookingcom-evolution-mysql-system-design
+[6]: https://allthingsopen.org/talk/choosing-the-right-open-source-database/
+[7]: https://allthingsopen.org/
+
diff --git a/published/20181029 4 open source Android email clients.md b/published/20181029 4 open source Android email clients.md
new file mode 100644
index 0000000000..4c1b32ef65
--- /dev/null
+++ b/published/20181029 4 open source Android email clients.md
@@ -0,0 +1,79 @@
+四个开源的 Android 邮件客户端
+======
+
+> Email 现在还没有绝迹，而且现在大部分邮件都来自于移动设备。
+
+
+
+现在一些年轻人正将邮件称之为“老年人的交流方式”，然而事实却是邮件绝对还没有消亡。虽然[协作工具][1]、社交媒体，和短信很常用，但是它们还没做好取代邮件这种必要的商业（和社交）通信工具的准备。
+
+考虑到邮件还没有消失，并且（很多研究表明）人们都是在移动设备上阅读邮件，拥有一个好的移动邮件客户端就变得很关键。如果你是一个想使用开源的邮件客户端的 Android 用户，事情就变得有点棘手了。
+
+我们提供了四个开源的 Andorid 邮件客户端供选择。其中两个可以通过 Andorid 官方应用商店 [Google Play][2] 下载。你也可以在 [Fossdroid][3] 或者 [F-Droid][4] 这些开源 Android 应用库中找到他们。（下方有每个应用的具体下载方式。）
+
+### K-9 Mail
+
+[K-9 Mail][5] 拥有几乎和 Android 一样长的历史——它起源于 Android 1.0 邮件客户端的一个补丁。它支持 IMAP 和 WebDAV、多用户、附件、emoji 和其它经典的邮件客户端功能。它的[用户文档][6]提供了关于安装、启动、安全、阅读和发送邮件等等的帮助。
+
+K-9 基于 [Apache 2.0][7] 协议开源，[源码][8]可以从 GitHub 上获得. 应用可以从 [Google Play][9]、[Amazon][10] 和 [F-Droid][11] 上下载。
+
+### p≡p
+
+正如它的全称，”Pretty Easy Privacy”说的那样，[p≡p][12] 主要关注于隐私和安全通信。它提供自动的、端到端的邮件和附件加密（但要求你的收件人也要能够加密邮件——否则，p≡p 会警告你的邮件将不加密发出）。
+
+你可以从 GitLab 获得[源码][13]（基于 [GPLv3][14] 协议），并且可以从应用的官网上找到相应的[文档][15]。应用可以在 [Fossdroid][16] 上免费下载或者在 [Google Play][17] 上支付一点儿象征性的费用下载。
+
+### InboxPager
+
+[InboxPager][18] 允许你通过 SSL/TLS 协议收发邮件信息，这也表明如果你的邮件提供商（比如 Gmail ）没有默认开启这个功能的话，你可能要做一些设置。（幸运的是， InboxPager 提供了 Gmail 的[设置教程][19]。）它同时也支持通过 OpenKeychain 应用进行 OpenPGP 加密。
+
+InboxPager 基于 [GPLv3][20] 协议，其源码可从 GitHub 获得，并且应用可以从 [F-Droid][21] 下载。
+
+### FairEmail
+
+[FairEmail][22] 是一个极简的邮件客户端，它的功能集中于读写信息，没有任何多余的可能拖慢客户端的功能。它支持多个帐号和用户、消息线索、加密等等。
+
+它基于 [GPLv3][23] 协议开源，[源码][24]可以从 GitHub 上获得。你可以在 [Fossdroid][25] 上下载 FairEamil；对 Google Play 版本感兴趣的人可以从 [testing the software][26] 获得应用。
+
+肯定还有更多的开源 Android 客户端（或者上述软件的加强版本）——活跃的开发者们可以关注一下。如果你知道还有哪些优秀的应用，可以在评论里和我们分享。
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/open-source-android-email-clients
+
+作者：[Opensource.com][a]
+选题：[lujun9972][b]
+译者：[zianglei][c]
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://opensource.com
+[b]: https://github.com/lujun9972
+[c]: https://github.com/zianglei
+[1]: https://opensource.com/alternatives/trello
+[2]: https://play.google.com/store
+[3]: https://fossdroid.com/
+[4]: https://f-droid.org/
+[5]: https://k9mail.github.io/
+[6]: https://k9mail.github.io/documentation.html
+[7]: http://www.apache.org/licenses/LICENSE-2.0
+[8]: https://github.com/k9mail/k-9
+[9]: https://play.google.com/store/apps/details?id=com.fsck.k9
+[10]: https://www.amazon.com/K-9-Dog-Walkers-Mail/dp/B004JK61K0/
+[11]: https://f-droid.org/packages/com.fsck.k9/
+[12]: https://www.pep.security/android.html.en
+[13]: https://pep-security.lu/gitlab/android/pep
+[14]: https://pep-security.lu/gitlab/android/pep/blob/feature/material/LICENSE
+[15]: https://www.pep.security/docs/
+[16]: https://fossdroid.com/a/p%E2%89%A1p.html
+[17]: https://play.google.com/store/apps/details?id=security.pEp
+[18]: https://github.com/itprojects/InboxPager
+[19]: https://github.com/itprojects/InboxPager/blob/HEAD/README.md#gmail-configuration
+[20]: https://github.com/itprojects/InboxPager/blob/c5641a6d644d001bd4cec520b5a96d7e588cb6ad/LICENSE
+[21]: https://f-droid.org/en/packages/net.inbox.pager/
+[22]: https://email.faircode.eu/
+[23]: https://github.com/M66B/open-source-email/blob/master/LICENSE
+[24]: https://github.com/M66B/open-source-email
+[25]: https://fossdroid.com/a/fairemail.html
+[26]: https://play.google.com/apps/testing/eu.faircode.email
diff --git a/published/20181030 How To Analyze And Explore The Contents Of Docker Images.md b/published/20181030 How To Analyze And Explore The Contents Of Docker Images.md
new file mode 100644
index 0000000000..932937b0f2
--- /dev/null
+++ b/published/20181030 How To Analyze And Explore The Contents Of Docker Images.md
@@ -0,0 +1,106 @@
+如何分析并探索 Docker 容器镜像的内容
+======
+
+
+
+或许你已经了解到 Docker 容器镜像是一个轻量、独立、含有运行某个应用所需全部软件的可执行包，这也是为什么容器镜像会经常被开发者用于构建和分发应用。假如你很好奇一个 Docker 镜像里面包含了什么东西，那么这篇简要的指南或许会帮助到你。今天，我们将学会使用一个名为 **Dive** 的工具来分析和探索 Docker 镜像每层的内容。
+
+通过分析 Docker 镜像，我们可以发现在各个层之间可能重复的文件并通过移除它们来减小 Docker 镜像的大小。Dive 工具不仅仅是一个 Docker 镜像分析工具，它还可以帮助我们来构建镜像。Dive 是一个用 Go 编程语言编写的自由开源工具。
+
+### 安装 Dive
+
+首先从该项目的 [发布页][1] 下载最新版本，然后像下面展示的那样根据你所使用的发行版来安装它。
+
+假如你正在使用 **Debian** 或者 **Ubuntu**，那么可以运行下面的命令来下载并安装它。
+
+```
+$ wget https://github.com/wagoodman/dive/releases/download/v0.0.8/dive_0.0.8_linux_amd64.deb
+```
+
+```
+$ sudo apt install ./dive_0.0.8_linux_amd64.deb
+```
+
+**在 RHEL 或 CentOS 系统中**
+
+```
+$ wget https://github.com/wagoodman/dive/releases/download/v0.0.8/dive_0.0.8_linux_amd64.rpm
+```
+
+```
+$ sudo rpm -i dive_0.0.8_linux_amd64.rpm
+```
+
+Dive 也可以使用 [Linuxbrew][2] 包管理器来安装。
+
+```
+$ brew tap wagoodman/dive
+```
+
+```
+$ brew install dive
+```
+
+至于其他的安装方法，请参考 [Dive 项目的 GitHub 网页][3]。
+
+### 分析并探索 Docker 镜像的内容
+
+要分析一个 Docker 镜像，只需要运行加上 Docker 镜像 ID 的 `dive` 命令就可以了。你可以使用 `sudo docker images` 来得到 Docker 镜像的 ID。
+
+```
+$ sudo dive ea4c82dcd15a
+```
+
+上面命令中的 `ea4c82dcd15a` 是某个镜像的 ID。
+
+然后 `dive` 命令将快速地分析给定 Docker 镜像的内容并将它在终端中展示出来。
+
+
+
+正如你在上面的截图中看到的那样，在终端的左边一栏列出了给定 Docker 镜像的各个层及其详细内容，浪费的空间大小等信息。右边一栏则给出了给定 Docker 镜像每一层的内容。你可以使用 `Ctrl+空格` 来在左右栏之间切换，使用 `UP`/`DOWN` 光标键来在目录树中进行浏览。
+
+下面是 `dive` 的快捷键列表：
+
+ * `Ctrl+空格` —— 在左右栏之间切换
+ * `空格` —— 展开或收起目录树
+ * `Ctrl+A` —— 文件树视图：展示或隐藏增加的文件
+ * `Ctrl+R` —— 文件树视图：展示或隐藏被移除的文件
+ * `Ctrl+M` —— 文件树视图：展示或隐藏被修改的文件
+ * `Ctrl+U` —— 文件树视图：展示或隐藏未修改的文件
+ * `Ctrl+L` —— 层视图：展示当前层的变化
+ * `Ctrl+A` —— 层视图：展示总的变化
+ * `Ctrl+/` —— 筛选文件
+ * `Ctrl+C` —— 退出
+
+在上面的例子中，我使用了 `sudo` 权限，这是因为我的 Docker 镜像存储在 `/var/lib/docker/` 目录中。假如你的镜像保存在你的家目录 （`$HOME`）或者在其他不属于 `root` 用户的目录，你就没有必要使用 `sudo` 命令。
+
+你还可以使用下面的单个命令来构建一个 Docker 镜像并立刻分析该镜像：
+
+```
+$ dive build -t
+```
+
+Dive 工具仍处于 beta 阶段，所以可能会存在 bug。假如你遇到了 bug，请在该项目的 GitHub 主页上进行报告。
+
+好了，这就是今天的全部内容。现在你知道如何使用 Dive 工具来探索和分析 Docker 容器镜像的内容以及利用它构建镜像。希望本文对你有所帮助。
+
+更多精彩内容即将呈现，请保持关注！
+
+干杯！
+
+--------------------------------------------------------------------------------
+
+via: https://www.ostechnix.com/how-to-analyze-and-explore-the-contents-of-docker-images/
+
+作者：[SK][a]
+选题：[lujun9972][b]
+译者：[FSSlc](https://github.com/FSSlc)
+校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
+
+[a]: https://www.ostechnix.com/author/sk/
+[b]: https://github.com/lujun9972
+[1]: https://github.com/wagoodman/dive/releases
+[2]: https://www.ostechnix.com/linuxbrew-common-package-manager-linux-mac-os-x/
+[3]: https://github.com/wagoodman/dive
diff --git a/scripts/badge/show_status.sh b/scripts/badge/show_status.sh
index aab852b486..7066561852 100755
--- a/scripts/badge/show_status.sh
+++ b/scripts/badge/show_status.sh
@@ -5,7 +5,7 @@ set -e
function help()
{
cat <
+
EOF
diff --git a/sign.md b/sign.md
deleted file mode 100644
index 960d450a96..0000000000
--- a/sign.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
----
-
-via：来源链接
-
-作者：[作者名][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，
-[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:作者链接
-[1]:文内链接
-[2]:
-[3]:
-[4]:
-[5]:
-[6]:
-[7]:
-[8]:
-[9]:
diff --git a/sources/talk/20170921 The Rise and Rise of JSON.md b/sources/talk/20170921 The Rise and Rise of JSON.md
index 84a594c89a..4f09aa1ddf 100644
--- a/sources/talk/20170921 The Rise and Rise of JSON.md
+++ b/sources/talk/20170921 The Rise and Rise of JSON.md
@@ -1,3 +1,5 @@
+thecyanbird translating
+
The Rise and Rise of JSON
======
JSON has taken over the world. Today, when any two applications communicate with each other across the internet, odds are they do so using JSON. It has been adopted by all the big players: Of the ten most popular web APIs, a list consisting mostly of APIs offered by major companies like Google, Facebook, and Twitter, only one API exposes data in XML rather than JSON. Twitter, to take an illustrative example from that list, supported XML until 2013, when it released a new version of its API that dropped XML in favor of using JSON exclusively. JSON has also been widely adopted by the programming rank and file: According to Stack Overflow, a question and answer site for programmers, more questions are now asked about JSON than about any other data interchange format.
diff --git a/sources/talk/20180308 20 questions DevOps job candidates should be prepared to answer.md b/sources/talk/20180308 20 questions DevOps job candidates should be prepared to answer.md
deleted file mode 100644
index beb6f372b9..0000000000
--- a/sources/talk/20180308 20 questions DevOps job candidates should be prepared to answer.md
+++ /dev/null
@@ -1,134 +0,0 @@
-20 questions DevOps job candidates should be prepared to answer Translating by FelixYFZ
-======
-
-
-Hiring the wrong person is [expensive][1]. Recruiting, hiring, and onboarding a new employee can cost a company as much as $240,000, according to Jörgen Sundberg, CEO of Link Humans. When you make the wrong hire:
-
- * You lose what they know.
- * You lose who they know.
- * Your team could go into the [storming][2] phase of group development.
- * Your company risks disorganization.
-
-
-
-When you lose an employee, you lose a piece of the fabric of the company. It's also worth mentioning the pain on the other end. The person hired into the wrong job may experience stress, feelings of overall dissatisfaction, and even health issues.
-
-On the other hand, when you get it right, your new hire will:
-
- * Enhance the existing culture, making your organization an even a better place to work. Studies show that a positive work culture helps [drive long-term financial performance][3] and that if you work in a happy environment, you’re more likely to do better in life.
- * Love working with your organization. When people love what they do, they tend to do it well.
-
-
-
-Hiring to fit or enhance your existing culture is essential in DevOps and agile teams. That means hiring someone who can encourage effective collaboration so that individual contributors from varying backgrounds, and teams with different goals and working styles, can work together productively. Your new hire should help teams collaborate to maximize their value while also increasing employee satisfaction and balancing conflicting organizational goals. He or she should be able to choose tools and workflows wisely to complement your organization. Culture is everything.
-
-As a follow-up to our November 2017 post, [20 questions DevOps hiring managers should be prepared to answer][4], this article will focus on how to hire for the best mutual fit.
-
-### Why hiring goes wrong
-
-The typical hiring strategy many companies use today is based on a talent surplus:
-
- * Post on job boards.
- * Focus on candidates with the skills they need.
- * Find as many candidates as possible.
- * Interview to weed out the weak.
- * Conduct formal interviews to do more weeding.
- * Assess, vote, and select.
- * Close on compensation.
-
-
-
-Job boards were invented during the Great Depression when millions of people were out of work and there was a talent surplus. There is no talent surplus in today's job market, yet we’re still using a hiring strategy that's based on one.
-
-
-
-### Hire for mutual fit: Use culture and emotions
-
-The idea behind the talent surplus hiring strategy is to design jobs and then slot people into them.
-
-Instead, do the opposite: Find talented people who will positively add to your business culture, then find the best fit for them in a job they’ll love. To do this, you must be open to creating jobs around their passions.
-
-**Who is looking for a job?** According to a 2016 survey of more than 50,000 U.S. developers, [85.7% of respondents][5] were either not interested in new opportunities or were not actively looking for them. And of those who were looking, a whopping [28.3% of job discoveries][5] came from referrals by friends. If you’re searching only for people who are looking for jobs, you’re missing out on top talent.
-
-**Use your team to find and vet potential recruits**. For example, if Diane is a developer on your team, chances are she has [been coding for years][6] and has met fellow developers along the way who also love what they do. Wouldn’t you think her chances of vetting potential recruits for skills, knowledge, and intelligence would be higher than having someone from HR find and vet potential recruits? And before asking Diane to share her knowledge of fellow recruits, inform her of the upcoming mission, explain your desire to hire a diverse team of passionate explorers, and describe some of the areas where help will be needed in the future.
-
-**What do employees want?** A comprehensive study comparing the wants and needs of Millennials, GenX’ers, and Baby Boomers shows that within two percentage points, we all [want the same things][7]:
-
- 1. To make a positive impact on the organization
- 2. To help solve social and/or environmental challenges
- 3. To work with a diverse group of people
-
-
-
-### The interview challenge
-
-The interview should be a two-way conversation for finding a mutual fit between the person hiring and the person interviewing. Focus your interview on CQ ([Cultural Quotient][7]) and EQ ([Emotional Quotient][8]): Will this person reinforce and add to your culture and love working with you? Can you help make them successful at their job?
-
-**For the hiring manager:** Every interview is an opportunity to learn how your organization could become more irresistible to prospective team members, and every positive interview can be your best opportunity to finding talent, even if you don’t hire that person. Everyone remembers being interviewed if it is a positive experience. Even if they don’t get hired, they will talk about the experience with their friends, and you may get a referral as a result. There is a big upside to this: If you’re not attracting this talent, you have the opportunity to learn the reason and fix it.
-
-**For the interviewee** : Each interview experience is an opportunity to unlock your passions.
-
-### 20 questions to help you unlock the passions of potential hires
-
- 1. What are you passionate about?
-
- 2. What makes you think, "I can't wait to get to work this morning!”
-
- 3. What is the most fun you’ve ever had?
-
- 4. What is your favorite example of a problem you’ve solved, and how did you solve it?
-
- 5. How do you feel about paired learning?
-
- 6. What’s at the top of your mind when you arrive at, and leave, the office?
-
- 7. If you could have changed one thing in your previous/current job, what would it be?
-
- 8. What are you excited to learn while working here?
-
- 9. What do you aspire to in life, and how are you pursuing it?
-
- 10. What do you want, or feel you need, to learn to achieve these aspirations?
-
- 11. What values do you hold?
-
- 12. How do you live those values?
-
- 13. What does balance mean in your life?
-
- 14. What work interactions are you are most proud of? Why?
-
- 15. What type of environment do you like to create?
-
- 16. How do you like to be treated?
-
- 17. What do you trust vs. verify?
-
- 18. Tell me about a recent learning you had when working on a project.
-
- 19. What else should we know about you?
-
- 20. If you were hiring me, what questions would you ask me?
-
-
-
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/3/questions-devops-employees-should-answer
-
-作者：[Catherine Louis][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/catherinelouis
-[1]:https://www.shrm.org/resourcesandtools/hr-topics/employee-relations/pages/cost-of-bad-hires.aspx
-[2]:https://en.wikipedia.org/wiki/Tuckman%27s_stages_of_group_development
-[3]:http://www.forbes.com/sites/johnkotter/2011/02/10/does-corporate-culture-drive-financial-performance/
-[4]:https://opensource.com/article/17/11/inclusive-workforce-takes-work
-[5]:https://insights.stackoverflow.com/survey/2016#work-job-discovery
-[6]:https://research.hackerrank.com/developer-skills/2018/
-[7]:http://www-935.ibm.com/services/us/gbs/thoughtleadership/millennialworkplace/
-[8]:https://en.wikipedia.org/wiki/Emotional_intelligence
diff --git a/sources/talk/20180409 5 steps to building a cloud that meets your users- needs.md b/sources/talk/20180409 5 steps to building a cloud that meets your users- needs.md
index 9ba926c722..db17eca751 100644
--- a/sources/talk/20180409 5 steps to building a cloud that meets your users- needs.md
+++ b/sources/talk/20180409 5 steps to building a cloud that meets your users- needs.md
@@ -1,3 +1,4 @@
+Translating by FelixYFZ
5 steps to building a cloud that meets your users' needs
======
diff --git a/sources/talk/20180417 What developers need to know about security.md b/sources/talk/20180417 What developers need to know about security.md
deleted file mode 100644
index 98d4f5fbf0..0000000000
--- a/sources/talk/20180417 What developers need to know about security.md
+++ /dev/null
@@ -1,58 +0,0 @@
-What developers need to know about security
-======
-
-
-
-DevOps doesn't mean that everyone needs to be an expert in both development and operations. This is especially true in larger organizations in which roles tend to be more specialized. Rather, DevOps thinking has evolved in a way that makes it more about the separation of concerns. To the degree that operations teams can deploy platforms for developers (whether on-premises or in a public cloud) and get out of the way, that's good news for both teams. Developers get a productive development environment and self-service. Operations can focus on keeping the underlying plumbing running and maintaining the platform.
-
-It's a contract of sorts. Devs expect a stable and functional platform from ops. Ops expects that devs will be able to handle most of the tasks associated with developing apps on their own.
-
-Devs expect a stable and functional platform from ops. Ops expects that devs will be able to handle most of the tasks associated with developing apps on their own.
-
-That said, DevOps is also about better communication, collaboration, and transparency. It works better if it's not about merely a new type of wall between dev and ops. Ops needs to be sensitive to the type of tools developers want and need and the visibility they require, through monitoring and logging, to write better applications. Conversely, developers need some awareness of how the underlying infrastructure can be used most effectively and what can keep operations up at night (literally).
-
-That said, DevOps is also about better communication, collaboration, and transparency. It works better if it's not about merely a new type of wall between dev and ops. Ops needs to be sensitive to the type of tools developers want and need and the visibility they require, through monitoring and logging, to write better applications. Conversely, developers need some awareness of how the underlying infrastructure can be used most effectively and what can keep operations up at night (literally).
-
-The same principle applies more broadly to DevSecOps, a term that serves to explicitly remind us that security needs to be embedded throughout the entire DevOps pipeline from sourcing content to writing apps, building them, testing them, and running them in production. Developers (and operations) don't suddenly need to become security specialists in addition to the other hats they already wear. But they can often benefit from a greater awareness of security best practices (which may be different from what they've become accustomed to) and shifting away from a mindset that views security as some unfortunate obstacle.
-
-Here are a few observations.
-
-The Open Web Application Security Project ([OWASP][1]) [Top 10 list][2] provides a window into the top vulnerabilities in web applications. Many entries on the list will be familiar to web programmers. Cross-site scripting (XSS) and injection flaws are among the most common. What's striking though is that many of the flaws on the original 2007 list are still on 2017's list ([PDF][3]). Whether it's training or tooling that's most at fault, many of the same coding flaws keep popping up.
-
-The situation is exacerbated by new platform technologies. For example, while containers don't necessarily require applications to be written differently, they dovetail with new patterns (such as [microservices][4] ) and can amplify the effects of certain security practices. For example, as my colleague [Dan Walsh][5] [@rhatdan][6] ) writes, "The biggest misconception in computing [is] you need root to run applications. The problem is not so much that devs think they need root. It is that they build this assumption into the services that they build, i.e., the services cannot run without root, making us all less secure."
-
-Was defaulting to root access ever a good practice? Not really. But it was arguably (maybe) a defensible one with applications and systems that were otherwise sufficiently isolated by other means. But with everything connected, no real perimeter, multi-tenant workloads, users with many different levels of access rights—to say nothing of an ever more dangerous threat environment—there's far less leeway for shortcuts.
-
-[Automation][7] should be an integral part of DevOps anyway. That automation needs to include security and compliance testing throughout the process. Where did the code come from? Are third-party technologies, products, or container images involved? Are there known security errata? Are there known common code flaws? Are secrets and personally identifiable information kept isolated? How do we authenticate? Who is authorized to deploy services and applications?
-
-You're not writing your own crypto, are you?
-
-Automate penetration testing where possible. Did I mention automation? It's an essential part of making security continuous rather than a checklist item that's done once in a while.
-
-Does this sound hard? It probably is a bit. At least it may be different. But as a participant in a [DevOpsDays OpenSpaces][8] London said to me: "It's just technical testing. It's not magical or mysterious." He went on to say that it's not even that hard to get involved with security as a way to gain a broader understanding of the whole software lifecycle (which is not a bad skill to have). He also suggested taking part in incident response exercises or [capture the flag exercises][9]. You might even find they're fun.
-
-This article is based on [a talk][10] the author will be giving at [Red Hat Summit 2018][11], which will be held May 8-10 in San Francisco. _[Register by May 7][11] to save US$ 500 off of registration. Use discount code **OPEN18** on the payment page to apply the discount._
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/4/what-developers-need-know-about-security
-
-作者：[Gordon Haff][a]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-选题：[lujun9972](https://github.com/lujun9972)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://opensource.com/users/ghaff
-[1]:https://www.owasp.org/index.php/Main_Page
-[2]:https://www.owasp.org/index.php/Category:OWASP_Top_Ten_Project
-[3]:https://www.owasp.org/images/7/72/OWASP_Top_10-2017_%28en%29.pdf.pdf
-[4]:https://opensource.com/tags/microservices
-[5]:https://opensource.com/users/rhatdan
-[6]:https://twitter.com/rhatdan
-[7]:https://opensource.com/tags/automation
-[8]:https://www.devopsdays.org/open-space-format/
-[9]:https://dev.to/_theycallmetoni/capture-the-flag-its-a-game-for-hacki-mean-security-professionals
-[10]:https://agenda.summit.redhat.com/SessionDetail.aspx?id=154677
-[11]:https://www.redhat.com/en/summit/2018
diff --git a/sources/talk/20180805 Where Vim Came From.md b/sources/talk/20180805 Where Vim Came From.md
deleted file mode 100644
index d3cf1abe82..0000000000
--- a/sources/talk/20180805 Where Vim Came From.md
+++ /dev/null
@@ -1,116 +0,0 @@
-Where Vim Came From
-======
-I recently stumbled across a file format known as Intel HEX. As far as I can gather, Intel HEX files (which use the `.hex` extension) are meant to make binary images less opaque by encoding them as lines of hexadecimal digits. Apparently they are used by people who program microcontrollers or need to burn data into ROM. In any case, when I opened up a HEX file in Vim for the first time, I discovered something shocking. Here was this file format that, at least to me, was deeply esoteric, but Vim already knew all about it. Each line of a HEX file is a record divided into different fields—Vim had gone ahead and colored each of the fields a different color. `set ft?` I asked, in awe. `filetype=hex`, Vim answered, triumphant.
-
-Vim is everywhere. It is used by so many people that something like HEX file support shouldn’t be a surprise. Vim comes pre-installed on Mac OS and has a large constituency in the Linux world. It is familiar even to people that hate it, because enough popular command line tools will throw users into Vim by default that the uninitiated getting trapped in Vim has become [a meme][1]. There are major websites, including Facebook, that will scroll down when you press the `j` key and up when you press the `k` key—the unlikely high-water mark of Vim’s spread through digital culture.
-
-And yet Vim is also a mystery. Unlike React, for example, which everyone knows is developed and maintained by Facebook, Vim has no obvious sponsor. Despite its ubiquity and importance, there doesn’t seem to be any kind of committee or organization that makes decisions about Vim. You could spend several minutes poking around the [Vim website][2] without getting a better idea of who created Vim or why. If you launch Vim without giving it a file argument, then you will see Vim’s startup message, which says that Vim is developed by “Bram Moolenaar et al.” But that doesn’t tell you much. Who is Bram Moolenaar and who are his shadowy confederates?
-
-Perhaps more importantly, while we’re asking questions, why does exiting Vim involve typing `:wq`? Sure, it’s a “write” operation followed by a “quit” operation, but that is not a particularly intuitive convention. Who decided that copying text should instead be called “yanking”? Why is `:%s/foo/bar/gc` short for “find and replace”? Vim’s idiosyncrasies seem too arbitrary to have been made up, but then where did they come from?
-
-The answer, as is so often the case, begins with that ancient crucible of computing, Bell Labs. In some sense, Vim is only the latest iteration of a piece of software—call it the “wq text editor”—that has been continuously developed and improved since the dawn of the Unix epoch.
-
-### Ken Thompson Writes a Line Editor
-
-In 1966, Bell Labs hired Ken Thompson. Thompson had just completed a Master’s degree in Electrical Engineering and Computer Science at the University of California, Berkeley. While there, he had used a text editor called QED, written for the Berkeley Timesharing System between 1965 and 1966. One of the first things Thompson did after arriving at Bell Labs was rewrite QED for the MIT Compatible Time-Sharing System. He would later write another version of QED for the Multics project. Along the way, he expanded the program so that users could search for lines in a file and make substitutions using regular expressions.
-
-The Multics project, which like the Berkeley Timesharing System sought to create a commercially viable time-sharing operating system, was a partnership between MIT, General Electric, and Bell Labs. AT&T eventually decided the project was going nowhere and pulled out. Thompson and fellow Bell Labs researcher Dennis Ritchie, now without access to a time-sharing system and missing the “feel of interactive computing” that such systems offered, set about creating their own version, which would eventually be known as Unix. In August 1969, while his wife and young son were away on vacation in California, Thompson put together the basic components of the new system, allocating “a week each to the operating system, the shell, the editor, and the assembler.”
-
-The editor would be called `ed`. It was based on QED but was not an exact re-implementation. Thompson decided to ditch certain QED features. Regular expression support was pared back so that only relatively simple regular expressions would be understood. QED allowed users to edit several files at once by opening multiple buffers, but `ed` would only work with one buffer at a time. And whereas QED could execute a buffer containing commands, `ed` would do no such thing. These simplifications may have been called for. Dennis Ritchie has said that going without QED’s advanced regular expressions was “not much of a loss.”
-
-`ed` is now a part of the POSIX specification, so if you have a POSIX-compliant system, you will have it installed on your computer. It’s worth playing around with, because many of the `ed` commands are today a part of Vim. In order to write a buffer to disk, for example, you have to use the `w` command. In order to quit the editor, you have to use the `q` command. These two commands can be specified on the same line at once—hence, `wq`. Like Vim, `ed` is a modal editor; to enter input mode from command mode you would use the insert command (`i`), the append command (`a`), or the change command (`c`), depending on how you are trying to transform your text. `ed` also introduced the `s/foo/bar/g` syntax for finding and replacing, or “substituting,” text.
-
-Given all these similarities, you might expect the average Vim user to have no trouble using `ed`. But `ed` is not at all like Vim in another important respect. `ed` is a true line editor. It was written and widely used in the days of the teletype printer. When Ken Thompson and Dennis Ritchie were hacking away at Unix, they looked like this:
-
-![Ken Thompson interacting with a PDP-11 via teletype.][3]
-
-`ed` doesn’t allow you to edit lines in place among the other lines of the open buffer, or move a cursor around, because `ed` would have to reprint the entire file every time you made a change to it. There was no mechanism in 1969 for `ed` to “clear” the contents of the screen, because the screen was just a sheet of paper and everything that had already been output had been output in ink. When necessary, you can ask `ed` to print out a range of lines for you using the list command (`l`), but most of the time you are operating on text that you can’t see. Using `ed` is thus a little trying to find your way around a dark house with an underpowered flashlight. You can only see so much at once, so you have to try your best to remember where everything is.
-
-Here’s an example of an `ed` session. I’ve added comments (after the `#` character) explaining the purpose of each line, though if these were actually entered `ed` wouldn’t recognize them as comments and would complain:
-
-```
-[sinclairtarget 09:49 ~]$ ed
-i # Enter input mode
-Hello world!
-
-Isn't it a nice day?
-. # Finish input
-1,2l # List lines 1 to 2
-Hello world!$
-$
-2d # Delete line 2
-,l # List entire buffer
-Hello world!$
-Isn't it a nice day?$
-s/nice/terrible/g # Substitute globally
-,l
-Hello world!$
-Isn't it a terrible day?$
-w foo.txt # Write to foo.txt
-38 # (bytes written)
-q # Quit
-[sinclairtarget 10:50 ~]$ cat foo.txt
-Hello world!
-Isn't it a terrible day?
-```
-
-As you can see, `ed` is not an especially talkative program.
-
-### Bill Joy Writes a Text Editor
-
-`ed` worked well enough for Thompson and Ritchie. Others found it difficult to use and it acquired a reputation for being a particularly egregious example of Unix’s hostility toward the novice. In 1975, a man named George Coulouris developed an improved version of `ed` on the Unix system installed at Queen Mary’s College, London. Coulouris wrote his editor to take advantage of the video displays that he had available at Queen Mary’s. Unlike `ed`, Coulouris’ program allowed users to edit a single line in place on screen, navigating through the line keystroke by keystroke (imagine using Vim on one line at a time). Coulouris called his program `em`, or “editor for mortals,” which he had supposedly been inspired to do after Thompson paid a visit to Queen Mary’s, saw the program Coulouris had built, and dismissed it, saying that he had no need to see the state of a file while editing it.
-
-In 1976, Coulouris brought `em` with him to UC Berkeley, where he spent the summer as a visitor to the CS department. This was exactly ten years after Ken Thompson had left Berkeley to work at Bell Labs. At Berkeley, Coulouris met Bill Joy, a graduate student working on the Berkeley Software Distribution (BSD). Coulouris showed `em` to Joy, who, starting with Coulouris’ source code, built out an improved version of `ed` called `ex`, for “extended `ed`.” Version 1.1 of `ex` was bundled with the first release of BSD Unix in 1978. `ex` was largely compatible with `ed`, but it added two more modes: an “open” mode, which enabled single-line editing like had been possible with `em`, and a “visual” mode, which took over the whole screen and enabled live editing of an entire file like we are used to today.
-
-For the second release of BSD in 1979, an executable named `vi` was introduced that did little more than open `ex` in visual mode.
-
-`ex`/`vi` (henceforth `vi`) established most of the conventions we now associate with Vim that weren’t already a part of `ed`. The video terminal that Joy was using was a Lear Siegler ADM-3A, which had a keyboard with no cursor keys. Instead, arrows were painted on the `h`, `j`, `k`, and `l` keys, which is why Joy used those keys for cursor movement in `vi`. The escape key on the ADM-3A keyboard was also where today we would find the tab key, which explains how such a hard-to-reach key was ever assigned an operation as common as exiting a mode. The `:` character that prefixes commands also comes from `vi`, which in regular mode (i.e. the mode entered by running `ex`) used `:` as a prompt. This addressed a long-standing complaint about `ed`, which, once launched, greets users with utter silence. In visual mode, saving and quitting now involved typing the classic `:wq`. “Yanking” and “putting,” marks, and the `set` command for setting options were all part of the original `vi`. The features we use in the course of basic text editing today in Vim are largely `vi` features.
-
-![A Lear Siegler ADM-3A keyboard.][4]
-
-`vi` was the only text editor bundled with BSD Unix other than `ed`. At the time, Emacs could cost hundreds of dollars (this was before GNU Emacs), so `vi` became enormously popular. But `vi` was a direct descendant of `ed`, which meant that the source code could not be modified without an AT&T source license. This motivated several people to create open-source versions of `vi`. STEVIE (ST Editor for VI Enthusiasts) appeared in 1987, Elvis appeared in 1990, and `nvi` appeared in 1994. Some of these clones added extra features like syntax highlighting and split windows. Elvis in particular saw many of its features incorporated into Vim, since so many Elvis users pushed for their inclusion.
-
-### Bram Moolenaar Writes Vim
-
-“Vim”, which now abbreviates “Vi Improved”, originally stood for “Vi Imitation.” Like many of the other `vi` clones, Vim began as an attempt to replicate `vi` on a platform where it was not available. Bram Moolenaar, a Dutch software engineer working for a photocopier company in Venlo, the Netherlands, wanted something like `vi` for his brand-new Amiga 2000. Moolenaar had grown used to using `vi` on the Unix systems at his university and it was now “in his fingers.” So in 1988, using the existing STEVIE `vi` clone as a starting point, Moolenaar began work on Vim.
-
-Moolenaar had access to STEVIE because STEVIE had previously appeared on something called a Fred Fish disk. Fred Fish was an American programmer that mailed out a floppy disk every month with a curated selection of the best open-source software available for the Amiga platform. Anyone could request a disk for nothing more than the price of postage. Several versions of STEVIE were released on Fred Fish disks. The version that Moolenaar used had been released on Fred Fish disk 256. (Disappointingly, Fred Fish disks seem to have nothing to do with [Freddi Fish][5].)
-
-Moolenaar liked STEVIE but quickly noticed that there were many `vi` commands missing. So, for the first release of Vim, Moolenaar made `vi` compatibility his priority. Someone else had written a series of `vi` macros that, when run through a properly `vi`-compatible editor, could solve a [randomly generated maze][6]. Moolenaar was able to get these macros working in Vim. In 1991, Vim was released for the first time on Fred Fish disk 591 as “Vi Imitation.” Moolenaar had added some features (including multi-level undo and a “quickfix” mode for compiler errors) that meant that Vim had surpassed `vi`. But Vim would remain “Vi Imitation” until Vim 2.0, released in 1993 via FTP.
-
-Moolenaar, with the occasional help of various internet collaborators, added features to Vim at a steady clip. Vim 2.0 introduced support for the `wrap` option and for horizontal scrolling through long lines of text. Vim 3.0 added support for split windows and buffers, a feature inspired by the `vi` clone `nvi`. Vim also now saved each buffer to a swap file, so that edited text could survive a crash. Vimscript made its first appearance in Vim 5.0, along with support for syntax highlighting. All the while, Vim’s popularity was growing. It was ported to MS-DOS, to Windows, to Mac, and even to Unix, where it competed with the original `vi`.
-
-In 2006, Vim was voted the most popular editor among Linux Journal readers. Today, according to Stack Overflow’s 2018 Developer Survey, Vim is the most popular text-mode (i.e. terminal emulator) editor, used by 25.8% of all software developers (and 40% of Sysadmin/DevOps people). For a while, during the late 1980s and throughout the 1990s, programmers waged the “Editor Wars,” which pitted Emacs users against `vi` (and eventually Vim) users. While Emacs certainly still has a following, some people think that the Editor Wars are over and that Vim won. The 2018 Stack Overflow Developer Survey suggests that this is true; only 4.1% of respondents used Emacs.
-
-How did Vim become so successful? Obviously people like the features that Vim has to offer. But I would argue that the long history behind Vim illustrates that it had more advantages than just its feature set. Vim’s codebase dates back only to 1988, when Moolenaar began working on it. The “wq text editor,” on the other hand—the broader vision of how a Unix-y text editor should work—goes back a half-century. The “wq text editor” had a few different concrete expressions, but thanks in part to the unusual attention paid to backward compatibility by both Bill Joy and Bram Moolenaar, good ideas accumulated gradually over time. The “wq text editor,” in that sense, is one of the longest-running and most successful open-source projects, having enjoyed contributions from some of the greatest minds in the computing world. I don’t think the “startup-company-throws-away all-precedents-and-creates-disruptive-new-software” approach to development is necessarily bad, but Vim is a reminder that the collaborative and incremental approach can also yield wonders.
-
-If you enjoyed this post, more like it come out every two weeks! Follow [@TwoBitHistory][7] on Twitter or subscribe to the [RSS feed][8] to make sure you know when a new post is out.
-
-Previously on TwoBitHistory…
-
-> New post! This time we're taking a look at the Altair 8800, the very first home computer, and how to simulate it on your modern PC.
->
-> — TwoBitHistory (@TwoBitHistory) [July 22, 2018][9]
-
---------------------------------------------------------------------------------
-
-via: https://twobithistory.org/2018/08/05/where-vim-came-from.html
-
-作者：[Two-Bit History][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://twobithistory.org
-[b]: https://github.com/lujun9972
-[1]: https://stackoverflow.blog/wp-content/uploads/2017/05/meme.jpeg
-[2]: https://www.vim.org/
-[3]: https://upload.wikimedia.org/wikipedia/commons/8/8f/Ken_Thompson_%28sitting%29_and_Dennis_Ritchie_at_PDP-11_%282876612463%29.jpg
-[4]: https://vintagecomputer.ca/wp-content/uploads/2015/01/LSI-ADM3A-full-keyboard.jpg
-[5]: https://en.wikipedia.org/wiki/Freddi_Fish
-[6]: https://github.com/isaacs/.vim/tree/master/macros/maze
-[7]: https://twitter.com/TwoBitHistory
-[8]: https://twobithistory.org/feed.xml
-[9]: https://twitter.com/TwoBitHistory/status/1021058552352387074?ref_src=twsrc%5Etfw
diff --git a/sources/talk/20181014 How Lisp Became God-s Own Programming Language.md b/sources/talk/20181014 How Lisp Became God-s Own Programming Language.md
index c02447a637..a1dcf6c2eb 100644
--- a/sources/talk/20181014 How Lisp Became God-s Own Programming Language.md
+++ b/sources/talk/20181014 How Lisp Became God-s Own Programming Language.md
@@ -1,3 +1,5 @@
+Northurland Translating
+
How Lisp Became God's Own Programming Language
======
When programmers discuss the relative merits of different programming languages, they often talk about them in prosaic terms as if they were so many tools in a tool belt—one might be more appropriate for systems programming, another might be more appropriate for gluing together other programs to accomplish some ad hoc task. This is as it should be. Languages have different strengths and claiming that a language is better than other languages without reference to a specific use case only invites an unproductive and vitriolic debate.
diff --git a/sources/talk/20181019 What is an SRE and how does it relate to DevOps.md b/sources/talk/20181019 What is an SRE and how does it relate to DevOps.md
deleted file mode 100644
index 7093b36cd5..0000000000
--- a/sources/talk/20181019 What is an SRE and how does it relate to DevOps.md
+++ /dev/null
@@ -1,71 +0,0 @@
-translating by belitex
-
-What is an SRE and how does it relate to DevOps?
-======
-The SRE role is common in large enterprises, but smaller businesses need it, too.
-
-
-
-Even though the site reliability engineer (SRE) role has become prevalent in recent years, many people—even in the software industry—don't know what it is or does. This article aims to clear that up by explaining what an SRE is, how it relates to DevOps, and how an SRE works when your entire engineering organization can fit in a coffee shop.
-
-### What is site reliability engineering?
-
-[Site Reliability Engineering: How Google Runs Production Systems][1], written by a group of Google engineers, is considered the definitive book on site reliability engineering. Google vice president of engineering Ben Treynor Sloss [coined the term][2] back in the early 2000s. He defined it as: "It's what happens when you ask a software engineer to design an operations function."
-
-Sysadmins have been writing code for a long time, but for many of those years, a team of sysadmins managed many machines manually. Back then, "many" may have been dozens or hundreds, but when you scale to thousands or hundreds of thousands of hosts, you simply can't continue to throw people at the problem. When the number of machines gets that large, the obvious solution is to use code to manage hosts (and the software that runs on them).
-
-Also, until fairly recently, the operations team was completely separate from the developers. The skillsets for each job were considered completely different. The SRE role tries to bring both jobs together.
-
-Before we dig deeper into what makes an SRE and how SREs work with the development team, we need to understand how site reliability engineering works within the DevOps paradigm.
-
-### Site reliability engineering and DevOps
-
-At its core, site reliability engineering is an implementation of the DevOps paradigm. There seems to be a wide array of ways to [define DevOps][3]. The traditional model, where the development ("devs") and operations ("ops") teams were separated, led to the team that writes the code not being responsible for how it works when customers start using it. The development team would "throw the code over the wall" to the operations team to install and support.
-
-This situation can lead to a significant amount of dysfunction. The goals of the dev and ops teams are constantly at odds—a developer wants customers to use the "latest and greatest" piece of code, but the operations team wants a steady system with as little change as possible. Their premise is that any change can introduce instability, while a system with no changes should continue to behave in the same manner. (Noting that minimizing change on the software side is not the only factor in preventing instability is important. For example, if your web application stays exactly the same, but the number of customers grows by 10x, your application may break in many different ways.)
-
-The premise of DevOps is that by merging these two distinct jobs into one, you eliminate contention. If the "dev" wants to deploy new code all the time, they have to deal with any fallout the new code creates. As Amazon's [Werner Vogels said][4], "you build it, you run it" (in production). But developers already have a lot to worry about. They are continually pushed to develop new features for their employer's products. Asking them to understand the infrastructure, including how to deploy, configure, and monitor their service, may be asking a little too much from them. This is where an SRE steps in.
-
-When a web application is developed, there are often many people that contribute. There are user interface designers, graphic designers, frontend engineers, backend engineers, and a whole host of other specialties (depending on the technologies used). Requirements include how the code gets managed (e.g., deployed, configured, monitored)—which are the SRE's areas of specialty. But, just as an engineer developing a nice look and feel for an application benefits from knowledge of the backend-engineer's job (e.g., how data is fetched from a database), the SRE understands how the deployment system works and how to adapt it to the specific needs of that particular codebase or project.
-
-So, an SRE is not just "an ops person who codes." Rather, the SRE is another member of the development team with a different set of skills particularly around deployment, configuration management, monitoring, metrics, etc. But, just as an engineer developing a nice look and feel for an application must know how data is fetched from a data store, an SRE is not singly responsible for these areas. The entire team works together to deliver a product that can be easily updated, managed, and monitored.
-
-The need for an SRE naturally comes about when a team is implementing DevOps but realizes they are asking too much of the developers and need a specialist for what the ops team used to handle.
-
-### How the SRE works at a startup
-
-This is great when there are hundreds of employees (let alone when you are the size of Google or Facebook). Large companies have SRE teams that are split up and embedded into each development team. But a startup doesn't have those economies of scale, and engineers often wear many hats. So, where does the "SRE hat" sit in a small company? One approach is to fully adopt DevOps and have the developers be responsible for the typical tasks an SRE would perform at a larger company. On the other side of the spectrum, you hire specialists — a.k.a., SREs.
-
-The most obvious advantage of trying to put the SRE hat on a developer's head is it scales well as your team grows. Also, the developer will understand all the quirks of the application. But many startups use a wide variety of SaaS products to power their infrastructure. The most obvious is the infrastructure platform itself. Then you add in metrics systems, site monitoring, log analysis, containers, and more. While these technologies solve some problems, they create an additional complexity cost. The developer would need to understand all those technologies and services in addition to the core technologies (e.g., languages) the application uses. In the end, keeping on top of all of that technology can be overwhelming.
-
-The other option is to hire a specialist to handle the SRE job. Their responsibility would be to focus on deployment, configuration, monitoring, and metrics, freeing up the developer's time to write the application. The disadvantage is that the SRE would have to split their time between multiple, different applications (i.e., the SRE needs to support the breadth of applications throughout engineering). This likely means they may not have the time to gain any depth of knowledge of any of the applications; however, they would be in a position to see how all the different pieces fit together. This "30,000-foot view" can help prioritize the weak spots to fix in the system as a whole.
-
-There is one key piece of information I am ignoring: your other engineers. They may have a deep desire to understand how deployment works and how to use the metrics system to the best of their ability. Also, hiring an SRE is not an easy task. You are looking for a mix of sysadmin skills and software engineering skills. (I am specific about software engineers, vs. just "being able to code," because software engineering involves more than just writing code [e.g., writing good tests or documentation].)
-
-Therefore, in some cases, it may make more sense for the "SRE hat" to live on a developer's head. If so, keep an eye on the amount of complexity in both the code and the infrastructure (SaaS or internal). At some point, the complexity on either end will likely push toward more specialization.
-
-### Conclusion
-
-An SRE team is one of the most efficient ways to implement the DevOps paradigm in a startup. I have seen a couple of different approaches, but I believe that hiring a dedicated SRE (pretty early) at your startup will free up time for the developers to focus on their specific challenges. The SRE can focus on improving the tools (and processes) that make the developers more productive. Also, an SRE will focus on making sure your customers have a product that is reliable and secure.
-
-Craig Sebenik will present [SRE (and DevOps) at a Startup][5] at [LISA18][6], October 29-31 in Nashville, Tennessee.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/10/sre-startup
-
-作者：[Craig Sebenik][a]
-选题：[lujun9972][b]
-译者：[译者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/craig5
-[b]: https://github.com/lujun9972
-[1]: http://shop.oreilly.com/product/0636920041528.do
-[2]: https://landing.google.com/sre/interview/ben-treynor.html
-[3]: https://opensource.com/resources/devops
-[4]: https://queue.acm.org/detail.cfm?id=1142065
-[5]: https://www.usenix.org/conference/lisa18/presentation/sebenik
-[6]: https://www.usenix.org/conference/lisa18
diff --git a/sources/talk/20181025 What breaks our systems- A taxonomy of black swans.md b/sources/talk/20181025 What breaks our systems- A taxonomy of black swans.md
new file mode 100644
index 0000000000..376809b08b
--- /dev/null
+++ b/sources/talk/20181025 What breaks our systems- A taxonomy of black swans.md
@@ -0,0 +1,134 @@
+translating by belitex
+
+What breaks our systems: A taxonomy of black swans
+======
+
+Find and fix outlier events that create issues before they trigger severe production problems.
+
+
+
+Black swans are a metaphor for outlier events that are severe in impact (like the 2008 financial crash). In production systems, these are the incidents that trigger problems that you didn't know you had, cause major visible impact, and can't be fixed quickly and easily by a rollback or some other standard response from your on-call playbook. They are the events you tell new engineers about years after the fact.
+
+Black swans, by definition, can't be predicted, but sometimes there are patterns we can find and use to create defenses against categories of related problems.
+
+For example, a large proportion of failures are a direct result of changes (code, environment, or configuration). Each bug triggered in this way is distinctive and unpredictable, but the common practice of canarying all changes is somewhat effective against this class of problems, and automated rollbacks have become a standard mitigation.
+
+As our profession continues to mature, other kinds of problems are becoming well-understood classes of hazards with generalized prevention strategies.
+
+### Black swans observed in the wild
+
+All technology organizations have production problems, but not all of them share their analyses. The organizations that publicly discuss incidents are doing us all a service. The following incidents describe one class of a problem and are by no means isolated instances. We all have black swans lurking in our systems; it's just some of us don't know it yet.
+
+#### Hitting limits
+
+Running headlong into any sort of limit can produce very severe incidents. A canonical example of this was [Instapaper's outage in February 2017][1] . I challenge any engineer who has carried a pager to read the outage report without a chill running up their spine. Instapaper's production database was on a filesystem that, unknown to the team running the service, had a 2TB limit. With no warning, it stopped accepting writes. Full recovery took days and required migrating its database.
+
+Limits can strike in various ways. Sentry hit [limits on maximum transaction IDs in Postgres][2] . Platform.sh hit [size limits on a pipe buffer][3] . SparkPost [triggered AWS's DDoS protection][4] . Foursquare hit a performance cliff when one of its [datastores ran out of RAM][5]
+
+One way to get advance knowledge of system limits is to test periodically. Good load testing (on a production replica) ought to involve write transactions and should involve growing each datastore beyond its current production size. It's easy to forget to test things that aren't your main datastores (such as Zookeeper). If you hit limits during testing, you have time to fix the problems. Given that resolution of limits-related issues can involve major changes (like splitting a datastore), time is invaluable.
+
+When it comes to cloud services, if your service generates unusual loads or uses less widely used products or features (such as older or newer ones), you may be more at risk of hitting limits. It's worth load testing these, too. But warn your cloud provider first.
+
+Finally, where limits are known, add monitoring (with associated documentation) so you will know when your systems are approaching those ceilings. Don't rely on people still being around to remember.
+
+#### Spreading slowness
+
+> "The world is much more correlated than we give credit to. And so we see more of what Nassim Taleb calls 'black swan events'—rare events happen more often than they should because the world is more correlated."
+> —[Richard Thaler][6]
+
+HostedGraphite's postmortem on how an [AWS outage took down its load balancers][7] (which are not hosted on AWS) is a good example of just how much correlation exists in distributed computing systems. In this case, the load-balancer connection pools were saturated by slow connections from customers that were hosted in AWS. The same kinds of saturation can happen with application threads, locks, and database connections—any kind of resource monopolized by slow operations.
+
+HostedGraphite's incident is an example of externally imposed slowness, but often slowness can result from saturation somewhere in your own system creating a cascade and causing other parts of your system to slow down. An [incident at Spotify][8] demonstrates such spread—the streaming service's frontends became unhealthy due to saturation in a different microservice. Enforcing deadlines for all requests, as well as limiting the length of request queues, can prevent such spread. Your service will serve at least some traffic, and recovery will be easier because fewer parts of your system will be broken.
+
+Retries should be limited with exponential backoff and some jitter. An outage at Square, in which its [Redis datastore became overloaded][9] due to a piece of code that retried failed transactions up to 500 times with no backoff, demonstrates the potential severity of excessive retries. The [Circuit Breaker][10] design pattern can be helpful here, too.
+
+Dashboards should be designed to clearly show [utilization, saturation, and errors][11] for all resources so problems can be found quickly.
+
+#### Thundering herds
+
+Often, failure scenarios arise when a system is under unusually heavy load. This can arise organically from users, but often it arises from systems. A surge of cron jobs that starts at midnight is a venerable example. Mobile clients can also be a source of coordinated demand if they are programmed to fetch updates at the same time (of course, it is much better to jitter such requests).
+
+Events occurring at pre-configured times aren't the only source of thundering herds. Slack experienced [multiple outages][12] over a short time due to large numbers of clients being disconnected and immediately reconnecting, causing large spikes of load. CircleCI saw a [severe outage][13] when a GitLab outage ended, leading to a surge of builds queued in its database, which became saturated and very slow.
+
+Almost any service can be the target of a thundering herd. Planning for such eventualities—and testing that your plan works as intended—is therefore a must. Client backoff and [load shedding][14] are often core to such approaches.
+
+If your systems must constantly ingest data that can't be dropped, it's key to have a scalable way to buffer this data in a queue for later processing.
+
+#### Automation systems are complex systems
+
+> "Complex systems are intrinsically hazardous systems."
+> —[Richard Cook, MD][15]
+
+If your systems must constantly ingest data that can't be dropped, it's key to have a scalable way to buffer this data in a queue for later processing.
+
+The trend for the past several years has been strongly towards more automation of software operations. Automation of anything that can reduce your system's capacity (e.g., erasing disks, decommissioning devices, taking down serving jobs) needs to be done with care. Accidents (due to bugs or incorrect invocations) with this kind of automation can take down your system very efficiently, potentially in ways that are hard to recover from.
+
+The trend for the past several years has been strongly towards more automation of software operations. Automation of anything that can reduce your system's capacity (e.g., erasing disks, decommissioning devices, taking down serving jobs) needs to be done with care. Accidents (due to bugs or incorrect invocations) with this kind of automation can take down your system very efficiently, potentially in ways that are hard to recover from.
+
+Christina Schulman and Etienne Perot of Google describe some examples in their talk [Help Protect Your Data Centers with Safety Constraints][16]. One incident sent Google's entire in-house content delivery network (CDN) to disk-erase.
+
+Schulman and Perot suggest using a central service to manage constraints, which limits the pace at which destructive automation can operate, and being aware of system conditions (for example, avoiding destructive operations if the service has recently had an alert).
+
+Automation systems can also cause havoc when they interact with operators (or with other automated systems). [Reddit][17] experienced a major outage when its automation restarted a system that operators had stopped for maintenance. Once you have multiple automation systems, their potential interactions become extremely complex and impossible to predict.
+
+It will help to deal with the inevitable surprises if all this automation writes logs to an easily searchable, central place. Automation systems should always have a mechanism to allow them to be quickly turned off (fully or only for a subset of operations or targets).
+
+### Defense against the dark swans
+
+These are not the only black swans that might be waiting to strike your systems. There are many other kinds of severe problem that can be avoided using techniques such as canarying, load testing, chaos engineering, disaster testing, and fuzz testing—and of course designing for redundancy and resiliency. Even with all that, at some point your system will fail.
+
+To ensure your organization can respond effectively, make sure your key technical staff and your leadership have a way to coordinate during an outage. For example, one unpleasant issue you might have to deal with is a complete outage of your network. It's important to have a fail-safe communications channel completely independent of your own infrastructure and its dependencies. For instance, if you run on AWS, using a service that also runs on AWS as your fail-safe communication method is not a good idea. A phone bridge or an IRC server that runs somewhere separate from your main systems is good. Make sure everyone knows what the communications platform is and practices using it.
+
+Another principle is to ensure that your monitoring and your operational tools rely on your production systems as little as possible. Separate your control and your data planes so you can make changes even when systems are not healthy. Don't use a single message queue for both data processing and config changes or monitoring, for example—use separate instances. In [SparkPost: The Day the DNS Died][4], Jeremy Blosser presents an example where critical tools relied on the production DNS setup, which failed.
+
+### The psychology of battling the black swan
+
+To ensure your organization can respond effectively, make sure your key technical staff and your leadership have a way to coordinate during an outage.
+
+Dealing with major incidents in production can be stressful. It really helps to have a structured incident-management process in place for these situations. Many technology organizations (
+
+Dealing with major incidents in production can be stressful. It really helps to have a structured incident-management process in place for these situations. Many technology organizations ( [including Google][18] ) successfully use a version of FEMA's Incident Command System. There should be a clear way for any on-call individual to call for assistance in the event of a major problem they can't resolve alone.
+
+For long-running incidents, it's important to make sure people don't work for unreasonable lengths of time and get breaks to eat and sleep (uninterrupted by a pager). It's easy for exhausted engineers to make a mistake or overlook something that might resolve the incident faster.
+
+### Learn more
+
+There are many other things that could be said about black (or formerly black) swans and strategies for dealing with them. If you'd like to learn more, I highly recommend these two books dealing with resilience and stability in production: Susan Fowler's [Production-Ready Microservices][19] and Michael T. Nygard's [Release It!][20].
+
+Laura Nolan will present [What Breaks Our Systems: A Taxonomy of Black Swans][21] at [LISA18][22], October 29-31 in Nashville, Tennessee, USA.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/taxonomy-black-swans
+
+作者：[Laura Nolan][a]
+选题：[lujun9972][b]
+译者：[译者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/lauranolan
+[b]: https://github.com/lujun9972
+[1]: https://medium.com/making-instapaper/instapaper-outage-cause-recovery-3c32a7e9cc5f
+[2]: https://blog.sentry.io/2015/07/23/transaction-id-wraparound-in-postgres.html
+[3]: https://medium.com/@florian_7764/technical-post-mortem-of-the-august-incident-82ab4c3d6547
+[4]: https://www.usenix.org/conference/srecon18americas/presentation/blosser
+[5]: https://groups.google.com/forum/#!topic/mongodb-user/UoqU8ofp134
+[6]: https://en.wikipedia.org/wiki/Richard_Thaler
+[7]: https://blog.hostedgraphite.com/2018/03/01/spooky-action-at-a-distance-how-an-aws-outage-ate-our-load-balancer/
+[8]: https://labs.spotify.com/2013/06/04/incident-management-at-spotify/
+[9]: https://medium.com/square-corner-blog/incident-summary-2017-03-16-2f65be39297
+[10]: https://en.wikipedia.org/wiki/Circuit_breaker_design_pattern
+[11]: http://www.brendangregg.com/usemethod.html
+[12]: https://slackhq.com/this-was-not-normal-really
+[13]: https://circleci.statuspage.io/incidents/hr0mm9xmm3x6
+[14]: https://www.youtube.com/watch?v=XNEIkivvaV4
+[15]: https://web.mit.edu/2.75/resources/random/How%20Complex%20Systems%20Fail.pdf
+[16]: https://www.usenix.org/conference/srecon18americas/presentation/schulman
+[17]: https://www.reddit.com/r/announcements/comments/4y0m56/why_reddit_was_down_on_aug_11/
+[18]: https://landing.google.com/sre/book/chapters/managing-incidents.html
+[19]: http://shop.oreilly.com/product/0636920053675.do
+[20]: https://www.oreilly.com/library/view/release-it/9781680500264/
+[21]: https://www.usenix.org/conference/lisa18/presentation/nolan
+[22]: https://www.usenix.org/conference/lisa18
diff --git a/sources/talk/20181026 Directing traffic- Demystifying internet-scale load balancing.md b/sources/talk/20181026 Directing traffic- Demystifying internet-scale load balancing.md
new file mode 100644
index 0000000000..6ebcba69e3
--- /dev/null
+++ b/sources/talk/20181026 Directing traffic- Demystifying internet-scale load balancing.md
@@ -0,0 +1,108 @@
+Directing traffic: Demystifying internet-scale load balancing
+======
+Common techniques used to balance network traffic come with advantages and trade-offs.
+
+Large, multi-site, internet-facing systems, including content-delivery networks (CDNs) and cloud providers, have several options for balancing traffic coming onto their networks. In this article, we'll describe common traffic-balancing designs, including techniques and trade-offs.
+
+If you were an early cloud computing provider, you could take a single customer web server, assign it an IP address, configure a domain name system (DNS) record to associate it with a human-readable name, and advertise the IP address via the border gateway protocol (BGP), the standard way of exchanging routing information between networks.
+
+It wasn't load balancing per se, but there probably was load distribution across redundant network paths and networking technologies to increase availability by routing around unavailable infrastructure (giving rise to phenomena like [asymmetric routing][1]).
+
+### Doing simple DNS load balancing
+
+As traffic to your customer's service grows, the business' owners want higher availability. You add a second web server with its own publicly accessible IP address and update the DNS record to direct users to both web servers (hopefully somewhat evenly). This is OK for a while until one web server unexpectedly goes offline. Assuming you detect the failure quickly, you can update the DNS configuration (either manually or with software) to stop referencing the broken server.
+
+Unfortunately, because DNS records are cached, around 50% of requests to the service will likely fail until the record expires from the client caches and those of other nameservers in the DNS hierarchy. DNS records generally have a time to live (TTL) of several minutes or more, so this can create a significant impact on your system's availability.
+
+Worse, some proportion of clients ignore TTL entirely, so some requests will be directed to your offline web server for some time. Setting very short DNS TTLs is not a great idea either; it means higher load on DNS services plus increased latency because clients will have to perform DNS lookups more often. If your DNS service is unavailable for any reason, access to your service will degrade more quickly with a shorter TTL because fewer clients will have your service's IP address cached.
+
+### Adding network load balancing
+
+To work around this problem, you can add a redundant pair of [Layer 4][2] (L4) network load balancers that serve the same virtual IP (VIP) address. They could be hardware appliances or software balancers like [HAProxy][3]. This means the DNS record points only at the VIP and no longer does load balancing.
+
+![Layer 4 load balancers balance connections across webservers.][5]
+
+Layer 4 load balancers balance connections from users across two webservers.
+
+The L4 balancers load-balance traffic from the internet to the backend servers. This is generally done based on a hash (a mathematical function) of each IP packet's 5-tuple: the source and destination IP address and port plus the protocol (such as TCP or UDP). This is fast and efficient (and still maintains essential properties of TCP) and doesn't require the balancers to maintain state per connection. (For more information, [Google's paper on Maglev][6] discusses implementation of a software L4 balancer in significant detail.)
+
+The L4 balancers can do health-checking and send traffic only to web servers that pass checks. Unlike in DNS balancing, there is minimal delay in redirecting traffic to another web server if one crashes, although existing connections will be reset.
+
+L4 balancers can do weighted balancing, dealing with backends with varying capacity. L4 balancing gives significant power and flexibility to operators while being relatively inexpensive in terms of computing power.
+
+### Going multi-site
+
+The system continues to grow. Your customers want to stay up even if your data center goes down. You build a new data center with its own set of service backends and another cluster of L4 balancers, which serve the same VIP as before. The DNS setup doesn't change.
+
+The edge routers in both sites advertise address space, including the service VIP. Requests sent to that VIP can reach either site, depending on how each network between the end user and the system is connected and how their routing policies are configured. This is known as anycast. Most of the time, this works fine. If one site isn't operating, you can stop advertising the VIP for the service via BGP, and traffic will quickly move to the alternative site.
+
+![Serving from multiple sites using anycast][8]
+
+Serving from multiple sites using anycast.
+
+This setup has several problems. Its worst failing is that you can't control where traffic flows or limit how much traffic is sent to a given site. You also don't have an explicit way to route users to the nearest site (in terms of network latency), but the network protocols and configurations that determine the routes should, in most cases, route requests to the nearest site.
+
+### Controlling inbound requests in a multi-site system
+
+To maintain stability, you need to be able to control how much traffic is served to each site. You can get that control by assigning a different VIP to each site and use DNS to balance them using simple or weighted [round-robin][9].
+
+![Serving from multiple sites using a primary VIP][11]
+
+Serving from multiple sites using a primary VIP per site, backed up by secondary sites, with geo-aware DNS.
+
+You now have two new problems.
+
+First, using DNS balancing means you have cached records, which is not good if you need to redirect traffic quickly.
+
+Second, whenever users do a fresh DNS lookup, a VIP connects them to the service at an arbitrary site, which may not be the closest site to them. If your service runs on widely separated sites, individual users will experience wide variations in your system's responsiveness, depending upon the network latency between them and the instance of your service they are using.
+
+You can solve the first problem by having each site constantly advertise and serve the VIPs for all the other sites (and consequently the VIP for any faulty site). Networking tricks (such as advertising less-specific routes from the backups) can ensure that VIP's primary site is preferred, as long as it is available. This is done via BGP, so we should see traffic move within a minute or two of updating BGP.
+
+There isn't an elegant solution to the problem of serving users from sites other than the nearest healthy site with capacity. Many large internet-facing services use DNS services that attempt to return different results to users in different locations, with some degree of success. This approach is always somewhat [complex and error-prone][12], given that internet-addressing schemes are not organized geographically, blocks of addresses can change locations (e.g., when a company reorganizes its network), and many end users can be served from a single caching nameserver.
+
+### Adding Layer 7 load balancing
+
+Over time, your customers begin to ask for more advanced features.
+
+While L4 load balancers can efficiently distribute load among multiple web servers, they operate only on source and destination IP addresses, protocol, and ports. They don't know anything about the content of a request, so you can't implement many advanced features in an L4 balancer. Layer 7 (L7) load balancers are aware of the structure and contents of requests and can do far more.
+
+Some things that can be implemented in L7 load balancers are caching, rate limiting, fault injection, and cost-aware load balancing (some requests require much more server time to process).
+
+They can also balance based on a request's attributes (e.g., HTTP cookies), terminate SSL connections, and help defend against application layer denial-of-service (DoS) attacks. The downside of L7 balancers at scale is cost—they do more computation to process requests, and each active request consumes some system resources. Running L4 balancers in front of one or more pools of L7 balancers can help with scaling.
+
+### Conclusion
+
+Load balancing is a difficult and complex problem. In addition to the strategies described in this article, there are different [load-balancing algorithms][13], high-availability techniques used to implement load balancers, client load-balancing techniques, and the recent rise of service meshes.
+
+Core load-balancing patterns have evolved alongside the growth of cloud computing, and they will continue to improve as large web services work to improve the control and flexibility that load-balancing techniques offer./p>
+
+Laura Nolan and Murali Suriar will present [Keeping the Balance: Load Balancing Demystified][14] at [LISA18][15], October 29-31 in Nashville, Tennessee, USA.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/internet-scale-load-balancing
+
+作者：[Laura Nolan][a]
+选题：[lujun9972][b]
+译者：[译者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/lauranolan
+[b]: https://github.com/lujun9972
+[1]: https://www.noction.com/blog/bgp-and-asymmetric-routing
+[2]: https://en.wikipedia.org/wiki/Transport_layer
+[3]: https://www.haproxy.com/blog/failover-and-worst-case-management-with-haproxy/
+[4]: /file/412596
+[5]: https://opensource.com/sites/default/files/uploads/loadbalancing1_l4-network-loadbalancing.png (Layer 4 load balancers balance connections across webservers.)
+[6]: https://ai.google/research/pubs/pub44824
+[7]: /file/412601
+[8]: https://opensource.com/sites/default/files/uploads/loadbalancing2_going-multisite.png (Serving from multiple sites using anycast)
+[9]: https://en.wikipedia.org/wiki/Round-robin_scheduling
+[10]: /file/412606
+[11]: https://opensource.com/sites/default/files/uploads/loadbalancing3_controlling-inbound-requests.png (Serving from multiple sites using a primary VIP)
+[12]: https://landing.google.com/sre/book/chapters/load-balancing-frontend.html
+[13]: https://medium.com/netflix-techblog/netflix-edge-load-balancing-695308b5548c
+[14]: https://www.usenix.org/conference/lisa18/presentation/suriar
+[15]: https://www.usenix.org/conference/lisa18
diff --git a/sources/talk/20181031 3 scary sysadmin stories.md b/sources/talk/20181031 3 scary sysadmin stories.md
new file mode 100644
index 0000000000..6810012f57
--- /dev/null
+++ b/sources/talk/20181031 3 scary sysadmin stories.md
@@ -0,0 +1,124 @@
+3 scary sysadmin stories
+======
+
+Terrifying ghosts are hanging around every data center, just waiting to haunt the unsuspecting sysadmin.
+
+
+
+> "It's all just a bunch of hocus pocus!" — Max in [Hocus Pocus][1]
+
+Over my many years as a system administrator, I've heard many horror stories about the different ghosts that have haunted new admins due to their inexperience.
+
+Here are three of the stories that stand out to me the most in helping build my character as a good sysadmin.
+
+### The ghost of the failed restore
+
+In a well-known data center (whose name I do not want to remember), one cold October night we had a production outage in which thousands of web servers stopped responding due to downtime in the main database. The database administrator asked me, the rookie sysadmin, to recover the database's last full backup and restore it to bring the service back online.
+
+But, at the end of the process, the database was still broken. I didn't worry, because there were other full backup files in stock. However, even after doing the process several times, the result didn't change.
+
+With great fear, I asked the senior sysadmin what to do to fix this behavior.
+
+"You remember when I showed you, a few days ago, how the full backup script was running? Something about how important it was to validate the backup?" responded the sysadmin.
+
+"Of course! You told me that I had to stay a couple of extra hours to perform that task," I answered.
+
+"Exactly! But you preferred to leave early without finishing that task," he said.
+
+"Oh my! I thought it was optional!" I exclaimed.
+
+"It was, it was…"
+
+**Moral of the story:** Even with the best solution that promises to make the most thorough backups, the ghost of the failed restoration can appear, darkening our job skills, if we don't make a habit of validating the backup every time.
+
+### The dark window
+
+Once upon a night watch, reflecting I was, lonely and tired,
+Looking at the file window on my screen.
+Clicking randomly, nearly napping, suddenly came a beeping
+From some server, sounding gently, sounding on my pager.
+"It's just a warning," I muttered, "sounding on my pager—
+Only this and nothing more."
+Soon again I heard a beeping somewhat louder than before.
+Opening my pager with great disdain,
+There was the message from a server of the saintly days of yore:
+"The legacy application, it's down, doesn't respond," and nothing more.
+There were many stories of this server,
+Incredibly, almost terrified,
+I went down to the data center to review it.
+I sat engaged in guessing, what would be the console to restart it
+Without keyboard, mouse, or monitor?
+"The task level up"—I think—"only this and nothing more."
+Then, thinking, "In another rack, I saw a similar server,
+I'll take its monitor and keyboard, nothing bad."
+Suddenly, this server shut down, and my pager beeped again:
+"The legacy application, it's down, doesn't respond", and nothing more.
+Bemused, I sat down to call my sysadmin mentor:
+"I wanted to use the console of another server, and now both are out."
+"Did you follow my advice? Don't use the graphics console, the terminal is better."
+Of course, I remember, it was last December;
+I felt fear, a horror that I had never felt before;
+"It is a tool of the past and nothing more."
+With great shame I understood my mistake:
+"Master," I said, "truly, your forgiveness I implore;
+but the fact is I thought it was not used anymore.
+A dark window and nothing more."
+"Learn it well, little kid," he spoke.
+"In the terminal you can trust, it's your friend and much, much more."
+Step by step, my master showed me to connect with the terminal,
+And restarting each one
+With infinite patience, he taught me
+That from that dark window I should not separate
+Never, nevermore.
+
+**Moral of the story:** Fluency in the command-line terminal is a skill often abandoned and considered archaic by newer generations, but it improves your flexibility and productivity as a sysadmin in obvious and subtle ways.
+
+### Troll bridge
+
+I'd been a sysadmin for three or four years when one of my old mentors was removed from work. The older man was known for making fun of the new guys in the group—the ones who brought from the university the desire to improve processes with the newly released community operating system. My manager assigned me the older man's office, a small space under the access stairs to the data center—"Troll Bridge," they called it—and the few legacy servers he still managed.
+
+While reviewing those legacy servers, I realized most of them had many scripts that did practically all the work. I just had to check that they did not go offline due to an electrical failure. I started using those methods, adapting them so my own servers would work the same way, making my tasks more efficient and, at the same time, requiring less of my time to complete them. My day soon became surfing the internet, watching funny videos, and even participating in internet forums.
+
+A couple of years went by, and I maintained my work in the same way. When a new server arrived, I automated its tasks so I could free myself and continue with my usual participation in internet forums. One day, when I shared one of my scripts in the internet forum, a new admin told me I could simplify it using one novelty language, a new trend that was becoming popular among the new folks.
+
+"I am a sysadmin, not a programmer," I answered. "They will never be the same."
+
+From that day on, I dedicated myself to ridiculing the kids who told me I should program in the new languages.
+
+"You do not know, newbie," I answered every time, "this job will never change."
+
+A few years later, my responsibilities increased, and my manager wanted me to modify the code of the applications hosted on my server.
+
+"That's what the job is about now," said my manager. "Development and operations are joining; if you're not willing to do it, we'll bring in some guy who does."
+
+"I will never do it, it's not my role," I said.
+
+"Well then…" he said, looking at me harshly.
+
+I've been here ever since. Hiding. Waiting. Under my bridge.
+
+I watch from the shadows as the people pass: up the stairs, muttering, or talking about the things the new applications do. Sometimes people pause beneath my bridge, to talk, or share code, or make plans. And I watch them, but they don't see me.
+
+I'm just going to stay here, in the darkness under the bridge. I can hear you all out there, everything you say.
+
+Oh yes, I can hear you.
+But I'm not coming out.
+
+**Moral of the story:** "The lazy sysadmin is the best sysadmin" is a well-known phrase that means if we are proactive enough to automate all our processes properly, we will have a lot of free time. The best sysadmins never seem to be very busy; they prefer to be relaxed and let the system do the work for them. "Work smarter not harder." However, if we don't use this free time productively, we can fall into obsoleteness and become something we do not want. The best sysadmins reinvent themselves constantly; they are always researching and learning.
+
+Following these stories' morals—and continually learning from my mistakes—helped me improve my management skills and create the good habits necessary for the sysadmin job.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/3-scary-sysadmin-stories
+
+作者：[Alex Callejas][a]
+选题：[lujun9972][b]
+译者：[译者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/darkaxl
+[b]: https://github.com/lujun9972
+[1]: https://en.wikipedia.org/wiki/Hocus_Pocus_(1993_film)
diff --git a/sources/talk/20181031 How open source hardware increases security.md b/sources/talk/20181031 How open source hardware increases security.md
new file mode 100644
index 0000000000..9e823436cf
--- /dev/null
+++ b/sources/talk/20181031 How open source hardware increases security.md
@@ -0,0 +1,84 @@
+How open source hardware increases security
+======
+Want to boost cybersecurity at your organization? Switch to open source hardware.
+
+
+Hardware hacks are particularly scary because they trump any software security safeguards—for example, they can render all accounts on a server password-less.
+
+Fortunately, we can benefit from what the software industry has learned from decades of fighting prolific software hackers: Using open source techniques can, perhaps counterintuitively, [make a system more secure][1]. Open source hardware and distributed manufacturing can provide protection from future attacks.
+
+### Trust—but verify
+
+Imagine you are a 007 agent holding classified documents. Would you feel more secure locking them in a safe whose manufacturer keeps the workings of the locks secret, or in a safe whose design is published openly so that everyone (including thieves) can judge its quality—thus enabling you to rely exclusively on technical complexity for protection?
+
+The former approach might be perfectly secure—you simply don’t know. But why would you trust any manufacturer that could be compromised now or in the future? In contrast, the open system is almost certain to be secure, especially if enough time has passed for it to be tested by multiple companies, governments, and individuals.
+
+To a large degree, the software world has seen the benefits of moving to free and open source software. That's why open source is run on all [supercomputers][2], [90% of the cloud, 82% of the smartphone market, and 62% of the embedded systems market][3]. Open source appears poised to dominate the future, with over [70% of the IoT][4].
+
+In fact, security is one of the core benefits of [open source][5]. While open source is not inherently more secure, it allows you to verify security yourself (or pay someone more qualified to do so). With closed source programs, you must trust, without verification, that a program works properly. To quote President Reagan: "Trust—but verify." The bottom line is that open source allows users to make more informed choices about the security of a system—choices that are based on their own independent judgment.
+
+### Open source hardware
+
+This concept also holds true for electronic devices. Most electronics customers have no idea what is in their products, and even technically sophisticated companies like Amazon may not know exactly what is in the hardware that runs their servers because they use proprietary products that are made by other companies.
+
+In the incident mentioned above, Chinese spies recently used a tiny microchip, not much bigger than a grain of rice, to infiltrate hardware made by SuperMicro (the Microsoft of the hardware world). These chips enabled outside infiltrators to access the core server functions of some of America’s leading companies and government operations, including DOD data centers, CIA drone operations, and the onboard networks of Navy warships. Operatives from the People’s Liberation Army or similar groups could have reverse-engineered or made identical or disguised modules (in this case, the chips looked like signal-conditioning couplers, a common motherboard component, rather than the spy devices they were).
+
+Having the source available helps customers much more than hackers, as most customers do not have the resources to reverse-engineer the electronics they buy. Without the device's source, or design, it's difficult to determine whether or not hardware has been hacked.
+
+Enter [open source hardware][6]: hardware design that is publicly available so that anyone can study, modify, test, distribute, make, or sell it, or hardware based on it. The hardware’s source is available to everyone.
+
+### Distributed manufacturing for cybersecurity
+
+Open source hardware and distributed manufacturing could have prevented the Chinese hack that rightfully terrified the security world. Organizations that require tight security, such as military groups, could then check the product's code and bring production in-house if necessary.
+
+This open source future may not be far off. Recently I co-authored, with Shane Oberloier, an [article][7] that discusses a low-cost open source benchtop device that enables anyone to make a wide range of open source electronic products. The number of open source electronics designs is proliferating on websites like [Hackaday][8], [Open Electronics][9], and the [Open Circuit Institute][10], as are communities based on specific products like [Arduino][11] and around companies like [Adafruit Industries][12] and [SparkFun Electronics][13].
+
+Every level of manufacturing that users can do themselves increases the security of the device. Not long ago, you had to be an expert to make even a simple breadboard design. Now, with open source mills for boards and electronics repositories, small companies and even individuals can make reasonably sophisticated electronic devices. While most builders are still using black-box chips on their devices, this is also changing as [open source chips gain traction][14].
+
+
+
+Creating electronics that are open source all the way down to the chip is certainly possible—and the more besieged we are by hardware hacks, perhaps it is even inevitable. Companies, governments, and other organizations that care about cybersecurity should strongly consider moving toward open source—perhaps first by establishing purchasing policies for software and hardware that makes the code accessible so they can test for security weaknesses.
+
+Although every customer and every manufacturer of an open source hardware product will have different standards of quality and security, this does not necessarily mean weaker security. Customers should choose whatever version of an open source product best meets their needs, just as users can choose their flavor of Linux. For example, do you run [Fedora][15] for free, or do you, like [90% of Fortune Global 500 companies][16], pay Red Hat for its version and support?
+
+Red Hat makes billions of dollars a year for the service it provides, on top of a product that can ostensibly be downloaded for free. Open source hardware can follow the [same business model][17]; it is just a less mature field, lagging [open source software by about 15 years][18].
+
+The core source code for hardware devices would be controlled by their manufacturer, following the "[benevolent dictator for life][19]" model. Code of any kind (infected or not) is screened before it becomes part of the root. This is true for hardware, too. For example, Aleph Objects manufacturers the popular [open source LulzBot brand of 3D printer][20], a commercial 3D printer that's essentially designed to be hacked. Users have made [dozens of modifications][21] (mods) to the printer, and while they are available, Aleph uses only the ones that meet its QC standards in each subsequent version of the printer. Sure, downloading a mod could mess up your own machine, but infecting the source code of the next LulzBot that way would be nearly impossible. Customers are also able to more easily check the security of the machines themselves.
+
+While [challenges certainly remain for the security of open source products][22], the open hardware model can help enhance cybersecurity—from the Pentagon to your living room.
+
+--------------------------------------------------------------------------------
+
+via: https://opensource.com/article/18/10/cybersecurity-demands-rapid-switch-open-source-hardware
+
+作者：[Joshua Pearce][a]
+选题：[lujun9972][b]
+译者：[译者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/jmpearce
+[b]: https://github.com/lujun9972
+[1]: https://dl.acm.org/citation.cfm?id=1188921
+[2]: https://www.zdnet.com/article/supercomputers-all-linux-all-the-time/
+[3]: https://www.serverwatch.com/server-news/linux-foundation-on-track-for-best-year-ever-as-open-source-dominates.html
+[4]: https://www.itprotoday.com/iot/survey-shows-linux-top-operating-system-internet-things-devices
+[5]: https://www.infoworld.com/article/2985242/linux/why-is-open-source-software-more-secure.html
+[6]: https://www.oshwa.org/definition/
+[7]: https://www.mdpi.com/2411-5134/3/3/64/htm
+[8]: https://hackaday.io/
+[9]: https://www.open-electronics.org/
+[10]: http://opencircuitinstitute.org/
+[11]: https://www.arduino.cc/
+[12]: http://www.adafruit.com/
+[13]: https://www.sparkfun.com/
+[14]: https://www.wired.com/story/using-open-source-designs-to-create-more-specialized-chips/
+[15]: https://getfedora.org/
+[16]: https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux
+[17]: https://openhardware.metajnl.com/articles/10.5334/joh.4/
+[18]: https://www.mdpi.com/2411-5134/3/3/44/htm
+[19]: https://www.theatlantic.com/technology/archive/2014/01/on-the-reign-of-benevolent-dictators-for-life-in-software/283139/
+[20]: https://www.lulzbot.com/
+[21]: https://forum.lulzbot.com/viewtopic.php?t=2378
+[22]: https://ieeexplore.ieee.org/abstract/document/8250205
diff --git a/sources/tech/20170928 A 3-step process for making more transparent decisions.md b/sources/tech/20170928 A 3-step process for making more transparent decisions.md
index 80e4d294f6..7523b40dd7 100644
--- a/sources/tech/20170928 A 3-step process for making more transparent decisions.md
+++ b/sources/tech/20170928 A 3-step process for making more transparent decisions.md
@@ -1,3 +1,5 @@
+MarineFish translating
+
A 3-step process for making more transparent decisions
======
diff --git a/sources/tech/20171002 Three Alternatives for Enabling Two Factor Authentication For SSH On Ubuntu 16.04 And Debian Jessie.md b/sources/tech/20171002 Three Alternatives for Enabling Two Factor Authentication For SSH On Ubuntu 16.04 And Debian Jessie.md
index ff78b3f809..cbe5e1f9bd 100644
--- a/sources/tech/20171002 Three Alternatives for Enabling Two Factor Authentication For SSH On Ubuntu 16.04 And Debian Jessie.md
+++ b/sources/tech/20171002 Three Alternatives for Enabling Two Factor Authentication For SSH On Ubuntu 16.04 And Debian Jessie.md
@@ -1,3 +1,5 @@
+Translating by cielllll
+
Three Alternatives for Enabling Two Factor Authentication For SSH On Ubuntu 16.04 And Debian Jessie
======
Security is now more important than ever and securing your SSH server is one of the most important things that you can do as a systems administrator. Traditionally this has meant disabling password authentication and instead using SSH keys. Whilst this is absolutely the first thing you should do that doesn't mean that SSH can't be made even more secure.
diff --git a/sources/tech/20171005 10 Games You Can Play on Linux with Wine.md b/sources/tech/20171005 10 Games You Can Play on Linux with Wine.md
index 5bab9d8c65..2936591150 100644
--- a/sources/tech/20171005 10 Games You Can Play on Linux with Wine.md
+++ b/sources/tech/20171005 10 Games You Can Play on Linux with Wine.md
@@ -1,3 +1,4 @@
+### fuzheng1998 reapplying
10 Games You Can Play on Linux with Wine
======
diff --git a/sources/tech/20171012 7 Best eBook Readers for Linux.md b/sources/tech/20171012 7 Best eBook Readers for Linux.md
index 128c667d88..5198f1bdc0 100644
--- a/sources/tech/20171012 7 Best eBook Readers for Linux.md
+++ b/sources/tech/20171012 7 Best eBook Readers for Linux.md
@@ -1,4 +1,3 @@
-Translating by bayar199468
7 Best eBook Readers for Linux
======
**Brief:** In this article, we are covering some of the best ebook readers for Linux. These apps give a better reading experience and some will even help in managing your ebooks.
diff --git a/sources/tech/20171116 How to use a here documents to write data to a file in bash script.md b/sources/tech/20171116 How to use a here documents to write data to a file in bash script.md
index 12d15af78f..5fe31f92cf 100644
--- a/sources/tech/20171116 How to use a here documents to write data to a file in bash script.md
+++ b/sources/tech/20171116 How to use a here documents to write data to a file in bash script.md
@@ -1,3 +1,5 @@
+translating by Flowsnow
+
How to use a here documents to write data to a file in bash script
======
diff --git a/sources/tech/20171202 Easily control delivery of your Python applications to millions of Linux users with Snapcraft.md b/sources/tech/20171202 Easily control delivery of your Python applications to millions of Linux users with Snapcraft.md
index dbdebf63e3..80975288e4 100644
--- a/sources/tech/20171202 Easily control delivery of your Python applications to millions of Linux users with Snapcraft.md
+++ b/sources/tech/20171202 Easily control delivery of your Python applications to millions of Linux users with Snapcraft.md
@@ -1,3 +1,4 @@
+Translating by DavidChenLiang
Python
============================================================
diff --git a/sources/tech/20171202 Simulating the Altair.md b/sources/tech/20171202 Simulating the Altair.md
deleted file mode 100644
index 3de613cb9a..0000000000
--- a/sources/tech/20171202 Simulating the Altair.md
+++ /dev/null
@@ -1,70 +0,0 @@
-translating---geekpi
-
-Simulating the Altair
-======
-The [Altair 8800][1] was a build-it-yourself home computer kit released in 1975. The Altair was basically the first personal computer, though it predated the advent of that term by several years. It is Adam (or Eve) to every Dell, HP, or Macbook out there.
-
-Some people thought it’d be awesome to write an emulator for the Z80—a processor closely related to the Altair’s Intel 8080—and then thought it needed a simulation of the Altair’s control panel on top of it. So if you’ve ever wondered what it was like to use a computer in 1975, you can run the Altair on your Macbook:
-
-![Altair 8800][2]
-
-### Installing it
-
-You can download Z80 pack from the FTP server available [here][3]. You’re looking for the latest Z80 pack release, something like `z80pack-1.26.tgz`.
-
-First unpack the file:
-
-```
-$ tar -xvf z80pack-1.26.tgz
-```
-
-Move into the unpacked directory:
-
-```
-$ cd z80pack-1.26
-```
-
-The control panel simulation is based on a library called `frontpanel`. You’ll have to compile that library first. If you move into the `frontpanel` directory, you will find a `README` file listing the libraries own dependencies. Your experience here will almost certainly differ from mine, but perhaps my travails will be illustrative. I had the dependencies installed, but via [Homebrew][4]. To get the library to compile I just had to make sure that `/usr/local/include` was added to Clang’s include path in `Makefile.osx`.
-
-If you’ve satisfied the dependencies, you should be able to compile the library (we’re now in `z80pack-1.26/frontpanel`:
-
-```
-$ make -f Makefile.osx ...
-$ make -f Makefile.osx clean
-```
-
-You should end up with `libfrontpanel.so`. I copied this to `/usr/local/lib`.
-
-The Altair simulator is under `z80pack-1.26/altairsim`. You now need to compile the simulator itself. Move into `z80pack-1.26/altairsim/srcsim` and run `make` once more:
-
-```
-$ make -f Makefile.osx ...
-$ make -f Makefile.osx clean
-```
-
-That process will create an executable called `altairsim` one level up in `z80pack-1.26/altairsim`. Run that executable and you should see that iconic Altair control panel!
-
-And if you really want to nerd out, read through the original [Altair manual][5].
-
-If you enjoyed this post, more like it come out every two weeks! Follow [@TwoBitHistory][6] on Twitter or subscribe to the [RSS feed][7] to make sure you know when a new post is out.
-
---------------------------------------------------------------------------------
-
-via: https://twobithistory.org/2017/12/02/simulating-the-altair.html
-
-作者：[Two-Bit History][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://twobithistory.org
-[b]: https://github.com/lujun9972
-[1]: https://en.wikipedia.org/wiki/Altair_8800
-[2]: https://www.autometer.de/unix4fun/z80pack/altair.png
-[3]: http://www.autometer.de/unix4fun/z80pack/ftp/
-[4]: http://brew.sh/
-[5]: http://www.classiccmp.org/dunfield/altair/d/88opman.pdf
-[6]: https://twitter.com/TwoBitHistory
-[7]: https://twobithistory.org/feed.xml
diff --git a/sources/tech/20171208 24 Must Have Essential Linux Applications In 2017.md b/sources/tech/20171208 24 Must Have Essential Linux Applications In 2017.md
deleted file mode 100644
index 7d576b8a73..0000000000
--- a/sources/tech/20171208 24 Must Have Essential Linux Applications In 2017.md
+++ /dev/null
@@ -1,253 +0,0 @@
-Translating by cycoe...
-cycoe 翻译中
-24 Must Have Essential Linux Applications In 2017
-======
-Brief: What are the must have applications for Linux? The answer is subjective and it depends on for what purpose do you use your desktop Linux. But there are still some essentials Linux apps that are more likely to be used by most Linux user. We have listed such best Linux applications that you should have installed in every Linux distribution you use.
-
-The world of Linux, everything is full of alternatives. You have to choose a distro? You have got several dozens of them. Are you trying to find a decent music player? Alternatives are there too.
-
-But not all of them are built with the same thing in mind – some of them might target minimalism while others might offer tons of features. Finding the right application for your needs can be quite confusing and a tiresome task. Let’s make that a bit easier.
-
-### Best free applications for Linux users
-
-I’m putting together a list of essential free Linux applications I prefer to use in different categories. I’m not saying that they are the best, but I have tried lots of applications in each category and finally liked the listed ones better. So, you are more than welcome to mention your favorite applications in the comment section.
-
-We have also compiled a nice video of this list. Do subscribe to our YouTube channel for more such educational Linux videos:
-
-### Web Browser
-
-
-[Save][1]Web Browsers
-
-#### [Google Chrome][12]
-
-Google Chrome is a powerful and complete solution for a web browser. It comes with excellent syncing capabilities and offers a vast collection of extensions. If you are accustomed to Google eco-system Google Chrome is for you without any doubt. If you prefer a more open source solution, you may want to try out [Chromium][13], which is the project Google Chrome is based on.
-
-#### [Firefox][14]
-
-If you are not a fan of Google Chrome, you can try out Firefox. It’s been around for a long time and is a very stable and robust web browser.
-
-#### [Vivaldi][15]
-
-However, if you want something new and different, you can check out Vivaldi. Vivaldi takes a completely fresh approach towards web browser. It’s from former team members of Opera and built on top of the Chromium project. It’s lightweight and customizable. Though it is still quite new and still missing out some features, it feels amazingly refreshing and does a really decent job.
-
-[Suggested read[Review] Otter Browser Brings Hope To Opera Lovers][40]
-
-### Download Manager
-
-
-[Save][2]Download Managers
-
-#### [uGet][16]
-
-uGet is the best download manager I have come across. It is open source and offers everything you can expect from a download manager. uGet offers advanced settings for managing downloads. It can queue and resume downloads, use multiple connections for downloading large files, download files to different directories according to categories and so on.
-
-#### [XDM][17]
-
-Xtreme Download Manager (XDM) is a powerful and open source tool developed with Java. It has all the basic features of a download manager, including – video grabber, smart scheduler and browser integration.
-
-[Suggested read4 Best Download Managers For Linux][41]
-
-### BitTorrent Client
-
-
-[Save][3]BitTorrent Clients
-
-#### [Deluge][18]
-
-Deluge is a open source BitTorrent client. It has a beautiful user interface. If you are used to using uTorrent for Windows, Deluge interface will feel familiar. It has various configuration options as well as plugins support for various tasks.
-
-#### [Transmission][19]
-
-Transmission takes the minimal approach. It is an open source BitTorrent client with a minimal user interface. Transmission comes pre-installed with many Linux distributions.
-
-[Suggested readTop 5 Torrent Clients For Ubuntu Linux][42]
-
-### Cloud Storage
-
-
-[Save][4]Cloud Storages
-
-#### [Dropbox][20]
-
-Dropbox is one of the most popular cloud storage service available out there. It gives you 2GB free storage to start with. Dropbox has a robust and straight-forward Linux client.
-
-#### [MEGA][21]
-
-MEGA offers 50GB of free storage. But that is not the best thing about it. The best thing about MEGA is that it has end-to-end encryption support for your files. MEGA has a solid Linux client named MEGAsync.
-
-[Suggested readBest Free Cloud Services For Linux in 2017][43]
-
-### Communication
-
-
-[Save][5]Communication Apps
-
-#### [Pidgin][22]
-
-Pidgin is an open source instant messenger client. It supports many chatting platforms including – Google Talk, Yahoo and even IRC. Pidgin is extensible through third-party plugins, that can provide a lot of additional functionalities to Pidgin.
-
-You can also use [Franz][23] or [Rambox][24] to use several messaging services in one application.
-
-#### [Skype][25]
-
-We all know Skype, it is one of the most popular video chatting platforms. Recently it has [released a brand new desktop client][26] for Linux.
-
-[Suggested read6 Best Messaging Apps Available For Linux In 2017][44]
-
-### Office Suite
-
-
-[Save][6]Office Suites
-
-#### [LibreOffice][27]
-
-LibreOffice is the most actively developed open source office suite for Linux. It has mainly six modules – Writer, Calc, Impress, Draw, Math and Base. And every one of them supports a wide range of file formats. LibreOffice also supports third-party extensions. It is the default office suite for many of the Linux distributions.
-
-#### [WPS Office][28]
-
-If you want to try out something other than LibreOffice, WPS Office might be your go-to. WPS Office suite includes writer, presentation and spreadsheets support.
-
-[Suggested read6 Best Open Source Alternatives to Microsoft Office for Linux][45]
-
-### Music Player
-
-
-[Save][7]Music Players
-
-#### [Lollypop][29]
-
-This is a relatively new music player. Lollypop is open source and has a beautiful yet simple user interface. It offers a nice music organizer, scrobbling support, online radio and a party mode. Though it is a simple music player without so many advanced features, it is worth giving it a try.
-
-#### [Rhythmbox][30]
-
-Rhythmbox is the music player mainly developed for GNOME desktop environment but it works on other desktop environments as well. It does all the basic tasks of a music player, including – CD Ripping & Burning, scribbling etc. It also has support for iPod.
-
-#### [cmus][31]
-
-If you want minimalism and love your terminal window, cmus is for you. Personally, I’m a fan and user of this one. cmus is a small, fast and powerful console music player for Unix-like operating systems. It has all the basic music player features. And you can also extend its functionalities with additional extensions and scripts.
-
-[Suggested readHow To Install Tomahawk Player In Ubuntu 14.04 And Linux Mint 17][46]
-
-### Video Player
-
-
-[Save][8]Video Players
-
-#### [VLC][32]
-
-VLC is an open source media player. It is simple, fast, lightweight and really powerful. VLC can play almost any media formats you can throw at it out-of-the-box. It can also stream online medias. It also have some nifty extensions for various tasks like downloading subtitles right from the player.
-
-#### [Kodi][33]
-
-Kodi is a full-fledged media center. Kodi is open source and very popular among its user base. It can handle videos, music, pictures, podcasts and even games, from both local and network media storage. You can even record TV with it. The behavior of Kodi can be customized via add-ons and skins.
-
-[Suggested read4 Format Factory Alternative In Linux][47]
-
-### Photo Editor
-
-
-[Save][9]Photo Editors
-
-#### [GIMP][34]
-
-GIMP is the Photoshop alternative for Linux. It is open source, full-featured and professional photo editing software. It is packed with a wide range of tools for manipulating images. And on top of that, there is various customization options and third-party plugins for enhancing the experience.
-
-#### [Krita][35]
-
-Krita is mainly a painting tool but serves as a photo editing application as well. It is open source and packed with lots of sophisticated and advanced tools.
-
-[Suggested readBest Photo Applications For Linux][48]
-
-### Text Editor
-
-Every Linux distribution comes with their own solution for text editors. Generally, they are quite simple and without much functionality. But here are some text editors with enhanced capabilities.
-
-
-[Save][10]Text Editors
-
-#### [Atom][36]
-
-Atom is the modern and hackable text editor maintained by GitHub. It is completely open-source and offers everything you can think of to get out of a text editor. You can use it right out-of-the-box or you can customize and tune it just the way you want. And it has a ton of extensions and themes from the community up for grab.
-
-#### [Sublime Text][37]
-
-Sublime Text is one of the most popular text editors. Though it is not free, it allows you to use the software for evaluation without any time limit. Sublime Text is a feature-rich and sophisticated piece of software. And of course, it has plugins and themes support.
-
-[Suggested read4 Best Modern Open Source Code Editors For Linux][49]
-
-### Launcher
-
-
-[Save][11]Launchers
-
-#### [Albert][38]
-
-Albert is inspired by Alfred (a productivity application for Mac, which is totally kickass by-the-way) and still in the development phase. Albert is fast, extensible and customizable. The goal is to “Access everything with virtually zero effort”. It integrates with your Linux distribution nicely and helps you to boost your productivity.
-
-#### [Synapse][39]
-
-Synapse has been around for years. It’s a simple launcher that can search and run applications. It can also speed up various workflows like – controlling music, searching files, directories, bookmarks etc., running commands and such.
-
-As Abhishek advised, we will keep this list of best Linux software updated with our readers’ (i.e. yours) feedback. So, what are your favorite must have Linux applications? Share with us and do suggest more categories of software to add to this list.
-
---------------------------------------------------------------------------------
-
-via: https://itsfoss.com/essential-linux-applications/
-
-作者：[Munif Tanjim][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/munif/
-[1]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Web-Browser-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Web%20Browsers
-[2]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Download-Manager-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Download%20Managers
-[3]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-BitTorrent-Client-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=BitTorrent%20Clients
-[4]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Cloud-Storage-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Cloud%20Storages
-[5]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Communication-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Communication%20Apps
-[6]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Office-Suite-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Office%20Suites
-[7]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Music-Player-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Music%20Players
-[8]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Video-Player-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Video%20Player
-[9]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Photo-Editor-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Photo%20Editors
-[10]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Text-Editor-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Text%20Editors
-[11]:http://pinterest.com/pin/create/bookmarklet/?media=https://itsfoss.com/wp-content/uploads/2016/10/Essential-Linux-Apps-Launcher-1024x512.jpg&url=https://itsfoss.com/essential-linux-applications/&is_video=false&description=Launchers
-[12]:https://www.google.com/chrome/browser
-[13]:https://www.chromium.org/Home
-[14]:https://www.mozilla.org/en-US/firefox
-[15]:https://vivaldi.com
-[16]:http://ugetdm.com/
-[17]:http://xdman.sourceforge.net/
-[18]:http://deluge-torrent.org/
-[19]:https://transmissionbt.com/
-[20]:https://www.dropbox.com
-[21]:https://mega.nz/
-[22]:https://www.pidgin.im/
-[23]:https://itsfoss.com/franz-messaging-app/
-[24]:http://rambox.pro/
-[25]:https://www.skype.com
-[26]:https://itsfoss.com/skpe-alpha-linux/
-[27]:https://www.libreoffice.org
-[28]:https://www.wps.com
-[29]:http://gnumdk.github.io/lollypop-web/
-[30]:https://wiki.gnome.org/Apps/Rhythmbox
-[31]:https://cmus.github.io/
-[32]:http://www.videolan.org
-[33]:https://kodi.tv
-[34]:https://www.gimp.org/
-[35]:https://krita.org/en/
-[36]:https://atom.io/
-[37]:http://www.sublimetext.com/
-[38]:https://github.com/ManuelSchneid3r/albert
-[39]:https://launchpad.net/synapse-project
-[40]:https://itsfoss.com/otter-browser-review/
-[41]:https://itsfoss.com/4-best-download-managers-for-linux/
-[42]:https://itsfoss.com/best-torrent-ubuntu/
-[43]:https://itsfoss.com/cloud-services-linux/
-[44]:https://itsfoss.com/best-messaging-apps-linux/
-[45]:https://itsfoss.com/best-free-open-source-alternatives-microsoft-office/
-[46]:https://itsfoss.com/install-tomahawk-ubuntu-1404-linux-mint-17/
-[47]:https://itsfoss.com/format-factory-alternative-linux/
-[48]:https://itsfoss.com/image-applications-ubuntu-linux/
-[49]:https://itsfoss.com/best-modern-open-source-code-editors-for-linux/
diff --git a/sources/tech/20180110 Using Your Own Private Registry with Docker Enterprise Edition.md b/sources/tech/20180110 Using Your Own Private Registry with Docker Enterprise Edition.md
index 88b1eb96e1..00507d2b9c 100644
--- a/sources/tech/20180110 Using Your Own Private Registry with Docker Enterprise Edition.md
+++ b/sources/tech/20180110 Using Your Own Private Registry with Docker Enterprise Edition.md
@@ -1,3 +1,5 @@
+fuowang 翻译中
+
Using Your Own Private Registry with Docker Enterprise Edition
======
diff --git a/sources/tech/20180129 The 5 Best Linux Distributions for Development.md b/sources/tech/20180129 The 5 Best Linux Distributions for Development.md
new file mode 100644
index 0000000000..cc11407ff3
--- /dev/null
+++ b/sources/tech/20180129 The 5 Best Linux Distributions for Development.md
@@ -0,0 +1,158 @@
+The 5 Best Linux Distributions for Development
+============================================================
+
+
+Jack Wallen looks at some of the best LInux distributions for development efforts.[Creative Commons Zero][6]
+
+When considering Linux, there are so many variables to take into account. What package manager do you wish to use? Do you prefer a modern or old-standard desktop interface? Is ease of use your priority? How flexible do you want your distribution? What task will the distribution serve?
+
+It is that last question which should often be considered first. Is the distribution going to work as a desktop or a server? Will you be doing network or system audits? Or will you be developing? If you’ve spent much time considering Linux, you know that for every task there are several well-suited distributions. This certainly holds true for developers. Even though Linux, by design, is an ideal platform for developers, there are certain distributions that rise above the rest, to serve as great operating systems to serve developers.
+
+I want to share what I consider to be some of the best distributions for your development efforts. Although each of these five distributions can be used for general purpose development (with maybe one exception), they each serve a specific purpose. You may or may not be surprised by the selections.
+
+With that said, let’s get to the choices.
+
+### Debian
+
+The [Debian][14] distribution winds up on the top of many a Linux list. With good reason. Debian is that distribution from which so many are based. It is this reason why many developers choose Debian. When you develop a piece of software on Debian, chances are very good that package will also work on [Ubuntu][15], [Linux Mint][16], [Elementary OS][17], and a vast collection of other distributions.
+
+Beyond that obvious answer, Debian also has a very large amount of applications available, by way of the default repositories (Figure 1).
+
+
+Figure 1: Available applications from the standard Debian repositories.[Used with permission][1]
+
+To make matters even programmer-friendly, those applications (and their dependencies) are simple to install. Take, for instance, the build-essential package (which can be installed on any distribution derived from Debian). This package includes the likes of dkpg-dev, g++, gcc, hurd-dev, libc-dev, and make—all tools necessary for the development process. The build-essential package can be installed with the command sudo apt install build-essential.
+
+There are hundreds of other developer-specific applications available from the standard repositories, tools such as:
+
+* Autoconf—configure script builder
+
+* Autoproject—creates a source package for a new program
+
+* Bison—general purpose parser generator
+
+* Bluefish—powerful GUI editor, targeted towards programmers
+
+* Geany—lightweight IDE
+
+* Kate—powerful text editor
+
+* Eclipse—helps builders independently develop tools that integrate with other people’s tools
+
+The list goes on and on.
+
+Debian is also as rock-solid a distribution as you’ll find, so there’s very little concern you’ll lose precious work, by way of the desktop crashing. As a bonus, all programs included with Debian have met the [Debian Free Software Guidelines][18], which adheres to the following “social contract”:
+
+* Debian will remain 100% free.
+
+* We will give back to the free software community.
+
+* We will not hide problems.
+
+* Our priorities are our users and free software
+
+* Works that do not meet our free software standards are included in a non-free archive.
+
+Also, if you’re new to developing on Linux, Debian has a handy [Programming section in their user manual][19].
+
+### openSUSE Tumbleweed
+
+If you’re looking to develop with a cutting-edge, rolling release distribution, [openSUSE][20] offers one of the best in [Tumbleweed][21]. Not only will you be developing with the most up to date software available, you’ll be doing so with the help of openSUSE’s amazing administrator tools … of which includes YaST. If you’re not familiar with YaST (Yet another Setup Tool), it’s an incredibly powerful piece of software that allows you to manage the whole of the platform, from one convenient location. From within YaST, you can also install using RPM Groups. Open YaST, click on RPM Groups (software grouped together by purpose), and scroll down to the Development section to see the large amount of groups available for installation (Figure 2).
+
+
+
+Figure 2: Installing package groups in openSUSE Tumbleweed.[Creative Commons Zero][2]
+
+openSUSE also allows you to quickly install all the necessary devtools with the simple click of a weblink. Head over to the [rpmdevtools install site][22] and click the link for Tumbleweed. This will automatically add the necessary repository and install rpmdevtools.
+
+By developing with a rolling release distribution, you know you’re working with the most recent releases of installed software.
+
+### CentOS
+
+Let’s face it, [Red Hat Enterprise Linux][23] (RHEL) is the de facto standard for enterprise businesses. If you’re looking to develop for that particular platform, and you can’t afford a RHEL license, you cannot go wrong with [CentOS][24]—which is, effectively, a community version of RHEL. You will find many of the packages found on CentOS to be the same as in RHEL—so once you’re familiar with developing on one, you’ll be fine on the other.
+
+If you’re serious about developing on an enterprise-grade platform, you cannot go wrong starting with CentOS. And because CentOS is a server-specific distribution, you can more easily develop for a web-centric platform. Instead of developing your work and then migrating it to a server (hosted on a different machine), you can easily have CentOS setup to serve as an ideal host for both developing and testing.
+
+Looking for software to meet your development needs? You only need open up the CentOS Application Installer, where you’ll find a Developer section that includes a dedicated sub-section for Integrated Development Environments (IDEs - Figure 3).
+
+
+Figure 3: Installing a powerful IDE is simple in CentOS.[Used with permission][3]
+
+CentOS also includes Security Enhanced Linux (SELinux), which makes it easier for you to test your software’s ability to integrate with the same security platform found in RHEL. SELinux can often cause headaches for poorly designed software, so having it at the ready can be a real boon for ensuring your applications work on the likes of RHEL. If you’re not sure where to start with developing on CentOS 7, you can read through the [RHEL 7 Developer Guide][25].
+
+### Raspbian
+
+Let’s face it, embedded systems are all the rage. One easy means of working with such systems is via the Raspberry Pi—a tiny footprint computer that has become incredibly powerful and flexible. In fact, the Raspberry Pi has become the hardware used by DIYers all over the planet. Powering those devices is the [Raspbian][26] operating system. Raspbian includes tools like [BlueJ][27], [Geany][28], [Greenfoot][29], [Sense HAT Emulator][30], [Sonic Pi][31], and [Thonny Python IDE][32], [Python][33], and [Scratch][34], so you won’t want for the necessary development software. Raspbian also includes a user-friendly desktop UI (Figure 4), to make things even easier.
+
+
+Figure 4: The Raspbian main menu, showing pre-installed developer software.[Used with permission][4]
+
+For anyone looking to develop for the Raspberry Pi platform, Raspbian is a must have. If you’d like to give Raspbian a go, without the Raspberry Pi hardware, you can always install it as a VirtualBox virtual machine, by way of the ISO image found [here][35].
+
+### Pop!_OS
+
+Don’t let the name full you, [System76][36]’s [Pop!_OS][37] entry into the world of operating systems is serious. And although what System76 has done to this Ubuntu derivative may not be readily obvious, it is something special.
+
+The goal of System76 is to create an operating system specific to the developer, maker, and computer science professional. With a newly-designed GNOME theme, Pop!_OS is beautiful (Figure 5) and as highly functional as you would expect from both the hardware maker and desktop designers.
+
+### [devel_5.jpg][11]
+
+
+Figure 5: The Pop!_OS Desktop.[Used with permission][5]
+
+But what makes Pop!_OS special is the fact that it is being developed by a company dedicated to Linux hardware. This means, when you purchase a System76 laptop, desktop, or server, you know the operating system will work seamlessly with the hardware—on a level no other company can offer. I would predict that, with Pop!_OS, System76 will become the Apple of Linux.
+
+### Time for work
+
+In their own way, each of these distributions. You have a stable desktop (Debian), a cutting-edge desktop (openSUSE Tumbleweed), a server (CentOS), an embedded platform (Raspbian), and a distribution to seamless meld with hardware (Pop!_OS). With the exception of Raspbian, any one of these distributions would serve as an outstanding development platform. Get one installed and start working on your next project with confidence.
+
+ _Learn more about Linux through the free ["Introduction to Linux" ][13]course from The Linux Foundation and edX._
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/blog/learn/intro-to-linux/2018/1/5-best-linux-distributions-development
+
+作者：[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/creative-commons-zero
+[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/used-permission
+[6]:https://www.linux.com/licenses/category/creative-commons-zero
+[7]:https://www.linux.com/files/images/devel1jpg
+[8]:https://www.linux.com/files/images/devel2jpg
+[9]:https://www.linux.com/files/images/devel3jpg
+[10]:https://www.linux.com/files/images/devel4jpg
+[11]:https://www.linux.com/files/images/devel5jpg
+[12]:https://www.linux.com/files/images/king-penguins1920jpg
+[13]:https://training.linuxfoundation.org/linux-courses/system-administration-training/introduction-to-linux
+[14]:https://www.debian.org/
+[15]:https://www.ubuntu.com/
+[16]:https://linuxmint.com/
+[17]:https://elementary.io/
+[18]:https://www.debian.org/social_contract
+[19]:https://www.debian.org/doc/manuals/debian-reference/ch12.en.html
+[20]:https://www.opensuse.org/
+[21]:https://en.opensuse.org/Portal:Tumbleweed
+[22]:https://software.opensuse.org/download.html?project=devel%3Atools&package=rpmdevtools
+[23]:https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux
+[24]:https://www.centos.org/
+[25]:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/pdf/developer_guide/Red_Hat_Enterprise_Linux-7-Developer_Guide-en-US.pdf
+[26]:https://www.raspberrypi.org/downloads/raspbian/
+[27]:https://www.bluej.org/
+[28]:https://www.geany.org/
+[29]:https://www.greenfoot.org/
+[30]:https://www.raspberrypi.org/blog/sense-hat-emulator/
+[31]:http://sonic-pi.net/
+[32]:http://thonny.org/
+[33]:https://www.python.org/
+[34]:https://scratch.mit.edu/
+[35]:http://rpf.io/x86iso
+[36]:https://system76.com/
+[37]:https://system76.com/pop
diff --git a/sources/tech/20180305 Getting started with Python for data science.md b/sources/tech/20180305 Getting started with Python for data science.md
deleted file mode 100644
index d00e1dbfd5..0000000000
--- a/sources/tech/20180305 Getting started with Python for data science.md
+++ /dev/null
@@ -1,138 +0,0 @@
-Translating by MjSeven
-
-
-Getting started with Python for data science
-======
-
-
-
-Whether you're a budding data science enthusiast with a math or computer science background or an expert in an unrelated field, the possibilities data science offers are within your reach. And you don't need expensive, highly specialized enterprise software—the open source tools discussed in this article are all you need to get started.
-
-[Python][1], its machine-learning and data science libraries ([pandas][2], [Keras][3], [TensorFlow][4], [scikit-learn][5], [SciPy][6], [NumPy][7], etc.), and its extensive list of visualization libraries ([Matplotlib][8], [pyplot][9], [Plotly][10], etc.) are excellent FOSS tools for beginners and experts alike. Easy to learn, popular enough to offer community support, and armed with the latest emerging techniques and algorithms developed for data science, these comprise one of the best toolsets you can acquire when starting out.
-
-Many of these Python libraries are built on top of each other (known as dependencies), and the basis is the [NumPy][7] library. Designed specifically for data science, NumPy is often used to store relevant portions of datasets in its ndarray datatype, which is a convenient datatype for storing records from relational tables as `cvs` files or in any other format, and vice-versa. It is particularly convenient when scikit functions are applied to multidimensional arrays. SQL is great for querying databases, but to perform complex and resource-intensive data science operations, storing data in ndarray boosts efficiency and speed (but make sure you have ample RAM when dealing with large datasets). When you get to using pandas for knowledge extraction and analysis, the almost seamless conversion between DataFrame datatype in pandas and ndarray in NumPy creates a powerful combination for extraction and compute-intensive operations, respectively.
-
-For a quick demonstration, let’s fire up the Python shell and load an open dataset on crime statistics from the city of Baltimore in a pandas DataFrame variable, and view a portion of the loaded frame:
-```
->>> import pandas as pd
-
->>> crime_stats = pd.read_csv('BPD_Arrests.csv')
-
->>> crime_stats.head()
-
-```
-
-
-
-We can now perform most of the queries on this pandas DataFrame that we can with SQL in databases. For instance, to get all the unique values of the "Description" attribute, the SQL query is:
-```
-$ SELECT unique(“Description”) from crime_stats;
-
-```
-
-This same query written for a pandas DataFrame looks like this:
-```
->>> crime_stats['Description'].unique()
-
-['COMMON ASSAULT' 'LARCENY' 'ROBBERY - STREET' 'AGG. ASSAULT'
-
-'LARCENY FROM AUTO' 'HOMICIDE' 'BURGLARY' 'AUTO THEFT'
-
-'ROBBERY - RESIDENCE' 'ROBBERY - COMMERCIAL' 'ROBBERY - CARJACKING'
-
-'ASSAULT BY THREAT' 'SHOOTING' 'RAPE' 'ARSON']
-
-```
-
-which returns a NumPy array (ndarray):
-```
->>> type(crime_stats['Description'].unique())
-
-
-
-```
-
-Next let’s feed this data into a neural network to see how accurately it can predict the type of weapon used, given data such as the time the crime was committed, the type of crime, and the neighborhood in which it happened:
-```
->>> from sklearn.neural_network import MLPClassifier
-
->>> import numpy as np
-
->>>
-
->>> prediction = crime_stats[[‘Weapon’]]
-
->>> predictors = crime_stats['CrimeTime', ‘CrimeCode’, ‘Neighborhood’]
-
->>>
-
->>> nn_model = MLPClassifier(solver='lbfgs', alpha=1e-5, hidden_layer_sizes=(5,
-
-2), random_state=1)
-
->>>
-
->>>predict_weapon = nn_model.fit(prediction, predictors)
-
-```
-
-Now that the learning model is ready, we can perform several tests to determine its quality and reliability. For starters, let’s feed a training set data (the portion of the original dataset used to train the model and not included in creating the model):
-```
->>> predict_weapon.predict(training_set_weapons)
-
-array([4, 4, 4, ..., 0, 4, 4])
-
-```
-
-As you can see, it returns a list, with each number predicting the weapon for each of the records in the training set. We see numbers rather than weapon names, as most classification algorithms are optimized with numerical data. For categorical data, there are techniques that can reliably convert attributes into numerical representations. In this case, the technique used is Label Encoding, using the LabelEncoder function in the sklearn preprocessing library: `preprocessing.LabelEncoder()`. It has a function to transform and inverse transform data and their numerical representations. In this example, we can use the `inverse_transform` function of LabelEncoder() to see what Weapons 0 and 4 are:
-```
->>> preprocessing.LabelEncoder().inverse_transform(encoded_weapons)
-
-array(['HANDS', 'FIREARM', 'HANDS', ..., 'FIREARM', 'FIREARM', 'FIREARM']
-
-```
-
-This is fun to see, but to get an idea of how accurate this model is, let's calculate several scores as percentages:
-```
->>> nn_model.score(X, y)
-
-0.81999999999999995
-
-```
-
-This shows that our neural network model is ~82% accurate. That result seems impressive, but it is important to check its effectiveness when used on a different crime dataset. There are other tests, like correlations, confusion, matrices, etc., to do this. Although our model has high accuracy, it is not very useful for general crime datasets as this particular dataset has a disproportionate number of rows that list ‘FIREARM’ as the weapon used. Unless it is re-trained, our classifier is most likely to predict ‘FIREARM’, even if the input dataset has a different distribution.
-
-It is important to clean the data and remove outliers and aberrations before we classify it. The better the preprocessing, the better the accuracy of our insights. Also, feeding the model/classifier with too much data to get higher accuracy (generally over ~90%) is a bad idea because it looks accurate but is not useful due to [overfitting][11].
-
-[Jupyter notebooks][12] are a great interactive alternative to the command line. While the CLI is fine for most things, Jupyter shines when you want to run snippets on the go to generate visualizations. It also formats data better than the terminal.
-
-[This article][13] has a list of some of the best free resources for machine learning, but plenty of additional guidance and tutorials are available. You will also find many open datasets available to use, based on your interests and inclinations. As a starting point, the datasets maintained by [Kaggle][14], and those available at state government websites are excellent resources.
-
-Payal Singh will be presenting at SCaLE16x this year, March 8-11 in Pasadena, California. To attend and get 50% of your ticket, [register][15] using promo code **OSDC**
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/3/getting-started-data-science
-
-作者：[Payal Singh][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/payalsingh
-[1]:https://www.python.org/
-[2]:https://pandas.pydata.org/
-[3]:https://keras.io/
-[4]:https://www.tensorflow.org/
-[5]:http://scikit-learn.org/stable/
-[6]:https://www.scipy.org/
-[7]:http://www.numpy.org/
-[8]:https://matplotlib.org/
-[9]:https://matplotlib.org/api/pyplot_api.html
-[10]:https://plot.ly/
-[11]:https://www.kdnuggets.com/2014/06/cardinal-sin-data-mining-data-science.html
-[12]:http://jupyter.org/
-[13]:https://machinelearningmastery.com/best-machine-learning-resources-for-getting-started/
-[14]:https://www.kaggle.com/
-[15]:https://register.socallinuxexpo.org/reg6/
diff --git a/sources/tech/20180530 How To Add, Enable And Disable A Repository In Linux.md b/sources/tech/20180530 How To Add, Enable And Disable A Repository In Linux.md
index acf33046bc..f30a21f526 100644
--- a/sources/tech/20180530 How To Add, Enable And Disable A Repository In Linux.md
+++ b/sources/tech/20180530 How To Add, Enable And Disable A Repository In Linux.md
@@ -1,3 +1,6 @@
+Translating by MjSeven
+
+
How To Add, Enable And Disable A Repository In Linux
======
Many of us using yum package manager to manage package installation, remove, update, search, etc, on RPM based system such as RHEL, CentOS, etc,.
diff --git a/sources/tech/20180612 Systemd Services- Reacting to Change.md b/sources/tech/20180612 Systemd Services- Reacting to Change.md
new file mode 100644
index 0000000000..a004f123c8
--- /dev/null
+++ b/sources/tech/20180612 Systemd Services- Reacting to Change.md
@@ -0,0 +1,275 @@
+Systemd Services: Reacting to Change
+======
+
+
+
+[I have one of these Compute Sticks][1] (Figure 1) and use it as an all-purpose server. It is inconspicuous and silent and, as it is built around an x86 architecture, I don't have problems getting it to work with drivers for my printer, and that’s what it does most days: it interfaces with the shared printer and scanner in my living room.
+
+![ComputeStick][3]
+
+An Intel ComputeStick. Euro coin for size.
+
+[Used with permission][4]
+
+Most of the time it is idle, especially when we are out, so I thought it would be good idea to use it as a surveillance system. The device doesn't come with its own camera, and it wouldn't need to be spying all the time. I also didn't want to have to start the image capturing by hand because this would mean having to log into the Stick using SSH and fire up the process by writing commands in the shell before rushing out the door.
+
+So I thought that the thing to do would be to grab a USB webcam and have the surveillance system fire up automatically just by plugging it in. Bonus points if the surveillance system fired up also after the Stick rebooted, and it found that the camera was connected.
+
+In prior installments, we saw that [systemd services can be started or stopped by hand][5] or [when certain conditions are met][6]. Those conditions are not limited to when the OS reaches a certain state in the boot up or powerdown sequence but can also be when you plug in new hardware or when things change in the filesystem. You do that by combining a Udev rule with a systemd service.
+
+### Hotplugging with Udev
+
+Udev rules live in the _/etc/udev/rules_ directory and are usually a single line containing _conditions_ and _assignments_ that lead to an _action_.
+
+That was a bit cryptic. Let's try again:
+
+Typically, in a Udev rule, you tell systemd what to look for when a device is connected. For example, you may want to check if the make and model of a device you just plugged in correspond to the make and model of the device you are telling Udev to wait for. Those are the _conditions_ mentioned earlier.
+
+Then you may want to change some stuff so you can use the device easily later. An example of that would be to change the read and write permissions to a device: if you plug in a USB printer, you're going to want users to be able to read information from the printer (the user's printing app would want to know the model, make, and whether it is ready to receive print jobs or not) and write to it, that is, send stuff to print. Changing the read and write permissions for a device is done using one of the _assignments_ you read about earlier.
+
+Finally, you will probably want the system to do something when the conditions mentioned above are met, like start a backup application to copy important files when a certain external hard disk drive is plugged in. That is an example of an _action_ mentioned above.
+
+With that in mind, ponder this:
+
+```
+ACTION=="add", SUBSYSTEM=="video4linux", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="e207",
+SYMLINK+="mywebcam", TAG+="systemd", MODE="0666", ENV{SYSTEMD_WANTS}="webcam.service"
+```
+
+The first part of the rule,
+
+```
+ACTION=="add", SUBSYSTEM=="video4linux", ATTRS{idVendor}=="03f0",
+ATTRS{idProduct}=="e207" [etc... ]
+```
+
+shows the conditions that the device has to meet before doing any of the other stuff you want the system to do. The device has to be added (`ACTION=="add"`) to the machine, it has to be integrated into the `video4linux` subsystem. To make sure the rule is applied only when the correct device is plugged in, you have to make sure Udev correctly identifies the manufacturer (`ATTRS{idVendor}=="03f0"`) and a model (`ATTRS{idProduct}=="e207"`) of the device.
+
+In this case, we're talking about this device (Figure 2):
+
+![webcam][8]
+
+The HP webcam used in this experiment.
+
+[Used with permission][4]
+
+Notice how you use `==` to indicate that these are a logical operation. You would read the above snippet of the rule like this:
+
+```
+if the device is added and the device controlled by the video4linux subsystem
+and the manufacturer of the device is 03f0 and the model is e207, then...
+```
+
+But where do you get all this information? Where do you find the action that triggers the event, the manufacturer, model, and so on? You will probably have to use several sources. The `IdVendor` and `idProduct` you can get by plugging the webcam into your machine and running `lsusb`:
+
+```
+lsusb
+Bus 002 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub
+Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 003 Device 003: ID 03f0:e207 Hewlett-Packard
+Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 001 Device 003: ID 04f2:b1bb Chicony Electronics Co., Ltd
+Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+```
+
+The webcam I’m using is made by HP, and you can only see one HP device in the list above. The `ID` gives you the manufacturer and the model numbers separated by a colon (`:`). If you have more than one device by the same manufacturer and not sure which is which, unplug the webcam, run `lsusb` again and check what's missing.
+
+OR...
+
+Unplug the webcam, wait a few seconds, run the command `udevadmin monitor --environment` and then plug the webcam back in again. When you do that with the HP webcam, you get:
+
+```
+udevadmin monitor --environment
+UDEV [35776.495221] add /devices/pci0000:00/0000:00:1c.3/0000:04:00.0
+ /usb3/3-1/3-1:1.0/input/input21/event11 (input)
+.MM_USBIFNUM=00
+ACTION=add
+BACKSPACE=guess
+DEVLINKS=/dev/input/by-path/pci-0000:04:00.0-usb-0:1:1.0-event
+ /dev/input/by-id/usb-Hewlett_Packard_HP_Webcam_HD_2300-event-if00
+DEVNAME=/dev/input/event11
+DEVPATH=/devices/pci0000:00/0000:00:1c.3/0000:04:00.0/
+ usb3/3-1/3-1:1.0/input/input21/event11
+ID_BUS=usb
+ID_INPUT=1
+ID_INPUT_KEY=1
+ID_MODEL=HP_Webcam_HD_2300
+ID_MODEL_ENC=HP\x20Webcam\x20HD\x202300
+ID_MODEL_ID=e207
+ID_PATH=pci-0000:04:00.0-usb-0:1:1.0
+ID_PATH_TAG=pci-0000_04_00_0-usb-0_1_1_0
+ID_REVISION=1020
+ID_SERIAL=Hewlett_Packard_HP_Webcam_HD_2300
+ID_TYPE=video
+ID_USB_DRIVER=uvcvideo
+ID_USB_INTERFACES=:0e0100:0e0200:010100:010200:030000:
+ID_USB_INTERFACE_NUM=00
+ID_VENDOR=Hewlett_Packard
+ID_VENDOR_ENC=Hewlett\x20Packard
+ID_VENDOR_ID=03f0
+LIBINPUT_DEVICE_GROUP=3/3f0/e207:usb-0000:04:00.0-1/button
+MAJOR=13
+MINOR=75
+SEQNUM=3162
+SUBSYSTEM=input
+USEC_INITIALIZED=35776495065
+XKBLAYOUT=es
+XKBMODEL=pc105
+XKBOPTIONS=
+XKBVARIANT=
+```
+
+That may look like a lot to process, but, check this out: the `ACTION` field early in the list tells you what event just happened, i.e., that a device got added to the system. You can also see the name of the device spelled out on several of the lines, so you can be pretty sure that it is the device you are looking for. The output also shows the manufacturer's ID number (`ID_VENDOR_ID=03f0`) and the model number (`ID_VENDOR_ID=03f0`).
+
+This gives you three of the four values the condition part of the rule needs. You may be tempted to think that it a gives you the fourth, too, because there is also a line that says:
+
+```
+SUBSYSTEM=input
+```
+
+Be careful! Although it is true that a USB webcam is a device that provides input (as does a keyboard and a mouse), it is also belongs to the _usb_ subsystem, and several others. This means that your webcam gets added to several subsystems and looks like several devices. If you pick the wrong subsystem, your rule may not work as you want it to, or, indeed, at all.
+
+So, the third thing you have to check is all the subsystems the webcam has got added to and pick the correct one. To do that, unplug your webcam again and run:
+
+```
+ls /dev/video*
+```
+
+This will show you all the video devices connected to the machine. If you are using a laptop, most come with a built-in webcam and it will probably show up as `/dev/video0`. Plug your webcam back in and run `ls /dev/video*` again.
+
+Now you should see one more video device (probably `/dev/video1`).
+
+Now you can find out all the subsystems it belongs to by running `udevadm info -a /dev/video1`:
+
+```
+udevadm info -a /dev/video1
+
+Udevadm info starts with the device specified by the devpath and then
+walks up the chain of parent devices. It prints for every device
+found, all possible attributes in the udev rules key format.
+A rule to match, can be composed by the attributes of the device
+and the attributes from one single parent device.
+
+ looking at device '/devices/pci0000:00/0000:00:1c.3/0000:04:00.0
+ /usb3/3-1/3-1:1.0/video4linux/video1':
+ KERNEL=="video1"
+ SUBSYSTEM=="video4linux"
+ DRIVER==""
+ ATTR{dev_debug}=="0"
+ ATTR{index}=="0"
+ ATTR{name}=="HP Webcam HD 2300: HP Webcam HD"
+
+[etc...]
+```
+
+The output goes on for quite a while, but what you're interested is right at the beginning: `SUBSYSTEM=="video4linux"`. This is a line you can literally copy and paste right into your rule. The rest of the output (not shown for brevity) gives you a couple more nuggets, like the manufacturer and mode IDs, again in a format you can copy and paste into your rule.
+
+Now you have a way of identifying the device and what event should trigger the action univocally, it is time to tinker with the device.
+
+The next section in the rule, `SYMLINK+="mywebcam", TAG+="systemd", MODE="0666"` tells Udev to do three things: First, you want to create symbolic link from the device to (e.g. _/dev/video1_ ) to _/dev/mywebcam_. This is because you cannot predict what the system is going to call the device by default. When you have an in-built webcam and you hotplug a new one, the in-built webcam will usually be _/dev/video0_ while the external one will become _/dev/video1_. However, if you boot your computer with the external USB webcam plugged in, that could be reversed and the internal webcam can become _/dev/video1_ and the external one _/dev/video0_. What this is telling you is that, although your image-capturing script (which you will see later on) always needs to point to the external webcam device, you can't rely on it being _/dev/video0_ or _/dev/video1_. To solve this problem, you tell Udev to create a symbolic link which will never change in the moment the device is added to the _video4linux_ subsystem and you will make your script point to that.
+
+The second thing you do is add `"systemd"` to the list of Udev tags associated with this rule. This tells Udev that the action that the rule will trigger will be managed by systemd, that is, it will be some sort of systemd service.
+
+Notice how in both cases you use `+=` operator. This adds the value to a list, which means you can add more than one value to `SYMLINK` and `TAG`.
+
+The `MODE` values, on the other hand, can only contain one value (hence you use the simple `=` assignment operator). What `MODE` does is tell Udev who can read from or write to the device. If you are familiar with `chmod` (and, if you are reading this, you should be), you will also be familiar of [how you can express permissions using numbers][9]. That is what this is: `0666` means " _give read and write privileges to the device to everybody_ ".
+
+At last, `ENV{SYSTEMD_WANTS}="webcam.service"` tells Udev what systemd service to run.
+
+Save this rule into file called _90-webcam.rules_ (or something like that) in _/etc/udev/rules.d_ and you can load it either by rebooting your machine, or by running:
+
+```
+sudo udevadm control --reload-rules && udevadm trigger
+```
+
+## Service at Last
+
+The service the Udev rule triggers is ridiculously simple:
+
+```
+# webcam.service
+
+[Service]
+Type=simple
+ExecStart=/home/[user name]/bin/checkimage.sh
+```
+
+Basically, it just runs the _checkimage.sh_ script stored in your personal _bin/_ and pushes it the background. [This is something you saw how to do in prior installments][5]. It may seem something little, but just because it is called by a Udev rule, you have just created a special kind of systemd unit called a _device_ unit. Congratulations.
+
+As for the _checkimage.sh_ script _webcam.service_ calls, there are several ways of grabbing an image from a webcam and comparing it to a prior one to check for changes (which is what _checkimage.sh_ does), but this is how I did it:
+
+```
+#!/bin/bash
+# This is the checkimage.sh script
+
+mplayer -vo png -frames 1 tv:// -tv driver=v4l2:width=640:height=480:device=
+ /dev/mywebcam &>/dev/null
+mv 00000001.png /home/[user name]/monitor/monitor.png
+
+while true
+do
+ mplayer -vo png -frames 1 tv:// -tv driver=v4l2:width=640:height=480:device=/dev/mywebcam &>/dev/null
+ mv 00000001.png /home/[user name]/monitor/temp.png
+
+ imagediff=`compare -metric mae /home/[user name]/monitor/monitor.png /home/[user name]
+ /monitor/temp.png /home/[user name]/monitor/diff.png 2>&1 > /dev/null | cut -f 1 -d " "`
+ if [ `echo "$imagediff > 700.0" | bc` -eq 1 ]
+ then
+ mv /home/[user name]/monitor/temp.png /home/[user name]/monitor/monitor.png
+ fi
+
+ sleep 0.5
+done
+```
+
+Start by using [MPlayer][10] to grab a frame ( _00000001.png_ ) from the webcam. Notice how we point `mplayer` to the `mywebcam` symbolic link we created in our Udev rule, instead of to `video0` or `video1`. Then you transfer the image to the _monitor/_ directory in your home directory. Then run an infinite loop that does the same thing again and again, but also uses [Image Magick's _compare_ tool][11] to see if there any differences between the last image captured and the one that is already in the _monitor/_ directory.
+
+If the images are different, it means something has moved within the webcam's frame. The script overwrites the original image with the new image and continues comparing waiting for some more movement.
+
+### Plugged
+
+With all the bits and pieces in place, when you plug your webcam in, your Udev rule will be triggered and will start the _webcam.service_. The _webcam.service_ will execute _checkimage.sh_ in the background, and _checkimage.sh_ will start taking pictures every half a second. You will know because your webcam's LED will start flashing indicating every time it takes a snap.
+
+As always, if something goes wrong, run
+
+```
+systemctl status webcam.service
+```
+
+to check what your service and script are up to.
+
+### Coming up
+
+You may be wondering: Why overwrite the original image? Surely you would want to see what's going on if the system detects any movement, right? You would be right, but as you will see in the next installment, leaving things as they are and processing the images using yet another type of systemd unit makes things nice, clean and easy.
+
+Just wait and see.
+
+Learn more about Linux through the free ["Introduction to Linux" ][12]course from The Linux Foundation and edX.
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/blog/intro-to-linux/2018/6/systemd-services-reacting-change
+
+作者：[Paul Brown][a]
+选题：[lujun9972][b]
+译者：[译者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/bro66
+[b]: https://github.com/lujun9972
+[1]: https://www.intel.com/content/www/us/en/products/boards-kits/compute-stick/stk1a32sc.html
+[2]: https://www.linux.com/files/images/fig01png
+[3]: https://www.linux.com/sites/lcom/files/styles/floated_images/public/fig01.png?itok=cfEHN5f1 (ComputeStick)
+[4]: https://www.linux.com/licenses/category/used-permission
+[5]: https://www.linux.com/blog/learn/intro-to-linux/2018/5/writing-systemd-services-fun-and-profit
+[6]: https://www.linux.com/blog/learn/2018/5/systemd-services-beyond-starting-and-stopping
+[7]: https://www.linux.com/files/images/fig02png
+[8]: https://www.linux.com/sites/lcom/files/styles/floated_images/public/fig02.png?itok=esFv4BdM (webcam)
+[9]: https://chmod-calculator.com/
+[10]: https://mplayerhq.hu/design7/news.html
+[11]: https://www.imagemagick.org/script/compare.php
+[12]: https://training.linuxfoundation.org/linux-courses/system-administration-training/introduction-to-linux
diff --git a/sources/tech/20180619 Systemd Services- Monitoring Files and Directories.md b/sources/tech/20180619 Systemd Services- Monitoring Files and Directories.md
new file mode 100644
index 0000000000..601132a33f
--- /dev/null
+++ b/sources/tech/20180619 Systemd Services- Monitoring Files and Directories.md
@@ -0,0 +1,152 @@
+Systemd Services: Monitoring Files and Directories
+======
+
+
+
+So far in this systemd multi-part tutorial, we’ve covered [how to start and stop a service by hand][1], [how to start a service when booting your OS and have it stop on power down][2], and [how to boot a service when a certain device is detected][3]. This installment does something different yet again and covers how to create a unit that starts a service when something changes in the filesystem. For the practical example, you'll see how you can use one of these units to extend the [surveillance system we talked about last time][4].
+
+### Where we left off
+
+[Last time we saw how the surveillance system took pictures, but it did nothing with them][3]. In fact, it even overwrote the last picture it took when it detected movement so as not to fill the storage of the device.
+
+Does that mean the system is useless? Not by a long shot. Because, you see, systemd offers yet another type of units, _paths_ , that can help you out. _Path_ units allow you to trigger a service when an event happens in the filesystem, say, when a file gets deleted or a directory accessed. And, overwriting an image is exactly the kind of event we are talking about here.
+
+### Anatomy of a Path Unit
+
+A systemd path unit takes the extension _.path_ , and it monitors a file or directory. A _.path_ unit calls another unit (usually a _.service_ unit with the same name) when something happens to the monitored file or directory. For example, if you have a _picchanged.path_ unit to monitor the snapshot from your webcam, you will also have a _picchanged.service_ that will execute a script when the snapshot is overwritten.
+
+Path units contain a new section, `[Path]`, with few more directives. First, you have the what-to-watch-for directives:
+
+ * **`PathExists=`** monitors whether the file or directory exists. If it does, the associated unit gets triggered. `PathExistsGlob=` works in a similar fashion, but lets you use globbing, like when you use `ls *.jpg` to search for all the JPEG images in a directory. This lets you check, for example, whether a file with a certain extension exists.
+ * **`PathChanged=`** watches a file or directory and activates the configured unit whenever it changes. It is not activated on every write to the watched file but only when a monitored file open for for writing is changed and then closed. The associated unit is executed when the file is closed.
+ * **`PathModified=`** , on the other hand, does activate the unit when anything is changed in the file you are monitoring, even before you close the file.
+ * **`DirectoryNotEmpty=`** does what it says on the box, that is, it activates the associated unit if the monitored directory contains files or subdirectories.
+
+
+
+Then, we have `Unit=` that tells the _.path_ which _.service_ unit to activate, in case you want to give it a different name to that of your _.path_ unit; `MakeDirectory=` can be `true` or `false` (or `0` or `1`, or `yes` or `no`) and creates the directory you want to monitor before monitoring starts. Obviously, using `MakeDirectory=` in combination with `PathExists=` does not make sense. However, `MakeDirectory=` can be used in combination with `DirectoryMode=`, which you use to set the the mode (permissions) of the new directory. If you don't use `DirectoryMode=`, the default permissions for the new directory are `0755`.
+
+### Building _picchanged.path_
+
+All these directives are very useful, but you will be just looking for changes made to one single file, so your _.path_ unit is very simple:
+
+```
+#picchanged.path
+[Unit]
+Wants= webcam.service
+
+[Path]
+PathChanged= /home/[user name]/monitor/monitor.jpg
+```
+
+In the `Unit=` section the line that says
+
+```
+Wants= webcam.service
+```
+
+The `Wants=` directive is the preferred way of starting up a unit the current unit needs to work properly. [`webcam.service` is the name you gave the surveillance service that you saw in the previous article][3] and is the service that actually controls the webcam and makes it take a snap every half second. This means it’s _picchanged.path_ that is going to start up _webcam.service_ now, and not the [Udev rule you saw in the prior article][3]. You will use the Udev rule to start _picchanged.path_ instead.
+
+To summarize: the Udev rule pulls in your new _picchanged.path_ unit, which, in turn pulls in the _webcam.service_ as a requirement for everything to work perfectly.
+
+The "thing" that _picchanged.path_ monitors is the _monitor.jpg_ file in the _monitor/_ directory in your home directory. As you saw last time, _webcam.service_ called a script, _checkimage.sh_ , took a picture at the beginning of its execution and stored it in _monitor/temp.jpg_. _checkimage.sh_ then took another pic, _temp.jpg_ , and compared it with _monitor.jpg_. If it found significant differences (like when somebody walks into frame) the script overwrote _monitor.jpg_ with the _temp.jpg_. That is when _picchanged.path_ fires.
+
+As you haven't included a `Unit=` directive in your _.path_ , the unit systemd expects a matching _picchanged.service_ unit which it will trigger when _/home/[ _user name_ ]/monitor/monitor.jpg_ gets modified:
+
+```
+#picchanged.service
+[Service]
+Type= simple
+ExecStart= /home/[user name]/bin/picmonitor.sh
+```
+
+For the time being, let’s make _picmonitor.sh_ save a time-stamped copy of _monitor.jpg_ every time changes get detected:
+
+```
+#!/bin/bash
+# This is the pcmonitor.sh script
+
+cp /home/[user name]/monitor/monitor.jpg /home/[user name]/monitor/"`date`.jpg"
+```
+
+### Udev Changes
+
+You have to change the custom Udev rule you wrote in [the previous installment][3] so everything works. Edit _/etc/udev/rules.d/01-webcam.rules_ so instead of looking like this:
+
+```
+ACTION=="add", SUBSYSTEM=="video4linux", ATTRS{idVendor}=="03f0",
+ ATTRS{idProduct}=="e207", SYMLINK+="mywebcam", TAG+="systemd",
+ MODE="0666", ENV{SYSTEMD_WANTS}="webcam.service"
+```
+
+It looks like this:
+
+```
+ACTION=="add", SUBSYSTEM=="video4linux", ATTRS{idVendor}=="03f0",
+ ATTRS{idProduct}=="e207", SYMLINK+="mywebcam", TAG+="systemd",
+ MODE="0666", ENV{SYSTEMD_WANTS}="picchanged.path"
+```
+
+The new rule, instead of calling _webcam.service_ , now calls _picchanged.path_ when your webcam gets detected. (Note that you will have to change the `idVendor` and `IdProduct` to those of your own webcam -- you saw how to find these out previously).
+
+For the record, I also changed _checkimage.sh_ from using PNG to JPEG images. I did this because I found some dependency problems with PNG images when working with _mplayer_ on some versions of Debian. _checkimage.sh_ now looks like this:
+
+```
+#!/bin/bash
+
+mplayer -vo jpeg -frames 1 tv:// -tv driver=v4l2:width=640:height=480:device=
+ /dev/mywebcam &>/dev/null
+mv 00000001.jpg /home/paul/monitor/monitor.jpg
+
+while true
+do
+ mplayer -vo jpeg -frames 1 tv:// -tv driver=v4l2:width=640:height=480:device=
+ /dev/mywebcam &>/dev/null
+ mv 00000001.jpg /home/paul/monitor/temp.jpg
+
+ imagediff=`compare -metric mae /home/paul/monitor/monitor.jpg
+ /home/paul/monitor/temp.jpg /home/paul/monitor/diff.png 2>&1 >
+ /dev/null | cut -f 1 -d " "`
+
+ if [ `echo "$imagediff > 700.0" | bc` -eq 1 ]
+ then
+ mv /home/paul/monitor/temp.jpg /home/paul/monitor/monitor.jpg
+ fi
+
+ sleep 0.5
+done
+```
+
+### Firing up
+
+This is a multi-unit service that, when all its bits and pieces are in place, you don't have to worry much about: you plug in the designated webcam (or boot the machine with the webcam already connected), _picchanged.path_ gets started thanks to the Udev rule and takes over, bringing up the _webcam.service_ and starting to check on the snaps. There is nothing else you need to do.
+
+### Conclusion
+
+Having the process split into two doesn't only help explain how path units work, but it’s also very useful for debugging. One service does not "touch" the other in any way, which means that you could, for example, improve the "motion detection" part, and it would be very easy to roll back if things didn't work as expected.
+
+Admittedly, the example is a bit goofy, as there are definitely [better ways of monitoring movement using a webcam][5]. But remember: the main aim of these articles is to help you learn how systemd units work within a context.
+
+Next time, we'll finish up with systemd units by looking at some of the other types of units available and show how to improve your home-monitoring system further by setting up service that sends images to another machine.
+
+Learn more about Linux through the free ["Introduction to Linux" ][6]course from The Linux Foundation and edX.
+
+--------------------------------------------------------------------------------
+
+via: https://www.linux.com/blog/learn/intro-to-linux/2018/6/systemd-services-monitoring-files-and-directories
+
+作者：[Paul Brown][a]
+选题：[lujun9972][b]
+译者：[译者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/bro66
+[b]: https://github.com/lujun9972
+[1]: https://www.linux.com/blog/learn/intro-to-linux/2018/5/writing-systemd-services-fun-and-profit
+[2]: https://www.linux.com/blog/learn/2018/5/systemd-services-beyond-starting-and-stopping
+[3]: https://www.linux.com/blog/intro-to-linux/2018/6/systemd-services-reacting-change
+[4]: https://www.linux.com/blog/learn/intro-to-linux/2018/6/systemd-services-monitoring-files-and-directories
+[5]: https://www.linux.com/learn/how-operate-linux-spycams-motion
+[6]: https://training.linuxfoundation.org/linux-courses/system-administration-training/introduction-to-linux
diff --git a/sources/tech/20180716 How To Find The Mounted Filesystem Type In Linux.md b/sources/tech/20180716 How To Find The Mounted Filesystem Type In Linux.md
deleted file mode 100644
index 5005cf44f7..0000000000
--- a/sources/tech/20180716 How To Find The Mounted Filesystem Type In Linux.md
+++ /dev/null
@@ -1,259 +0,0 @@
-How To Find The Mounted Filesystem Type In Linux
-======
-
-
-
-As you may already know, the Linux supports numerous filesystems, such as Ext4, ext3, ext2, sysfs, securityfs, FAT16, FAT32, NTFS, and many. The most commonly used filesystem is Ext4. Ever wondered what type of filesystem are you currently using in your Linux system? No? Worry not! We got your back. This guide explains how to find the mounted filesystem type in Unix-like operating systems.
-
-### Find The Mounted Filesystem Type In Linux
-
-There can be many ways to find the filesystem type in Linux. Here, I have given 8 different methods. Let us get started, shall we?
-
-#### Method 1 – Using findmnt command
-
-This is the most commonly used method to find out the type of a filesystem. The **findmnt** command will list all mounted filesystems or search for a filesystem. The findmnt command can be able to search in **/etc/fstab** , **/etc/mtab** or **/proc/self/mountinfo**.
-
-findmnt command comes pre-installed in most Linux distributions, because it is part of the package named **util-linux**. Just in case if it is not available, simply install this package and you’re good to go. For instance, you can install **util-linux** package in Debian-based systems using command:
-```
-$ sudo apt install util-linux
-
-```
-
-Let us go ahead and see how to use findmnt command to find out the mounted filesystems.
-
-If you run it without any arguments/options, it will list all mounted filesystems in a tree-like format as shown below.
-```
-$ findmnt
-
-```
-
-**Sample output:**
-
-![][2]
-
-As you can see, the findmnt command displays the target mount point (TARGET), source device (SOURCE), file system type (FSTYPE), and relevant mount options, like whether the filesystem is read/write or read-only. (OPTIONS). In my case, my root(/) filesystem type is EXT4.
-
-If you don’t like/want to display the output in tree-like format, use **-l** flag to display in simple, plain format.
-```
-$ findmnt -l
-
-```
-
-![][3]
-
-You can also list a particular type of filesystem, for example **ext4** , using **-t** option.
-```
-$ findmnt -t ext4
-TARGET SOURCE FSTYPE OPTIONS
-/ /dev/sda2 ext4 rw,relatime,commit=360
-└─/boot /dev/sda1 ext4 rw,relatime,commit=360,data=ordered
-
-```
-
-Findmnt can produce df style output as well.
-```
-$ findmnt --df
-
-```
-
-Or
-```
-$ findmnt -D
-
-```
-
-Sample output:
-```
-SOURCE FSTYPE SIZE USED AVAIL USE% TARGET
-dev devtmpfs 3.9G 0 3.9G 0% /dev
-run tmpfs 3.9G 1.1M 3.9G 0% /run
-/dev/sda2 ext4 456.3G 342.5G 90.6G 75% /
-tmpfs tmpfs 3.9G 32.2M 3.8G 1% /dev/shm
-tmpfs tmpfs 3.9G 0 3.9G 0% /sys/fs/cgroup
-bpf bpf 0 0 0 - /sys/fs/bpf
-tmpfs tmpfs 3.9G 8.4M 3.9G 0% /tmp
-/dev/loop0 squashfs 82.1M 82.1M 0 100% /var/lib/snapd/snap/core/4327
-/dev/sda1 ext4 92.8M 55.7M 30.1M 60% /boot
-tmpfs tmpfs 788.8M 32K 788.8M 0% /run/user/1000
-gvfsd-fuse fuse.gvfsd-fuse 0 0 0 - /run/user/1000/gvfs
-
-```
-
-You can also display filesystems for a specific device, or mountpoint too.
-
-Search for a device:
-```
-$ findmnt /dev/sda1
-TARGET SOURCE FSTYPE OPTIONS
-/boot /dev/sda1 ext4 rw,relatime,commit=360,data=ordered
-
-```
-
-Search for a mountpoint:
-```
-$ findmnt /
-TARGET SOURCE FSTYPE OPTIONS
-/ /dev/sda2 ext4 rw,relatime,commit=360
-
-```
-
-You can even find filesystems with specific label:
-```
-$ findmnt LABEL=Storage
-
-```
-
-For more details, refer the man pages.
-```
-$ man findmnt
-
-```
-
-The findmnt command is just enough to find the type of a mounted filesystem in Linux. It is created for that specific purpose only. However, there are also few other ways available to find out the filesystem type. If you’re interested to know, read on.
-
-#### Method 2 – Using blkid command
-
-The **blkid** command is used locate and print block device attributes. It is also part of the util-linux package, so you don’t bother to install it.
-
-To find out the type of a filesystem using blkid command, run:
-```
-$ blkid /dev/sda1
-
-```
-
-#### Method 3 – Using df command
-
-The **df** command is used to report filesystem disk space usage in Unix-like operating systems. To find the type of all mounted filesystems, simply run:
-```
-$ df -T
-
-```
-
-**Sample output:**
-
-![][4]
-
-For details about df command, refer the following guide.
-
-Also, check man pages.
-```
-$ man df
-
-```
-
-#### Method 4 – Using file command
-
-The **file** command determines the type of a specified file. It works just fine for files with no file extension.
-
-Run the following command to find the filesystem type of a partition:
-```
-$ sudo file -sL /dev/sda1
-[sudo] password for sk:
-/dev/sda1: Linux rev 1.0 ext4 filesystem data, UUID=83a1dbbf-1e15-4b45-94fe-134d3872af96 (needs journal recovery) (extents) (large files) (huge files)
-
-```
-
-Check man pages for more details:
-```
-$ man file
-
-```
-
-#### Method 5 – Using fsck command
-
-The **fsck** command is used to check the integrity of a filesystem or repair it. You can find the type of a filesystem by passing the partition as an argument like below.
-```
-$ fsck -N /dev/sda1
-fsck from util-linux 2.32
-[/usr/bin/fsck.ext4 (1) -- /boot] fsck.ext4 /dev/sda1
-
-```
-
-For more details, refer man pages.
-```
-$ man fsck
-
-```
-
-#### Method 6 – Using fstab Command
-
-**fstab** is a file that contains static information about the filesystems. This file usually contains the mount point, filesystem type and mount options.
-
-To view the type of a filesystem, simply run:
-```
-$ cat /etc/fstab
-
-```
-
-![][5]
-
-For more details, refer man pages.
-```
-$ man fstab
-
-```
-
-#### Method 7 – Using lsblk command
-
-The **lsblk** command displays the information about devices.
-
-To display info about mounted filesystems, simply run:
-```
-$ lsblk -f
-NAME FSTYPE LABEL UUID MOUNTPOINT
-loop0 squashfs /var/lib/snapd/snap/core/4327
-sda
-├─sda1 ext4 83a1dbbf-1e15-4b45-94fe-134d3872af96 /boot
-├─sda2 ext4 4d25ddb0-5b20-40b4-ae35-ef96376d6594 /
-└─sda3 swap 1f8f5e2e-7c17-4f35-97e6-8bce7a4849cb [SWAP]
-sr0
-
-```
-
-For more details, refer man pages.
-```
-$ man lsblk
-
-```
-
-#### Method 8 – Using mount command
-
-The **mount** command is used to mount a local or remote filesystems in Unix-like systems.
-
-To find out the type of a filesystem using mount command, do:
-```
-$ mount | grep "^/dev"
-/dev/sda2 on / type ext4 (rw,relatime,commit=360)
-/dev/sda1 on /boot type ext4 (rw,relatime,commit=360,data=ordered)
-
-```
-
-For more details, refer man pages.
-```
-$ man mount
-
-```
-
-And, that’s all for now folks. You now know 8 different Linux commands to find out the type of a mounted Linux filesystems. If you know any other methods, feel free to let me know in the comment section below. I will check and update this guide accordingly.
-
-More good stuffs to come. Stay tuned!
-
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/how-to-find-the-mounted-filesystem-type-in-linux/
-
-作者：[SK][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.ostechnix.com/author/sk/
-[1]:data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7
-[2]:http://www.ostechnix.com/wp-content/uploads/2018/07/findmnt-1.png
-[3]:http://www.ostechnix.com/wp-content/uploads/2018/07/findmnt-2.png
-[4]:http://www.ostechnix.com/wp-content/uploads/2018/07/df.png
-[5]:http://www.ostechnix.com/wp-content/uploads/2018/07/fstab.png
diff --git a/sources/tech/20180723 Setting Up a Timer with systemd in Linux.md b/sources/tech/20180723 Setting Up a Timer with systemd in Linux.md
deleted file mode 100644
index 1718f4fbde..0000000000
--- a/sources/tech/20180723 Setting Up a Timer with systemd in Linux.md
+++ /dev/null
@@ -1,166 +0,0 @@
-LuuMing translating
-Setting Up a Timer with systemd in Linux
-======
-
-
-
-Previously, we saw how to enable and disable systemd services [by hand][1], [at boot time and on power down][2], [when a certain device is activated][3], and [when something changes in the filesystem][4].
-
-Timers add yet another way of starting services, based on... well, time. Although similar to cron jobs, systemd timers are slightly more flexible. Let's see how they work.
-
-### "Run when"
-
-Let's expand the [Minetest][5] [service you set up][1] in [the first two articles of this series][2] as our first example on how to use timer units. If you haven't read those articles yet, you may want to go and give them a look now.
-
-So you will "improve" your Minetest set up by creating a timer that will run the game's server 1 minute after boot up has finished instead of right away. The reason for this could be that, as you want your service to do other stuff, like send emails to the players telling them the game is available, you will want to make sure other services (like the network) are fully up and running before doing anything fancy.
-
-Jumping in at the deep end, your _minetest.timer_ unit will look like this:
-```
-# minetest.timer
-[Unit]
-Description=Runs the minetest.service 1 minute after boot up
-
-[Timer]
-OnBootSec=1 m
-Unit=minetest.service
-
-[Install]
-WantedBy=basic.target
-
-```
-
-Not hard at all.
-
-As usual, you have a `[Unit]` section with a description of what the unit does. Nothing new there. The `[Timer]` section is new, but it is pretty self-explanatory: it contains information on when the service will be triggered and the service to trigger. In this case, the `OnBootSec` is the directive you need to tell systemd to run the service after boot has finished.
-
-Other directives you could use are:
-
- * `OnActiveSec=`, which tells systemd how long to wait after the timer itself is activated before starting the service.
- * `OnStartupSec=`, on the other hand, tells systemd how long to wait after systemd was started before starting the service.
- * `OnUnitActiveSec=` tells systemd how long to wait after the service the timer is activating was last activated.
- * `OnUnitInactiveSec=` tells systemd how long to wait after the service the timer is activating was last deactivated.
-
-
-
-Continuing down the _minetest.timer_ unit, the `basic.target` is usually used as a synchronization point for late boot services. This means it makes _minetest.timer_ wait until local mount points and swap devices are mounted, sockets, timers, path units and other basic initialization processes are running before letting _minetest.timer_ start. As we explained in [the second article on systemd units][2], _targets_ are like the old run levels and can be used to put your machine into one state or another, or, like here, to tell your service to wait until a certain state has been reached.
-
-The _minetest.service_ you developed in the first two articles [ended up][2] looking like this:
-```
-# minetest.service
-[Unit]
-Description= Minetest server
-Documentation= https://wiki.minetest.net/Main_Page
-
-[Service]
-Type= simple
-User=
-
-ExecStart= /usr/games/minetest --server
-ExecStartPost= /home//bin/mtsendmail.sh "Ready to rumble?" "Minetest Starting up"
-
-TimeoutStopSec= 180
-ExecStop= /home//bin/mtsendmail.sh "Off to bed. Nightie night!" "Minetest Stopping in 2 minutes"
-ExecStop= /bin/sleep 120
-ExecStop= /bin/kill -2 $MAINPID
-
-[Install]
-WantedBy= multi-user.target
-
-```
-
-There’s nothing you need to change here. But you do have to change _mtsendmail.sh_ (your email sending script) from this:
-```
-#!/bin/bash
-# mtsendmail
-sleep 20
-echo $1 | mutt -F /home//.muttrc -s "$2" my_minetest@mailing_list.com
-sleep 10
-
-```
-
-to this:
-```
-#!/bin/bash
-# mtsendmail.sh
-echo $1 | mutt -F /home/paul/.muttrc -s "$2" pbrown@mykolab.com
-
-```
-
-What you are doing is stripping out those hacky pauses in the Bash script. Systemd does the waiting now.
-
-### Making it work
-
-To make sure things work, disable _minetest.service_ :
-```
-sudo systemctl disable minetest
-
-```
-
-so it doesn't get started when the system starts; and, instead, enable _minetest.timer_ :
-```
-sudo systemctl enable minetest.timer
-
-```
-
-Now you can reboot you server machine and, when you run `sudo journalctl -u minetest.*` you will see how, first the _minetest.timer_ unit gets executed and then the _minetest.service_ starts up after a minute... more or less.
-
-![minetest timer][7]
-
-Figure 1: The minetest.service gets started one minute after the minetest.timer... more or less.
-
-[Used with permission][8]
-
-### A Matter of Time
-
-A couple of clarifications about why the _minetest.timer_ entry in the systemd's Journal shows its start time as 09:08:33, while the _minetest.service_ starts at 09:09:18, that is less than a minute later: First, remember we said that the `OnBootSec=` directive calculates when to start a service from when boot is complete. By the time _minetest.timer_ comes along, boot has finished a few seconds ago.
-
-The other thing is that systemd gives itself a margin of error (by default, 1 minute) to run stuff. This helps distribute the load when several resource-intensive processes are running at the same time: by giving itself a minute, systemd can wait for some processes to power down. This also means that _minetest.service_ will start somewhere between the 1 minute and 2 minute mark after boot is completed, but when exactly within that range is anybody's guess.
-
-For the record, [you can change the margin of error with `AccuracySec=` directive][9].
-
-Another thing you can do is check when all the timers on your system are scheduled to run or the last time the ran:
-```
-systemctl list-timers --all
-
-```
-
-![check timer][11]
-
-Figure 2: Check when your timers are scheduled to fire or when they fired last.
-
-[Used with permission][8]
-
-The final thing to take into consideration is the format you should use to express the periods of time. Systemd is very flexible in that respect: `2 h`, `2 hours` or `2hr` will all work to express a 2 hour delay. For seconds, you can use `seconds`, `second`, `sec`, and `s`, the same way as for minutes you can use `minutes`, `minute`, `min`, and `m`. You can see a full list of time units systemd understands by checking `man systemd.time`.
-
-### Next Time
-
-You'll see how to use calendar dates and times to run services at regular intervals and how to combine timers and device units to run services at defined point in time after you plug in some hardware.
-
-See you then!
-
-Learn more about Linux through the free ["Introduction to Linux" ][12]course from The Linux Foundation and edX.
-
---------------------------------------------------------------------------------
-
-via: https://www.linux.com/blog/learn/intro-to-linux/2018/7/setting-timer-systemd-linux
-
-作者：[Paul Brown][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者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/bro66
-[1]:https://www.linux.com/blog/learn/intro-to-linux/2018/5/writing-systemd-services-fun-and-profit
-[2]:https://www.linux.com/blog/learn/2018/5/systemd-services-beyond-starting-and-stopping
-[3]:https://www.linux.com/blog/intro-to-linux/2018/6/systemd-services-reacting-change
-[4]:https://www.linux.com/blog/learn/intro-to-linux/2018/6/systemd-services-monitoring-files-and-directories
-[5]:https://www.minetest.net/
-[6]:/files/images/minetest-timer-1png
-[7]:https://www.linux.com/sites/lcom/files/styles/rendered_file/public/minetest-timer-1.png?itok=TG0xJvYM (minetest timer)
-[8]:/licenses/category/used-permission
-[9]:https://www.freedesktop.org/software/systemd/man/systemd.timer.html#AccuracySec=
-[10]:/files/images/minetest-timer-2png
-[11]:https://www.linux.com/sites/lcom/files/styles/rendered_file/public/minetest-timer-2.png?itok=pYxyVx8- (check timer)
-[12]:https://training.linuxfoundation.org/linux-courses/system-administration-training/introduction-to-linux
diff --git a/sources/tech/20180725 Build an interactive CLI with Node.js.md b/sources/tech/20180725 Build an interactive CLI with Node.js.md
index 6ec13f1cfc..f240e51efd 100644
--- a/sources/tech/20180725 Build an interactive CLI with Node.js.md
+++ b/sources/tech/20180725 Build an interactive CLI with Node.js.md
@@ -1,3 +1,5 @@
+translating by Flowsnow
+
Build an interactive CLI with Node.js
======
diff --git a/sources/tech/20180727 How to analyze your system with perf and Python.md b/sources/tech/20180727 How to analyze your system with perf and Python.md
index c1be98cc0e..4573ed1ee0 100644
--- a/sources/tech/20180727 How to analyze your system with perf and Python.md
+++ b/sources/tech/20180727 How to analyze your system with perf and Python.md
@@ -1,3 +1,7 @@
+**translating by [erlinux](https://github.com/erlinux)**
+**PROJECT MANAGEMENT TOOL called [gn2.sh](https://github.com/lctt/lctt-cli)**
+
+
How to analyze your system with perf and Python
======
diff --git a/sources/tech/20180810 How To Quickly Serve Files And Folders Over HTTP In Linux.md b/sources/tech/20180810 How To Quickly Serve Files And Folders Over HTTP In Linux.md
deleted file mode 100644
index c4adc3ac07..0000000000
--- a/sources/tech/20180810 How To Quickly Serve Files And Folders Over HTTP In Linux.md
+++ /dev/null
@@ -1,168 +0,0 @@
-How To Quickly Serve Files And Folders Over HTTP In Linux
-======
-
-
-
-Today, I came across a whole bunch of methods to serve a single file or entire directory with other systems in your local area network via a web browser. I tested all of them in my Ubuntu test machine, and everything worked just fine as described below. If you ever wondered how to easily and quickly serve files and folders over HTTP in Unix-like operating systems, one of the following methods will definitely help.
-
-### Serve Files And Folders Over HTTP In Linux
-
-**Disclaimer:** All the methods given here are meant to be used within a secure local area network. Since these methods doesn’t have any security mechanism, it is **not recommended to use them in production**. You have been warned!
-
-#### Method 1 – Using simpleHTTPserver (Python)
-
-We already have written a brief guide to setup a simple http server to share files and directories instantly in the following link. If you have a system with Python installed, this method is quite handy.
-
-#### Method 2 – Using Quickserve (Python)
-
-This method is specifically for Arch Linux and its variants. Check the following link for more details.
-
-#### Method 3 – Using Ruby**
-
-In this method, we use Ruby to serve files and folders over HTTP in Unix-like systems. Install Ruby and Rails as described in the following link.
-
-Once Ruby installed, go to the directory, for example ostechnix, that you want to share over the network:
-```
-$ cd ostechnix
-
-```
-
-And, run the following command:
-```
-$ ruby -run -ehttpd . -p8000
-[2018-08-10 16:02:55] INFO WEBrick 1.4.2
-[2018-08-10 16:02:55] INFO ruby 2.5.1 (2018-03-29) [x86_64-linux]
-[2018-08-10 16:02:55] INFO WEBrick::HTTPServer#start: pid=5859 port=8000
-
-```
-
-Make sure the port 8000 is opened in your router or firewall . If the port has already been used by some other services use different port.
-
-You can now access the contents of this folder from any remote system using URL – **http:// :8000/**.
-
-
-
-To stop sharing press **CTRL+C**.
-
-#### Method 4 – Using Http-server (NodeJS)
-
-[**Http-server**][1] is a simple, production ready command line http-server written in NodeJS. It requires zero configuration and can be used to instantly share files and directories via web browser.
-
-Install NodeJS as described below.
-
-Once NodeJS installed, run the following command to install http-server.
-```
-$ npm install -g http-server
-
-```
-
-Now, go to any directory and share its contents over HTTP as shown below.
-```
-$ cd ostechnix
-
-$ http-server -p 8000
-Starting up http-server, serving ./
-Available on:
- http://127.0.0.1:8000
- http://192.168.225.24:8000
- http://192.168.225.20:8000
-Hit CTRL-C to stop the server
-
-```
-
-Now, you can access the contents of this directory from local or remote systems in the network using URL – **http:// :8000**.
-
-
-
-To stop sharing, press **CTRL+C**.
-
-#### Method 5 – Using Miniserve (Rust)
-
-[**Miniserve**][2] is yet another command line utility that allows you to quickly serve files over HTTP. It is very fast, easy-to-use, and cross-platform utility written in **Rust** programming language. Unlike the above utilities/methods, it provides authentication support, so you can setup username and password to the shares.
-
-Install Rust in your Linux system as described in the following link.
-
-After installing Rust, run the following command to install miniserve:
-```
-$ cargo install miniserve
-
-```
-
-Alternatively, you can download the binaries from [**the releases page**][3] and make it executable.
-```
-$ chmod +x miniserve-linux
-
-```
-
-And, then you can run it using command (assuming miniserve binary file is downloaded in the current working directory):
-```
-$ ./miniserve-linux
-
-```
-
-**Usage**
-
-To serve a directory:
-```
-$ miniserve
-
-```
-
-**Example:**
-```
-$ miniserve /home/sk/ostechnix/
-miniserve v0.2.0
-Serving path /home/sk/ostechnix at http://[::]:8080, http://localhost:8080
-Quit by pressing CTRL-C
-
-```
-
-Now, you can access the share from local system itself using URL – **** and/or from remote system with URL – **http:// :8080**.
-
-To serve a single file:
-```
-$ miniserve
-
-```
-
-**Example:**
-```
-$ miniserve ostechnix/file.txt
-
-```
-
-Serve file/folder with username and password:
-```
-$ miniserve --auth joe:123
-
-```
-
-Bind to multiple interfaces:
-```
-$ miniserve -i 192.168.225.1 -i 10.10.0.1 -i ::1 --
-
-```
-
-As you can see, I have given only 5 methods. But, there are few more methods given in the link attached at the end of this guide. Go and test them as well. Also, bookmark and revisit it from time to time to check if there are any new additions to the list in future.
-
-And, that’s all for now. Hope this was useful. More good stuffs to come. Stay tuned!
-
-Cheers!
-
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/how-to-quickly-serve-files-and-folders-over-http-in-linux/
-
-作者：[SK][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.ostechnix.com/author/sk/
-[1]:https://www.npmjs.com/package/http-server
-[2]:https://github.com/svenstaro/miniserve
-[3]:https://github.com/svenstaro/miniserve/releases
diff --git a/sources/tech/20180814 Top Linux developers- recommended programming books.md b/sources/tech/20180814 Top Linux developers- recommended programming books.md
deleted file mode 100644
index 589fc8dc6e..0000000000
--- a/sources/tech/20180814 Top Linux developers- recommended programming books.md
+++ /dev/null
@@ -1,96 +0,0 @@
-Translateing By DavidChenLiang
-Top Linux developers' recommended programming books
-======
-Without question, Linux was created by brilliant programmers who employed good computer science knowledge. Let the Linux programmers whose names you know share the books that got them started and the technology references they recommend for today's developers. How many of them have you read?
-
-Linux is, arguably, the operating system of the 21st century. While Linus Torvalds made a lot of good business and community decisions in building the open source community, the primary reason networking professionals and developers adopted Linux is the quality of its code and its usefulness. While Torvalds is a programming genius, he has been assisted by many other brilliant developers.
-
-I asked Torvalds and other top Linux developers which books helped them on their road to programming excellence. This is what they told me.
-
-### By shining C
-
-Linux was developed in the 1990s, as were other fundamental open source applications. As a result, the tools and languages the developers used reflected the times, which meant a lot of C programming language. While [C is no longer as popular][1], for many established developers it was their first serious language, which is reflected in their choice of influential books.
-
-“You shouldn't start programming with the languages I started with or the way I did,” says Torvalds. He started with BASIC, moved on to machine code (“not even assembly language, actual ‘just numbers’ machine code,” he explains), then assembly language and C.
-
-“None of those languages are what anybody should begin with anymore,” Torvalds says. “Some of them make no sense at all today (BASIC and machine code). And while C is still a major language, I don't think you should begin with it.”
-
-It's not that he dislikes C. After all, Linux is written in [GNU C][2]. "I still think C is a great language with a pretty simple syntax and is very good for many things,” he says. But the effort to get started with it is much too high for it to be a good beginner language by today's standards. “I suspect you'd just get frustrated. Going from your first ‘Hello World’ program to something you might actually use is just too big of a step."
-
-From that era, the only programming book that stood out for Torvalds is Brian W. Kernighan and Dennis M. Ritchie's [C Programming Language][3], known in serious programming circles as K&R. “It was small, clear, concise,” he explains. “But you need to already have a programming background to appreciate it."
-
-Torvalds is not the only open source developer to recommend K&R. Several others cite their well-thumbed copies as influential references, among them Wim Coekaerts, senior vice president for Linux and virtualization development at Oracle; Linux developer Alan Cox; Google Cloud CTO Brian Stevens; and Pete Graner, Canonical's vice president of technical operations.
-
-If you want to tackle C today, Jeremy Allison, co-founder of Samba, recommends [21st Century C][4]. Then, Allison suggests, follow it up with the older but still thorough [Expert C Programming][5] as well as the 20-year-old [Programming with POSIX Threads][6].
-
-### If not C, what?
-
-Linux developers’ recommendations for current programming books naturally are an offshoot of the tools and languages they think are most suitable for today’s development projects. They also reflect the developers’ personal preferences. For example, Allison thinks young developers would be well served by learning Go with the help of [The Go Programming Language][7] and Rust with [Programming Rust][8].
-
-But it may make sense to think beyond programming languages (and thus books to teach you their techniques). To do something meaningful today, “start from some environment with a toolkit that does 99 percent of the obscure details for you, so that you can script things around it," Torvalds recommends.
-
-"Honestly, the language itself isn't nearly as important as the infrastructure around it,” he continues. “Maybe you'd start with Java or Kotlin—not because of those languages per se, but because you want to write an app for your phone and the Android SDK ends up making those better choices. Or, maybe you're interested in games, so you start with one of the game engines, which often have some scripting language of their own."
-
-That infrastructure includes programming books specific to the operating system itself. Graner followed K&R by reading W. Richard Stevens' [Unix Network Programming][10] books. In particular, Stevens' [TCP/IP Illustrated, Volume 1: The Protocols][11] is considered still relevant even though it's almost 30 years old. Because Linux development is largely [relevant to networking infrastructure][12], Graner also recommends the many O’Reilly books on [Sendmail][13], [Bash][14], [DNS][15], and [IMAP/POP][16].
-
-Coekaerts is also fond of Maurice Bach's [The Design of the Unix Operating System][17]. So is James Bottomley, a Linux kernel developer who used Bach's tome to pull apart Linux when the OS was new.
-
-### Design knowledge never goes stale
-
-But even that may be too tech-specific. "All developers should start with design before syntax,” says Stevens. “[The Design of Everyday Things][18] is one of my favorites.”
-
-Coekaerts likes Kernighan and Rob Pike's [The Practice of Programming][19]. The design-practice book wasn't around when Coekaerts was in school, “but I recommend it to everyone to read," he says.
-
-Whenever you ask serious long-term developers about their favorite books, sooner or later someone's going to mention Donald Knuth’s [The Art of Computer Programming][20]. Dirk Hohndel, VMware's chief open source officer, considers it timeless though, admittedly, “not necessarily super-useful today."
-
-### Read code. Lots of code
-
-While programming books can teach you a lot, don’t miss another opportunity that is unique to the open source community: [reading the code][21]. There are untold megabytes of examples of how to solve a given programming problem—and how you can get in trouble, too. Stevens says his No. 1 “book” for honing programming skills is having access to the Unix source code.
-
-Don’t overlook the opportunity to learn in person, too. “I learned BASIC by being in a computer club with other people all learning together,” says Cox. “In my opinion, that is still by far the best way to learn." He learned machine code from [Mastering Machine Code on Your ZX81][22] and the Honeywell L66 B compiler manuals, but working with other developers made a big difference.
-
-“I still think the way to learn best remains to be with a group of people having fun and trying to solve a problem you care about together,” says Cox. “It doesn't matter if you are 5 or 55."
-
-What struck me the most about these recommendations is how often the top Linux developers started at a low level—not just C or assembly language but machine language. Obviously, it’s been very useful in helping developers understand how computing works at a very basic level.
-
-So, ready to give hard-core Linux development a try? Greg Kroah-Hartman, the Linux stable branch kernel maintainer, recommends Steve Oualline's [Practical C Programming][23] and Samuel Harbison and Guy Steele's [C: A Reference Manual][24]. Next, read "[HOWTO do Linux kernel development][25]." Then, says Kroah-Hartman, you'll be ready to start.
-
-In the meantime, study hard, program lots, and best of luck to you in following the footsteps of Linux's top programmers.
-
---------------------------------------------------------------------------------
-
-via: https://www.hpe.com/us/en/insights/articles/top-linux-developers-recommended-programming-books-1808.html
-
-作者：[Steven Vaughan-Nichols][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.hpe.com/us/en/insights/contributors/steven-j-vaughan-nichols.html
-[1]:https://www.codingdojo.com/blog/7-most-in-demand-programming-languages-of-2018/
-[2]:https://www.gnu.org/software/gnu-c-manual/
-[3]:https://amzn.to/2nhyjEO
-[4]:https://amzn.to/2vsL8k9
-[5]:https://amzn.to/2KBbWn9
-[6]:https://amzn.to/2M0rfeR
-[7]:https://amzn.to/2nhyrnMe
-[8]:http://shop.oreilly.com/product/0636920040385.do
-[9]:https://www.hpe.com/us/en/resources/storage/containers-for-dummies.html?jumpid=in_510384402_linuxbooks_containerebook0818
-[10]:https://amzn.to/2MfpbyC
-[11]:https://amzn.to/2MpgrTn
-[12]:https://www.hpe.com/us/en/insights/articles/how-to-see-whats-going-on-with-your-linux-system-right-now-1807.html
-[13]:http://shop.oreilly.com/product/9780596510299.do
-[14]:http://shop.oreilly.com/product/9780596009656.do
-[15]:http://shop.oreilly.com/product/9780596100575.do
-[16]:http://shop.oreilly.com/product/9780596000127.do
-[17]:https://amzn.to/2vsCJgF
-[18]:https://amzn.to/2APzt3Z
-[19]:https://www.amazon.com/Practice-Programming-Addison-Wesley-Professional-Computing/dp/020161586X/ref=as_li_ss_tl?ie=UTF8&linkCode=sl1&tag=thegroovycorpora&linkId=e6bbdb1ca2182487069bf9089fc8107e&language=en_US
-[20]:https://amzn.to/2OknFsJ
-[21]:https://amzn.to/2M4VVL3
-[22]:https://amzn.to/2OjccJA
-[23]:http://shop.oreilly.com/product/9781565923065.do
-[24]:https://amzn.to/2OjzgrT
-[25]:https://www.kernel.org/doc/html/v4.16/process/howto.html
diff --git a/sources/tech/20180820 How To Disable Ads In Terminal Welcome Message In Ubuntu Server.md b/sources/tech/20180820 How To Disable Ads In Terminal Welcome Message In Ubuntu Server.md
deleted file mode 100644
index 8f6ef80dbe..0000000000
--- a/sources/tech/20180820 How To Disable Ads In Terminal Welcome Message In Ubuntu Server.md
+++ /dev/null
@@ -1,120 +0,0 @@
-How To Disable Ads In Terminal Welcome Message In Ubuntu Server
-======
-
-
-
-If you’re using any latest Ubuntu server edition, you might have noticed some promotional links in welcome message which are not relevant to Ubuntu server platform. As you might already know **MOTD** , abbreviation of **M** essage **O** f **T** he **D** ay, displays a welcome message at every login in Linux systems. Usually, the welcome message contains the version of your OS, basic system information, official documentation link, and the links to read about the latest security updates etc. This is what we usually see at every time we login either via SSH or on the local machine. However, there some additional links started to appear in the terminal welcome message lately. I have already noticed this link few times, but I didn’t care about it and never clicked it though. Here is the Terminal welcome message shown in my Ubuntu 18.04 LTS server.
-
-
-
-As you can see in the above screenshot, there is also a bit.ly link and Ubuntu wiki link in the welcome message. Some of you may surprise and wondering what this is. There is nothing to worry about the links in the welcome message. It may look sort of ad-like, but those are not really commercial ads. The links are actually pointing to [**Ubuntu official blog**][1] and [**Ubuntu wiki**][2]. As I said earlier, one of link is not relevant and doesn’t has any details related to Ubuntu server. That’s why I called them ads in the first place.
-
-Even though most of us won’t visit bit.ly links, but some people may visit those links out of curiosity and ended up disappointed realizing that it simply points you to an external link. You can use any URL unshortners services, such as unshorten.it, to see where they lead before visiting the actual link. Alternatively, you can just type a plus sign ( **+** ) at the end of the bit.ly link to see where they lead and some statistics about the link.
-
-
-
-### What is MOTD and how it works?
-
-Back in 2009, **Dustin Kirkland** from Canonical introduced the concept of MOTD in Ubuntu. It’s a flexible framework that enables the administrators or distro packages to add executable scripts in /etc/update-motd.d/* location to generate informative, interesting messages displayed at login. It was originally implemented for Landscape (a commercial service from Canonical), however other distribution maintainers found it useful and adopted this feature in their own distributions as well.
-
-If you look in **/etc/update-motd.d/** location in your Ubuntu system, you’ll see a set of scripts. One prints the generic “welcome” banner. The next one prints 3 links showing where to find help for the OS. The other one counts and displays the number of package updates available for the local system. Another one tells you if a reboot is required and so on.
-
-From Ubuntu 17.04 onwards, the developers have added **/etc/update-motd.d/50-motd-news** , a script to include some additional information in the welcome message. They additional information are;
-
- 1. Important critical information, such as
-
-ShellShock, Heartbleed etc.
-
- 2. End-of-Life (EOL) messages, new feature availability, etc.
-
- 3. Some fun and informative posts published in Ubuntu official blog and other news about Ubuntu.
-
-
-
-
-Asynchronously, about 60 seconds after boot, a systemd timer runs “/etc/update-motd.d/50-motd-news –force” script. It sources 3 config variables defined in /etc/default/motd-news script. The default values are: ENABLED=1, URLS=”, WAIT=”5″.
-
-Here is the contents of /etc/default/motd-news file:
-```
-$ cat /etc/default/motd-news
-# Enable/disable the dynamic MOTD news service
-# This is a useful way to provide dynamic, informative
-# information pertinent to the users and administrators
-# of the local system
-ENABLED=1
-
-# Configure the source of dynamic MOTD news
-# White space separated list of 0 to many news services
-# For security reasons, these must be https
-# and have a valid certificate
-# Canonical runs a service at motd.ubuntu.com, and you
-# can easily run one too
-URLS="https://motd.ubuntu.com"
-
-# Specify the time in seconds, you're willing to wait for
-# dynamic MOTD news
-# Note that news messages are fetched in the background by
-# a systemd timer, so this should never block boot or login
-WAIT=5
-
-```
-
-Good thing is MOTD is fully customizable, so you can disable it entirely (ENABLED=0), change or add scripts as per your wish, and change the wait time in seconds
-
-If MOTD is enabled, that systemd timer job will loop over each of the URLS, trim them to 80 characters per line, and a maximum of 10 lines, and concatenate them to a cache file in /var/cache/motd-news. This systemd timer job will re-run and update the /var/cache/motd-news every 12 hours. Upon user login, the contents of /var/cache/motd-news is just printed to screen. This is how MOTD works.
-
-Also, a custom user-agent string is included in **/etc/update-motd.d/50-motd-news** file to report information about your computer. If you look into **/etc/update-motd.d/50-motd-news** file, you will see the following code.
-```
-# Piece together the user agent
-USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime"
-
-```
-
-That means, the MOTD retriever reports your **operating system release** , **hardware platform** , **CPU type** and **uptime** to Canonical.
-
-Hope you got the basic idea about MOTD.
-
-Let us now get back to the topic. I don’t want this feature. How do I disable it? If the promotional links in the welcome message still bothers you and you wanted to disable them permanently, here is a quick way to disable it.
-
-### Disable Ads In Terminal Welcome Message In Ubuntu Server
-
-To disable these ads, edit file:
-```
-$ sudo vi /etc/default/motd-news
-
-```
-
-Find the following line and set its value as 0 (zero).
-```
-[...]
-ENABLED=0
-[...]
-
-```
-
-Save and close the file. Now, reboot your system and see if the welcome message stills showing the links from Ubuntu blog.
-
-
-
-See? There are no links from Ubuntu blog and Ubuntu wiki now.
-
-And, that’s all for now. Hope this helps. More good stuffs to come. Stay tuned!
-
-Cheers!
-
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/how-to-disable-ads-in-terminal-welcome-message-in-ubuntu-server/
-
-作者：[SK][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]:https://www.ostechnix.com/author/sk/
-[1]:https://blog.ubuntu.com/
-[2]:https://wiki.ubuntu.com/
diff --git a/sources/tech/20180824 Joplin- Encrypted Open Source Note Taking And To-Do Application.md b/sources/tech/20180824 Joplin- Encrypted Open Source Note Taking And To-Do Application.md
index 5c520c8021..ae6a1f32d9 100644
--- a/sources/tech/20180824 Joplin- Encrypted Open Source Note Taking And To-Do Application.md
+++ b/sources/tech/20180824 Joplin- Encrypted Open Source Note Taking And To-Do Application.md
@@ -1,3 +1,5 @@
+translating---geekpi
+
Joplin: Encrypted Open Source Note Taking And To-Do Application
======
**[Joplin][1] is a free and open source note taking and to-do application available for Linux, Windows, macOS, Android and iOS. Its key features include end-to-end encryption, Markdown support, and synchronization via third-party services like NextCloud, Dropbox, OneDrive or WebDAV.**
diff --git a/sources/tech/20180827 Top 10 Raspberry Pi blogs to follow.md b/sources/tech/20180827 Top 10 Raspberry Pi blogs to follow.md
deleted file mode 100644
index a6f4e965c5..0000000000
--- a/sources/tech/20180827 Top 10 Raspberry Pi blogs to follow.md
+++ /dev/null
@@ -1,94 +0,0 @@
-Translating by jlztan
-
-Top 10 Raspberry Pi blogs to follow
-======
-
-
-
-There are plenty of great Raspberry Pi fan sites, tutorials, repositories, YouTube channels, and other resources on the web. Here are my top 10 favorite Raspberry Pi blogs, in no particular order.
-
-### 1. Raspberry Pi Spy
-
-Raspberry Pi fan Matt Hawkins has been writing a broad range of comprehensive and informative tutorials on his site, Raspberry Pi Spy, since the early days. I have learned a lot directly from this site, and Matt always seems to be the first to cover many topics. I have reached out for help many times in my first three years in the world of hacking and making with Raspberry Pi.
-
-Fortunately for everyone, this early adopter site is still going strong. I hope to see it live on, giving new community members a helping hand when they need it.
-
-### 2. Adafruit
-
-Adafruit is one of the biggest names in hardware hacking. The company makes and sells beautiful hardware and provides excellent tutorials written by staff, community members, and even the wonderful Lady Ada herself.
-
-As well as being a webshop, Adafruit also run a blog, which is full to the brim of great content from around the world. Check out the Raspberry Pi category, especially at the end of the work week, as [Friday is Pi Day][1] at Adafruit Towers.
-
-### 3. Recantha's Raspberry Pi Pod
-
-Mike Horne (Recantha) is a key Pi community member in the UK who runs the [CamJam and Potton Pi & Pint][2] (two Raspberry Jams in Cambridge) and [Pi Wars][3] (an annual Pi robotics competition). He gives advice to others setting up Jams and always has time to help beginners. With his co-organizer Tim Richardson, Horne developed the CamJam Edu Kit (a series of small and affordable kits for beginners to learn physical computing with Python).
-
-On top of all this, he runs the Pi Pod, a blog full of anything and everything Pi-related from around the world. It's probably the most regularly updated Pi blog on this list, so it's a great way to keep your finger on the pulse of the Pi community.
-
-### 4. Raspberry Pi blog
-
-Not forgetting the official [Raspberry Pi Foundation][4], this blog covers a range of content from the Foundation's world of hardware, software, education, community, and charity and youth coding clubs. Big themes on the blog are digital making at home, empowerment through education, as well as official news on hardware releases and software updates.
-
-The blog has been running [since 2011][5] and provides an [archive][6] of all 1800+ posts since that time. You can also follow [@raspberrypi_otd][7] on Twitter, which is a bot I created in [Python][8] (for an [Opensource.com tutorial][9], of course). The bot tweets links to blog posts from the current day in previous years from the Raspberry Pi blog archive.
-
-### 5. RasPi.tv
-
-Another seminal Raspberry Pi community member is Alex Eames, who got on board early on with his blog and YouTube channel, RasPi.tv. The site is packed with high-quality, well-produced video tutorials and written guides covering maker projects for all.
-
-Alex makes a series of add-on boards and accessories for the Pi as [RasP.iO][10], including a handy GPIO port label, reference rulers, and more. His blog branches out into [Arduino][11], [WEMO][12], and other small boards too.
-
-### 6. pyimagesearch
-
-Though not strictly a Raspberry Pi blog (the "py" in the name is for "Python," not "Raspberry Pi"), this site features an extensive [Raspberry Pi category][13]. Adrian Rosebrock earned a PhD studying the fields of computer vision and machine learning. His blog aims to share the machine learning tricks he's picked up while studying and making his own computer vision projects.
-
-If you want to learn about facial or object recognition using the Pi camera module, this is the place to be. Adrian's knowledge and practical application of deep learning and AI for image recognition is second to none—and he writes up his projects so that anyone can try.
-
-### 7. Raspberry Pi Roundup
-
-One of the UK's official Raspberry Pi resellers, The Pi Hut, maintains a blog curating the finds of the week. It's another great resource to keep up with what's on in the Pi world, and worth looking back through past issues.
-
-### 8. Dave Akerman
-
-A leading expert in high-altitude ballooning, Dave Akerman shares his knowledge and experience with balloon launches at minimal cost using Raspberry Pi. He publishes writeups of his launches with photos from the stratosphere and offers tips on how to launch a Pi balloon yourself.
-
-Check out Dave's blogfor amazing photography from near space.
-
-### 9. Pimoroni
-
-A world-renowned Raspberry Pi reseller based in Sheffield in the UK, Pimoroni made the famous [Pibow Rainbow case][14] and followed it up with a host of incredible custom add-on boards and accessories.
-
-Pimoroni's blog is laid out as beautifully as its hardware design and branding, and it provides great content for makers and hobbyists at home. The blog accompanies their entertaining YouTube channel [Bilge Tank][15].
-
-### 10. Stuff About Code
-
-Martin O'Hanlon is a Pi community member-turned-Foundation employee who started out hacking Minecraft on the Pi for fun and recently joined the Foundation as a content writer. Luckily, Martin's new job hasn't stopped him from updating his blog and sharing useful tidbits with the world. As well as lots on Minecraft, you'll find stuff on the Python libraries, [Blue Dot][16], and [guizero][17], along with general Raspberry Pi tips.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/8/top-10-raspberry-pi-blogs-follow
-
-作者：[Ben Nuttall][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者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/bennuttall
-[1]:https://blog.adafruit.com/category/raspberry-pi/
-[2]:https://camjam.me/?page_id=753
-[3]:https://piwars.org/
-[4]:https://www.raspberrypi-spy.co.uk/
-[5]:https://www.raspberrypi.org/blog/first-post/
-[6]:https://www.raspberrypi.org/blog/archive/
-[7]:https://twitter.com/raspberrypi_otd
-[8]:https://github.com/bennuttall/rpi-otd-bot/blob/master/src/bot.py
-[9]:https://opensource.com/article/17/8/raspberry-pi-twitter-bot
-[10]:https://rasp.io/
-[11]:https://www.arduino.cc/
-[12]:http://community.wemo.com/
-[13]:https://www.pyimagesearch.com/category/raspberry-pi/
-[14]:https://shop.pimoroni.com/products/pibow-for-raspberry-pi-3-b-plus
-[15]:https://www.youtube.com/channel/UCuiDNTaTdPTGZZzHm0iriGQ
-[16]:https://bluedot.readthedocs.io/en/latest/#
-[17]:https://lawsie.github.io/guizero/
diff --git a/sources/tech/20180831 Publishing Markdown to HTML with MDwiki.md b/sources/tech/20180831 Publishing Markdown to HTML with MDwiki.md
index 769f9ba420..c25239b7ba 100644
--- a/sources/tech/20180831 Publishing Markdown to HTML with MDwiki.md
+++ b/sources/tech/20180831 Publishing Markdown to HTML with MDwiki.md
@@ -1,4 +1,3 @@
-Translating by z52527
Publishing Markdown to HTML with MDwiki
======
diff --git a/sources/tech/20180831 Test containers with Python and Conu.md b/sources/tech/20180831 Test containers with Python and Conu.md
index e28ca4674e..9911901d51 100644
--- a/sources/tech/20180831 Test containers with Python and Conu.md
+++ b/sources/tech/20180831 Test containers with Python and Conu.md
@@ -1,4 +1,4 @@
-Test containers with Python and Conu
+translating by GraveAccent Test containers with Python and Conu
======
diff --git a/sources/tech/20180903 A Cross-platform High-quality GIF Encoder.md b/sources/tech/20180903 A Cross-platform High-quality GIF Encoder.md
deleted file mode 100644
index 7a7f79064b..0000000000
--- a/sources/tech/20180903 A Cross-platform High-quality GIF Encoder.md
+++ /dev/null
@@ -1,160 +0,0 @@
-A Cross-platform High-quality GIF Encoder
-======
-
-
-
-As a content writer, I needed to add images in my articles. Sometimes, it is better to add videos or gif images to explain the concept a bit easier. The readers can easily understand the guide much better by watching the output in video or gif format than the text. The day before, I have written about [**Flameshot**][1], a feature-rich and powerful screenshot tool for Linux. Today, I will show you how to make high quality gif images either from a video or set of images. Meet **Gifski** , a cross-platform, open source, command line High-quality GIF encoder based on **Pngquant**.
-
-For those wondering, pngquant is a command line lossy PNG image compressor. Trust me, pngquant is one of the best loss-less PNG compressor that I ever use. It compresses PNG images **upto 70%** without losing the original quality and and preserves full alpha transparency. The compressed images are compatible with all web browsers and operating systems. Since Gifski is based on Pngquant, it uses pngquant’s features for creating efficient GIF animations. Gifski is capable of creating animated GIFs that use thousands of colors per frame. Gifski is also requires **ffmpeg** to convert video into PNG images.
-
-### **Installing Gifski**
-
-Make sure you have installed FFMpeg and Pngquant.
-
-FFmpeg is available in the default repositories of most Linux distributions, so you can install it using the default package manager. For installation instructions, refer the following guide.
-
-Pngquant is available in [**AUR**][2]. To install it in Arch-based systems, use any AUR helper programs like [**Yay**][3].
-```
-$ yay -S pngquant
-
-```
-
-On Debian-based systems, run:
-```
-$ sudo apt install pngquant
-
-```
-
-If pngquant is not available for your distro, compile and install it from source. You will need **`libpng-dev`** package installed with development headers.
-```
-$ git clone --recursive https://github.com/kornelski/pngquant.git
-
-$ make
-
-$ sudo make install
-
-```
-
-After installing the prerequisites, install Gifski. You can install it using **cargo** if you have installed [**Rust**][4] programming language.
-```
-$ cargo install gifski
-
-```
-
-You can also get it with [**Linuxbrew**][5] package manager.
-```
-$ brew install gifski
-
-```
-
-If you don’t want to install cargo or Linuxbrew, download the latest binary executables from [**releases page**][6] and compile and install gifski manually.
-
-### Create high-quality GIF animations using Gifski high-quality GIF encoder
-
-Go to the location where you have kept the PNG images and run the following command to create GIF animation from the set of images:
-```
-$ gifski -o file.gif *.png
-
-```
-
-Here file.gif is the final output gif animation.
-
-Gifski has also some other additional features, like;
-
- * Create GIF animation with specific dimension
- * Show specific number of animations per second
- * Encode with a specific quality
- * Encode faster
- * Encode images exactly in the order given, rather than sorted
-
-
-
-To create GIF animation with specific dimension, for example width=800 and height=400, use the following command:
-```
-$ gifski -o file.gif -W 800 -H 400 *.png
-
-```
-
-You can set how many number of animation frames per second you want in the gif animation. The default value is **20**. To do so, run:
-```
-$ gifski -o file.gif --fps 1 *.png
-
-```
-
-In the above example, I have used one animation frame per second.
-
-We can encode with specific quality on the scale of 1-100. Obviously, the lower quality may give smaller file and higher quality give bigger seize gif animation.
-```
-$ gifski -o file.gif --quality 50 *.png
-
-```
-
-Gifski will take more time when you encode large number of images. To make the encoding process 3 times faster than usual speed, run:
-```
-$ gifski -o file.gif --fast *.png
-
-```
-
-Please note that it will reduce quality to 10% and create bigger animation file.
-
-To encode images exactly in the order given (rather than sorted), use **`--nosort`** option.
-```
-$ gifski -o file.gif --nosort *.png
-
-```
-
-If you do not to loop the GIF, simple use **`--once`** option.
-```
-$ gifski -o file.gif --once *.png
-
-```
-
-**Create GIF animation from Video file**
-
-Some times you might want to an animated file from a video. It is also possible. This is where FFmpeg comes in help. First convert the video into PNG frames first like below.
-```
-$ ffmpeg -i video.mp4 frame%04d.png
-
-```
-
-The above command makes image files namely “frame0001.png”, “frame0002.png”, “frame0003.png”…, etc. from video.mp4 (%04d makes the frame number) and save them in the current working directory.
-
-After converting the image files, simply run the following command to make the animated GIF file.
-```
-$ gifski -o file.gif *.png
-
-```
-
-For more details, refer the help section.
-```
-$ gifski -h
-
-```
-
-Here is the sample animated file created using Gifski.
-
-As you can see, the quality of the GIF file is really great.
-
-And, that’s all for now. Hope this was useful. More good stuffs to come. Stay tuned!
-
-Cheers!
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/gifski-a-cross-platform-high-quality-gif-encoder/
-
-作者：[SK][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://www.ostechnix.com/author/sk/
-[1]: https://www.ostechnix.com/flameshot-a-simple-yet-powerful-feature-rich-screenshot-tool/
-[2]: https://aur.archlinux.org/packages/pngquant/
-[3]: https://www.ostechnix.com/yay-found-yet-another-reliable-aur-helper/
-[4]: https://www.ostechnix.com/install-rust-programming-language-in-linux/
-[5]: https://www.ostechnix.com/linuxbrew-common-package-manager-linux-mac-os-x/
-[6]: https://github.com/ImageOptim/gifski/releases
diff --git a/sources/tech/20180905 How To Run MS-DOS Games And Programs In Linux.md b/sources/tech/20180905 How To Run MS-DOS Games And Programs In Linux.md
deleted file mode 100644
index 0552fb3d09..0000000000
--- a/sources/tech/20180905 How To Run MS-DOS Games And Programs In Linux.md
+++ /dev/null
@@ -1,253 +0,0 @@
-How To Run MS-DOS Games And Programs In Linux
-======
-
-
-
-If you ever wanted to try some good-old MS-DOS games and defunct C++ compilers like Turbo C++ in Linux? Good! This tutorial will teach you how to run MS-DOS games and programs under Linux environment using **DOSBox**. It is an x86 PC DOS-emulator that can be used to run classic DOS games or programs. DOSBox emulates an Intel x86 PC with sound, graphics, mouse, joystick, and modem etc., that allows you to run many old MS-DOS games and programs that simply cannot be run on any modern PCs and operating systems, such as Microsoft Windows XP and later, Linux and FreeBSD. It is free, written using C++ programming language and distributed under GPL.
-
-### Install DOSBox In Linux
-
-DOSBox is available in the default repositories of most Linux distributions.
-
-On Arch Linux and its variants like Antergos, Manjaro Linux:
-```
-$ sudo pacman -S dosbox
-
-```
-
-On Debian, Ubuntu, Linux Mint:
-```
-$ sudo apt-get install dosbox
-
-```
-
-On Fedora:
-```
-$ sudo dnf install dosbox
-
-```
-
-### Configure DOSBox
-
-There is no initial configuration required to use DOSBox and it just works out of the box. The default configuration file named `dosbox-x.xx.conf` exists in your **`~/.dosbox`** folder. In this configuration file, you can edit/modify various settings, such as starting DOSBox in fullscreen mode, use double buffering in fullscreen, set preferred resolution to use for fullscreen, mouse sensitivity, enable or disable sound, speaker, joystick and a lot more. As I mentioned earlier, the default settings will work just fine. You need not to make any changes.
-
-### Run MS-DOS Games And Programs In Linux
-
-To launch DOSBox, run the following command from the Terminal:
-```
-$ dosbox
-
-```
-
-This is how DOSBox interface looks like.
-
-
-
-As you can see, DOSBox comes with its own DOS-like command prompt with a virtual `Z:\` Drive, so if you’re familiar with MS-DOS, you wouldn’t find any difficulties to work in DOSBox environment.
-
-Here is the output of `dir`command (Equivalent of `ls` command in Linux) output:
-
-
-
-If you’re a new user and it is the first time you use DOSBox, you can view the short introduction about DOSBox by entering the following command in DOSBox prompt:
-```
-intro
-
-```
-
-Press ENTER to go through next page of the introduction section.
-
-To view the list of most often used commands in DOS, use this command:
-```
-help
-
-```
-
-To view list of all supported commands in DOSBox, type:
-```
-help /all
-
-```
-
-Remember, these commands should be used in the DOSBox prompt, not in your Linux Terminal.
-
-DOSBox also supports a good set of keyboard bindings. Here is the default keyboard shortcuts to effectively use DOSBox.
-
-
-
-To exit from DOSBox, simply type and hit ENTER:
-```
-exit
-
-```
-
-By default, DOSBox starts with a normal window-sized screen like above.
-
-To start dosbox directly in fullscreen, edit your `dosbox-x.xx.conf` file and set the value of **fullscreen** variable as **enable**. Now, DosBox will start in fullscreen mode. To go back to normal screen, press **ALT+ENTER**.
-
-Hope you get the basic usage of DOSBox.
-
-Let us go ahead and install some DOS programs and games.
-
-First, we need to create directories to save the programs and games in our Linux system. I am going to create two directories named **`~/dosprograms`** and **`~/dosgames`** , the first one for storing programs and latter for storing games.
-```
-$ mkdir ~/dosprograms ~/dosgames
-
-```
-
-For the purpose of this guide, I will show you how to install **Turbo C++** program and Mario game. First, we will see how to install Turbo.
-
-Download the latest Turbo C++ compiler, extract it and save the contents file in **`~/dosprograms`** directory. I have save the contents turbo c++ in my **~/dosprograms/TC/** directory.
-```
-$ ls dosprograms/tc/
-BGI BIN CLASSLIB DOC EXAMPLES FILELIST.DOC INCLUDE LIB README README.COM
-
-```
-
-Start Dosbox:
-```
-$ dosbox
-
-```
-
-And mount the **`~/dosprograms`** directory as virtual drive **C:\** in DOSBox.
-```
-Z:\>mount c ~/dosprograms
-
-```
-
-You will see an output something like below.
-```
-Drive C is mounted as local directory /home/sk/dosprograms.
-
-```
-
-
-
-Now, change to the C drive using command:
-```
-Z:\>c:
-
-```
-
-And then, switch to **tc/bin** directory:
-```
-Z:\>cd tc/bin
-
-```
-
-Finally, run turbo c++ executable file:
-```
-Z:\>tc.exe
-
-```
-
-**Note:** Just type first few letters and hit ENTER to autocomplete the file name.
-
-
-
-You will now be in Turbo C++ console.
-
-
-
-Create new file (ATL+F) and start coding:
-
-
-
-Similarly, you can install and run other classic DOS programs.
-
-**Troubleshooting:**
-
-You might be encountered with following error while running turbo c++ or any other dos programs:
-```
-DOSBox switched to max cycles, because of the setting: cycles=auto. If the game runs too fast try a fixed cycles amount in DOSBox's options. Exit to error: DRC64:Unhandled memory reference
-
-```
-
-To fix this, edit your **~/.dosbox/dosbox-x.xx.conf** file:
-```
-$ nano ~/.dosbox/dosbox-0.74.conf
-
-```
-
-Find the following variable and change its value from:
-```
-core=auto
-
-```
-
-to
-```
-core=normal
-
-```
-
-Save and close the file. Now you can be able to run the dos programs without any problems.
-
-Now, let us see how to run a dos-based game, for example **Mario Bros VGA**.
-
-Download Mario game from [**here**][1] and extract the contents in **~/dosgames** directory in your Linux machine.
-
-Start DOSBox:
-```
-$ dosbox
-
-```
-
-We have used virtual drive **c:** for dos programs. For games, let us use **d:** as virtual drive.
-
-At the DOSBox prompt, run the following command to mount **~/dosgames** directory as virtuald drive **d**.
-```
-Z:\>mount d ~/dosgames
-
-```
-
-Switch to D: drive:
-```
-Z:\>d:
-
-```
-
-And then go to mario game directory and run the **mario.exe** file to launch the game.
-```
-Z:\>cd mario
-
-Z:\>mario.exe
-
-```
-
-
-
-Start playing the game:
-
-
-
-Similarly, you can run any dos-based games as described above. You can view the complete list of supported games that can be run using DOSBox [**here**][2].
-
-### Conclusion
-
-Even though DOSBOX is not a complete replacement for MS-DOS and it lacks many of the features found in MS-DOS, it is just enough to install and run most DOS games and programs.
-
-For more details, refer the official [**DOSBox manual**][3].
-
-And, that’s all for now. Hope this was useful. More good stuffs to come. Stay tuned!
-
-Cheers!
-
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/how-to-run-ms-dos-games-and-programs-in-linux/
-
-作者：[SK][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://www.ostechnix.com/author/sk/
-[1]: https://www.dosgames.com/game/mario-bros-vga
-[2]: https://www.dosbox.com/comp_list.php
-[3]: https://www.dosbox.com/DOSBoxManual.html
diff --git a/sources/tech/20180907 6 open source tools for writing a book.md b/sources/tech/20180907 6 open source tools for writing a book.md
deleted file mode 100644
index 8b8140bd61..0000000000
--- a/sources/tech/20180907 6 open source tools for writing a book.md
+++ /dev/null
@@ -1,67 +0,0 @@
-6 open source tools for writing a book
-======
-
-
-
-I first used and contributed to free and open source software in 1993, and since then I've been an open source software developer and evangelist. I've written or contributed to dozens of open source software projects, although the one that I'll be remembered for is the [FreeDOS Project][1], an open source implementation of the DOS operating system.
-
-I recently wrote a book about FreeDOS. [_Using FreeDOS_][2] is my celebration of the 24th anniversary of FreeDOS. It is a collection of how-to's about installing and using FreeDOS, essays about my favorite DOS applications, and quick-reference guides to the DOS command line and DOS batch programming. I've been working on this book for the last few months, with the help of a great professional editor.
-
-_Using FreeDOS_ is available under the Creative Commons Attribution (cc-by) International Public License. You can download the EPUB and PDF versions at no charge from the [FreeDOS e-books][2] website. (I'm also planning a print version, for those who prefer a bound copy.)
-
-The book was produced almost entirely with open source software. I'd like to share a brief insight into the tools I used to create, edit, and produce _Using FreeDOS_.
-
-### Google Docs
-
-[Google Docs][3] is the only tool I used that isn't open source software. I uploaded my first drafts to Google Docs so my editor and I could collaborate. I'm sure there are open source collaboration tools, but Google Doc's ability to let two people edit the same document at the same time, make comments, edit suggestions, and change tracking—not to mention its use of paragraph styles and the ability to download the finished document—made it a valuable part of the editing process.
-
-### LibreOffice
-
-I started on [LibreOffice][4] 6.0 but I finished the book using LibreOffice 6.1. I love LibreOffice's rich support of styles. Paragraph styles made it easy to apply a style for titles, headers, body text, sample code, and other text. Character styles let me modify the appearance of text within a paragraph, such as inline sample code or a different style to indicate a filename. Graphics styles let me apply certain styling to screenshots and other images. And page styles allowed me to easily modify the layout and appearance of the page.
-
-### GIMP
-
-My book includes a lot of DOS program screenshots, website screenshots, and FreeDOS logos. I used [GIMP][5] to modify these images for the book. Usually, this was simply cropping or resizing an image, but as I prepare the print edition of the book, I'm using GIMP to create a few images that will be simpler for print layout.
-
-### Inkscape
-
-Most of the FreeDOS logos and fish mascots are in SVG format, and I used [Inkscape][6] for any image tweaking here. And in preparing the PDF version of the ebook, I wanted a simple blue banner at top of the page, with the FreeDOS logo in the corner. After some experimenting, I found it easier to create an SVG image in Inkscape that looked like the banner I wanted, and I pasted that into the header.
-
-### ImageMagick
-
-While it's great to use GIMP to do the fine work, sometimes it's faster to run an [ImageMagick][7] command over a set of images, such as to convert into PNG format or to resize images.
-
-### Sigil
-
-LibreOffice can export directly to EPUB format, but it wasn't a great transfer. I haven't tried creating an EPUB with LibreOffice 6.1, but LibreOffice 6.0 didn't include my images. It also added styles in a weird way. I used [Sigil][8] to tweak the EPUB file and make everything look right. Sigil even has a preview function so you can see what the EPUB will look like.
-
-### QEMU
-
-Because this book is about installing and running FreeDOS, I needed to actually run FreeDOS. You can boot FreeDOS inside any PC emulator, including VirtualBox, QEMU, GNOME Boxes, PCem, and Bochs. But I like the simplicity of [QEMU][9]. And the QEMU console lets you issue a screen dump in PPM format, which is ideal for grabbing screenshots to include in the book.
-
-Of course, I have to mention running [GNOME][10] on [Linux][11]. I use the [Fedora][12] distribution of Linux.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/9/writing-book-open-source-tools
-
-作者：[Jim Hall][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者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/jim-hall
-[1]: http://www.freedos.org/
-[2]: http://www.freedos.org/ebook/
-[3]: https://www.google.com/docs/about/
-[4]: https://www.libreoffice.org/
-[5]: https://www.gimp.org/
-[6]: https://inkscape.org/
-[7]: https://www.imagemagick.org/
-[8]: https://sigil-ebook.com/
-[9]: https://www.qemu.org/
-[10]: https://www.gnome.org/
-[11]: https://www.kernel.org/
-[12]: https://getfedora.org/
diff --git a/sources/tech/20180914 Convert files at the command line with Pandoc.md b/sources/tech/20180914 Convert files at the command line with Pandoc.md
index 7b72da76a5..e2ae10bdfa 100644
--- a/sources/tech/20180914 Convert files at the command line with Pandoc.md
+++ b/sources/tech/20180914 Convert files at the command line with Pandoc.md
@@ -1,3 +1,5 @@
+Translating by jlztan
+
Convert files at the command line with Pandoc
======
diff --git a/sources/tech/20180925 9 Easiest Ways To Find Out Process ID (PID) In Linux.md b/sources/tech/20180925 9 Easiest Ways To Find Out Process ID (PID) In Linux.md
index f542b15808..ae353bf11f 100644
--- a/sources/tech/20180925 9 Easiest Ways To Find Out Process ID (PID) In Linux.md
+++ b/sources/tech/20180925 9 Easiest Ways To Find Out Process ID (PID) In Linux.md
@@ -1,4 +1,3 @@
-【moria(knuth.fan at gmail.com)翻译中】
9 Easiest Ways To Find Out Process ID (PID) In Linux
======
Everybody knows about PID, Exactly what is PID? Why you want PID? What are you going to do using PID? Are you having the same questions on your mind? If so, you are in the right place to get all the details.
diff --git a/sources/tech/20180928 Quiet log noise with Python and machine learning.md b/sources/tech/20180928 Quiet log noise with Python and machine learning.md
index f1fe2f1b7f..79894775ed 100644
--- a/sources/tech/20180928 Quiet log noise with Python and machine learning.md
+++ b/sources/tech/20180928 Quiet log noise with Python and machine learning.md
@@ -1,3 +1,5 @@
+translating by Flowsnow
+
Quiet log noise with Python and machine learning
======
diff --git a/sources/tech/20180928 Using Grails with jQuery and DataTables.md b/sources/tech/20180928 Using Grails with jQuery and DataTables.md
deleted file mode 100644
index 0f02fabe8a..0000000000
--- a/sources/tech/20180928 Using Grails with jQuery and DataTables.md
+++ /dev/null
@@ -1,546 +0,0 @@
-[translating by jrg 20181014]
-
-Using Grails with jQuery and DataTables
-======
-
-Learn to build a Grails-based data browser that lets users visualize complex tabular data.
-
-
-
-I’m a huge fan of [Grails][1]. Granted, I’m mostly a data person who likes to explore and analyze data using command-line tools. But even data people sometimes need to _look at_ the data, and sometimes using data means having a great data browser. With Grails, [jQuery][2], and the [DataTables jQuery plugin][3], we can make really nice tabular data browsers.
-
-The [DataTables website][3] offers a lot of decent “recipe-style” documentation that shows how to put together some fine sample applications, and it includes the necessary JavaScript, HTML, and occasional [PHP][4] to accomplish some pretty spiffy stuff. But for those who would rather use Grails as their backend, a bit of interpretation is necessary. Also, the sample application data used is a single flat table of employees of a fictional company, so the complexity of dealing with table relations serves as an exercise for the reader.
-
-In this article, we’ll fill those two gaps by creating a Grails application with a slightly more complex data structure and a DataTables browser. In doing so, we’ll cover Grails criteria, which are [Groovy][5] -fied Java Hibernate criteria. I’ve put the code for the application on [GitHub][6] , so this article is oriented toward explaining the nuances of the code.
-
-For prerequisites, you will need Java, Groovy, and Grails environments set up. With Grails, I tend to use a terminal window and [Vim][7], so that’s what’s used here. To get a modern Java, I suggest downloading and installing the [Open Java Development Kit][8] (OpenJDK) provided by your Linux distro (which should be Java 8, 9, 10 or 11; at the time of writing, I’m working with Java 8). From my point of view, the best way to get up-to-date Groovy and Grails is to use [SDKMAN!][9].
-
-Readers who have never tried Grails will probably need to do some background reading. As a starting point, I recommend [Creating Your First Grails Application][10].
-
-### Getting the employee browser application
-
-As mentioned above, I’ve put the source code for this sample employee browser application on [GitHub][6]. For further explanation, the application **embrow** was built using the following commands in a Linux terminal window:
-
-```
-cd Projects
-grails create-app com.nuevaconsulting.embrow
-```
-
-The domain classes and unit tests are created as follows:
-
-```
-grails create-domain-class com.nuevaconsulting.embrow.Position
-grails create-domain-class com.nuevaconsulting.embrow.Office
-grails create-domain-class com.nuevaconsulting.embrow.Employeecd embrowgrails createdomaincom.grails createdomaincom.grails createdomaincom.
-```
-
-The domain classes built this way have no attributes, so they must be edited as follows:
-
-The Position domain class:
-
-```
-package com.nuevaconsulting.embrow
-
-class Position {
-
- String name
- int starting
-
- static constraints = {
- name nullable: false, blank: false
- starting nullable: false
- }
-}com.Stringint startingstatic constraintsnullableblankstarting nullable
-```
-
-The Office domain class:
-
-```
-package com.nuevaconsulting.embrow
-
-class Office {
-
- String name
- String address
- String city
- String country
-
- static constraints = {
- name nullable: false, blank: false
- address nullable: false, blank: false
- city nullable: false, blank: false
- country nullable: false, blank: false
- }
-}
-```
-
-And the Employee domain class:
-
-```
-package com.nuevaconsulting.embrow
-
-class Employee {
-
- String surname
- String givenNames
- Position position
- Office office
- int extension
- Date hired
- int salary
- static constraints = {
- surname nullable: false, blank: false
- givenNames nullable: false, blank: false
- : false
- office nullable: false
- extension nullable: false
- hired nullable: false
- salary nullable: false
- }
-}
-```
-
-Note that whereas the Position and Office domain classes use predefined Groovy types String and int, the Employee domain class defines fields that are of type Position and Office (as well as the predefined Date). This causes the creation of the database table in which instances of Employee are stored to contain references, or foreign keys, to the tables in which instances of Position and Office are stored.
-
-Now you can generate the controllers, views, and various other test components:
-
-```
--all com.nuevaconsulting.embrow.Position
-grails generate-all com.nuevaconsulting.embrow.Office
-grails generate-all com.nuevaconsulting.embrow.Employeegrails generateall com.grails generateall com.grails generateall com.
-```
-
-At this point, you have a basic create-read-update-delete (CRUD) application ready to go. I’ve included some base data in the **grails-app/init/com/nuevaconsulting/BootStrap.groovy** to populate the tables.
-
-If you run the application with the command:
-
-```
-grails run-app
-```
-
-you will see the following screen in the browser at ****
-
-![Embrow home screen][12]
-
-The Embrow application home screen
-
-Clicking on the link for the OfficeController gives you a screen that looks like this:
-
-![Office list][14]
-
-The office list
-
-Note that this list is generated by the **OfficeController index** method and displayed by the view `office/index.gsp`.
-
-Similarly, clicking on the **EmployeeController** gives a screen that looks like this:
-
-![Employee controller][16]
-
-The employee controller
-
-Ok, that’s pretty ugly—what’s with the Position and Office links?
-
-Well, the views generated by the `generate-all` commands above create an **index.gsp** file that uses the Grails tag that by default shows the class name ( **com.nuevaconsulting.embrow.Position** ) and the persistent instance identifier ( **30** ). This behavior can be customized to yield something better looking, and there is some pretty neat stuff with the autogenerated links, the autogenerated pagination, and the autogenerated sortable columns.
-
-But even when it's fully cleaned up, this employee browser offers limited functionality. For example, what if you want to find all employees whose position includes the text “dev”? What if you want to combine columns for sorting so that the primary sort key is a surname and the secondary sort key is an office name? Or what if you want to export a sorted subset to a spreadsheet or PDF to email to someone who doesn’t have access to the browser?
-
-The jQuery DataTables plugin provides this kind of extra functionality and allows you to create a full-fledged tabular data browser.
-
-### Creating the employee browser view and controller methods
-
-In order to create an employee browser based on jQuery DataTables, you must complete two tasks:
-
- 1. Create a Grails view that incorporates the HTML and JavaScript required to enable the DataTables
-
- 2. Add a method to the Grails controller to handle the new view
-
-
-
-
-#### The employee browser view
-
-In the directory **embrow/grails-app/views/employee** , start by making a copy of the **index.gsp** file, calling it **browser.gsp** :
-
-```
-cd Projects
-cd embrow/grails-app/views/employee
-cp gsp browser.gsp
-```
-
-At this point, you want to customize the new **browser.gsp** file to add the relevant jQuery DataTables code.
-
-As a rule, I like to grab my JavaScript and CSS from a content provider when feasible; to do so in this case, after the line:
-
-```
-<g:message code="default.list.label" args="[entityName]" />
-```
-
-insert the following lines:
-
-```
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-Next, remove the code that provided the data pagination in **index.gsp** :
-
-```
-
-
-
-
${flash.message}
-
-
-
-
-
-
-
-```
-
-and insert the code that materializes the jQuery DataTables.
-
-The first part to insert is the HTML that creates the basic tabular structure of the browser. For the application where DataTables talks to a database backend, provide only the table headers and footers; the DataTables JavaScript takes care of the table contents.
-
-```
-
-
Employee Browser
-
-
-
-
Surname
-
Given name(s)
-
Position
-
Office
-
Extension
-
Hired
-
Salary
-
-
-
-
-
Surname
-
Given name(s)
-
Position
-
Office
-
Extension
-
Hired
-
Salary
-
-
-
-
-```
-
-Next, insert a JavaScript block, which serves three primary functions: It sets the size of the text boxes shown in the footer for column filtering, it establishes the DataTables table model, and it creates a handler to do the column filtering.
-
-```
-
-$('#employee_dt tfoot th').each( function() {javascript
-```
-
-The code below handles sizing the filter boxes at the bottoms of the table columns:
-
-```
-var title = $(this).text();
-if (title == 'Extension' || title == 'Hired')
-$(this).html('');
-else
-$(this).html('');
-});titletitletitletitletitle
-```
-
-Next, define the table model. This is where all the table options are provided, including the scrolling, rather than paginated, nature of the interface, the cryptic decorations to be provided according to the dom string, the ability to export data to CSV and other formats, as well as where the Ajax connection to the server is established. Note that the URL is created with a Groovy GString call to the Grails **createLink()** method, referring to the **browserLister** action in the **EmployeeController**. Also of interest is the definition of the columns of the table. This information is sent across to the back end, which queries the database and returns the appropriate records.
-
-```
-var table = $('#employee_dt').DataTable( {
-"scrollY": 500,
-"deferRender": true,
-"scroller": true,
-"dom": "Brtip",
-"buttons": [ 'copy', 'csv', 'excel', 'pdf', 'print' ],
-"processing": true,
-"serverSide": true,
-"ajax": {
-"url": "${createLink(controller: 'employee', action: 'browserLister')}",
-"type": "POST",
-},
-"columns": [
-{ "data": "surname" },
-{ "data": "givenNames" },
-{ "data": "position" },
-{ "data": "office" },
-{ "data": "extension" },
-{ "data": "hired" },
-{ "data": "salary" }
-]
-});
-```
-
-Finally, monitor the filter columns for changes and use them to apply the filter(s).
-
-```
-table.columns().every(function() {
-var that = this;
-$('input', this.footer()).on('keyup change', function(e) {
-if (that.search() != this.value && 8 < e.keyCode && e.keyCode < 32)
-that.search(this.value).draw();
-});
-```
-
-And that’s it for the JavaScript. This completes the changes to the view code.
-
-```
-});
-
-```
-
-Here’s a screenshot of the UI this view creates:
-
-
-
-Here’s another screenshot showing the filtering and multi-column sorting at work (looking for employees whose positions include the characters “dev”, ordering first by office, then by surname):
-
-
-
-Here’s another screenshot, showing what happens when you click on the CSV button:
-
-
-
-And finally, here’s a screenshot showing the CSV data opened in LibreOffice:
-
-
-
-Ok, so the view part looked pretty straightforward; therefore, the controller action must do all the heavy lifting, right? Let’s see…
-
-#### The employee controller browserLister action
-
-Recall that we saw this string
-
-```
-"${createLink(controller: 'employee', action: 'browserLister')}"
-```
-
-as the URL used for the Ajax calls from the DataTables table model. [createLink() is the method][17] behind a Grails tag that is used to dynamically generate a link as the HTML is preprocessed on the Grails server. This ends up generating a link to the **EmployeeController** , located in
-
-```
-embrow/grails-app/controllers/com/nuevaconsulting/embrow/EmployeeController.groovy
-```
-
-and specifically to the controller method **browserLister()**. I’ve left some print statements in the code so that the intermediate results can be seen in the terminal window where the application is running.
-
-```
- def browserLister() {
- // Applies filters and sorting to return a list of desired employees
-```
-
-First, print out the parameters passed to **browserLister()**. I usually start building controller methods with this code so that I’m completely clear on what my controller is receiving.
-
-```
- println "employee browserLister params $params"
- println()
-```
-
-Next, process those parameters to put them in a more usable shape. First, the jQuery DataTables parameters, a Groovy map called **jqdtParams** :
-
-```
-def jqdtParams = [:]
-params.each { key, value ->
- def keyFields = key.replace(']','').split(/\[/)
- def table = jqdtParams
- for (int f = 0; f < keyFields.size() - 1; f++) {
- def keyField = keyFields[f]
- if (!table.containsKey(keyField))
- table[keyField] = [:]
- table = table[keyField]
- }
- table[keyFields[-1]] = value
-}
-println "employee dataTableParams $jqdtParams"
-println()
-```
-
-Next, the column data, a Groovy map called **columnMap** :
-
-```
-def columnMap = jqdtParams.columns.collectEntries { k, v ->
- def whereTerm = null
- switch (v.data) {
- case 'extension':
- case 'hired':
- case 'salary':
- if (v.search.value ==~ /\d+(,\d+)*/)
- whereTerm = v.search.value.split(',').collect { it as Integer }
- break
- default:
- if (v.search.value ==~ /[A-Za-z0-9 ]+/)
- whereTerm = "%${v.search.value}%" as String
- break
- }
- [(v.data): [where: whereTerm]]
-}
-println "employee columnMap $columnMap"
-println()
-```
-
-Next, a list of all column names, retrieved from **columnMap** , and a corresponding list of how those columns should be ordered in the view, Groovy lists called **allColumnList** and **orderList** , respectively:
-
-```
-def allColumnList = columnMap.keySet() as List
-println "employee allColumnList $allColumnList"
-def orderList = jqdtParams.order.collect { k, v -> [allColumnList[v.column as Integer], v.dir] }
-println "employee orderList $orderList"
-```
-
-We’re going to use Grails’ implementation of Hibernate criteria to actually carry out the selection of elements to be displayed as well as their ordering and pagination. Criteria requires a filter closure; in most examples, this is given as part of the creation of the criteria instance itself, but here we define the filter closure beforehand. Note in this case the relatively complex interpretation of the “date hired” filter, which is treated as a year and applied to establish date ranges, and the use of **createAlias** to allow us to reach into related classes Position and Office:
-
-```
-def filterer = {
- createAlias 'position', 'p'
- createAlias 'office', 'o'
-
- if (columnMap.surname.where) ilike 'surname', columnMap.surname.where
- if (columnMap.givenNames.where) ilike 'givenNames', columnMap.givenNames.where
- if (columnMap.position.where) ilike 'p.name', columnMap.position.where
- if (columnMap.office.where) ilike 'o.name', columnMap.office.where
- if (columnMap.extension.where) inList 'extension', columnMap.extension.where
- if (columnMap.salary.where) inList 'salary', columnMap.salary.where
- if (columnMap.hired.where) {
- if (columnMap.hired.where.size() > 1) {
- or {
- columnMap.hired.where.each {
- between 'hired', Date.parse('yyyy/MM/dd',"${it}/01/01" as String),
- Date.parse('yyyy/MM/dd',"${it}/12/31" as String)
- }
- }
- } else {
- between 'hired', Date.parse('yyyy/MM/dd',"${columnMap.hired.where[0]}/01/01" as String),
- Date.parse('yyyy/MM/dd',"${columnMap.hired.where[0]}/12/31" as String)
- }
- }
-}
-```
-
-At this point, it’s time to apply the foregoing. The first step is to get a total count of all the Employee instances, required by the pagination code:
-
-```
- def recordsTotal = Employee.count()
- println "employee recordsTotal $recordsTotal"
-```
-
-Next, apply the filter to the Employee instances to get the count of filtered results, which will always be less than or equal to the total number (again, this is for the pagination code):
-
-```
- def c = Employee.createCriteria()
- def recordsFiltered = c.count {
- filterer.delegate = delegate
- filterer()
- }
- println "employee recordsFiltered $recordsFiltered"
-
-```
-
-Once you have those two counts, you can get the actual filtered instances using the pagination and ordering information as well.
-
-```
- def orderer = Employee.withCriteria {
- filterer.delegate = delegate
- filterer()
- orderList.each { oi ->
- switch (oi[0]) {
- case 'surname': order 'surname', oi[1]; break
- case 'givenNames': order 'givenNames', oi[1]; break
- case 'position': order 'p.name', oi[1]; break
- case 'office': order 'o.name', oi[1]; break
- case 'extension': order 'extension', oi[1]; break
- case 'hired': order 'hired', oi[1]; break
- case 'salary': order 'salary', oi[1]; break
- }
- }
- maxResults (jqdtParams.length as Integer)
- firstResult (jqdtParams.start as Integer)
- }
-```
-
-To be completely clear, the pagination code in JTables manages three counts: the total number of records in the data set, the number resulting after the filters are applied, and the number to be displayed on the page (whether the display is scrolling or paginated). The ordering is applied to all the filtered records and the pagination is applied to chunks of those filtered records for display purposes.
-
-Next, process the results returned by the orderer, creating links to the Employee, Position, and Office instance in each row so the user can click on these links to get all the detail on the relevant instance:
-
-```
- def dollarFormatter = new DecimalFormat('$##,###.##')
- def employees = orderer.collect { employee ->
- ['surname': "${employee.surname}",
- 'givenNames': employee.givenNames,
- 'position': "${employee.position?.name}",
- 'office': "${employee.office?.name}",
- 'extension': employee.extension,
- 'hired': employee.hired.format('yyyy/MM/dd'),
- 'salary': dollarFormatter.format(employee.salary)]
- }
-```
-
-And finally, create the result you want to return and give it back as JSON, which is what jQuery DataTables requires.
-
-```
- def result = [draw: jqdtParams.draw, recordsTotal: recordsTotal, recordsFiltered: recordsFiltered, data: employees]
- render(result as JSON)
- }
-```
-
-That’s it.
-
-If you’re familiar with Grails, this probably seems like more work than you might have originally thought, but there’s no rocket science here, just a lot of moving parts. However, if you haven’t had much exposure to Grails (or to Groovy), there’s a lot of new stuff to understand—closures, delegates, and builders, among other things.
-
-In that case, where to start? The best place is to learn about Groovy itself, especially [Groovy closures][18] and [Groovy delegates and builders][19]. Then go back to the reading suggested above on Grails and Hibernate criteria queries.
-
-### Conclusions
-
-jQuery DataTables make awesome tabular data browsers for Grails. Coding the view isn’t too tricky, but the PHP examples provided in the DataTables documentation take you only so far. In particular, they aren’t written with Grails programmers in mind, nor do they explore the finer details of using elements that are references to other classes (essentially lookup tables).
-
-I’ve used this approach to make a couple of data browsers that allow the user to select which columns to view and accumulate record counts, or just to browse the data. The performance is good even in million-row tables on a relatively modest VPS.
-
-One caveat: I have stumbled upon some problems with the various Hibernate criteria mechanisms exposed in Grails (see my other GitHub repositories), so care and experimentation is required. If all else fails, the alternative approach is to build SQL strings on the fly and execute them instead. As of this writing, I prefer to work with Grails criteria, unless I get into messy subqueries, but that may just reflect my relative lack of experience with subqueries in Hibernate.
-
-I hope you Grails programmers out there find this interesting. Please feel free to leave comments or suggestions below.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/9/using-grails-jquery-and-datatables
-
-作者：[Chris Hermansen][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者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]: https://grails.org/
-[2]: https://jquery.com/
-[3]: https://datatables.net/
-[4]: http://php.net/
-[5]: http://groovy-lang.org/
-[6]: https://github.com/monetschemist/grails-datatables
-[7]: https://www.vim.org/
-[8]: http://openjdk.java.net/
-[9]: http://sdkman.io/
-[10]: http://guides.grails.org/creating-your-first-grails-app/guide/index.html
-[11]: https://opensource.com/file/410061
-[12]: https://opensource.com/sites/default/files/uploads/screen_1.png (Embrow home screen)
-[13]: https://opensource.com/file/410066
-[14]: https://opensource.com/sites/default/files/uploads/screen_2.png (Office list screenshot)
-[15]: https://opensource.com/file/410071
-[16]: https://opensource.com/sites/default/files/uploads/screen3.png (Employee controller screenshot)
-[17]: https://gsp.grails.org/latest/ref/Tags/createLink.html
-[18]: http://groovy-lang.org/closures.html
-[19]: http://groovy-lang.org/dsls.html
diff --git a/sources/tech/20181002 4 open source invoicing tools for small businesses.md b/sources/tech/20181002 4 open source invoicing tools for small businesses.md
deleted file mode 100644
index 29589a6ad1..0000000000
--- a/sources/tech/20181002 4 open source invoicing tools for small businesses.md
+++ /dev/null
@@ -1,76 +0,0 @@
-4 open source invoicing tools for small businesses
-======
-Manage your billing and get paid with easy-to-use, web-based invoicing software.
-
-
-
-No matter what your reasons for starting a small business, the key to keeping that business going is getting paid. Getting paid usually means sending a client an invoice.
-
-It's easy enough to whip up an invoice using LibreOffice Writer or LibreOffice Calc, but sometimes you need a bit more. A more professional look. A way of keeping track of your invoices. Reminders about when to follow up on the invoices you've sent.
-
-There's a wide range of commercial and closed-source invoicing tools out there. But the offerings on the open source side of the fence are just as good, and maybe even more flexible, than their closed source counterparts.
-
-Let's take a look at four web-based open source invoicing tools that are great choices for freelancers and small businesses on a tight budget. I reviewed two of them in 2014, in an [earlier version][1] of this article. These four picks are easy to use and you can use them on just about any device.
-
-### Invoice Ninja
-
-I've never been a fan of the term ninja. Despite that, I like [Invoice Ninja][2]. A lot. It melds a simple interface with a set of features that let you create, manage, and send invoices to clients and customers.
-
-You can easily configure multiple clients, track payments and outstanding invoices, generate quotes, and email invoices. What sets Invoice Ninja apart from its competitors is its [integration with][3] over 40 online popular payment gateways, including PayPal, Stripe, WePay, and Apple Pay.
-
-[Download][4] a version that you can install on your own server or get an account with the [hosted version][5] of Invoice Ninja. There's a free version and a paid tier that will set you back US$ 8 a month.
-
-### InvoicePlane
-
-Once upon a time, there was a nifty open source invoicing tool called FusionInvoice. One day, its creators took the latest version of the code proprietary. That didn't end happily, as FusionInvoice's doors were shut for good in 2018. But that wasn't the end of the application. An old version of the code stayed open source and morphed into [InvoicePlane][6], which packs all of FusionInvoice's goodness.
-
-Creating an invoice takes just a couple of clicks. You can make them as minimal or detailed as you need. When you're ready, you can email your invoices or output them as PDFs. You can also create recurring invoices for clients or customers you regularly bill.
-
-InvoicePlane does more than generate and track invoices. You can also create quotes for jobs or goods, track products you sell, view and enter payments, and run reports on your invoices.
-
-[Grab the code][7] and install it on your web server. Or, if you're not quite ready to do that, [take the demo][8] for a spin.
-
-### OpenSourceBilling
-
-Described by its developer as "beautifully simple billing software," [OpenSourceBilling][9] lives up to the description. It has one of the cleanest interfaces I've seen, which makes configuring and using the tool a breeze.
-
-OpenSourceBilling stands out because of its dashboard, which tracks your current and past invoices, as well as any outstanding amounts. Your information is broken up into graphs and tables, which makes it easy to follow.
-
-You do much of the configuration on the invoice itself. You can add items, tax rates, clients, and even payment terms with a click and a few keystrokes. OpenSourceBilling saves that information across all of your invoices, both new and old.
-
-As with some of the other tools we've looked at, OpenSourceBilling has a [demo][10] you can try.
-
-### BambooInvoice
-
-When I was a full-time freelance writer and consultant, I used [BambooInvoice][11] to bill my clients. When its original developer stopped working on the software, I was a bit disappointed. But BambooInvoice is back, and it's as good as ever.
-
-What attracted me to BambooInvoice is its simplicity. It does one thing and does it well. You can create and edit invoices, and BambooInvoice keeps track of them by client and by the invoice numbers you assign to them. It also lets you know which invoices are open or overdue. You can email the invoices from within the application or generate PDFs. You can also run reports to keep tabs on your income.
-
-To [install][12] and use BambooInvoice, you'll need a web server running PHP 5 or newer as well as a MySQL database. Chances are you already have access to one, so you're good to go.
-
-Do you have a favorite open source invoicing tool? Feel free to share it by leaving a comment.
-
---------------------------------------------------------------------------------
-
-via: https://opensource.com/article/18/10/open-source-invoicing-tools
-
-作者：[Scott Nesbitt][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者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/scottnesbitt
-[1]: https://opensource.com/business/14/9/4-open-source-invoice-tools
-[2]: https://www.invoiceninja.org/
-[3]: https://www.invoiceninja.com/integrations/
-[4]: https://github.com/invoiceninja/invoiceninja
-[5]: https://www.invoiceninja.com/invoicing-pricing-plans/
-[6]: https://invoiceplane.com/
-[7]: https://wiki.invoiceplane.com/en/1.5/getting-started/installation
-[8]: https://demo.invoiceplane.com/
-[9]: http://www.opensourcebilling.org/
-[10]: http://demo.opensourcebilling.org/
-[11]: https://www.bambooinvoice.net/
-[12]: https://sourceforge.net/projects/bambooinvoice/
diff --git a/sources/tech/20181004 4 Must-Have Tools for Monitoring Linux.md b/sources/tech/20181004 4 Must-Have Tools for Monitoring Linux.md
index beb3bab797..987809aa0d 100644
--- a/sources/tech/20181004 4 Must-Have Tools for Monitoring Linux.md
+++ b/sources/tech/20181004 4 Must-Have Tools for Monitoring Linux.md
@@ -1,3 +1,5 @@
+### translating by way-ww
+
4 Must-Have Tools for Monitoring Linux
======
diff --git a/sources/tech/20181008 KeeWeb - An Open Source, Cross Platform Password Manager.md b/sources/tech/20181008 KeeWeb - An Open Source, Cross Platform Password Manager.md
deleted file mode 100644
index a9b20ac54d..0000000000
--- a/sources/tech/20181008 KeeWeb - An Open Source, Cross Platform Password Manager.md
+++ /dev/null
@@ -1,110 +0,0 @@
-KeeWeb – An Open Source, Cross Platform Password Manager
-======
-
-
-
-If you’ve been using the internet for any amount of time, chances are, you have a lot of accounts on a lot of websites. All of those accounts must have passwords, and you have to remember all those passwords. Either that, or write them down somewhere. Writing down passwords on paper may not be secure, and remembering them won’t be practically possible if you have more than a few passwords. This is why Password Managers have exploded in popularity in the last few years. A password Manager is like a central repository where you store all your passwords for all your accounts, and you lock it with a master password. With this approach, the only thing you need to remember is the Master password.
-
-**KeePass** is one such open source password manager. KeePass has an official client, but it’s pretty barebones. But there are a lot of other apps, both for your computer and for your phone, that are compatible with the KeePass file format for storing encrypted passwords. One such app is **KeeWeb**.
-
-KeeWeb is an open source, cross platform password manager with features like cloud sync, keyboard shortcuts and plugin support. KeeWeb uses Electron, which means it runs on Windows, Linux, and Mac OS.
-
-### Using KeeWeb Password Manager
-
-When it comes to using KeeWeb, you actually have 2 options. You can either use KeeWeb webapp without having to install it on your system and use it on the fly or simply install KeeWeb client in your local system.
-
-**Using the KeeWeb webapp**
-
-If you don’t want to bother installing a desktop app, you can just go to [**https://app.keeweb.info/**][1] and use it as a password manager.
-
-
-
-It has all the features of the desktop app. Obviously, this requires you to be online when using the app.
-
-**Installing KeeWeb on your Desktop**
-
-If you like the comfort and offline availability of using a desktop app, you can also install it on your desktop.
-
-If you use Ubuntu/Debian, you can just go to [**releases pages**][2] and download KeeWeb latest **.deb** file, which you can install via this command:
-
-```
-$ sudo dpkg -i KeeWeb-1.6.3.linux.x64.deb
-
-```
-
-If you’re on Arch, it is available in the [**AUR**][3], so you can install using any helper programs like [**Yay**][4]:
-
-```
-$ yay -S keeweb
-
-```
-
-Once installed, launch it from Menu or application launcher. This is how KeeWeb default interface looks like:
-
-
-
-### General Layout
-
-KeeWeb basically shows a list of all your passwords, along with all your tags to the left. Clicking on a tag will filter the list to only passwords of that tag. To the right, all the fields for the selected account are shown. You can set username, password, website, or just add a custom note. You can even create your own fields and mark them as secure fields, which is great when storing things like credit card information. You can copy passwords by just clicking on them. KeeWeb also shows the date when an account was created and modified. Deleted passwords are kept in the trash, where they can be restored or permanently deleted.
-
-
-
-### KeeWeb Features
-
-**Cloud Sync**
-
-One of the main features of KeeWeb is the support for a wide variety of remote locations and cloud services.
-Other than loading local files, you can open files from:
-
- 1. WebDAV Servers
- 2. Google Drive
- 3. Dropbox
- 4. OneDrive
-
-
-
-This means that if you use multiple computers, you can synchronize the password files between them, so you don’t have to worry about not having all the passwords available on all devices.
-
-**Password Generator**
-
-
-
-Along with encrypting your passwords, it’s also important to create new, strong passwords for every single account. This means that if one of your account gets hacked, the attacker won’t be able to get in to your other accounts using the same password.
-
-To achieve this, KeeWeb has a built-in password generator, that lets you generate a custom password of a specific length, including specific type of characters.
-
-**Plugins**
-
-
-
-You can extend KeeWeb functionality with plugins. Some of these plugins are translations for other languages, while others add new functionality, like checking **** for exposed passwords.
-
-**Local Backups**
-
-
-
-Regardless of where your password file is stored, you should probably keep local backups of the file on your computer. Luckily, KeeWeb has this feature built-in. You can backup to a specific path, and set it to backup periodically, or just whenever the file is changed.
-
-
-### Verdict
-
-I have actually been using KeeWeb for several years now. It completely changed the way I store my passwords. The cloud sync is basically the feature that makes it a done deal for me. I don’t have to worry about keeping multiple unsynchronized files on multiple devices. If you want a great looking password manager that has cloud sync, KeeWeb is something you should look at.
-
-
-
---------------------------------------------------------------------------------
-
-via: https://www.ostechnix.com/keeweb-an-open-source-cross-platform-password-manager/
-
-作者：[EDITOR][a]
-选题：[lujun9972](https://github.com/lujun9972)
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://www.ostechnix.com/author/editor/
-[1]: https://app.keeweb.info/
-[2]: https://github.com/keeweb/keeweb/releases/latest
-[3]: https://aur.archlinux.org/packages/keeweb/
-[4]: https://www.ostechnix.com/yay-found-yet-another-reliable-aur-helper/
diff --git a/sources/tech/20181008 Taking notes with Laverna, a web-based information organizer.md b/sources/tech/20181008 Taking notes with Laverna, a web-based information organizer.md
index 27616a9f6e..71adf0112b 100644
--- a/sources/tech/20181008 Taking notes with Laverna, a web-based information organizer.md
+++ b/sources/tech/20181008 Taking notes with Laverna, a web-based information organizer.md
@@ -1,3 +1,5 @@
+translating by cyleft
+
Taking notes with Laverna, a web-based information organizer
======
diff --git a/sources/tech/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md b/sources/tech/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md
deleted file mode 100644
index c119f69ebf..0000000000
--- a/sources/tech/20181009 6 Commands To Shutdown And Reboot The Linux System From Terminal.md
+++ /dev/null
@@ -1,331 +0,0 @@
-translating---cyleft
-====
-
-6 Commands To Shutdown And Reboot The Linux System From Terminal
-======
-Linux administrator performing many tasks in their routine work. The system Shutdown and Reboot task also included in it.
-
-It’s one of the risky task for them because some times it wont come back due to some reasons and they need to spend more time on it to troubleshoot.
-
-These task can be performed through CLI in Linux. Most of the time Linux administrator prefer to perform these kind of tasks via CLI because they are familiar on this.
-
-There are few commands are available in Linux to perform these tasks and user needs to choose appropriate command to perform the task based on the requirement.
-
-All these commands has their own feature and allow Linux admin to use it.
-
-**Suggested Read :**
-**(#)** [11 Methods To Find System/Server Uptime In Linux][1]
-**(#)** [Tuptime – A Tool To Report The Historical And Statistical Running Time Of Linux System][2]
-
-When the system is initiated for Shutdown or Reboot. It will be notified to all logged-in users and processes. Also, it wont allow any new logins if the time argument is used.
-
-I would suggest you to double check before you perform this action because you need to follow few prerequisites to make sure everything is fine.
-
-Those steps are listed below.
-
- * Make sure you should have a console access to troubleshoot further in case any issues arise. VMWare access for VMs and IPMI/iLO/iDRAC access for physical servers.
- * You have to create a ticket as per your company procedure either Incident or Change ticket and get approval
- * Take the important configuration files backup and move to other servers for safety
- * Verify the log files (Perform the pre-check)
- * Communicate about your activity with other dependencies teams like DBA, Application, etc
- * Ask them to bring down their Database service or Application service and get a confirmation from them.
- * Validate the same from your end using the appropriate command to double confirm this.
- * Finally reboot the system
- * Verify the log files (Perform the post-check), If everything is good then move to next step. If you found something is wrong then troubleshoot accordingly.
- * If it’s back to up and running, ask the dependencies team to bring up their applications.
- * Monitor for some time, and communicate back to them saying everything is working fine as expected.
-
-
-
-This task can be performed using following commands.
-
- * **`shutdown Command:`** shutdown command used to halt, power-off or reboot the machine.
- * **`halt Command:`** halt command used to halt, power-off or reboot the machine.
- * **`poweroff Command:`** poweroff command used to halt, power-off or reboot the machine.
- * **`reboot Command:`** reboot command used to halt, power-off or reboot the machine.
- * **`init Command:`** init (short for initialization) is the first process started during booting of the computer system.
- * **`systemctl Command:`** systemd is a system and service manager for Linux operating systems.
-
-
-
-### Method-1: How To Shutdown And Reboot The Linux System Using Shutdown Command
-
-shutdown command used to power-off or reboot a Linux remote machine or local host. It’s offering
-multiple options to perform this task effectively. If the time argument is used, 5 minutes before the system goes down the /run/nologin file is created to ensure that further logins shall not be allowed.
-
-The general syntax is
-
-```
-# shutdown [OPTION] [TIME] [MESSAGE]
-
-```
-
-Run the below command to shutdown a Linux machine immediately. It will kill all the processes immediately and will shutdown the system.
-
-```
-# shutdown -h now
-
-```
-
- * **`-h:`** Equivalent to –poweroff, unless –halt is specified.
-
-
-
-Alternatively we can use the shutdown command with `halt` option to bring down the machine immediately.
-
-```
-# shutdown --halt now
-or
-# shutdown -H now
-
-```
-
- * **`-H, --halt:`** Halt the machine.
-
-
-
-Alternatively we can use the shutdown command with `poweroff` option to bring down the machine immediately.
-
-```
-# shutdown --poweroff now
-or
-# shutdown -P now
-
-```
-
- * **`-P, --poweroff:`** Power-off the machine (the default).
-
-
-
-Run the below command to shutdown a Linux machine immediately. It will kill all the processes immediately and will shutdown the system.
-
-```
-# shutdown -h now
-
-```
-
- * **`-h:`** Equivalent to –poweroff, unless –halt is specified.
-
-
-
-If you run the below commands without time parameter, it will wait for a minute then execute the given command.
-
-```
-# shutdown -h
-Shutdown scheduled for Mon 2018-10-08 06:42:31 EDT, use 'shutdown -c' to cancel.
-
-[email protected]#
-Broadcast message from [email protected] (Mon 2018-10-08 06:41:31 EDT):
-
-The system is going down for power-off at Mon 2018-10-08 06:42:31 EDT!
-
-```
-
-All other logged in users can see a broadcast message in their terminal like below.
-
-```
-[[email protected] ~]$
-Broadcast message from [email protected] (Mon 2018-10-08 06:41:31 EDT):
-
-The system is going down for power-off at Mon 2018-10-08 06:42:31 EDT!
-
-```
-
-for Halt option.
-
-```
-# shutdown -H
-Shutdown scheduled for Mon 2018-10-08 06:37:53 EDT, use 'shutdown -c' to cancel.
-
-[email protected]#
-Broadcast message from [email protected] (Mon 2018-10-08 06:36:53 EDT):
-
-The system is going down for system halt at Mon 2018-10-08 06:37:53 EDT!
-
-```
-
-for Poweroff option.
-
-```
-# shutdown -P
-Shutdown scheduled for Mon 2018-10-08 06:40:07 EDT, use 'shutdown -c' to cancel.
-
-[email protected]#
-Broadcast message from [email protected] (Mon 2018-10-08 06:39:07 EDT):
-
-The system is going down for power-off at Mon 2018-10-08 06:40:07 EDT!
-
-```
-
-This can be cancelled by hitting `shutdown -c` option on your terminal.
-
-```
-# shutdown -c
-
-Broadcast message from [email protected] (Mon 2018-10-08 06:39:09 EDT):
-
-The system shutdown has been cancelled at Mon 2018-10-08 06:40:09 EDT!
-
-```
-
-All other logged in users can see a broadcast message in their terminal like below.
-
-```
-[[email protected] ~]$
-Broadcast message from [email protected] (Mon 2018-10-08 06:41:35 EDT):
-
-The system shutdown has been cancelled at Mon 2018-10-08 06:42:35 EDT!
-
-```
-
-Add a time parameter, if you want to perform shutdown or reboot in `N` seconds. Here you can add broadcast a custom message to logged-in users. In this example, we are rebooting the machine in another 5 minutes.
-
-```
-# shutdown -r +5 "To activate the latest Kernel"
-Shutdown scheduled for Mon 2018-10-08 07:13:16 EDT, use 'shutdown -c' to cancel.
-
-[[email protected] ~]#
-Broadcast message from [email protected] (Mon 2018-10-08 07:08:16 EDT):
-
-To activate the latest Kernel
-The system is going down for reboot at Mon 2018-10-08 07:13:16 EDT!
-
-```
-
-Run the below command to reboot a Linux machine immediately. It will kill all the processes immediately and will reboot the system.
-
-```
-# shutdown -r now
-
-```
-
- * **`-r, --reboot:`** Reboot the machine.
-
-
-
-### Method-2: How To Shutdown And Reboot The Linux System Using reboot Command
-
-reboot command used to power-off or reboot a Linux remote machine or local host. Reboot command comes with two useful options.
-
-It will perform a graceful shutdown and restart of the machine (This is similar to your restart option which is available in your system menu).
-
-Run “reboot’ command without any option to reboot Linux machine.
-
-```
-# reboot
-
-```
-
-Run the “reboot” command with `-p` option to power-off or shutdown the Linux machine.
-
-```
-# reboot -p
-
-```
-
- * **`-p, --poweroff:`** Power-off the machine, either halt or poweroff commands is invoked.
-
-
-
-Run the “reboot” command with `-f` option to forcefully reboot the Linux machine (This is similar to pressing the power button on the CPU).
-
-```
-# reboot -f
-
-```
-
- * **`-f, --force:`** Force immediate halt, power-off, or reboot.
-
-
-
-### Method-3: How To Shutdown And Reboot The Linux System Using init Command
-
-init (short for initialization) is the first process started during booting of the computer system.
-
-It will check the /etc/inittab file to decide the Linux run level. Also, allow users to perform shutdown and reboot the Linux machine. There are seven runlevels exist, from zero to six.
-
-**Suggested Read :**
-**(#)** [How To Check All Running Services In Linux][3]
-
-Run the below init command to shutdown the system .
-
-```
-# init 0
-
-```
-
- * **`0:`** Halt – to shutdown the system.
-
-
-
-Run the below init command to reboot the system .
-
-```
-# init 6
-
-```
-
- * **`6:`** Reboot – to reboot the system.
-
-
-
-### Method-4: How To Shutdown The Linux System Using halt Command
-
-halt command used to power-off or shutdown a Linux remote machine or local host.
-halt terminates all processes and shuts down the cpu.
-
-```
-# halt
-
-```
-
-### Method-5: How To Shutdown The Linux System Using poweroff Command
-
-poweroff command used to power-off or shutdown a Linux remote machine or local host. Poweroff is exactly like halt, but it also turns off the unit itself (lights and everything on a PC). It sends an ACPI command to the board, then to the PSU, to cut the power.
-
-```
-# poweroff
-
-```
-
-### Method-6: How To Shutdown And Reboot The Linux System Using systemctl Command
-
-Systemd is a new init system and system manager which was implemented/adapted into all the major Linux distributions over the traditional SysV init systems.
-
-systemd is compatible with SysV and LSB init scripts. It can work as a drop-in replacement for sysvinit system. systemd is the first process get started by kernel and holding PID 1.
-
-**Suggested Read :**
-**(#)** [chkservice – A Tool For Managing Systemd Units From Linux Terminal][4]
-
-It’s a parent process for everything and Fedora 15 is the first distribution which was adapted systemd instead of upstart.
-
-systemctl is command line utility and primary tool to manage the systemd daemons/services such as (start, restart, stop, enable, disable, reload & status).
-
-systemd uses .service files Instead of bash scripts (SysVinit uses). systemd sorts all daemons into their own Linux cgroups and you can see the system hierarchy by exploring /cgroup/systemd file.
-
-```
-# systemctl halt
-# systemctl poweroff
-# systemctl reboot
-# systemctl suspend
-# systemctl hibernate
-
-```
-
---------------------------------------------------------------------------------
-
-via: https://www.2daygeek.com/6-commands-to-shutdown-halt-poweroff-reboot-the-linux-system/
-
-作者：[Prakash Subramanian][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://www.2daygeek.com/author/prakash/
-[b]: https://github.com/lujun9972
-[1]: https://www.2daygeek.com/11-methods-to-find-check-system-server-uptime-in-linux/
-[2]: https://www.2daygeek.com/tuptime-a-tool-to-report-the-historical-and-statistical-running-time-of-linux-system/
-[3]: https://www.2daygeek.com/how-to-check-all-running-services-in-linux/
-[4]: https://www.2daygeek.com/chkservice-a-tool-for-managing-systemd-units-from-linux-terminal/
diff --git a/sources/tech/20181010 5 alerting and visualization tools for sysadmins.md b/sources/tech/20181010 5 alerting and visualization tools for sysadmins.md
index f933449461..a13dd1617a 100644
--- a/sources/tech/20181010 5 alerting and visualization tools for sysadmins.md
+++ b/sources/tech/20181010 5 alerting and visualization tools for sysadmins.md
@@ -1,3 +1,5 @@
+HackChow translating
+
5 alerting and visualization tools for sysadmins
======
These open source tools help users understand system behavior and output, and provide alerts for potential problems.
diff --git a/sources/tech/20181011 Exploring the Linux kernel- The secrets of Kconfig-kbuild.md b/sources/tech/20181011 Exploring the Linux kernel- The secrets of Kconfig-kbuild.md
index 8ee4f34897..f2885b177c 100644
--- a/sources/tech/20181011 Exploring the Linux kernel- The secrets of Kconfig-kbuild.md
+++ b/sources/tech/20181011 Exploring the Linux kernel- The secrets of Kconfig-kbuild.md
@@ -1,3 +1,4 @@
+translating by leemeans
Exploring the Linux kernel: The secrets of Kconfig/kbuild
======
Dive into understanding how the Linux config/build system works.
diff --git a/sources/tech/20181015 How to Enable or Disable Services on Boot in Linux Using chkconfig and systemctl Command.md b/sources/tech/20181015 How to Enable or Disable Services on Boot in Linux Using chkconfig and systemctl Command.md
deleted file mode 100644
index e1b66d4f6d..0000000000
--- a/sources/tech/20181015 How to Enable or Disable Services on Boot in Linux Using chkconfig and systemctl Command.md
+++ /dev/null
@@ -1,248 +0,0 @@
-Translating by way-ww
-
-How to Enable or Disable Services on Boot in Linux Using chkconfig and systemctl Command
-======
-It’s a important topic for Linux admin (such a wonderful topic) so, everyone must be aware of this and practice how to use this in the efficient way.
-
-In Linux, whenever we install any packages which has services or daemons. By default all the services “init & systemd” scripts will be added into it but it wont enabled.
-
-Hence, we need to enable or disable the service manually if it’s required. There are three major init systems are available in Linux which are very famous and still in use.
-
-### What is init System?
-
-In Linux/Unix based operating systems, init (short for initialization) is the first process that started during the system boot up by the kernel.
-
-It’s holding a process id (PID) of 1. It will be running in the background continuously until the system is shut down.
-
-Init looks at the `/etc/inittab` file to decide the Linux run level then it starts all other processes & applications in the background as per the run level.
-
-BIOS, MBR, GRUB and Kernel processes were kicked up before hitting init process as part of Linux booting process.
-
-Below are the available run levels for Linux (There are seven runlevels exist, from zero to six).
-
- * **`0:`** halt
- * **`1:`** Single user mode
- * **`2:`** Multiuser, without NFS
- * **`3:`** Full multiuser mode
- * **`4:`** Unused
- * **`5:`** X11 (GUI – Graphical User Interface)
- * **`:`** reboot
-
-
-
-Below three init systems are widely used in Linux.
-
- * System V (Sys V)
- * Upstart
- * systemd
-
-
-
-### What is System V (Sys V)?
-
-System V (Sys V) is one of the first and traditional init system for Unix like operating system. init is the first process that started during the system boot up by the kernel and it’s a parent process for everything.
-
-Most of the Linux distributions started using traditional init system called System V (Sys V) first. Over the years, several replacement init systems were released to address design limitations in the standard versions such as launchd, the Service Management Facility, systemd and Upstart.
-
-But systemd has been adopted by several major Linux distributions over the traditional SysV init systems.
-
-### What is Upstart?
-
-Upstart is an event-based replacement for the /sbin/init daemon which handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running.
-
-It was originally developed for the Ubuntu distribution, but is intended to be suitable for deployment in all Linux distributions as a replacement for the venerable System-V init.
-
-It was used in Ubuntu from 9.10 to Ubuntu 14.10 & RHEL 6 based systems after that they are replaced with systemd.
-
-### What is systemd?
-
-Systemd is a new init system and system manager which was implemented/adapted into all the major Linux distributions over the traditional SysV init systems.
-
-systemd is compatible with SysV and LSB init scripts. It can work as a drop-in replacement for sysvinit system. systemd is the first process get started by kernel and holding PID 1.
-
-It’s a parant process for everything and Fedora 15 is the first distribution which was adapted systemd instead of upstart. systemctl is command line utility and primary tool to manage the systemd daemons/services such as (start, restart, stop, enable, disable, reload & status).
-
-systemd uses .service files Instead of bash scripts (SysVinit uses). systemd sorts all daemons into their own Linux cgroups and you can see the system hierarchy by exploring `/cgroup/systemd` file.
-
-### How to Enable or Disable Services on Boot Using chkconfig Commmand?
-
-The chkconfig utility is a command-line tool that allows you to specify in which
-runlevel to start a selected service, as well as to list all available services along with their current setting.
-
-Also, it will allows us to enable or disable a services from the boot. Make sure you must have superuser privileges (either root or sudo) to use this command.
-
-All the services script are located on `/etc/rd.d/init.d`.
-
-### How to list All Services in run-level
-
-The `-–list` parameter displays all the services along with their current status (What run-level the services are enabled or disabled).
-
-```
- # chkconfig --list
- NetworkManager 0:off 1:off 2:on 3:on 4:on 5:on 6:off
- abrt-ccpp 0:off 1:off 2:off 3:on 4:off 5:on 6:off
- abrtd 0:off 1:off 2:off 3:on 4:off 5:on 6:off
- acpid 0:off 1:off 2:on 3:on 4:on 5:on 6:off
- atd 0:off 1:off 2:off 3:on 4:on 5:on 6:off
- auditd 0:off 1:off 2:on 3:on 4:on 5:on 6:off
- .
- .
-```
-
-### How to check the Status of Specific Service
-
-If you would like to see a particular service status in run-level then use the following format and grep the required service.
-
-In this case, we are going to check the `auditd` service status in run-level.
-
-```
- # chkconfig --list| grep auditd
- auditd 0:off 1:off 2:on 3:on 4:on 5:on 6:off
-```
-
-### How to Enable a Particular Service on Run Levels
-
-Use `--level` parameter to enable a service in the required run-level. In this case, we are going to enable `httpd` service on run-level 3 and 5.
-
-```
- # chkconfig --level 35 httpd on
-```
-
-### How to Disable a Particular Service on Run Levels
-
-Use `--level` parameter to disable a service in the required run-level. In this case, we are going to enable `httpd` service on run-level 3 and 5.
-
-```
- # chkconfig --level 35 httpd off
-```
-
-### How to Add a new Service to the Startup List
-
-The `-–add` parameter allows us to add any new service to the startup. By default, it will turn on level 2, 3, 4 and 5 automatically for that service.
-
-```
- # chkconfig --add nagios
-```
-
-### How to Remove a Service from Startup List
-
-Use `--del` parameter to remove the service from the startup list. Here, we are going to remove the Nagios service from the startup list.
-
-```
- # chkconfig --del nagios
-```
-
-### How to Enable or Disable Services on Boot Using systemctl Command?
-
-systemctl is command line utility and primary tool to manage the systemd daemons/services such as (start, restart, stop, enable, disable, reload & status).
-
-All the created systemd unit files are located on `/etc/systemd/system/`.
-
-### How to list All Services
-
-Use the following command to list all the services which included enabled and disabled.
-
-```
- # systemctl list-unit-files --type=service
- UNIT FILE STATE
- arp-ethers.service disabled
- auditd.service enabled
- [email protected] enabled
- blk-availability.service disabled
- brandbot.service static
- [email protected] static
- chrony-wait.service disabled
- chronyd.service enabled
- cloud-config.service enabled
- cloud-final.service enabled
- cloud-init-local.service enabled
- cloud-init.service enabled
- console-getty.service disabled
- console-shell.service disabled
- [email protected] static
- cpupower.service disabled
- crond.service enabled
- .
- .
- 150 unit files listed.
-```
-
-If you would like to see a particular service status then use the following format and grep the required service. In this case, we are going to check the `httpd` service status.
-
-```
- # systemctl list-unit-files --type=service | grep httpd
- httpd.service disabled
-```
-
-### How to Enable a Particular Service on boot
-
-Use the following systemctl command format to enable a particular service. To enable a service, it will create a symlink. The same can be found below.
-
-```
- # systemctl enable httpd
- Created symlink from /etc/systemd/system/multi-user.target.wants/httpd.service to /usr/lib/systemd/system/httpd.service.
-```
-
-Run the following command to double check whether the services is enabled or not on boot.
-
-```
- # systemctl is-enabled httpd
- enabled
-```
-
-### How to Disable a Particular Service on boot
-
-Use the following systemctl command format to disable a particular service. When you run the command, it will remove a symlink which was created by you while enabling the service. The same can be found below.
-
-```
- # systemctl disable httpd
- Removed symlink /etc/systemd/system/multi-user.target.wants/httpd.service.
-```
-
-Run the following command to double check whether the services is disabled or not on boot.
-
-```
- # systemctl is-enabled httpd
- disabled
-```
-
-### How to Check the current run level
-
-Use the following systemctl command to verify which run-level you are in. Still “runlevel” command works with systemd, however runlevels is a legacy concept in systemd so, i would advise you to use systemctl command for all activity.
-
-We are in `run-level 3`, the same is showing below as `multi-user.target`.
-
-```
- # systemctl list-units --type=target
- UNIT LOAD ACTIVE SUB DESCRIPTION
- basic.target loaded active active Basic System
- cloud-config.target loaded active active Cloud-config availability
- cryptsetup.target loaded active active Local Encrypted Volumes
- getty.target loaded active active Login Prompts
- local-fs-pre.target loaded active active Local File Systems (Pre)
- local-fs.target loaded active active Local File Systems
- multi-user.target loaded active active Multi-User System
- network-online.target loaded active active Network is Online
- network-pre.target loaded active active Network (Pre)
- network.target loaded active active Network
- paths.target loaded active active Paths
- remote-fs.target loaded active active Remote File Systems
- slices.target loaded active active Slices
- sockets.target loaded active active Sockets
- swap.target loaded active active Swap
- sysinit.target loaded active active System Initialization
- timers.target loaded active active Timers
-```
---------------------------------------------------------------------------------
-
-via: https://www.2daygeek.com/how-to-enable-or-disable-services-on-boot-in-linux-using-chkconfig-and-systemctl-command/
-
-作者：[Prakash Subramanian][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://www.2daygeek.com/author/prakash/
-[b]: https://github.com/lujun9972
diff --git a/sources/tech/20181015 Kali Linux- What You Must Know Before Using it - FOSS Post.md b/sources/tech/20181015 Kali Linux- What You Must Know Before Using it - FOSS Post.md
deleted file mode 100644
index 0a8571b7e6..0000000000
--- a/sources/tech/20181015 Kali Linux- What You Must Know Before Using it - FOSS Post.md
+++ /dev/null
@@ -1,93 +0,0 @@
-Kali Linux: What You Must Know Before Using it – FOSS Post
-======
-
-
-Kali Linux is the industry’s leading Linux distribution in penetration testing and ethical hacking. It is a distribution that comes shipped with tons and tons of hacking and penetration tools and software by default, and is widely recognized in all parts of the world, even among Windows users who may not even know what Linux is.
-
-Because of the latter, many people are trying to get alone with Kali Linux although they don’t even understand the basics of a Linux system. The reasons may vary from having fun, faking being a hacker to impress a girlfriend or simply trying to hack the neighbors’ WiFi network to get a free Internet, all of which is a bad thing to do if you are planning to use Kali Linux.
-
-Here are some tips that you should know before even planning to use Kali Linux
-
-### Kali Linux is Not for Beginners
-
-
-Kali Linux Default GNOME Desktop
-
-If you are someone who has just started to use Linux few months ago, or if you are don’t consider yourself to be above average in terms of knowledge, then Kali Linux is not for you. If you are going to ask stuff like “How do I install Steam on Kali? How do I make my printer work on Kali? How do I solve the APT sources error on Kali”? Then Kali Linux is not suitable for you.
-
-Kali Linux is mainly made for professionals wanting to run penetration testing suits or people who want to learn ethical hacking and digital forensics. But even if you were from the latter, the average Kali Linux user is expected to face a lot of trouble while using Kali Linux for his day-to-day usage. He’s also expected to take a very careful approach to how he uses the tools and software, it’s not just “let’s install it and run everything”. Every tool must be carefully used, every software you install must be carefully examined.
-
-**Good Read:** [What are the components of a Linux system?][1]
-
-Stuff which the average Linux user can’t do normally. A better approach would be to spend few weeks learning about Linux and its daemons, services, software, distributions and the way it works, and then watch few dozens of videos and courses about ethical hacking, and only then, try to use Kali to apply what you learned.
-
-### it Can Get You Hacked
-
-
-Kali Linux Hacking & Testing Tools
-
-In a normal Linux system, there’s one account for normal user and one separate account for root. This is not the case in Kali Linux. Kali Linux uses the root account by default and doesn’t provide you with a normal user account. This is because almost all security tools available in Kali do require root privileges, and to avoid asking you for root password every minute, they designed it that way.
-
-Of course, you could simply create a normal user account and start using it. Well, it’s still not recommended because that’s not how the Kali Linux system design is meant to work. You’ll face a lot of problems then in using programs, opening ports, debugging software, discovering why this thing doesn’t work only to discover that it was a weird privilege bug. You will also be annoyed by all the tools that will require you to enter the password each time you try to do anything on your system.
-
-Now, since you are forced to use it in as a root user, all the software you run on your system will also run with root privileges. This is bad if you don’t know what you are doing, because if there’s a vulnerability in Firefox for example and you visit one of the infected dark web sites, the hacker will be able to get full root permissions on your PC and hack you, which would have been limited if you were using a normal user account. Also, some tools that you may install and use can open ports and leak information without your knowledge, so if you are not extremely careful, people can hack you in the same way you may try to hack them.
-
-If you visit Facebook groups related to Kali Linux on few occasions, you’ll notice that almost a quarter of the posts in these groups are people calling for help because someone hacked them.
-
-### it Can Get You in Jail
-
-Kali Linux provide the software as it is. Then, it is your own responsibility alone of how you use them.
-
-In most advanced countries around the world, using penetration testing tools against public WiFi networks or the devices of others can easily get you in jail. Now don’t think that you can’t be tracked just because you are using Kali, many systems are configured to have complex logging devices to simply track whoever tries to listen or hack their networks, and you may stumble upon one of these, and it will destroy you life.
-
-Don’t ever use Kali Linux tools against devices/networks which do not belong to you or given explicit permission to try hacking them. If you say that you didn’t know what you were doing, it won’t be accepted as an excuse in a court.
-
-### Modified Kernel and Software
-
-Kali is [based][2] on Debian (Testing branch, which means that Kali Linux uses a rolling release model), so it uses most of the software architecture from there, and you will find most of the software in Kali Linux just as they are in Debian.
-
-However, some packages were modified to harden security and fix some possible vulnerabilities. The Linux kernel that Kali uses for example is patched to allow wireless injection on various devices. These patches are not normally available in the vanilla kernel. Also, Kali Linux does not depend on Debian servers and mirrors, but builds the packages by its own servers. Here’s the default software sources in the latest release:
-
-```
- deb http://http.kali.org/kali kali-rolling main contrib non-free
- deb-src http://http.kali.org/kali kali-rolling main contrib non-free
-```
-
-That’s why, for some specific software, you will find a different behaviour when using the same program in Kali Linux or using it in Fedora, for example. You can see a full list of Kali Linux software from [git.kali.org][3]. You can also find our [own generated list of installed packages][4] on Kali Linux (GNOME).
-
-More importantly, Kali Linux official documentation extremely suggests to NOT add any other 3rd-party software repositories, because since Kali Linux is a rolling release and depends on Debian Testing, you will most likely break your system by just adding a new repository source due to dependencies conflicts and package hooks.
-
-### Don’t Install Kali Linux
-
-
-Running wpscan on fosspost.org using Kali Linux
-
-I use Kali Linux on rare occasions to test the software and servers I deploy. However, I will never dare to install it and use it as a primary system.
-
-If you are going to use it as a primary system, then you will have to keep your own personal files, password, data and everything else on your system. You will also need to install tons of daily-use software in order to ease your life. But as we mentioned above, using Kali Linux is very risky and should be done very carefully, and if you get hacked, you will lose all your data and it may get exposed to a wider audience. Your personal information can also be used to track you if you are doing non-legal stuff. You may even destroy your data by yourself if you are not careful about how you use the tools.
-
-Even professional white hackers don’t recommend installing it as a primary system, but rather, use it from USB to just do your penetration testing work and then leave back to your normal Linux distribution.
-
-### The Bottom Line
-
-As you may see now, using Kali is not an easy decision to take lightly. If you are planning to be a whiter hacker and you need to use Kali to learn, then go for it after learning the basics and spending few months with a normal system. But be careful for what you are doing to avoid being in trouble.
-
-If you are planning to use Kali or if you need any help, I’ll be happy to hear your thoughts in the comments.
-
---------------------------------------------------------------------------------
-
-via: https://fosspost.org/articles/must-know-before-using-kali-linux
-
-作者：[M.Hanny Sabbagh][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://fosspost.org/author/mhsabbagh
-[b]: https://github.com/lujun9972
-[1]: https://fosspost.org/articles/what-are-the-components-of-a-linux-distribution
-[2]: https://www.kali.org/news/kali-linux-rolling-edition-2016-1/
-[3]: http://git.kali.org
-[4]: https://paste.ubuntu.com/p/bctSVWwpVw/
diff --git a/sources/tech/20181016 Lab 4- Preemptive Multitasking.md b/sources/tech/20181016 Lab 4- Preemptive Multitasking.md
deleted file mode 100644
index de68cd7f39..0000000000
--- a/sources/tech/20181016 Lab 4- Preemptive Multitasking.md
+++ /dev/null
@@ -1,596 +0,0 @@
-Translating by qhwdw
-Lab 4: Preemptive Multitasking
-======
-### Lab 4: Preemptive Multitasking
-
-**Part A due Thursday, October 18, 2018
-Part B due Thursday, October 25, 2018
-Part C due Thursday, November 1, 2018**
-
-#### Introduction
-
-In this lab you will implement preemptive multitasking among multiple simultaneously active user-mode environments.
-
-In part A you will add multiprocessor support to JOS, implement round-robin scheduling, and add basic environment management system calls (calls that create and destroy environments, and allocate/map memory).
-
-In part B, you will implement a Unix-like `fork()`, which allows a user-mode environment to create copies of itself.
-
-Finally, in part C you will add support for inter-process communication (IPC), allowing different user-mode environments to communicate and synchronize with each other explicitly. You will also add support for hardware clock interrupts and preemption.
-
-##### Getting Started
-
-Use Git to commit your Lab 3 source, fetch the latest version of the course repository, and then create a local branch called `lab4` based on our lab4 branch, `origin/lab4`:
-
-```
- athena% cd ~/6.828/lab
- athena% add git
- athena% git pull
- Already up-to-date.
- athena% git checkout -b lab4 origin/lab4
- Branch lab4 set up to track remote branch refs/remotes/origin/lab4.
- Switched to a new branch "lab4"
- athena% git merge lab3
- Merge made by recursive.
- ...
- athena%
-```
-
-Lab 4 contains a number of new source files, some of which you should browse before you start:
-| kern/cpu.h | Kernel-private definitions for multiprocessor support |
-| kern/mpconfig.c | Code to read the multiprocessor configuration |
-| kern/lapic.c | Kernel code driving the local APIC unit in each processor |
-| kern/mpentry.S | Assembly-language entry code for non-boot CPUs |
-| kern/spinlock.h | Kernel-private definitions for spin locks, including the big kernel lock |
-| kern/spinlock.c | Kernel code implementing spin locks |
-| kern/sched.c | Code skeleton of the scheduler that you are about to implement |
-
-##### Lab Requirements
-
-This lab is divided into three parts, A, B, and C. We have allocated one week in the schedule for each part.
-
-As before, you will need to do all of the regular exercises described in the lab and _at least one_ challenge problem. (You do not need to do one challenge problem per part, just one for the whole lab.) Additionally, you will need to write up a brief description of the challenge problem that you implemented. If you implement more than one challenge problem, you only need to describe one of them in the write-up, though of course you are welcome to do more. Place the write-up in a file called `answers-lab4.txt` in the top level of your `lab` directory before handing in your work.
-
-#### Part A: Multiprocessor Support and Cooperative Multitasking
-
-In the first part of this lab, you will first extend JOS to run on a multiprocessor system, and then implement some new JOS kernel system calls to allow user-level environments to create additional new environments. You will also implement _cooperative_ round-robin scheduling, allowing the kernel to switch from one environment to another when the current environment voluntarily relinquishes the CPU (or exits). Later in part C you will implement _preemptive_ scheduling, which allows the kernel to re-take control of the CPU from an environment after a certain time has passed even if the environment does not cooperate.
-
-##### Multiprocessor Support
-
-We are going to make JOS support "symmetric multiprocessing" (SMP), a multiprocessor model in which all CPUs have equivalent access to system resources such as memory and I/O buses. While all CPUs are functionally identical in SMP, during the boot process they can be classified into two types: the bootstrap processor (BSP) is responsible for initializing the system and for booting the operating system; and the application processors (APs) are activated by the BSP only after the operating system is up and running. Which processor is the BSP is determined by the hardware and the BIOS. Up to this point, all your existing JOS code has been running on the BSP.
-
-In an SMP system, each CPU has an accompanying local APIC (LAPIC) unit. The LAPIC units are responsible for delivering interrupts throughout the system. The LAPIC also provides its connected CPU with a unique identifier. In this lab, we make use of the following basic functionality of the LAPIC unit (in `kern/lapic.c`):
-
- * Reading the LAPIC identifier (APIC ID) to tell which CPU our code is currently running on (see `cpunum()`).
- * Sending the `STARTUP` interprocessor interrupt (IPI) from the BSP to the APs to bring up other CPUs (see `lapic_startap()`).
- * In part C, we program LAPIC's built-in timer to trigger clock interrupts to support preemptive multitasking (see `apic_init()`).
-
-
-
-A processor accesses its LAPIC using memory-mapped I/O (MMIO). In MMIO, a portion of _physical_ memory is hardwired to the registers of some I/O devices, so the same load/store instructions typically used to access memory can be used to access device registers. You've already seen one IO hole at physical address `0xA0000` (we use this to write to the VGA display buffer). The LAPIC lives in a hole starting at physical address `0xFE000000` (32MB short of 4GB), so it's too high for us to access using our usual direct map at KERNBASE. The JOS virtual memory map leaves a 4MB gap at `MMIOBASE` so we have a place to map devices like this. Since later labs introduce more MMIO regions, you'll write a simple function to allocate space from this region and map device memory to it.
-
-```
-Exercise 1. Implement `mmio_map_region` in `kern/pmap.c`. To see how this is used, look at the beginning of `lapic_init` in `kern/lapic.c`. You'll have to do the next exercise, too, before the tests for `mmio_map_region` will run.
-```
-
-###### Application Processor Bootstrap
-
-Before booting up APs, the BSP should first collect information about the multiprocessor system, such as the total number of CPUs, their APIC IDs and the MMIO address of the LAPIC unit. The `mp_init()` function in `kern/mpconfig.c` retrieves this information by reading the MP configuration table that resides in the BIOS's region of memory.
-
-The `boot_aps()` function (in `kern/init.c`) drives the AP bootstrap process. APs start in real mode, much like how the bootloader started in `boot/boot.S`, so `boot_aps()` copies the AP entry code (`kern/mpentry.S`) to a memory location that is addressable in the real mode. Unlike with the bootloader, we have some control over where the AP will start executing code; we copy the entry code to `0x7000` (`MPENTRY_PADDR`), but any unused, page-aligned physical address below 640KB would work.
-
-After that, `boot_aps()` activates APs one after another, by sending `STARTUP` IPIs to the LAPIC unit of the corresponding AP, along with an initial `CS:IP` address at which the AP should start running its entry code (`MPENTRY_PADDR` in our case). The entry code in `kern/mpentry.S` is quite similar to that of `boot/boot.S`. After some brief setup, it puts the AP into protected mode with paging enabled, and then calls the C setup routine `mp_main()` (also in `kern/init.c`). `boot_aps()` waits for the AP to signal a `CPU_STARTED` flag in `cpu_status` field of its `struct CpuInfo` before going on to wake up the next one.
-
-```
-Exercise 2. Read `boot_aps()` and `mp_main()` in `kern/init.c`, and the assembly code in `kern/mpentry.S`. Make sure you understand the control flow transfer during the bootstrap of APs. Then modify your implementation of `page_init()` in `kern/pmap.c` to avoid adding the page at `MPENTRY_PADDR` to the free list, so that we can safely copy and run AP bootstrap code at that physical address. Your code should pass the updated `check_page_free_list()` test (but might fail the updated `check_kern_pgdir()` test, which we will fix soon).
-```
-
-```
-Question
-
- 1. Compare `kern/mpentry.S` side by side with `boot/boot.S`. Bearing in mind that `kern/mpentry.S` is compiled and linked to run above `KERNBASE` just like everything else in the kernel, what is the purpose of macro `MPBOOTPHYS`? Why is it necessary in `kern/mpentry.S` but not in `boot/boot.S`? In other words, what could go wrong if it were omitted in `kern/mpentry.S`?
-Hint: recall the differences between the link address and the load address that we have discussed in Lab 1.
-```
-
-
-###### Per-CPU State and Initialization
-
-When writing a multiprocessor OS, it is important to distinguish between per-CPU state that is private to each processor, and global state that the whole system shares. `kern/cpu.h` defines most of the per-CPU state, including `struct CpuInfo`, which stores per-CPU variables. `cpunum()` always returns the ID of the CPU that calls it, which can be used as an index into arrays like `cpus`. Alternatively, the macro `thiscpu` is shorthand for the current CPU's `struct CpuInfo`.
-
-Here is the per-CPU state you should be aware of:
-
- * **Per-CPU kernel stack**.
-Because multiple CPUs can trap into the kernel simultaneously, we need a separate kernel stack for each processor to prevent them from interfering with each other's execution. The array `percpu_kstacks[NCPU][KSTKSIZE]` reserves space for NCPU's worth of kernel stacks.
-
-In Lab 2, you mapped the physical memory that `bootstack` refers to as the BSP's kernel stack just below `KSTACKTOP`. Similarly, in this lab, you will map each CPU's kernel stack into this region with guard pages acting as a buffer between them. CPU 0's stack will still grow down from `KSTACKTOP`; CPU 1's stack will start `KSTKGAP` bytes below the bottom of CPU 0's stack, and so on. `inc/memlayout.h` shows the mapping layout.
-
- * **Per-CPU TSS and TSS descriptor**.
-A per-CPU task state segment (TSS) is also needed in order to specify where each CPU's kernel stack lives. The TSS for CPU _i_ is stored in `cpus[i].cpu_ts`, and the corresponding TSS descriptor is defined in the GDT entry `gdt[(GD_TSS0 >> 3) + i]`. The global `ts` variable defined in `kern/trap.c` will no longer be useful.
-
- * **Per-CPU current environment pointer**.
-Since each CPU can run different user process simultaneously, we redefined the symbol `curenv` to refer to `cpus[cpunum()].cpu_env` (or `thiscpu->cpu_env`), which points to the environment _currently_ executing on the _current_ CPU (the CPU on which the code is running).
-
- * **Per-CPU system registers**.
-All registers, including system registers, are private to a CPU. Therefore, instructions that initialize these registers, such as `lcr3()`, `ltr()`, `lgdt()`, `lidt()`, etc., must be executed once on each CPU. Functions `env_init_percpu()` and `trap_init_percpu()` are defined for this purpose.
-
-
-
-```
-Exercise 3. Modify `mem_init_mp()` (in `kern/pmap.c`) to map per-CPU stacks starting at `KSTACKTOP`, as shown in `inc/memlayout.h`. The size of each stack is `KSTKSIZE` bytes plus `KSTKGAP` bytes of unmapped guard pages. Your code should pass the new check in `check_kern_pgdir()`.
-```
-
-```
-Exercise 4. The code in `trap_init_percpu()` (`kern/trap.c`) initializes the TSS and TSS descriptor for the BSP. It worked in Lab 3, but is incorrect when running on other CPUs. Change the code so that it can work on all CPUs. (Note: your new code should not use the global `ts` variable any more.)
-```
-
-When you finish the above exercises, run JOS in QEMU with 4 CPUs using make qemu CPUS=4 (or make qemu-nox CPUS=4), you should see output like this:
-
-```
- ...
- Physical memory: 66556K available, base = 640K, extended = 65532K
- check_page_alloc() succeeded!
- check_page() succeeded!
- check_kern_pgdir() succeeded!
- check_page_installed_pgdir() succeeded!
- SMP: CPU 0 found 4 CPU(s)
- enabled interrupts: 1 2
- SMP: CPU 1 starting
- SMP: CPU 2 starting
- SMP: CPU 3 starting
-```
-
-###### Locking
-
-Our current code spins after initializing the AP in `mp_main()`. Before letting the AP get any further, we need to first address race conditions when multiple CPUs run kernel code simultaneously. The simplest way to achieve this is to use a _big kernel lock_. The big kernel lock is a single global lock that is held whenever an environment enters kernel mode, and is released when the environment returns to user mode. In this model, environments in user mode can run concurrently on any available CPUs, but no more than one environment can run in kernel mode; any other environments that try to enter kernel mode are forced to wait.
-
-`kern/spinlock.h` declares the big kernel lock, namely `kernel_lock`. It also provides `lock_kernel()` and `unlock_kernel()`, shortcuts to acquire and release the lock. You should apply the big kernel lock at four locations:
-
- * In `i386_init()`, acquire the lock before the BSP wakes up the other CPUs.
- * In `mp_main()`, acquire the lock after initializing the AP, and then call `sched_yield()` to start running environments on this AP.
- * In `trap()`, acquire the lock when trapped from user mode. To determine whether a trap happened in user mode or in kernel mode, check the low bits of the `tf_cs`.
- * In `env_run()`, release the lock _right before_ switching to user mode. Do not do that too early or too late, otherwise you will experience races or deadlocks.
-
-
-```
-Exercise 5. Apply the big kernel lock as described above, by calling `lock_kernel()` and `unlock_kernel()` at the proper locations.
-```
-
-How to test if your locking is correct? You can't at this moment! But you will be able to after you implement the scheduler in the next exercise.
-
-```
-Question
-
- 2. It seems that using the big kernel lock guarantees that only one CPU can run the kernel code at a time. Why do we still need separate kernel stacks for each CPU? Describe a scenario in which using a shared kernel stack will go wrong, even with the protection of the big kernel lock.
-```
-
-```
-Challenge! The big kernel lock is simple and easy to use. Nevertheless, it eliminates all concurrency in kernel mode. Most modern operating systems use different locks to protect different parts of their shared state, an approach called _fine-grained locking_. Fine-grained locking can increase performance significantly, but is more difficult to implement and error-prone. If you are brave enough, drop the big kernel lock and embrace concurrency in JOS!
-
-It is up to you to decide the locking granularity (the amount of data that a lock protects). As a hint, you may consider using spin locks to ensure exclusive access to these shared components in the JOS kernel:
-
- * The page allocator.
- * The console driver.
- * The scheduler.
- * The inter-process communication (IPC) state that you will implement in the part C.
-```
-
-
-##### Round-Robin Scheduling
-
-Your next task in this lab is to change the JOS kernel so that it can alternate between multiple environments in "round-robin" fashion. Round-robin scheduling in JOS works as follows:
-
- * The function `sched_yield()` in the new `kern/sched.c` is responsible for selecting a new environment to run. It searches sequentially through the `envs[]` array in circular fashion, starting just after the previously running environment (or at the beginning of the array if there was no previously running environment), picks the first environment it finds with a status of `ENV_RUNNABLE` (see `inc/env.h`), and calls `env_run()` to jump into that environment.
- * `sched_yield()` must never run the same environment on two CPUs at the same time. It can tell that an environment is currently running on some CPU (possibly the current CPU) because that environment's status will be `ENV_RUNNING`.
- * We have implemented a new system call for you, `sys_yield()`, which user environments can call to invoke the kernel's `sched_yield()` function and thereby voluntarily give up the CPU to a different environment.
-
-
-
-```
-Exercise 6. Implement round-robin scheduling in `sched_yield()` as described above. Don't forget to modify `syscall()` to dispatch `sys_yield()`.
-
-Make sure to invoke `sched_yield()` in `mp_main`.
-
-Modify `kern/init.c` to create three (or more!) environments that all run the program `user/yield.c`.
-
-Run make qemu. You should see the environments switch back and forth between each other five times before terminating, like below.
-
-Test also with several CPUS: make qemu CPUS=2.
-
- ...
- Hello, I am environment 00001000.
- Hello, I am environment 00001001.
- Hello, I am environment 00001002.
- Back in environment 00001000, iteration 0.
- Back in environment 00001001, iteration 0.
- Back in environment 00001002, iteration 0.
- Back in environment 00001000, iteration 1.
- Back in environment 00001001, iteration 1.
- Back in environment 00001002, iteration 1.
- ...
-
-After the `yield` programs exit, there will be no runnable environment in the system, the scheduler should invoke the JOS kernel monitor. If any of this does not happen, then fix your code before proceeding.
-```
-
-```
-Question
-
- 3. In your implementation of `env_run()` you should have called `lcr3()`. Before and after the call to `lcr3()`, your code makes references (at least it should) to the variable `e`, the argument to `env_run`. Upon loading the `%cr3` register, the addressing context used by the MMU is instantly changed. But a virtual address (namely `e`) has meaning relative to a given address context--the address context specifies the physical address to which the virtual address maps. Why can the pointer `e` be dereferenced both before and after the addressing switch?
- 4. Whenever the kernel switches from one environment to another, it must ensure the old environment's registers are saved so they can be restored properly later. Why? Where does this happen?
-```
-
-```
-Challenge! Add a less trivial scheduling policy to the kernel, such as a fixed-priority scheduler that allows each environment to be assigned a priority and ensures that higher-priority environments are always chosen in preference to lower-priority environments. If you're feeling really adventurous, try implementing a Unix-style adjustable-priority scheduler or even a lottery or stride scheduler. (Look up "lottery scheduling" and "stride scheduling" in Google.)
-
-Write a test program or two that verifies that your scheduling algorithm is working correctly (i.e., the right environments get run in the right order). It may be easier to write these test programs once you have implemented `fork()` and IPC in parts B and C of this lab.
-```
-
-```
-Challenge! The JOS kernel currently does not allow applications to use the x86 processor's x87 floating-point unit (FPU), MMX instructions, or Streaming SIMD Extensions (SSE). Extend the `Env` structure to provide a save area for the processor's floating point state, and extend the context switching code to save and restore this state properly when switching from one environment to another. The `FXSAVE` and `FXRSTOR` instructions may be useful, but note that these are not in the old i386 user's manual because they were introduced in more recent processors. Write a user-level test program that does something cool with floating-point.
-```
-
-##### System Calls for Environment Creation
-
-Although your kernel is now capable of running and switching between multiple user-level environments, it is still limited to running environments that the _kernel_ initially set up. You will now implement the necessary JOS system calls to allow _user_ environments to create and start other new user environments.
-
-Unix provides the `fork()` system call as its process creation primitive. Unix `fork()` copies the entire address space of calling process (the parent) to create a new process (the child). The only differences between the two observable from user space are their process IDs and parent process IDs (as returned by `getpid` and `getppid`). In the parent, `fork()` returns the child's process ID, while in the child, `fork()` returns 0. By default, each process gets its own private address space, and neither process's modifications to memory are visible to the other.
-
-You will provide a different, more primitive set of JOS system calls for creating new user-mode environments. With these system calls you will be able to implement a Unix-like `fork()` entirely in user space, in addition to other styles of environment creation. The new system calls you will write for JOS are as follows:
-
- * `sys_exofork`:
-This system call creates a new environment with an almost blank slate: nothing is mapped in the user portion of its address space, and it is not runnable. The new environment will have the same register state as the parent environment at the time of the `sys_exofork` call. In the parent, `sys_exofork` will return the `envid_t` of the newly created environment (or a negative error code if the environment allocation failed). In the child, however, it will return 0. (Since the child starts out marked as not runnable, `sys_exofork` will not actually return in the child until the parent has explicitly allowed this by marking the child runnable using....)
- * `sys_env_set_status`:
-Sets the status of a specified environment to `ENV_RUNNABLE` or `ENV_NOT_RUNNABLE`. This system call is typically used to mark a new environment ready to run, once its address space and register state has been fully initialized.
- * `sys_page_alloc`:
-Allocates a page of physical memory and maps it at a given virtual address in a given environment's address space.
- * `sys_page_map`:
-Copy a page mapping ( _not_ the contents of a page!) from one environment's address space to another, leaving a memory sharing arrangement in place so that the new and the old mappings both refer to the same page of physical memory.
- * `sys_page_unmap`:
-Unmap a page mapped at a given virtual address in a given environment.
-
-
-
-For all of the system calls above that accept environment IDs, the JOS kernel supports the convention that a value of 0 means "the current environment." This convention is implemented by `envid2env()` in `kern/env.c`.
-
-We have provided a very primitive implementation of a Unix-like `fork()` in the test program `user/dumbfork.c`. This test program uses the above system calls to create and run a child environment with a copy of its own address space. The two environments then switch back and forth using `sys_yield` as in the previous exercise. The parent exits after 10 iterations, whereas the child exits after 20.
-
-```
-Exercise 7. Implement the system calls described above in `kern/syscall.c` and make sure `syscall()` calls them. You will need to use various functions in `kern/pmap.c` and `kern/env.c`, particularly `envid2env()`. For now, whenever you call `envid2env()`, pass 1 in the `checkperm` parameter. Be sure you check for any invalid system call arguments, returning `-E_INVAL` in that case. Test your JOS kernel with `user/dumbfork` and make sure it works before proceeding.
-```
-
-```
-Challenge! Add the additional system calls necessary to _read_ all of the vital state of an existing environment as well as set it up. Then implement a user mode program that forks off a child environment, runs it for a while (e.g., a few iterations of `sys_yield()`), then takes a complete snapshot or _checkpoint_ of the child environment, runs the child for a while longer, and finally restores the child environment to the state it was in at the checkpoint and continues it from there. Thus, you are effectively "replaying" the execution of the child environment from an intermediate state. Make the child environment perform some interaction with the user using `sys_cgetc()` or `readline()` so that the user can view and mutate its internal state, and verify that with your checkpoint/restart you can give the child environment a case of selective amnesia, making it "forget" everything that happened beyond a certain point.
-```
-
-This completes Part A of the lab; make sure it passes all of the Part A tests when you run make grade, and hand it in using make handin as usual. If you are trying to figure out why a particular test case is failing, run ./grade-lab4 -v, which will show you the output of the kernel builds and QEMU runs for each test, until a test fails. When a test fails, the script will stop, and then you can inspect `jos.out` to see what the kernel actually printed.
-
-#### Part B: Copy-on-Write Fork
-
-As mentioned earlier, Unix provides the `fork()` system call as its primary process creation primitive. The `fork()` system call copies the address space of the calling process (the parent) to create a new process (the child).
-
-xv6 Unix implements `fork()` by copying all data from the parent's pages into new pages allocated for the child. This is essentially the same approach that `dumbfork()` takes. The copying of the parent's address space into the child is the most expensive part of the `fork()` operation.
-
-However, a call to `fork()` is frequently followed almost immediately by a call to `exec()` in the child process, which replaces the child's memory with a new program. This is what the the shell typically does, for example. In this case, the time spent copying the parent's address space is largely wasted, because the child process will use very little of its memory before calling `exec()`.
-
-For this reason, later versions of Unix took advantage of virtual memory hardware to allow the parent and child to _share_ the memory mapped into their respective address spaces until one of the processes actually modifies it. This technique is known as _copy-on-write_. To do this, on `fork()` the kernel would copy the address space _mappings_ from the parent to the child instead of the contents of the mapped pages, and at the same time mark the now-shared pages read-only. When one of the two processes tries to write to one of these shared pages, the process takes a page fault. At this point, the Unix kernel realizes that the page was really a "virtual" or "copy-on-write" copy, and so it makes a new, private, writable copy of the page for the faulting process. In this way, the contents of individual pages aren't actually copied until they are actually written to. This optimization makes a `fork()` followed by an `exec()` in the child much cheaper: the child will probably only need to copy one page (the current page of its stack) before it calls `exec()`.
-
-In the next piece of this lab, you will implement a "proper" Unix-like `fork()` with copy-on-write, as a user space library routine. Implementing `fork()` and copy-on-write support in user space has the benefit that the kernel remains much simpler and thus more likely to be correct. It also lets individual user-mode programs define their own semantics for `fork()`. A program that wants a slightly different implementation (for example, the expensive always-copy version like `dumbfork()`, or one in which the parent and child actually share memory afterward) can easily provide its own.
-
-##### User-level page fault handling
-
-A user-level copy-on-write `fork()` needs to know about page faults on write-protected pages, so that's what you'll implement first. Copy-on-write is only one of many possible uses for user-level page fault handling.
-
-It's common to set up an address space so that page faults indicate when some action needs to take place. For example, most Unix kernels initially map only a single page in a new process's stack region, and allocate and map additional stack pages later "on demand" as the process's stack consumption increases and causes page faults on stack addresses that are not yet mapped. A typical Unix kernel must keep track of what action to take when a page fault occurs in each region of a process's space. For example, a fault in the stack region will typically allocate and map new page of physical memory. A fault in the program's BSS region will typically allocate a new page, fill it with zeroes, and map it. In systems with demand-paged executables, a fault in the text region will read the corresponding page of the binary off of disk and then map it.
-
-This is a lot of information for the kernel to keep track of. Instead of taking the traditional Unix approach, you will decide what to do about each page fault in user space, where bugs are less damaging. This design has the added benefit of allowing programs great flexibility in defining their memory regions; you'll use user-level page fault handling later for mapping and accessing files on a disk-based file system.
-
-###### Setting the Page Fault Handler
-
-In order to handle its own page faults, a user environment will need to register a _page fault handler entrypoint_ with the JOS kernel. The user environment registers its page fault entrypoint via the new `sys_env_set_pgfault_upcall` system call. We have added a new member to the `Env` structure, `env_pgfault_upcall`, to record this information.
-
-```
-Exercise 8. Implement the `sys_env_set_pgfault_upcall` system call. Be sure to enable permission checking when looking up the environment ID of the target environment, since this is a "dangerous" system call.
-```
-
-###### Normal and Exception Stacks in User Environments
-
-During normal execution, a user environment in JOS will run on the _normal_ user stack: its `ESP` register starts out pointing at `USTACKTOP`, and the stack data it pushes resides on the page between `USTACKTOP-PGSIZE` and `USTACKTOP-1` inclusive. When a page fault occurs in user mode, however, the kernel will restart the user environment running a designated user-level page fault handler on a different stack, namely the _user exception_ stack. In essence, we will make the JOS kernel implement automatic "stack switching" on behalf of the user environment, in much the same way that the x86 _processor_ already implements stack switching on behalf of JOS when transferring from user mode to kernel mode!
-
-The JOS user exception stack is also one page in size, and its top is defined to be at virtual address `UXSTACKTOP`, so the valid bytes of the user exception stack are from `UXSTACKTOP-PGSIZE` through `UXSTACKTOP-1` inclusive. While running on this exception stack, the user-level page fault handler can use JOS's regular system calls to map new pages or adjust mappings so as to fix whatever problem originally caused the page fault. Then the user-level page fault handler returns, via an assembly language stub, to the faulting code on the original stack.
-
-Each user environment that wants to support user-level page fault handling will need to allocate memory for its own exception stack, using the `sys_page_alloc()` system call introduced in part A.
-
-###### Invoking the User Page Fault Handler
-
-You will now need to change the page fault handling code in `kern/trap.c` to handle page faults from user mode as follows. We will call the state of the user environment at the time of the fault the _trap-time_ state.
-
-If there is no page fault handler registered, the JOS kernel destroys the user environment with a message as before. Otherwise, the kernel sets up a trap frame on the exception stack that looks like a `struct UTrapframe` from `inc/trap.h`:
-
-```
- <-- UXSTACKTOP
- trap-time esp
- trap-time eflags
- trap-time eip
- trap-time eax start of struct PushRegs
- trap-time ecx
- trap-time edx
- trap-time ebx
- trap-time esp
- trap-time ebp
- trap-time esi
- trap-time edi end of struct PushRegs
- tf_err (error code)
- fault_va <-- %esp when handler is run
-
-```
-
-The kernel then arranges for the user environment to resume execution with the page fault handler running on the exception stack with this stack frame; you must figure out how to make this happen. The `fault_va` is the virtual address that caused the page fault.
-
-If the user environment is _already_ running on the user exception stack when an exception occurs, then the page fault handler itself has faulted. In this case, you should start the new stack frame just under the current `tf->tf_esp` rather than at `UXSTACKTOP`. You should first push an empty 32-bit word, then a `struct UTrapframe`.
-
-To test whether `tf->tf_esp` is already on the user exception stack, check whether it is in the range between `UXSTACKTOP-PGSIZE` and `UXSTACKTOP-1`, inclusive.
-
-```
-Exercise 9. Implement the code in `page_fault_handler` in `kern/trap.c` required to dispatch page faults to the user-mode handler. Be sure to take appropriate precautions when writing into the exception stack. (What happens if the user environment runs out of space on the exception stack?)
-```
-
-###### User-mode Page Fault Entrypoint
-
-Next, you need to implement the assembly routine that will take care of calling the C page fault handler and resume execution at the original faulting instruction. This assembly routine is the handler that will be registered with the kernel using `sys_env_set_pgfault_upcall()`.
-
-```
-Exercise 10. Implement the `_pgfault_upcall` routine in `lib/pfentry.S`. The interesting part is returning to the original point in the user code that caused the page fault. You'll return directly there, without going back through the kernel. The hard part is simultaneously switching stacks and re-loading the EIP.
-```
-
-Finally, you need to implement the C user library side of the user-level page fault handling mechanism.
-
-```
-Exercise 11. Finish `set_pgfault_handler()` in `lib/pgfault.c`.
-```
-
-###### Testing
-
-Run `user/faultread` (make run-faultread). You should see:
-
-```
- ...
- [00000000] new env 00001000
- [00001000] user fault va 00000000 ip 0080003a
- TRAP frame ...
- [00001000] free env 00001000
-```
-
-Run `user/faultdie`. You should see:
-
-```
- ...
- [00000000] new env 00001000
- i faulted at va deadbeef, err 6
- [00001000] exiting gracefully
- [00001000] free env 00001000
-```
-
-Run `user/faultalloc`. You should see:
-
-```
- ...
- [00000000] new env 00001000
- fault deadbeef
- this string was faulted in at deadbeef
- fault cafebffe
- fault cafec000
- this string was faulted in at cafebffe
- [00001000] exiting gracefully
- [00001000] free env 00001000
-```
-
-If you see only the first "this string" line, it means you are not handling recursive page faults properly.
-
-Run `user/faultallocbad`. You should see:
-
-```
- ...
- [00000000] new env 00001000
- [00001000] user_mem_check assertion failure for va deadbeef
- [00001000] free env 00001000
-```
-
-Make sure you understand why `user/faultalloc` and `user/faultallocbad` behave differently.
-
-```
-Challenge! Extend your kernel so that not only page faults, but _all_ types of processor exceptions that code running in user space can generate, can be redirected to a user-mode exception handler. Write user-mode test programs to test user-mode handling of various exceptions such as divide-by-zero, general protection fault, and illegal opcode.
-```
-
-##### Implementing Copy-on-Write Fork
-
-You now have the kernel facilities to implement copy-on-write `fork()` entirely in user space.
-
-We have provided a skeleton for your `fork()` in `lib/fork.c`. Like `dumbfork()`, `fork()` should create a new environment, then scan through the parent environment's entire address space and set up corresponding page mappings in the child. The key difference is that, while `dumbfork()` copied _pages_ , `fork()` will initially only copy page _mappings_. `fork()` will copy each page only when one of the environments tries to write it.
-
-The basic control flow for `fork()` is as follows:
-
- 1. The parent installs `pgfault()` as the C-level page fault handler, using the `set_pgfault_handler()` function you implemented above.
-
- 2. The parent calls `sys_exofork()` to create a child environment.
-
- 3. For each writable or copy-on-write page in its address space below UTOP, the parent calls `duppage`, which should map the page copy-on-write into the address space of the child and then _remap_ the page copy-on-write in its own address space. [ Note: The ordering here (i.e., marking a page as COW in the child before marking it in the parent) actually matters! Can you see why? Try to think of a specific case where reversing the order could cause trouble. ] `duppage` sets both PTEs so that the page is not writeable, and to contain `PTE_COW` in the "avail" field to distinguish copy-on-write pages from genuine read-only pages.
-
-The exception stack is _not_ remapped this way, however. Instead you need to allocate a fresh page in the child for the exception stack. Since the page fault handler will be doing the actual copying and the page fault handler runs on the exception stack, the exception stack cannot be made copy-on-write: who would copy it?
-
-`fork()` also needs to handle pages that are present, but not writable or copy-on-write.
-
- 4. The parent sets the user page fault entrypoint for the child to look like its own.
-
- 5. The child is now ready to run, so the parent marks it runnable.
-
-
-
-
-Each time one of the environments writes a copy-on-write page that it hasn't yet written, it will take a page fault. Here's the control flow for the user page fault handler:
-
- 1. The kernel propagates the page fault to `_pgfault_upcall`, which calls `fork()`'s `pgfault()` handler.
- 2. `pgfault()` checks that the fault is a write (check for `FEC_WR` in the error code) and that the PTE for the page is marked `PTE_COW`. If not, panic.
- 3. `pgfault()` allocates a new page mapped at a temporary location and copies the contents of the faulting page into it. Then the fault handler maps the new page at the appropriate address with read/write permissions, in place of the old read-only mapping.
-
-
-
-The user-level `lib/fork.c` code must consult the environment's page tables for several of the operations above (e.g., that the PTE for a page is marked `PTE_COW`). The kernel maps the environment's page tables at `UVPT` exactly for this purpose. It uses a [clever mapping trick][1] to make it to make it easy to lookup PTEs for user code. `lib/entry.S` sets up `uvpt` and `uvpd` so that you can easily lookup page-table information in `lib/fork.c`.
-
-``````
-Exercise 12. Implement `fork`, `duppage` and `pgfault` in `lib/fork.c`.
-
-Test your code with the `forktree` program. It should produce the following messages, with interspersed 'new env', 'free env', and 'exiting gracefully' messages. The messages may not appear in this order, and the environment IDs may be different.
-
- 1000: I am ''
- 1001: I am '0'
- 2000: I am '00'
- 2001: I am '000'
- 1002: I am '1'
- 3000: I am '11'
- 3001: I am '10'
- 4000: I am '100'
- 1003: I am '01'
- 5000: I am '010'
- 4001: I am '011'
- 2002: I am '110'
- 1004: I am '001'
- 1005: I am '111'
- 1006: I am '101'
-```
-
-```
-Challenge! Implement a shared-memory `fork()` called `sfork()`. This version should have the parent and child _share_ all their memory pages (so writes in one environment appear in the other) except for pages in the stack area, which should be treated in the usual copy-on-write manner. Modify `user/forktree.c` to use `sfork()` instead of regular `fork()`. Also, once you have finished implementing IPC in part C, use your `sfork()` to run `user/pingpongs`. You will have to find a new way to provide the functionality of the global `thisenv` pointer.
-```
-
-```
-Challenge! Your implementation of `fork` makes a huge number of system calls. On the x86, switching into the kernel using interrupts has non-trivial cost. Augment the system call interface so that it is possible to send a batch of system calls at once. Then change `fork` to use this interface.
-
-How much faster is your new `fork`?
-
-You can answer this (roughly) by using analytical arguments to estimate how much of an improvement batching system calls will make to the performance of your `fork`: How expensive is an `int 0x30` instruction? How many times do you execute `int 0x30` in your `fork`? Is accessing the `TSS` stack switch also expensive? And so on...
-
-Alternatively, you can boot your kernel on real hardware and _really_ benchmark your code. See the `RDTSC` (read time-stamp counter) instruction, defined in the IA32 manual, which counts the number of clock cycles that have elapsed since the last processor reset. QEMU doesn't emulate this instruction faithfully (it can either count the number of virtual instructions executed or use the host TSC, neither of which reflects the number of cycles a real CPU would require).
-```
-
-This ends part B. Make sure you pass all of the Part B tests when you run make grade. As usual, you can hand in your submission with make handin.
-
-#### Part C: Preemptive Multitasking and Inter-Process communication (IPC)
-
-In the final part of lab 4 you will modify the kernel to preempt uncooperative environments and to allow environments to pass messages to each other explicitly.
-
-##### Clock Interrupts and Preemption
-
-Run the `user/spin` test program. This test program forks off a child environment, which simply spins forever in a tight loop once it receives control of the CPU. Neither the parent environment nor the kernel ever regains the CPU. This is obviously not an ideal situation in terms of protecting the system from bugs or malicious code in user-mode environments, because any user-mode environment can bring the whole system to a halt simply by getting into an infinite loop and never giving back the CPU. In order to allow the kernel to _preempt_ a running environment, forcefully retaking control of the CPU from it, we must extend the JOS kernel to support external hardware interrupts from the clock hardware.
-
-###### Interrupt discipline
-
-External interrupts (i.e., device interrupts) are referred to as IRQs. There are 16 possible IRQs, numbered 0 through 15. The mapping from IRQ number to IDT entry is not fixed. `pic_init` in `picirq.c` maps IRQs 0-15 to IDT entries `IRQ_OFFSET` through `IRQ_OFFSET+15`.
-
-In `inc/trap.h`, `IRQ_OFFSET` is defined to be decimal 32. Thus the IDT entries 32-47 correspond to the IRQs 0-15. For example, the clock interrupt is IRQ 0. Thus, IDT[IRQ_OFFSET+0] (i.e., IDT[32]) contains the address of the clock's interrupt handler routine in the kernel. This `IRQ_OFFSET` is chosen so that the device interrupts do not overlap with the processor exceptions, which could obviously cause confusion. (In fact, in the early days of PCs running MS-DOS, the `IRQ_OFFSET` effectively _was_ zero, which indeed caused massive confusion between handling hardware interrupts and handling processor exceptions!)
-
-In JOS, we make a key simplification compared to xv6 Unix. External device interrupts are _always_ disabled when in the kernel (and, like xv6, enabled when in user space). External interrupts are controlled by the `FL_IF` flag bit of the `%eflags` register (see `inc/mmu.h`). When this bit is set, external interrupts are enabled. While the bit can be modified in several ways, because of our simplification, we will handle it solely through the process of saving and restoring `%eflags` register as we enter and leave user mode.
-
-You will have to ensure that the `FL_IF` flag is set in user environments when they run so that when an interrupt arrives, it gets passed through to the processor and handled by your interrupt code. Otherwise, interrupts are _masked_ , or ignored until interrupts are re-enabled. We masked interrupts with the very first instruction of the bootloader, and so far we have never gotten around to re-enabling them.
-
-```
-Exercise 13. Modify `kern/trapentry.S` and `kern/trap.c` to initialize the appropriate entries in the IDT and provide handlers for IRQs 0 through 15. Then modify the code in `env_alloc()` in `kern/env.c` to ensure that user environments are always run with interrupts enabled.
-
-Also uncomment the `sti` instruction in `sched_halt()` so that idle CPUs unmask interrupts.
-
-The processor never pushes an error code when invoking a hardware interrupt handler. You might want to re-read section 9.2 of the [80386 Reference Manual][2], or section 5.8 of the [IA-32 Intel Architecture Software Developer's Manual, Volume 3][3], at this time.
-
-After doing this exercise, if you run your kernel with any test program that runs for a non-trivial length of time (e.g., `spin`), you should see the kernel print trap frames for hardware interrupts. While interrupts are now enabled in the processor, JOS isn't yet handling them, so you should see it misattribute each interrupt to the currently running user environment and destroy it. Eventually it should run out of environments to destroy and drop into the monitor.
-```
-
-###### Handling Clock Interrupts
-
-In the `user/spin` program, after the child environment was first run, it just spun in a loop, and the kernel never got control back. We need to program the hardware to generate clock interrupts periodically, which will force control back to the kernel where we can switch control to a different user environment.
-
-The calls to `lapic_init` and `pic_init` (from `i386_init` in `init.c`), which we have written for you, set up the clock and the interrupt controller to generate interrupts. You now need to write the code to handle these interrupts.
-
-```
-Exercise 14. Modify the kernel's `trap_dispatch()` function so that it calls `sched_yield()` to find and run a different environment whenever a clock interrupt takes place.
-
-You should now be able to get the `user/spin` test to work: the parent environment should fork off the child, `sys_yield()` to it a couple times but in each case regain control of the CPU after one time slice, and finally kill the child environment and terminate gracefully.
-```
-
-This is a great time to do some _regression testing_. Make sure that you haven't broken any earlier part of that lab that used to work (e.g. `forktree`) by enabling interrupts. Also, try running with multiple CPUs using make CPUS=2 _target_. You should also be able to pass `stresssched` now. Run make grade to see for sure. You should now get a total score of 65/80 points on this lab.
-
-##### Inter-Process communication (IPC)
-
-(Technically in JOS this is "inter-environment communication" or "IEC", but everyone else calls it IPC, so we'll use the standard term.)
-
-We've been focusing on the isolation aspects of the operating system, the ways it provides the illusion that each program has a machine all to itself. Another important service of an operating system is to allow programs to communicate with each other when they want to. It can be quite powerful to let programs interact with other programs. The Unix pipe model is the canonical example.
-
-There are many models for interprocess communication. Even today there are still debates about which models are best. We won't get into that debate. Instead, we'll implement a simple IPC mechanism and then try it out.
-
-###### IPC in JOS
-
-You will implement a few additional JOS kernel system calls that collectively provide a simple interprocess communication mechanism. You will implement two system calls, `sys_ipc_recv` and `sys_ipc_try_send`. Then you will implement two library wrappers `ipc_recv` and `ipc_send`.
-
-The "messages" that user environments can send to each other using JOS's IPC mechanism consist of two components: a single 32-bit value, and optionally a single page mapping. Allowing environments to pass page mappings in messages provides an efficient way to transfer more data than will fit into a single 32-bit integer, and also allows environments to set up shared memory arrangements easily.
-
-###### Sending and Receiving Messages
-
-To receive a message, an environment calls `sys_ipc_recv`. This system call de-schedules the current environment and does not run it again until a message has been received. When an environment is waiting to receive a message, _any_ other environment can send it a message - not just a particular environment, and not just environments that have a parent/child arrangement with the receiving environment. In other words, the permission checking that you implemented in Part A will not apply to IPC, because the IPC system calls are carefully designed so as to be "safe": an environment cannot cause another environment to malfunction simply by sending it messages (unless the target environment is also buggy).
-
-To try to send a value, an environment calls `sys_ipc_try_send` with both the receiver's environment id and the value to be sent. If the named environment is actually receiving (it has called `sys_ipc_recv` and not gotten a value yet), then the send delivers the message and returns 0. Otherwise the send returns `-E_IPC_NOT_RECV` to indicate that the target environment is not currently expecting to receive a value.
-
-A library function `ipc_recv` in user space will take care of calling `sys_ipc_recv` and then looking up the information about the received values in the current environment's `struct Env`.
-
-Similarly, a library function `ipc_send` will take care of repeatedly calling `sys_ipc_try_send` until the send succeeds.
-
-###### Transferring Pages
-
-When an environment calls `sys_ipc_recv` with a valid `dstva` parameter (below `UTOP`), the environment is stating that it is willing to receive a page mapping. If the sender sends a page, then that page should be mapped at `dstva` in the receiver's address space. If the receiver already had a page mapped at `dstva`, then that previous page is unmapped.
-
-When an environment calls `sys_ipc_try_send` with a valid `srcva` (below `UTOP`), it means the sender wants to send the page currently mapped at `srcva` to the receiver, with permissions `perm`. After a successful IPC, the sender keeps its original mapping for the page at `srcva` in its address space, but the receiver also obtains a mapping for this same physical page at the `dstva` originally specified by the receiver, in the receiver's address space. As a result this page becomes shared between the sender and receiver.
-
-If either the sender or the receiver does not indicate that a page should be transferred, then no page is transferred. After any IPC the kernel sets the new field `env_ipc_perm` in the receiver's `Env` structure to the permissions of the page received, or zero if no page was received.
-
-###### Implementing IPC
-
-```
-Exercise 15. Implement `sys_ipc_recv` and `sys_ipc_try_send` in `kern/syscall.c`. Read the comments on both before implementing them, since they have to work together. When you call `envid2env` in these routines, you should set the `checkperm` flag to 0, meaning that any environment is allowed to send IPC messages to any other environment, and the kernel does no special permission checking other than verifying that the target envid is valid.
-
-Then implement the `ipc_recv` and `ipc_send` functions in `lib/ipc.c`.
-
-Use the `user/pingpong` and `user/primes` functions to test your IPC mechanism. `user/primes` will generate for each prime number a new environment until JOS runs out of environments. You might find it interesting to read `user/primes.c` to see all the forking and IPC going on behind the scenes.
-```
-
-```
-Challenge! Why does `ipc_send` have to loop? Change the system call interface so it doesn't have to. Make sure you can handle multiple environments trying to send to one environment at the same time.
-```
-
-```
-Challenge! The prime sieve is only one neat use of message passing between a large number of concurrent programs. Read C. A. R. Hoare, ``Communicating Sequential Processes,'' _Communications of the ACM_ 21(8) (August 1978), 666-667, and implement the matrix multiplication example.
-```
-
-```
-Challenge! One of the most impressive examples of the power of message passing is Doug McIlroy's power series calculator, described in [M. Douglas McIlroy, ``Squinting at Power Series,'' _Software--Practice and Experience_ , 20(7) (July 1990), 661-683][4]. Implement his power series calculator and compute the power series for _sin_ ( _x_ + _x_ ^3).
-```
-
-```
-Challenge! Make JOS's IPC mechanism more efficient by applying some of the techniques from Liedtke's paper, [Improving IPC by Kernel Design][5], or any other tricks you may think of. Feel free to modify the kernel's system call API for this purpose, as long as your code is backwards compatible with what our grading scripts expect.
-```
-
-**This ends part C.** Make sure you pass all of the make grade tests and don't forget to write up your answers to the questions and a description of your challenge exercise solution in `answers-lab4.txt`.
-
-Before handing in, use git status and git diff to examine your changes and don't forget to git add answers-lab4.txt. When you're ready, commit your changes with git commit -am 'my solutions to lab 4', then make handin and follow the directions.
-
---------------------------------------------------------------------------------
-
-via: https://pdos.csail.mit.edu/6.828/2018/labs/lab4/
-
-作者：[csail.mit][a]
-选题：[lujun9972][b]
-译者：[译者ID](https://github.com/译者ID)
-校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
-
-[a]: https://pdos.csail.mit.edu
-[b]: https://github.com/lujun9972
-[1]: https://pdos.csail.mit.edu/6.828/2018/labs/lab4/uvpt.html
-[2]: https://pdos.csail.mit.edu/6.828/2018/labs/readings/i386/toc.htm
-[3]: https://pdos.csail.mit.edu/6.828/2018/labs/readings/ia32/IA32-3A.pdf
-[4]: https://swtch.com/~rsc/thread/squint.pdf
-[5]: http://dl.acm.org/citation.cfm?id=168633
diff --git a/sources/tech/20181016 Lab 5- File system, Spawn and Shell.md b/sources/tech/20181016 Lab 5- File system, Spawn and Shell.md
deleted file mode 100644
index 9250700723..0000000000
--- a/sources/tech/20181016 Lab 5- File system, Spawn and Shell.md
+++ /dev/null
@@ -1,346 +0,0 @@
-Translating by qhwdw
-Lab 5: File system, Spawn and Shell
-======
-
-**Due Thursday, November 15, 2018
-**
-
-### Introduction
-
-In this lab, you will implement `spawn`, a library call that loads and runs on-disk executables. You will then flesh out your kernel and library operating system enough to run a shell on the console. These features need a file system, and this lab introduces a simple read/write file system.
-
-#### Getting Started
-
-Use Git to fetch the latest version of the course repository, and then create a local branch called `lab5` based on our lab5 branch, `origin/lab5`:
-
-```
- athena% cd ~/6.828/lab
- athena% add git
- athena% git pull
- Already up-to-date.
- athena% git checkout -b lab5 origin/lab5
- Branch lab5 set up to track remote branch refs/remotes/origin/lab5.
- Switched to a new branch "lab5"
- athena% git merge lab4
- Merge made by recursive.
- .....
- athena%
-```
-
-The main new component for this part of the lab is the file system environment, located in the new `fs` directory. Scan through all the files in this directory to get a feel for what all is new. Also, there are some new file system-related source files in the `user` and `lib` directories,
-
-| fs/fs.c | Code that mainipulates the file system's on-disk structure. |
-| fs/bc.c | A simple block cache built on top of our user-level page fault handling facility. |
-| fs/ide.c | Minimal PIO-based (non-interrupt-driven) IDE driver code. |
-| fs/serv.c | The file system server that interacts with client environments using file system IPCs. |
-| lib/fd.c | Code that implements the general UNIX-like file descriptor interface. |
-| lib/file.c | The driver for on-disk file type, implemented as a file system IPC client. |
-| lib/console.c | The driver for console input/output file type. |
-| lib/spawn.c | Code skeleton of the spawn library call. |
-
-You should run the pingpong, primes, and forktree test cases from lab 4 again after merging in the new lab 5 code. You will need to comment out the `ENV_CREATE(fs_fs)` line in `kern/init.c` because `fs/fs.c` tries to do some I/O, which JOS does not allow yet. Similarly, temporarily comment out the call to `close_all()` in `lib/exit.c`; this function calls subroutines that you will implement later in the lab, and therefore will panic if called. If your lab 4 code doesn't contain any bugs, the test cases should run fine. Don't proceed until they work. Don't forget to un-comment these lines when you start Exercise 1.
-
-If they don't work, use git diff lab4 to review all the changes, making sure there isn't any code you wrote for lab4 (or before) missing from lab 5. Make sure that lab 4 still works.
-
-#### Lab Requirements
-
-As before, you will need to do all of the regular exercises described in the lab and _at least one_ challenge problem. Additionally, you will need to write up brief answers to the questions posed in the lab and a short (e.g., one or two paragraph) description of what you did to solve your chosen challenge problem. If you implement more than one challenge problem, you only need to describe one of them in the write-up, though of course you are welcome to do more. Place the write-up in a file called `answers-lab5.txt` in the top level of your `lab5` directory before handing in your work.
-
-### File system preliminaries
-
-The file system you will work with is much simpler than most "real" file systems including that of xv6 UNIX, but it is powerful enough to provide the basic features: creating, reading, writing, and deleting files organized in a hierarchical directory structure.
-
-We are (for the moment anyway) developing only a single-user operating system, which provides protection sufficient to catch bugs but not to protect multiple mutually suspicious users from each other. Our file system therefore does not support the UNIX notions of file ownership or permissions. Our file system also currently does not support hard links, symbolic links, time stamps, or special device files like most UNIX file systems do.
-
-### On-Disk File System Structure
-
-Most UNIX file systems divide available disk space into two main types of regions: _inode_ regions and _data_ regions. UNIX file systems assign one _inode_ to each file in the file system; a file's inode holds critical meta-data about the file such as its `stat` attributes and pointers to its data blocks. The data regions are divided into much larger (typically 8KB or more) _data blocks_ , within which the file system stores file data and directory meta-data. Directory entries contain file names and pointers to inodes; a file is said to be _hard-linked_ if multiple directory entries in the file system refer to that file's inode. Since our file system will not support hard links, we do not need this level of indirection and therefore can make a convenient simplification: our file system will not use inodes at all and instead will simply store all of a file's (or sub-directory's) meta-data within the (one and only) directory entry describing that file.
-
-Both files and directories logically consist of a series of data blocks, which may be scattered throughout the disk much like the pages of an environment's virtual address space can be scattered throughout physical memory. The file system environment hides the details of block layout, presenting interfaces for reading and writing sequences of bytes at arbitrary offsets within files. The file system environment handles all modifications to directories internally as a part of performing actions such as file creation and deletion. Our file system does allow user environments to _read_ directory meta-data directly (e.g., with `read`), which means that user environments can perform directory scanning operations themselves (e.g., to implement the `ls` program) rather than having to rely on additional special calls to the file system. The disadvantage of this approach to directory scanning, and the reason most modern UNIX variants discourage it, is that it makes application programs dependent on the format of directory meta-data, making it difficult to change the file system's internal layout without changing or at least recompiling application programs as well.
-
-#### Sectors and Blocks
-
-Most disks cannot perform reads and writes at byte granularity and instead perform reads and writes in units of _sectors_. In JOS, sectors are 512 bytes each. File systems actually allocate and use disk storage in units of _blocks_. Be wary of the distinction between the two terms: _sector size_ is a property of the disk hardware, whereas _block size_ is an aspect of the operating system using the disk. A file system's block size must be a multiple of the sector size of the underlying disk.
-
-The UNIX xv6 file system uses a block size of 512 bytes, the same as the sector size of the underlying disk. Most modern file systems use a larger block size, however, because storage space has gotten much cheaper and it is more efficient to manage storage at larger granularities. Our file system will use a block size of 4096 bytes, conveniently matching the processor's page size.
-
-#### Superblocks
-
-![Disk layout][1]
-
-File systems typically reserve certain disk blocks at "easy-to-find" locations on the disk (such as the very start or the very end) to hold meta-data describing properties of the file system as a whole, such as the block size, disk size, any meta-data required to find the root directory, the time the file system was last mounted, the time the file system was last checked for errors, and so on. These special blocks are called _superblocks_.
-
-Our file system will have exactly one superblock, which will always be at block 1 on the disk. Its layout is defined by `struct Super` in `inc/fs.h`. Block 0 is typically reserved to hold boot loaders and partition tables, so file systems generally do not use the very first disk block. Many "real" file systems maintain multiple superblocks, replicated throughout several widely-spaced regions of the disk, so that if one of them is corrupted or the disk develops a media error in that region, the other superblocks can still be found and used to access the file system.
-
-#### File Meta-data
-
-![File structure][2]
-The layout of the meta-data describing a file in our file system is described by `struct File` in `inc/fs.h`. This meta-data includes the file's name, size, type (regular file or directory), and pointers to the blocks comprising the file. As mentioned above, we do not have inodes, so this meta-data is stored in a directory entry on disk. Unlike in most "real" file systems, for simplicity we will use this one `File` structure to represent file meta-data as it appears _both on disk and in memory_.
-
-The `f_direct` array in `struct File` contains space to store the block numbers of the first 10 (`NDIRECT`) blocks of the file, which we call the file's _direct_ blocks. For small files up to 10*4096 = 40KB in size, this means that the block numbers of all of the file's blocks will fit directly within the `File` structure itself. For larger files, however, we need a place to hold the rest of the file's block numbers. For any file greater than 40KB in size, therefore, we allocate an additional disk block, called the file's _indirect block_ , to hold up to 4096/4 = 1024 additional block numbers. Our file system therefore allows files to be up to 1034 blocks, or just over four megabytes, in size. To support larger files, "real" file systems typically support _double-_ and _triple-indirect blocks_ as well.
-
-#### Directories versus Regular Files
-
-A `File` structure in our file system can represent either a _regular_ file or a directory; these two types of "files" are distinguished by the `type` field in the `File` structure. The file system manages regular files and directory-files in exactly the same way, except that it does not interpret the contents of the data blocks associated with regular files at all, whereas the file system interprets the contents of a directory-file as a series of `File` structures describing the files and subdirectories within the directory.
-
-The superblock in our file system contains a `File` structure (the `root` field in `struct Super`) that holds the meta-data for the file system's root directory. The contents of this directory-file is a sequence of `File` structures describing the files and directories located within the root directory of the file system. Any subdirectories in the root directory may in turn contain more `File` structures representing sub-subdirectories, and so on.
-
-### The File System
-
-The goal for this lab is not to have you implement the entire file system, but for you to implement only certain key components. In particular, you will be responsible for reading blocks into the block cache and flushing them back to disk; allocating disk blocks; mapping file offsets to disk blocks; and implementing read, write, and open in the IPC interface. Because you will not be implementing all of the file system yourself, it is very important that you familiarize yourself with the provided code and the various file system interfaces.
-
-### Disk Access
-
-The file system environment in our operating system needs to be able to access the disk, but we have not yet implemented any disk access functionality in our kernel. Instead of taking the conventional "monolithic" operating system strategy of adding an IDE disk driver to the kernel along with the necessary system calls to allow the file system to access it, we instead implement the IDE disk driver as part of the user-level file system environment. We will still need to modify the kernel slightly, in order to set things up so that the file system environment has the privileges it needs to implement disk access itself.
-
-It is easy to implement disk access in user space this way as long as we rely on polling, "programmed I/O" (PIO)-based disk access and do not use disk interrupts. It is possible to implement interrupt-driven device drivers in user mode as well (the L3 and L4 kernels do this, for example), but it is more difficult since the kernel must field device interrupts and dispatch them to the correct user-mode environment.
-
-The x86 processor uses the IOPL bits in the EFLAGS register to determine whether protected-mode code is allowed to perform special device I/O instructions such as the IN and OUT instructions. Since all of the IDE disk registers we need to access are located in the x86's I/O space rather than being memory-mapped, giving "I/O privilege" to the file system environment is the only thing we need to do in order to allow the file system to access these registers. In effect, the IOPL bits in the EFLAGS register provides the kernel with a simple "all-or-nothing" method of controlling whether user-mode code can access I/O space. In our case, we want the file system environment to be able to access I/O space, but we do not want any other environments to be able to access I/O space at all.
-
-```
-Exercise 1. `i386_init` identifies the file system environment by passing the type `ENV_TYPE_FS` to your environment creation function, `env_create`. Modify `env_create` in `env.c`, so that it gives the file system environment I/O privilege, but never gives that privilege to any other environment.
-
-Make sure you can start the file environment without causing a General Protection fault. You should pass the "fs i/o" test in make grade.
-```
-
-```
-Question
-
- 1. Do you have to do anything else to ensure that this I/O privilege setting is saved and restored properly when you subsequently switch from one environment to another? Why?
-```
-
-
-Note that the `GNUmakefile` file in this lab sets up QEMU to use the file `obj/kern/kernel.img` as the image for disk 0 (typically "Drive C" under DOS/Windows) as before, and to use the (new) file `obj/fs/fs.img` as the image for disk 1 ("Drive D"). In this lab our file system should only ever touch disk 1; disk 0 is used only to boot the kernel. If you manage to corrupt either disk image in some way, you can reset both of them to their original, "pristine" versions simply by typing:
-
-```
- $ rm obj/kern/kernel.img obj/fs/fs.img
- $ make
-```
-
-or by doing:
-
-```
- $ make clean
- $ make
-```
-
-Challenge! Implement interrupt-driven IDE disk access, with or without DMA. You can decide whether to move the device driver into the kernel, keep it in user space along with the file system, or even (if you really want to get into the micro-kernel spirit) move it into a separate environment of its own.
-
-### The Block Cache
-
-In our file system, we will implement a simple "buffer cache" (really just a block cache) with the help of the processor's virtual memory system. The code for the block cache is in `fs/bc.c`.
-
-Our file system will be limited to handling disks of size 3GB or less. We reserve a large, fixed 3GB region of the file system environment's address space, from 0x10000000 (`DISKMAP`) up to 0xD0000000 (`DISKMAP+DISKMAX`), as a "memory mapped" version of the disk. For example, disk block 0 is mapped at virtual address 0x10000000, disk block 1 is mapped at virtual address 0x10001000, and so on. The `diskaddr` function in `fs/bc.c` implements this translation from disk block numbers to virtual addresses (along with some sanity checking).
-
-Since our file system environment has its own virtual address space independent of the virtual address spaces of all other environments in the system, and the only thing the file system environment needs to do is to implement file access, it is reasonable to reserve most of the file system environment's address space in this way. It would be awkward for a real file system implementation on a 32-bit machine to do this since modern disks are larger than 3GB. Such a buffer cache management approach may still be reasonable on a machine with a 64-bit address space.
-
-Of course, it would take a long time to read the entire disk into memory, so instead we'll implement a form of _demand paging_ , wherein we only allocate pages in the disk map region and read the corresponding block from the disk in response to a page fault in this region. This way, we can pretend that the entire disk is in memory.
-
-```
-Exercise 2. Implement the `bc_pgfault` and `flush_block` functions in `fs/bc.c`. `bc_pgfault` is a page fault handler, just like the one your wrote in the previous lab for copy-on-write fork, except that its job is to load pages in from the disk in response to a page fault. When writing this, keep in mind that (1) `addr` may not be aligned to a block boundary and (2) `ide_read` operates in sectors, not blocks.
-
-The `flush_block` function should write a block out to disk _if necessary_. `flush_block` shouldn't do anything if the block isn't even in the block cache (that is, the page isn't mapped) or if it's not dirty. We will use the VM hardware to keep track of whether a disk block has been modified since it was last read from or written to disk. To see whether a block needs writing, we can just look to see if the `PTE_D` "dirty" bit is set in the `uvpt` entry. (The `PTE_D` bit is set by the processor in response to a write to that page; see 5.2.4.3 in [chapter 5][3] of the 386 reference manual.) After writing the block to disk, `flush_block` should clear the `PTE_D` bit using `sys_page_map`.
-
-Use make grade to test your code. Your code should pass "check_bc", "check_super", and "check_bitmap".
-```
-
-`fs_init` function in `fs/fs.c` is a prime example of how to use the block cache. After initializing the block cache, it simply stores pointers into the disk map region in the `super` global variable. After this point, we can simply read from the `super` structure as if they were in memory and our page fault handler will read them from disk as necessary.
-
-```
-Challenge! The block cache has no eviction policy. Once a block gets faulted in to it, it never gets removed and will remain in memory forevermore. Add eviction to the buffer cache. Using the `PTE_A` "accessed" bits in the page tables, which the hardware sets on any access to a page, you can track approximate usage of disk blocks without the need to modify every place in the code that accesses the disk map region. Be careful with dirty blocks.
-```
-
-### The Block Bitmap
-
-After `fs_init` sets the `bitmap` pointer, we can treat `bitmap` as a packed array of bits, one for each block on the disk. See, for example, `block_is_free`, which simply checks whether a given block is marked free in the bitmap.
-
-```
-Exercise 3. Use `free_block` as a model to implement `alloc_block` in `fs/fs.c`, which should find a free disk block in the bitmap, mark it used, and return the number of that block. When you allocate a block, you should immediately flush the changed bitmap block to disk with `flush_block`, to help file system consistency.
-
-Use make grade to test your code. Your code should now pass "alloc_block".
-```
-
-### File Operations
-
-We have provided a variety of functions in `fs/fs.c` to implement the basic facilities you will need to interpret and manage `File` structures, scan and manage the entries of directory-files, and walk the file system from the root to resolve an absolute pathname. Read through _all_ of the code in `fs/fs.c` and make sure you understand what each function does before proceeding.
-
-```
-Exercise 4. Implement `file_block_walk` and `file_get_block`. `file_block_walk` maps from a block offset within a file to the pointer for that block in the `struct File` or the indirect block, very much like what `pgdir_walk` did for page tables. `file_get_block` goes one step further and maps to the actual disk block, allocating a new one if necessary.
-
-Use make grade to test your code. Your code should pass "file_open", "file_get_block", and "file_flush/file_truncated/file rewrite", and "testfile".
-```
-
-`file_block_walk` and `file_get_block` are the workhorses of the file system. For example, `file_read` and `file_write` are little more than the bookkeeping atop `file_get_block` necessary to copy bytes between scattered blocks and a sequential buffer.
-
-```
-Challenge! The file system is likely to be corrupted if it gets interrupted in the middle of an operation (for example, by a crash or a reboot). Implement soft updates or journalling to make the file system crash-resilient and demonstrate some situation where the old file system would get corrupted, but yours doesn't.
-```
-
-### The file system interface
-
-Now that we have the necessary functionality within the file system environment itself, we must make it accessible to other environments that wish to use the file system. Since other environments can't directly call functions in the file system environment, we'll expose access to the file system environment via a _remote procedure call_ , or RPC, abstraction, built atop JOS's IPC mechanism. Graphically, here's what a call to the file system server (say, read) looks like
-
-```
- Regular env FS env
- +---------------+ +---------------+
- | read | | file_read |
- | (lib/fd.c) | | (fs/fs.c) |
-...|.......|.......|...|.......^.......|...............
- | v | | | | RPC mechanism
- | devfile_read | | serve_read |
- | (lib/file.c) | | (fs/serv.c) |
- | | | | ^ |
- | v | | | |
- | fsipc | | serve |
- | (lib/file.c) | | (fs/serv.c) |
- | | | | ^ |
- | v | | | |
- | ipc_send | | ipc_recv |
- | | | | ^ |
- +-------|-------+ +-------|-------+
- | |
- +-------------------+
-
-```
-
-Everything below the dotted line is simply the mechanics of getting a read request from the regular environment to the file system environment. Starting at the beginning, `read` (which we provide) works on any file descriptor and simply dispatches to the appropriate device read function, in this case `devfile_read` (we can have more device types, like pipes). `devfile_read` implements `read` specifically for on-disk files. This and the other `devfile_*` functions in `lib/file.c` implement the client side of the FS operations and all work in roughly the same way, bundling up arguments in a request structure, calling `fsipc` to send the IPC request, and unpacking and returning the results. The `fsipc` function simply handles the common details of sending a request to the server and receiving the reply.
-
-The file system server code can be found in `fs/serv.c`. It loops in the `serve` function, endlessly receiving a request over IPC, dispatching that request to the appropriate handler function, and sending the result back via IPC. In the read example, `serve` will dispatch to `serve_read`, which will take care of the IPC details specific to read requests such as unpacking the request structure and finally call `file_read` to actually perform the file read.
-
-Recall that JOS's IPC mechanism lets an environment send a single 32-bit number and, optionally, share a page. To send a request from the client to the server, we use the 32-bit number for the request type (the file system server RPCs are numbered, just like how syscalls were numbered) and store the arguments to the request in a `union Fsipc` on the page shared via the IPC. On the client side, we always share the page at `fsipcbuf`; on the server side, we map the incoming request page at `fsreq` (`0x0ffff000`).
-
-The server also sends the response back via IPC. We use the 32-bit number for the function's return code. For most RPCs, this is all they return. `FSREQ_READ` and `FSREQ_STAT` also return data, which they simply write to the page that the client sent its request on. There's no need to send this page in the response IPC, since the client shared it with the file system server in the first place. Also, in its response, `FSREQ_OPEN` shares with the client a new "Fd page". We'll return to the file descriptor page shortly.
-
-```
-Exercise 5. Implement `serve_read` in `fs/serv.c`.
-
-`serve_read`'s heavy lifting will be done by the already-implemented `file_read` in `fs/fs.c` (which, in turn, is just a bunch of calls to `file_get_block`). `serve_read` just has to provide the RPC interface for file reading. Look at the comments and code in `serve_set_size` to get a general idea of how the server functions should be structured.
-
-Use make grade to test your code. Your code should pass "serve_open/file_stat/file_close" and "file_read" for a score of 70/150.
-```
-
-```
-Exercise 6. Implement `serve_write` in `fs/serv.c` and `devfile_write` in `lib/file.c`.
-
-Use make grade to test your code. Your code should pass "file_write", "file_read after file_write", "open", and "large file" for a score of 90/150.
-```
-
-### Spawning Processes
-
-We have given you the code for `spawn` (see `lib/spawn.c`) which creates a new environment, loads a program image from the file system into it, and then starts the child environment running this program. The parent process then continues running independently of the child. The `spawn` function effectively acts like a `fork` in UNIX followed by an immediate `exec` in the child process.
-
-We implemented `spawn` rather than a UNIX-style `exec` because `spawn` is easier to implement from user space in "exokernel fashion", without special help from the kernel. Think about what you would have to do in order to implement `exec` in user space, and be sure you understand why it is harder.
-
-```
-Exercise 7. `spawn` relies on the new syscall `sys_env_set_trapframe` to initialize the state of the newly created environment. Implement `sys_env_set_trapframe` in `kern/syscall.c` (don't forget to dispatch the new system call in `syscall()`).
-
-Test your code by running the `user/spawnhello` program from `kern/init.c`, which will attempt to spawn `/hello` from the file system.
-
-Use make grade to test your code.
-```
-
-```
-Challenge! Implement Unix-style `exec`.
-```
-
-```
-Challenge! Implement `mmap`-style memory-mapped files and modify `spawn` to map pages directly from the ELF image when possible.
-```
-
-### Sharing library state across fork and spawn
-
-The UNIX file descriptors are a general notion that also encompasses pipes, console I/O, etc. In JOS, each of these device types has a corresponding `struct Dev`, with pointers to the functions that implement read/write/etc. for that device type. `lib/fd.c` implements the general UNIX-like file descriptor interface on top of this. Each `struct Fd` indicates its device type, and most of the functions in `lib/fd.c` simply dispatch operations to functions in the appropriate `struct Dev`.
-
-`lib/fd.c` also maintains the _file descriptor table_ region in each application environment's address space, starting at `FDTABLE`. This area reserves a page's worth (4KB) of address space for each of the up to `MAXFD` (currently 32) file descriptors the application can have open at once. At any given time, a particular file descriptor table page is mapped if and only if the corresponding file descriptor is in use. Each file descriptor also has an optional "data page" in the region starting at `FILEDATA`, which devices can use if they choose.
-
-We would like to share file descriptor state across `fork` and `spawn`, but file descriptor state is kept in user-space memory. Right now, on `fork`, the memory will be marked copy-on-write, so the state will be duplicated rather than shared. (This means environments won't be able to seek in files they didn't open themselves and that pipes won't work across a fork.) On `spawn`, the memory will be left behind, not copied at all. (Effectively, the spawned environment starts with no open file descriptors.)
-
-We will change `fork` to know that certain regions of memory are used by the "library operating system" and should always be shared. Rather than hard-code a list of regions somewhere, we will set an otherwise-unused bit in the page table entries (just like we did with the `PTE_COW` bit in `fork`).
-
-We have defined a new `PTE_SHARE` bit in `inc/lib.h`. This bit is one of the three PTE bits that are marked "available for software use" in the Intel and AMD manuals. We will establish the convention that if a page table entry has this bit set, the PTE should be copied directly from parent to child in both `fork` and `spawn`. Note that this is different from marking it copy-on-write: as described in the first paragraph, we want to make sure to _share_ updates to the page.
-
-```
-Exercise 8. Change `duppage` in `lib/fork.c` to follow the new convention. If the page table entry has the `PTE_SHARE` bit set, just copy the mapping directly. (You should use `PTE_SYSCALL`, not `0xfff`, to mask out the relevant bits from the page table entry. `0xfff` picks up the accessed and dirty bits as well.)
-
-Likewise, implement `copy_shared_pages` in `lib/spawn.c`. It should loop through all page table entries in the current process (just like `fork` did), copying any page mappings that have the `PTE_SHARE` bit set into the child process.
-```
-
-Use make run-testpteshare to check that your code is behaving properly. You should see lines that say "`fork handles PTE_SHARE right`" and "`spawn handles PTE_SHARE right`".
-
-Use make run-testfdsharing to check that file descriptors are shared properly. You should see lines that say "`read in child succeeded`" and "`read in parent succeeded`".
-
-### The keyboard interface
-
-For the shell to work, we need a way to type at it. QEMU has been displaying output we write to the CGA display and the serial port, but so far we've only taken input while in the kernel monitor. In QEMU, input typed in the graphical window appear as input from the keyboard to JOS, while input typed to the console appear as characters on the serial port. `kern/console.c` already contains the keyboard and serial drivers that have been used by the kernel monitor since lab 1, but now you need to attach these to the rest of the system.
-
-```
-Exercise 9. In your `kern/trap.c`, call `kbd_intr` to handle trap `IRQ_OFFSET+IRQ_KBD` and `serial_intr` to handle trap `IRQ_OFFSET+IRQ_SERIAL`.
-```
-
-We implemented the console input/output file type for you, in `lib/console.c`. `kbd_intr` and `serial_intr` fill a buffer with the recently read input while the console file type drains the buffer (the console file type is used for stdin/stdout by default unless the user redirects them).
-
-Test your code by running make run-testkbd and type a few lines. The system should echo your lines back to you as you finish them. Try typing in both the console and the graphical window, if you have both available.
-
-### The Shell
-
-Run make run-icode or make run-icode-nox. This will run your kernel and start `user/icode`. `icode` execs `init`, which will set up the console as file descriptors 0 and 1 (standard input and standard output). It will then spawn `sh`, the shell. You should be able to run the following commands:
-
-```
- echo hello world | cat
- cat lorem |cat
- cat lorem |num
- cat lorem |num |num |num |num |num
- lsfd
-```
-
-Note that the user library routine `cprintf` prints straight to the console, without using the file descriptor code. This is great for debugging but not great for piping into other programs. To print output to a particular file descriptor (for example, 1, standard output), use `fprintf(1, "...", ...)`. `printf("...", ...)` is a short-cut for printing to FD 1. See `user/lsfd.c` for examples.
-
-```
-Exercise 10.
-
-The shell doesn't support I/O redirection. It would be nice to run sh
+
+
+
+
+
+
+
+
+
+
+
+```
+
+然后删除 **index.gsp** 中提供数据分页的代码：
+
+```
+