Merge branch 'master' of https://github.com/LCTT/TranslateProject

2025-02-06 23:50:16 +08:00 · 2014-02-03 20:11:38 +08:00 · 2014-02-03 20:11:38 +08:00 · eed3c0c9b4
commit eed3c0c9b4
parent eeca27cdc5 47bf0ff30f
97 changed files with 3538 additions and 1496 deletions
--- a/translated/10
+++ b/translated/10
@ -7,112 +7,80 @@

 前几篇文章的地址如下：

- [11 Lesser Known Useful Linux Commands – Part I][1]
-
- [10 Lesser Known Linux Commands – Part II][2]
-
- [10 Lesser Known Commands for Linux – Part III][3]
-
- [10 Lesser Known Effective Linux Commands – Part IV][4]
+- [十一个鲜为人知的 Linux 命令 - Part 1][1]
+- [十个鲜为人知的 Linux 命令 - Part 2][2]
+- [十个鲜为人知的 Linux 命令 - Part 3][3]
+- [十个鲜为人知的 Linux 命令 - Part 4][4]

 ### 42. lsb_release ###

- **‘lsb_release’** 命令会打印特殊发行版的信息。如果 **lsb_release** 还没安装，你可以在基于 **Debain** 的发行版中用命令 apt **‘lsb-core’** 安装，在基于 **Red Hat** 系统下用 yum **‘redhat-lsb’** 来安装包。 
+ **‘lsb_release’** 命令会打印特殊发行版的信息。如果 **lsb_release** 还没安装，你可以在基于 **Debain** 的发行版中用命令 apt 安装，在基于 **Red Hat** 系统下用 yum 来安装包。 

    # lsb_release -a
-
    LSB Version:    :base-4.0-ia32:base-4.0-noarch:core-4.0-ia32:core-4.0-noarch:graphics-4.0-ia32:
-
    Distributor ID: CentOS
-
    Description:    CentOS release 6.3 (Final)
-
    Release:        6.3
-
    Codename:       Final

-**注意：**选项‘**-a**‘，会显示有关**版本、ID、详情、发行号**和**研发代号**的全部可用信息。
+**注意：**选项‘**-a**’，会显示有关**版本、ID、详情、发行号**和**研发代号**的全部可用信息。

 ### 43. nc -zv localhost 80 ###

 检查 **80** 端口是否被打开。我们可以用任何其他端口号替换‘**80**’来检查端口是否被打开或关闭。

    $ nc -zv localhost 80
+    Connection to localhost 80 port [tcp/http] succeeded!

-    Connection to localhost 80 port [tcp/http] succeeded!（译注：出现该信息表示80端口已被打开。）
+ （译注：出现该信息表示80端口已被打开。）

 检查 **8080** 端口是否启用

    $ nc -zv localhost 8080
+    nc: connect to localhost port 8080 (tcp) failed: Connection refused
+    
+（译注：该信息显示了8080端口并未打开。）

-    nc: connect to localhost port 8080 (tcp) failed: Connection refused（译注：该信息显示了8080端口并未打开。）
-
-### 44. curl inpinfo.io ###
+### 44. curl ipinfo.io ###

 该命令会输出并提供 **IP 地址** 的 **‘地理位置’** 。

    $ curl ipinfo.io 
-
   "ip": "xx.xx.xx.xx",
-
    "hostname": "triband-del-aa.bbb.cc.ddd.bol.net.in",
-
    "city": "null",
-
    "region": "null",
-
    "country": "IN",
-
    "loc": "20,77",
-
    "org": "AS17813 Mahanagar Telephone Nigam Ltd".

 ### 45. find . -user root ###

-该命令会输出( **root** )用户所拥有的文件（译注：即owner为root）。下面是在当前目录下列出的所有 ‘root’用户拥有的文件。
+该命令会输出当前目录下( **root** )用户所拥有的文件（译注：即owner为root）。下面是在当前目录下列出的所有 ‘root’用户拥有的文件。

    # find . -user root
-
    ./.recently-used.xbel
-
    ./.mysql_history
-
    ./.aptitude
-
    ./.aptitude/config
-
    ./.aptitude/cache
-
    ./.bluefish
-
    ./.bluefish/session-2.0
-
    ./.bluefish/autosave
-
    ./.bash_history

 在当前路径下列出所有 **‘avi’** 用户拥有的文件

    # find . -user avi
-
    ./.cache/chromium/Cache/f_002b66
-
    ./.cache/chromium/Cache/f_001719
-
    ./.cache/chromium/Cache/f_001262
-
    ./.cache/chromium/Cache/f_000544
-
    ./.cache/chromium/Cache/f_002e40
-
    ./.cache/chromium/Cache/f_00119a
-
    ./.cache/chromium/Cache/f_0014fc
-
    ./.cache/chromium/Cache/f_001b52
-
    ./.cache/chromium/Cache/f_00198d
-
    ./.cache/chromium/Cache/f_003680

 ### 46. sudo apt-get build-dep ffmpeg ###
@ -120,53 +88,35 @@
 该命令会在相应的包安装时自动构建依赖关系。因此包安装的过程将非常流畅，也是非常容易的。

    # apt-get build-dep ffmpeg
-
    libxinerama-dev libxml-namespacesupport-perl libxml-sax-expat-perl
-
    libxml-sax-perl libxml-simple-perl libxrandr-dev libxrender-dev
-
    x11proto-render-dev x11proto-xinerama-dev xulrunner-dev
-
    The following packages will be upgraded:
-
    libpixman-1-0
-
+    
    1 upgraded, 143 newly installed, 0 to remove and 6 not upgraded.
-
    Need to get 205 MB of archives.
-
    After this operation, 448 MB of additional disk space will be used.
-
    Do you want to continue [Y/n]?

 ### 47. lsof -iTCP:80 -sTCP:LISTEN ###

-该命令会输出所用正在使用 **80** 端口的 **进程/服务** 的名称。为了更好的理解，在 **80** 端口运行下列命令，它会列出所用运行在该端口的 **进程/服务** 。
+该命令会输出所用正在使用 **80** 端口的 **进程/服务** 的名称。在 **80** 端口运行下列命令会更好理解这个命令，它会列出所用运行在该端口的 **进程/服务** 。

    root@localhost:/home/avi# lsof -iTCP:80 -sTCP:LISTEN
-
    COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
-
    apache2 1566 root 5u IPv6 5805 0t0 TCP *:www (LISTEN)
-
    apache2 1664 www-data 5u IPv6 5805 0t0 TCP *:www (LISTEN)
-
    apache2 1665 www-data 5u IPv6 5805 0t0 TCP *:www (LISTEN)
-
    apache2 1666 www-data 5u IPv6 5805 0t0 TCP *:www (LISTEN)
-
    apache2 1667 www-data 5u IPv6 5805 0t0 TCP *:www (LISTEN)
-
    apache2 1668 www-data 5u IPv6 5805 0t0 TCP *:www (LISTEN)

 同样，你可以检查运行在端口 **22** 的进程/服务。

    root@localhost:/home/avi# lsof -iTCP:22 -sTCP:LISTEN
-
    COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
-
    sshd 2261 root 3u IPv4 8366 0t0 TCP *:ssh (LISTEN)
-
    sshd 2261 root 4u IPv6 8369 0t0 TCP *:ssh (LISTEN)

 ### 48. find -size +100M ###
@ -174,35 +124,22 @@
 这条find命令会在当前目录下列出所有超过指定大小的文件(这里指定为**100 MB**)，递归查询。

    # find -size +100M
-
    ./.local/share/Trash/files/linuxmint-15-cinnamon-dvd-32bit.iso
-
    ./Downloads/Fedora-Live-Desktop-i686-19-1.iso
-
    ./Downloads/Ant Videos/shakira 2.avi
-
    ./Downloads/Deewar.avi
-
    ./Desktop/101MSDCF/MOV02224.AVI
-
    ./Desktop/101MSDCF/MOV02020.AVI
-
    ./Desktop/101MSDCF/MOV00406.MP4
-
    ./Desktop/squeeze.iso

 在当前目录递归的列出所用大于 **1000 MB** 的文件。

    root@localhost:/home/avi# find -size +1000M
-
    ./Downloads/The Dark Knight 2008 hindi BRRip 720p/The Dark Knight.mkv.part
-
    ./Downloads/Saudagar - (1991) - DVDRiP - x264 - AAC 5.1 - Chapters - Esubs - [DDR]/Saudagar 
-
    - (1991) - DVDRiP - x264 - AAC 5.1 - Chapters - Esubs - [DDR].mkv
-
    ./Downloads/Deewar.avi
-
    ./Desktop/squeeze.iso

 ### 49. pdftk ###
@ -216,32 +153,23 @@
 该命令会输出一个用户的进程和线程。选项“**L**”（列出线程），选项“**-F**”（完整格式化）

    $ ps -LF -u avi
-
    avi 21645 3717 21766 0 5 66168 117164 1 18:58 ? 00:00:00 /usr/
-
    avi 21645 3717 21768 0 5 66168 117164 1 18:58 ? 00:00:00 /usr/
-
    avi 22314 3717 22314 0 2 42797 50332 0 19:00 ? 00:00:40 /usr/
-
    avi 22314 3717 22316 0 2 42797 50332 1 19:00 ? 00:00:00 /usr/
-
    avi 22678 24621 22678 0 1 969 1060 1 21:05 pts/1 00:00:00 ps -L
-
    avi 23051 3717 23051 0 2 37583 45444 1 19:03 ? 00:00:52 /usr/
-
    avi 23051 3717 23053 0 2 37583 45444 0 19:03 ? 00:00:03 /usr/
-
    avi 23652 1 23652 0 2 22092 12520 0 19:06 ? 00:00:22 gnome
-
    avi 23652 1 23655 0 2 22092 12520 0 19:06 ? 00:00:00 gnome

-### 51. Startx — :1 ###
+### 51. startx - :1 ###

-分享 **X** 会话，意味着需要频繁的登入或登出，这就需要 **startx** 来救场。这个命令建立了一个新的会话从而避免了在一个会话中反复的登入和登出。为了在X会话间进行交换，我们可以通过‘**ctrl+Alt+F7**’和‘**ctrl+Alt+F8**’的组合键来完成。
+分享 **X** 会话。如果你需要频繁的（以不同用户身份）登入或登出桌面时，那就需要 **startx** 来救场。这个命令建立了一个新的会话从而避免了在一个会话中反复的登入和登出。为了在X会话间进行交换，我们可以通过‘**ctrl+Alt+F7**’和‘**ctrl+Alt+F8**’的组合键来完成。

 **注意**：快捷键“**ctrl+Alt+F1～F6**“是为了控制台会话准备的，而“**ctrl+Alt+F７～F12**”则为X会话服务。因此我们有**6**个控制台会话和**6**个X会话，不需要频繁的登入登出。上面的顺序适用于大多数的发行版，然而不同发行版可能会有不同的实现。我在Debian中尝试过，运行的很好。

-以上就是今天的所有内容。我们如有需要会在以后的文章中继续发布“鲜为人知的命令”，不要忘记留下你对我们文章和‘ **鲜为人知的Linux命令** ’系列的宝贵意见。我会很快带来我的新文章，敬请期待。直到那时，要保持电脑健康,记得常回 **Tecmint** 看看哦。
+以上就是今天的所有内容。我们如有需要会在以后的文章中继续发布“鲜为人知的命令”，不要忘记留下你对我们文章和‘ **鲜为人知的Linux命令** ’系列的宝贵意见。我会很快带来我的新文章，敬请期待，记得常回来看看哦。

 --------------------------------------------------------------------------------

@ -251,7 +179,7 @@ via: http://www.tecmint.com/10-lesser-known-useful-linux-commands-part-v/

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

-[1]:http://www.tecmint.com/11-lesser-known-useful-linux-commands/
-[2]:http://www.tecmint.com/10-lesser-known-linux-commands-part-2/
-[3]:http://www.tecmint.com/10-lesser-known-commands-for-linux-part-3/
-[4]:http://www.tecmint.com/10-lesser-known-effective-linux-commands-part-iv/
+[1]:http://linux.cn/article-2258-1.html
+[2]:http://linux.cn/article-2265-1.html
+[3]:http://linux.cn/article-2284-1.html
+[4]:http://linux.cn/article-2404-1.html
--- a/published/12
+++ b/published/12
@ -0,0 +1,38 @@
+Linux 服务器管理员的12个有用的命令
+================================================================================
+
+我们已经读了很多教程和看了很多视频了，你现在是一名Linux高级用户了。好的，恭喜你。但是还有一些需要学习！下面一些命令在你成为全能的管理员时会派上用场！
+
+![](http://www.efytimes.com/admin/useradmin/photo/fQjv122633PM162014.png)
+
+1. **ifconfig**: 在修改内核中已有的网络接口时，你会用到ifconfig命令。这个命令通常用于系统调校和调试，但同时也可以用于在启动过程中设置接口。
+
+2. **netstat**: 对于Linux用户来说这是一个用于显示网络相关信息的高级命令。它包括路由表、网络连接、伪装连接、接口统计等丰富信息。
+
+3. **nslookup**: 在你需要找出关于网络服务的信息时可以用到这个命令。它能帮你找到用于查询DNS域的名称服务器信息。
+
+4. **dig**: dig工具用于请求DNS域名服务器。如果你要找出主机地址、邮件交换、名称服务器和其他相关信息，那么这个工具就是最佳选择。你可以在Linux和Mac OS X操作系统上使用这个命令。
+
+5. **uptime**: uptime命令用于验证服务器在无人照看下发生了什么。当你需要坐在服务器前查找错误的时候，这个命令尤其有用。
+
+6. **wall**: 这个命令用于给所有已登录的用户发送消息。你可以只给那些消息权限设置成了'是'的用户发消息。消息是作为wall命令的参数给出的。
+
+7. **mesg**: 用户可以使用'write'命令给你发送消息。但是作为服务器管理员，你可以使用mesg命令来决定他们是否能够使用write命令。你可以选择'n'和'y'，分别用于控制在屏幕上不弹出或者弹出消息。
+
+8. **write**: 如果对于一个用户的'mesg'命令的状态设置为'y'，那么write命令就允许你发送消息给那个用户。
+
+9. **talk**: 当上面所说的“消息”不够用时，使用talk命令与登陆的用户进行“会话”。
+
+10. **w**: 这个命令是uptime和who命令的结合，其显示结果就好像连续先后执行了这两个命令一样。
+
+11. **rename**:当你需要重命名特定的文件时，rename命令会派上用场。这个命令可以通过匹配替换来为多个文件批量重命名。
+
+12. **top**:这个命令可以显示运行在CPU上的进程。命令会自动刷新并持续显示进程直到你使用中断命令停止它。
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=125990
+
+译者：[geekpi](https://github.com/geekpi) 校对：[Mr小眼儿](http://blog.csdn.net/tinyeyeser)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/Directory.md
+++ b/Directory.md
@ -0,0 +1,234 @@
+ls命令的20个实用范例
+================================================================================
+Linux中一个基本命令是ls。没有这个命令，我们会在浏览目录条目时会遇到困难。这个命令必须被每个学习Linux的人知道。
+
+### ls是什么 ###
+
+ls命令用于列出文件和目录。默认上，他会列出当前目录的内容。带上参数后，我们可以用ls做更多的事情。这里是一些在日常操作中使用到的ls用法的示例。
+
+#### 1. 不带参数运行ls ####
+
+不带参数运行ls会只列出文件或者目录。看不到其他信息输出（译注：有时候你发现无参数的ls命令和这里描述的不同，那有可能是你的ls命令实际上带参数的ls别名）。
+
+    $ ls
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls.png)
+
+#### 2. 使用长清单模式 ####
+
+使用-l字符(小写L字符),会显示当前目录内容的长列表。在接下来的例子中，我们会结合-l参数(这个参数经常使用)来得到更好的结果。
+
+    $ ls -l
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_l.png)
+
+这里是如何读取输出 :
+
+- **第1列**
+	- 第一个字母**d**意味着内容是目录或者文件。在上面的截图中，Desktop、 Documents、 Downloads 和 lynis-1.3.8是目录。如果是'-'(**减号**)，这意味着它的内容是文件。当它是l(**小写l字符**)，意味这内容是链接文件。
+
+	- 下面的9个字符是关于文件权限。**前3个rwx**字符是文件的拥有者的权限，**第二组3rwx**是文件的所有组的权限，**最后的rwx**是对其他人访问文件的权限。
+
+- **第2列**
+这行告诉我们有多少链接指向这个文件。
+
+- **第3列**
+这行告诉我们谁是这个文件/文件夹的所有者。
+
+- **第4列**
+这行告诉我们谁是这个文件/文件夹的所有组。
+
+- **第5列**
+这行告诉我们这个文件/文件夹的以字节为单位的大小。 目录的大小总是4096字节。
+
+- **第6列**
+这告诉我们文件最后的修改时间。
+
+- **第7列**
+这告诉我们文件名或者目录名。
+
+#### 3. 显示文件大小 ####
+
+以字节为单位看大小可能会不方便。6.5M读起来比6727680字节更简单。要这么做，我们可以使用-h与**-l**结合的参数。**-h参数意味着便于人识别**。
+
+    $ ls -lh
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_lh1.png)
+
+另外一个可以这么做的参数是**--si**。这个参数和-h参数类似，但是**-si以1000为单位，而-h以1024为单位**。
+
+    $ ls -si
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_si.png)
+
+#### 4. 排序文件大小 ####
+
+在我们可以显示文件大小之后，我们希望以文件大小排序。我们可以使用-S参数来这么做。这列表会从大到校排序。
+
+    $ ls -lhS
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_lhS.png)
+
+#### 5. 测量大小 ####
+
+ls可以通过使用**-block-size=SIZE**改单位大小。这里的SIZE是：
+
+    K = Kilobyte
+    M = Megabyte
+    G = Gigabyte
+    T = Terabyte
+    P = Petabyte
+    E = Exabyte
+    Z = Zettabyte
+    Y = Yottabyte
+
+比如，我们希望使用MB作为单位大小。所以语法就会像这样:
+
+    $ ls -l --block-size=M
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_block_size.png)
+
+#### 6. 显示隐藏文件 ####
+
+在Linux中，以"."(**点号**)开头的文件是隐藏文件。为了在ls命令中显示它，我们可以使用**-a**选项。
+
+    $ ls -a
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_a.png)
+
+#### 7. 只列出目录条目 ####
+
+如果我们希望只列出目录，我们可以使用**-d**选项。
+
+    $ ls -d */
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_d.png)
+
+#### 8. 不打印所有者信息 ####
+
+要这么做，我们使用**-g**选项。
+
+    $ ls -g
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_lg.png)
+
+#### 9. 不打印组信息 ####
+
+-g隐藏了拥有者信息，**—G**会隐藏组信息。
+
+
+    $ ls -lG
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_lG2.png)
+
+#### 10. 打印UID和GID ####
+
+如果你想以数字方式列出项的所有者和所有组（即UID和GID），我们可以带**-n**选项使用ls命令。这里是个例子。
+
+    $ ls -n
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_n.png)
+
+从上面的例子中，我们知道**用户pungki的UID**是100，**GID是1000**，而**root组的GID是0**。
+
+#### 11. 不带颜色打印 ####
+
+一些Linux发行版已经对ls命令启用彩色。这会使ls以各种颜色打印列表。如果你不想要这样，你可以使用 **--color=never** 参数。
+
+    $ ls --color=never
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_color_never.png)
+
+#### 12. 打印每个文件的索引号 ####
+
+为了打印索引或者大家俗称的inode号，我们可以使用-i选项。索引号会显示在第一列。
+
+    $ ls -li
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_inode.png)
+
+#### 13. 增加 / (斜线) 标记目录 ####
+
+要这么做，使用**-p选项**。
+
+    $ ls -p
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_p.png)
+
+#### 14. 排序时反转顺序 ####
+
+你或许需要在列出条目时反转顺序。要这么做，你可以使用**-r**选项。
+
+    $ ls -r
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_r.png)
+
+#### 15. 递归列出子目录 ####
+
+带**-R**参数后，你可以列出包含它子目录的目录。
+
+    $ ls -R
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_Recursive.png)
+
+#### 16. 扩展名排序 ####
+
+你可以使用-X参数或者--sort=extension来通过扩展名来排序（译注：这样对于筛选不同类型的文件很有用）。
+
+    $ ls -lX
+
+**或**
+
+    $ ls --sort=extension
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_x.png)
+
+#### 17. 通过修改时间列出 ####
+
+使用-t选项会按修改时间排序，新的文件在前。
+
+    $ ls -lt
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_lt.png)
+
+#### 18. 列出你的主目录 ####
+
+要列出你的主目录，你可以用"~"(**波浪号**)来代表它。这样你就不必输入完整的目录名。让我们假设家文件名为**/home/pungki**，那么**波浪号**就对/home/pungki有意义了。
+
+    $ ls ~
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_tilde.png)
+
+#### 19. 列出父目录 ####
+
+无论你在那个目录，你可以列出父目录而不必输入完整路径。这是个例子。
+
+    $ ls ../
+
+这回列出**1**层之上的目录内容。
+
+    $ ls ../../
+
+这回列出**2**层之上的目录内容（译注：可不支持“...”来代表2层之上）。
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_parent.png)
+
+#### 20. 打印ls命令版本 ####
+
+使用--version参数打印它。
+
+    $ ls --version
+
+![](http://linoxide.com/wp-content/uploads/2014/01/ls_version.png)
+
+### 总结 ###
+
+这些是在日常操作中会使用到的参数。当然你总可以输入**man ls** 或者 **ls --help** 来查询ls的手册页
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/linux-command/linux-ls-command/
+
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/published/2013：The
+++ b/published/2013：The
@ -0,0 +1,56 @@
+2013：Linux的黄金之年-十大杰出成就
+================================================================================
+
+**2013年**已经过去。这一年见证了许多里程碑事件，使得2013年可以称得上是一个**Linux的黄金之年**。其中一些成果在**FOSS**和**Linux**世界更可以称得上是举世瞩目的成就。
+
+![2013 Year of Linux](http://www.tecmint.com/wp-content/uploads/2013/12/Year-2013-Linux.jpg)
+
+### 1.Android的上升趋势 ###
+
+2013年，Android手机达到了每日**150万**的激活量记录。不用说，正是Android的**Linux内核**以及它在该方面的狂热贡献使其达到了今天的标杆地位，这一趋势还将在未来的日子里一直持续下去。
+
+### 2. Raspberry pi 树莓派 ###
+
+**Raspberry pi**，低成本单片计算机历史上的最伟大发明之一。它在学校和其他很多地方极大地推广了Linux，同时在FOSS社区中也有很高的欢迎程度，这一状况也仍将继续。
+
+### 3. Debian上太空 ###
+
+Debian，众多优秀Linux发行版中的其中一款高端发行版。2013年三月下旬的一次**航天飞机**任务中就使用了Debian负责实验的控制。实验的主要内容是尝试无土植物栽培的新方法，从而为宇航员提供空气和食物。
+
+### 4. SteamOS的崛起 ###
+
+SteamOS，基于Debian发行版，用于**Stream Machine Game Console游戏终端**，已经于**2013年12月**中旬发布。GNU/Linux开始涉足于游戏环境，这对广大宅男极客来说当然是喜闻乐见喜大普奔。
+
+### 5. Linux的平板应用 ###
+
+查看**亚马逊**的平板销量，排名前十的平板都是Android操作系统。苹果和微软的平板则排在第11和12位，远远地被抛在后面，这对于FOSS社区来说确实是一个振奋人心的消息。
+
+### 6. Chromebooks ###
+
+Chromebooks之所以能在笔记本电脑市场赢得一席之地，是由于比起微软等专属平台，诸如三星，华硕等许多高端制造商给了GNU/Linux类操作系统更多的空间。
+
+### 7. The Firefox OS 火狐操作系统 ###
+
+Firefox OS是基于Linux和FOSS的开源操作系统，主要用于智能手机和平板，发布于**2013年4月**下旬。基于**ARM**构架的移动设备Linux发行版显示出了广阔的前景。
+
+### 8. Kali发布 ###
+
+来自BackTrack Linux的开发者发布了**Kali Linux**。Kali是是基于Debian的Linux发行版，其母系统或者说其前身(BT Linux)，主要用于渗透测试，并分享了大量的Debian版本库，成为了最为丰富的一个发行版。Kail仍保持着在刚发布后的很短时间内超高下载量的记录。
+
+### 9. Android Kitkat ###
+
+尽管之前预测的发布版本是**5.0 Key Lime Pie**，经过万众期待后，最新发布的android版本被命名为**Kitkat**，Google宣布**Android 4.4**又名**KitKat 4于2013年9月发布**。Kitkat进行了优化更新，能在具有最小的**512 MB内存**的设备上运行，这样就能够支持众多各种各样的设备。
+
+### 10. Linux 在汽车上的应用 ###
+
+截至目前，Linux被应用于各种设备，从腕表到遥控器，再到太空飞船，所以**Linux在汽车上的应用**并不让人意外。但当Linux的作用表现在**汽车趋势杂志**的年度车上时仍然令人惊讶。2013年被选为优胜候选的两个车型，都运行Linux系统。
+
+2013年已经过去，但故事远没有结束，我们可能错过了一些重要的里程碑，你可以在评论部分告诉我们。2014年，未来，还在继续……
+
+--------------------------------------------------------------------------------
+
+via: http://www.tecmint.com/2013-the-golden-year-for-linux-and-foss/
+
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[Mr小眼儿](http://blog.csdn.net/tinyeyeser)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/published/2014--The
+++ b/published/2014--The
@ -0,0 +1,47 @@
+2014：Linux汽车之年？
+================================================================================
+> 你看得没错：不是Linux桌面之年，是Linux汽车之年。大量的汽车公司正在投资使Linux成为他们汽车的操作系统选择。
+
+当你想起Linux，你也许会想起服务器，桌面操作系统，或者Android 智能手机/平板。你几乎肯定不会考虑汽车吧，但是，Linux确实已经运行在许多汽车的引擎盖下了，也许很快它将会扮演一个非常重大的角色。
+
+![](http://cdn-static.zdnet.com/i/r/story/70/00/014091/auto-linux-455x269.png)
+
+*向运行在汽车引擎盖下的linux问声好* 
+
+Matt Jones在加里福利亚的旧金山召开的[Linux基金会][1] 的 [Linux合作高峰会][2]上带来这个消息。Jones是[捷豹路虎][3]的娱乐系统的一个高级技术专家，也是一个旨在推动汽车行业应用车载娱乐信息的开源开发平台的非盈利组织--[GenIVI Alliance][4]的副总裁，
+
+Jones说，捷豹路虎已经询问他们的顾客需要什么，不需要什么，比如在他们的车上有一个全功能的家庭娱乐网络。当然，你可以在前仪表盘放一个高清品质的、在城市交通上提供高速网络的显示器，解决一个超出了汽车行业范围之外的问题。
+
+汽车企业能做什么，他们正致力于[AGL][5]（ Automotive Grade Linux，汽车级Linux)--一个Linux基金会的下级小组，提供一个公共的操作系统和应用程序接口（API）。通过它的支持，汽车制造商可以专注于实现应用程序而不用担心操作系统下层结构。毕竟，正如Jones 说道：“你上次是什么时候买了一辆基于操作系统的车？”
+
+在他的演讲里面，Jones宣布AGL已经发布一个[车载信息娱乐、远程汽车娱乐操作系统和应用程序开发包][6]原型。这是一个基于Linux开源镜像创建的车载娱乐系统，拥有一个控制器区网络CAN、一个车载总线标准、API；一个HTML5应用程序框架；及简单用户接口。
+
+Jones 说:“我们（捷豹路虎）已经加入AGL来使之开源并让Linux使用在整个汽车中，专注方便于开发者有可参考的硬件和软件平台。这样的技术已经在大量地车载，但是之前没有人提供出来”所以如果你准备Hack一个汽车的话，AGL已经有了你需要的工具。
+
+AGL和捷豹路虎也给了开发者开始汽车hacking的原因。他们联合举办了开发者竞赛：[2013 AGL User Experience Contest][7]。比赛胜利者将会得到机会在AGL或者捷豹路虎工作。
+
+比赛有三个类别：最好用户体验，最好视觉外观，和最好概念或者是可扩展的特征。这个比赛在4月15日 - 5月17日举行，胜利者将会在5月底东京举行的[汽车Linux峰会][8]上宣布。如果你和Linux以及汽车一起工作，这似乎就像是在一个在底层的理想机会。
+
+相关链接：
+
+- [Tizen Linux heads for vehicles as car makers and tech firms form workgroup][9]
+- [The Open-Source Car][10]
+
+--------------------------------------------------------------------------------
+
+via: http://www.zdnet.com/2014-the-year-of-the-linux-car-7000014091/
+
+译者：[Vic___](http://blog.csdn.net/Vic___) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://events.linuxfoundation.org/
+[2]:http://events.linuxfoundation.org/events/collaboration-summit
+[3]:http://www.jaguarlandrover.com/index.html
+[4]:http://www.genivi.org/
+[5]:http://automotive.linuxfoundation.org/
+[6]:http://automotive.linuxfoundation.org/agl-demonstrator
+[7]:http://automotive.linuxfoundation.org/2013-agl-user-experience-contest
+[8]:http://events.linuxfoundation.org/events/automotive-linux-summit-spring
+[9]:http://www.zdnet.com/tizen-linux-heads-for-vehicles-as-car-makers-and-tech-firms-form-workgroup-7000004491/
+[10]:http://www.zdnet.com/blog/open-source/the-open-source-car/9193
--- a/published/5
+++ b/published/5
@ -0,0 +1,57 @@
+Ubuntu 13.10让人又爱又恨的五件事
+================================================================================
+Ubuntu 13.10发布前后引起了很大的反响。这个操作系统让Canonical达到了一个全新的等级，尤其是在2013年这样一个Linux大年。但现在已经尘埃落定，外界的声音也小了，让我们看看这个系统让你喜欢的五件事，和让你讨厌的五件事。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83076/slide_image_010614-ubuntuLOVE-HATE-1.jpg)
+
+### 爱 ###
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83077/slide_image_010614-ubuntuLOVE-HATE-2.jpg)
+
+**OpenStack APIs**:Ubuntu 13.10兼容OpenStack APIs。事实上，内部和外部Ubuntu-主机云现在与OpenStack APIs兼容。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83078/slide_image_010614-ubuntuLOVE-HATE-3.jpg)
+
+**GUI**: Unity的GUI正在从个人电脑到智能手机和平板电脑很好的转变。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83079/slide_image_010614-ubuntuLOVE-HATE-4.jpg)
+
+**升级后的Dashboard**: 为用户提供了搜索甚至是Ubuntu One cloud的Ubuntu Dash已经升级了。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83080/slide_image_010614-ubuntuLOVE-HATE-5.jpg)
+
+**好用的Juju**: 在活泼的火蜥蜴中，您可以使用Juju在Linux容器或LXC中创建应用程序实例。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83081/slide_image_010614-ubuntuLOVE-HATE-6.jpg)
+
+**GUI更加顺滑**:也许正因为它的多功能性,活泼的火蜥蜴的漂亮的用户界面比过去版本的用户界面更为顺滑。
+
+### 恨 ###
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83082/slide_image_010614-ubuntuLOVE-HATE-7.jpg)
+
+**没有Mir**: Unity界面还没有从X.org转移到Mir 编译器。这是让很多人失望的主要的地方。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83083/slide_image_010614-ubuntuLOVE-HATE-8.jpg)
+
+**没有MariaDB**: MySQL数据库的替代产品——MariaDB尚未被Canonical引入。这与其说让人失望，不如说是让人震惊,因为大多数其他发行版已经这么做了。Canonical的Ubuntu 13.10还在用MySQL作为LAMP的默认数据库。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83084/slide_image_010614-ubuntuLOVE-HATE-9.jpg)
+
+**老版本的landscape管理工具**:Canonical的landscape服务还不够先进，实际上，甚至比微软的跟着Windows发布的系统中心还要古老。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83085/slide_image_010614-ubuntuLOVE-HATE-10.jpg)
+
+**只支持两款手机**:现在只有Galaxy Nexus4和Galaxy Nexus智能手机支持Ubuntu 13.10。此外,这两个设备只能使用核心和shell程序。
+
+![](http://d1piko3ylsjhpd.cloudfront.net/uploads/roboto/slide/image/83086/slide_image_010614-ubuntuLOVE-HATE-11.jpg)
+
+**LXC仍然是测试版**: 我们说Juju和LXC一起使用,但LXC本身仍在测试模式。它今年2月应该能出一个稳定版。
+
+--------------------------------------------------------------------------------
+
+via: http://www.networkworld.com/slideshow/134353/ubuntu-1310-5-things-we-love-5-things-we-hate.html
+
+译者：[Kingname](https://github.com/kingname) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/published/8
+++ b/published/8
@ -0,0 +1,168 @@
+8个有趣的Linux提示与技巧！
+================================================================================
+
+我们时不时给你带来关于Linux的提示与技巧。和这个系列保持一致，这里有8个我们从读者收到最有趣的提示和技巧。我们希望你喜欢它。请继续读下去。。。
+
+![](http://www.efytimes.com/admin/useradmin/photo/j4lm23703PM1182014.jpg)
+
+### 以它们的大小列出文件 ###
+
+如果你想要一个基于它们大小排序的文件列表，你可以使用下面的命令。
+
+它会以递减顺序排列文件。
+
+    # ls -l | grep ^- | sort -nr -k 5 | more
+
+如果你想要递归地做相同的事，你可以使用下面的第二个命令。
+
+    # ls -lR | grep ^- | sort -nr -k 5 | more
+
+*—Sumedh Gajbhiye,
+sumedh.gajbhiye1985@gmail.com*
+
+### 重置奇怪的终端 ###
+
+如果感觉你的bash终端错误地显示垃圾的提示字符信息，并无论你输入任何命令都显示非ASCII字符-下面的命令可以让事情回到正轨。
+
+在终端盲打输入（译注：因为你其实看不到你输入的这些字符的正确显示，不过尽管输入好了！）下面的命令并按回车：
+
+    # reset
+
+如果那个不能修复这个问题，试一下下面的:
+
+    # stty sane
+
+*—Sudheer Divakaran,
+cdsudheer@gmail.com*
+
+### 记录并回放终端会话 ###
+
+下面是一个简单的贴士来记录并回放终端回放。它通过使用命令script和scriptreplay。
+
+这在使用终端制作教程时非常方便。
+
+要开始记录你的终端会话，使用下面的命令：
+
+    $ script -t 2> timing.log -a output.session
+
+接着输入:
+
+    $ ls
+    $touch test
+    .....
+
+    $ exit
+
+这里，script命令取两个文件作为参数timing.log(它记录了每个命令执行的时间信息)和output.session(存储了命令的输出)。
+
+现在，要回访记录的会话，使用下面所示的scriptplay。
+
+    $ scriptreplay timing.log output.session
+
+注：timing.log和output.session可以被任何想要在自己的终端上重放会话的人使用。
+
+*—Abhishek Singh,
+abhishekkumarsingh.cse@gmail.com*
+
+### 使用shell脚本生成随机数 ###
+
+有时当你想要用shell脚本编程时，可能需要生成一个随机数来用于脚本。
+
+这里是获得一个3位随机数的代码。
+
+    var=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -f1 -d” “ | cut -c 3-5);
+
+这回存储随机生成的数字在名为var的变量中。
+
+*—Arpan Chavda,
+09bce006@nirmauni.ac.in*
+
+### 以root用户运行Linux上的软件 ###
+
+作为一名root用户，为了让某些不能在root身份运行的软件运行（译注：典型的是google chrome），你需要在软件的二进制文件中改变geteuid调用为getppid。
+
+这个技术在操作系统中非常有用，比如backtrack，这里的大多数安装工作都以root用户完成。
+
+比如:为了以root用户运行Google Chrome，使用下面的命令:
+
+    # hexedit /opt/google/chome/chrome
+
+接着按下Ctrl+S并在16进制转储文件中搜寻geteuid字符串。用字符串getppid代替。按下Ctrl+X来保存并退出编辑器。
+
+现在浏览器就可以以root用户运行了。
+
+    # google-chrome
+
+*—Mayank Bhanderi,
+mbhanderi24@gmail.com*
+
+### 用gzip压缩优化你的站点 ###
+
+压缩是一种简单、有效的方法来节约带宽和加速你的站点。在压缩的帮助下，多数站点的主页面会从100KB变成10KB。
+
+为了在Apache Web服务器中启用这个特性，你需要在httpd.conf中包含deflate_module，并且在Apache配置文件中加入下面的行 (/etc/httpd/conf/httpd.conf)来压缩text、html、 javascript、 css 和 xml 文件:
+
+    AddOutputFilterByType DEFLATE text/plain
+    AddOutputFilterByType DEFLATE text/html
+    AddOutputFilterByType DEFLATE text/xml
+    AddOutputFilterByType DEFLATE text/css
+    AddOutputFilterByType DEFLATE application/xml
+    AddOutputFilterByType DEFLATE application/xhtml+xml
+    AddOutputFilterByType DEFLATE application/rss+xml
+    AddOutputFilterByType DEFLATE application/javascript
+    AddOutputFilterByType DEFLATE application/x-javascript
+
+*—Munish Kumar,
+munishtotech@gmail.com*
+
+### 在登陆时检查服务器负载信息 ###
+
+这里有一个贴士来在你登陆服务器的时候检查服务器平均负载。创建一个sload.sh的文本文件，内容如下:
+
+    #!/bin/bash
+    gh=$(uptime | awk -F, ‘{print $3}’)
+    echo -e “Server$gh\n”
+
+现在，为了在登陆时检查服务器负载，通过/root/.bashrc调用sload.sh脚本。
+
+记住如下设置脚本权限：
+
+    # chmod 755 /root/sload.sh
+
+要调用sload.sh脚本，如下在/root/.bashrc后追加
+
+    /root/sload.sh
+
+或者你还可以这样追加sload.sh的内容到.bashrc中。
+
+    $echo “/root/sload.sh” >> /root/.bashrc
+
+当你完成上面的步骤后，你可以登出并再次登陆来查看服务器负载。
+
+*—Ranjith Kumar T,
+ranjith.stc@gmail.com*
+
+### 在特定时间开始你的任务 ###
+
+你可以使用下面的命令来在特定时间调度你的作业：
+
+    # at 2015
+
+    > >vlc /music/rockstar.mp3
+
+这个命令会在2015小时后使用vlc播放器播放rockstar.mp3。你可以在at命令后跟上-l选项来检查挂起的作业：
+
+    # at -l
+
+更多at命令的信息可以在man页找到。
+
+*—Manas Pradhan,
+acmeofmanas@gmail.com*
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=127250
+
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Configure
+++ b/translated/Configure
@ -1,14 +1,14 @@
-Ubuntu/Debian/Linux Mint 系统中使用 Tor 配置你的浏览器
+Ubuntu/Debian/Linux Mint 系统中使用 Tor
 ================================================================================
 **Tor**, **T**he **O**nion **R**outer (洋葱路由)，是一种虚拟通道网络，它可使用户安全以及匿名的进行互联网通信。Tor 可以让组织及个人通过公共网络分享信息而不用担心隐私会泄露。我们可以用 Tor 来避免网站追踪我们及我们家人的信息，也可以用来连接新闻网站、即时通讯服务或者那些被网络提供商和网络管理员封锁的网站。

-Tor 最初是当做第三代[美国海军研究实验室的洋葱路由项目][1]而设计、实现及发展起来的。在美国海军心中，最初设计的目的是为了政府通信的安全，但今天，每天都以各式各样的目的而被普通人、军队、记者、执法人员、活动家以及其他更多的人使用。
+Tor 最初是当做第三代[美国海军研究实验室的洋葱路由项目][1]而设计、实现及发展起来的。在美国海军心中，最初设计Tor的目的是为了政府的通信安全，但到了今天，出于各种各样的目的，Tor正在供普通人、军队、记者、执法人员、活动家以及其他更多的人每天使用。

 这篇快速教程中，我们会学到怎么在浏览器上使用 Tor。下面所示的操作步骤是 Ubuntu 13.04 桌面系统中测试的，但它在所有的 Debian/Ubuntu 系统及它们的衍生系统中应该也适用。

 ### 在 Ubuntu / Debian / Linux Mint 上安装 Tor 和 Vidalia ###

-Tor 在 Debian/Ubuntu 系统的默认源库中已经存在，但它们有点过时了。所以得把 Tor 源库加入你的发布版本的源列表中。
+Tor 在 Debian/Ubuntu 系统的默认源库中已经存在，但它们有点过时了。所以得把 Tor 源库加入你发行版的源列表中。

 编辑 **/etc/apt/sources.list** 文件，

@ -27,7 +27,7 @@ Debian 7 Wheezy 如下：

    deb     http://deb.torproject.org/torproject.org wheezy main

-用如下命令添加 gpg 键：
+用如下命令添加 gpg 密钥：

    $ gpg --keyserver keys.gnupg.net --recv 886DDD89 
    $ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
@ -53,7 +53,7 @@ Debian 7 Wheezy 如下：

 ![你使用 Tor 吗? - Mozilla Firefox_014](http://180016988.r.cdn77.net/wp-content/uploads/2013/12/Are-you-using-Tor-Mozilla-Firefox_014.jpg)

-相同的设置适用于所有浏览器，只要打开浏览器设置/首选项窗口，找到网络设置，在代理服务器栏中输入 **127.0.0.1**,在端口选项框中输入**9050**。要禁用 Tor，选择**使用系统代理设置**。
+相同的设置适用于所有浏览器，只要打开浏览器设置/首选项窗口，找到网络设置，在代理服务器栏中输入 **127.0.0.1**,在端口选项框中输入**9050**。要禁用 Tor，在浏览器设置中选择**使用系统代理设置**。

 **注意**: 如果你想使用 Tor 匿名浏览网页，请阅读我们有关[Tor浏览器套件][2]的文章,它提供了易于配置的Tor以及浏览器补丁包，以使匿名访问更方便。要直接使用SOCKS（即时通讯，Jabber，IRC等），你可以直接在 Tor（本地端口9050）配置里指向你的应用程序，但需要先看看[这些FAQ条目] [3]来了解这么做的风险。

@ -63,10 +63,10 @@ Debian 7 Wheezy 如下：

 via: http://www.unixmen.com/configure-browser-use-tor-ubuntu-debian-linux-mint/

-译者：[runningwater](https://github.com/runningwater) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[runningwater](https://github.com/runningwater) 校对：[Mr小眼儿](http://blog.csdn.net/tinyeyeser)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

 [1]:http://www.onion-router.net/
 [2]:http://www.unixmen.com/protect-your-online-privacy-with-tor-browser/
-[3]:https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#SOCKSAndDNS
+[3]:https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#SOCKSAndDNS
--- a/translated/Daily
+++ b/translated/Daily
@ -1,23 +1,16 @@
-
 Ubuntu 每日小贴士 - 在Ubuntu下用桌面图形界面挂载分区
 ================================================================================

-
-如果在不久前你询问过一位经验丰富的 Linux 用户如何在 Ubuntu 下挂载磁盘分区，他们可能会告诉你使用在 **/etc** 目录里的fstab文件。这似乎是 Linux 系统包括 Ubuntu 挂载分区的唯一方式。
-
+如果在之前你询问过经验丰富的 Linux 用户如何在 Ubuntu 下挂载磁盘分区，他们可能会告诉你使用在 **/etc** 目录里的fstab文件。这似乎是 Linux 系统包括 Ubuntu 挂载分区的唯一方式。

 呵呵，幸亏有了[GNOME Disk Utility][1]，让挂载分区变得更加多样化。使用这个磁盘工具，你就可以在图形界面下轻松的挂载分区，不需要再在命令行下修改 fstab 文件。fstab 文件是一个用来列出可用磁盘和分区的 Linux 文件，同时指示出他们的挂载情况。

-
-mount 命令与 fstab 文件很相似，它决定了设备挂载的方式和位置。这只能通过系统管理员或 root 来修改。
-
+mount 命令查找 fstab 文件中的配置，它决定了设备挂载的方式和位置。这只能通过系统管理员或 root 来修改。

 这个简短的教程将会展示给你如何在 Ubuntu 下轻松的挂载分区，在不主动修改 fstab 文件的前提下。对于新手和那些刚开始使用 Ubuntu 的用户，他们会发现这个方法易于挂载额外的分区和设备。

-
 虽然有一些工具也许能帮助你构建 fstab 文件，但是在 Ubuntu 下很少有像这个磁盘工具那么高效的。

-
 如果你在 Ubuntu 下打开了fstab 文件， 你会看到类似下面的内容。

    #<File System>  <Mount Point>    <type>   <options>  <dump>  <pass>
@ -26,28 +19,22 @@ mount 命令与 fstab 文件很相似，它决定了设备挂载的方式和位

 上列只是 Ubuntu 分区挂载的一个样例。每一个设备都有它自己的文件类型和挂载点。对于刚接触 Ubuntu 的用户，可能会感到生畏。

+对于经验丰富的 Linux 用户来说，管理 fstab 并不困难。如果你已经做过一次了，那么下次会更加的轻松。

-对于经验丰富的 Linux 用户来说，管理 fstab 并不困难。如果你已经做个一次了，那么下次会更加的轻松。
-
-
-所以，接下来动手吧。在 fstab 文件中添加一个条目或挂载一个分区，打开 Unity Dash 搜索**Disk app**并打开。当程序打开后，选择你想要挂载和格式化的驱动器。在格式完后，选择**选项 -> Mount 编辑选项**。
+所以，接下来动手吧。在 fstab 文件中添加一个条目或挂载一个分区，打开 Unity Dash 搜索**Disk app**并打开。当程序打开后，选择你想要挂载和格式化的驱动器。在格式完后，选择**选项 -> 编辑挂载选项**。

 ![](http://www.liberiangeek.net/wp-content/uploads/2014/01/mountguiubuntu.png)

-
-最后，关闭自动关在选项并手动指定你的挂载选项。磁盘会自动的将这些选项写入到 fstab 文件中，这样 mount 命令才可以读取挂载的分区。
+最后，关闭自动挂载选项并手动指定你的挂载选项。磁盘会自动的将这些选项写入到 fstab 文件中，这样 mount 命令才可以读取挂载的分区。

 ![](http://www.liberiangeek.net/wp-content/uploads/2014/01/mountguiubuntu1.png)

-
 保存你的设置并重启，或用 mount 命令挂载分区。

-
 上面的选项在 fstab 文件中会像这样显示。

    /dev/sdb /media/richard/ExtPartition ntfs-3g rw,auto,user,fmask=0111,dmask=0000 0 0

-
 好了，这些就是今天全部内容！每当你启动你的机子是新分区将会自动挂载上。

 Enjoy!
@ -58,7 +45,7 @@ Enjoy!

 via: http://www.liberiangeek.net/2014/01/daily-ubuntu-tips-mount-partitions-in-ubuntu-from-your-desktop-gui/

-译者：[Luoxcat](https://github.com/Luoxcat) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[Luoxcat](https://github.com/Luoxcat) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/translated/Daily
+++ b/translated/Daily
@ -1,8 +1,8 @@
-每日Ubuntu小技巧——合上笔记本，系统不睡眠
+每日Ubuntu小技巧：合上笔记本，系统不睡眠
 ================================================================================
 Ubuntu 是一个处在牛 A 和牛 C 之间的现代操作系统，全世界数百万用户和公司都在使用它。无论是充当工作台还是高级工程机器，Ubuntu 都游刃有余。

-如果你是 Ubuntu 初学者，使用过程还需要高手指导，那就关注本博客吧。我们已经写了数百篇 Ubuntu 教程，足以带你入门。从安装 Ubuntu 到系统基本设置，我们都有涉猎。
+如果你是 Ubuntu 初学者，使用过程还需要高手指导，那就关注本站吧。我们已经写了数百篇 Ubuntu 教程，足以带你入门。从安装 Ubuntu 到系统基本设置，我们都有涉猎。

 这篇简单的教程为你介绍当笔记本盖子合上时该干嘛还是干嘛，而不是进入睡眠模式或者直接关机。

--- a/translated/Daily
+++ b/translated/Daily
--- a/translated/Gnu--toward
+++ b/translated/Gnu--toward
@ -1,18 +1,18 @@
-Gnu: 走向后匮乏世界 – 自由软件专栏
+GNU: 走向后稀缺世界 
 ================================================================================
 **自从理查德·斯托曼宣布编写名为 GNU 的完全兼容 UNIX 的软件系统以来已经过去 30 年了，GNU 点燃了软件自由之理念，并使开源斗争延续至今**

 ![](http://www.linuxuser.co.uk/wp-content/uploads/2011/04/Richard-Hillesley-200x150.jpg)

-Gnu 不是第一款分布式免费软件，却是第一款宣布永久免费，以及“不受政治约束的自由软件”。
+GNU 不是第一款分布式免费软件，却是第一款宣布永久免费，以及“不受政治约束的自由软件”。

-在 GNU 宣言中，斯托曼描述了美好的愿景。“从长远角度来看，”他写道，“软件自由是步入后匮乏世界的必经之道，在后匮乏世界任何人都无需为生计奔波。人们可以自愿投身于一些他们感兴趣的活动，比如软件开发，代价只是每周花费十个小时完成诸如法律制定、家庭协商、机器人修理、小行星观察等工作任务。”
+在 GNU 宣言中，斯托曼描述了美好的愿景。“从长远角度来看，”他写道，“软件自由是步入[后稀缺世界][1]的必经之道，在后稀缺世界任何人都无需为生计奔波。人们可以自愿投身于一些他们感兴趣的活动，比如软件开发，代价只是每周花费十个小时完成诸如法律制定、家庭协商、机器人修理、小行星观察等工作任务。”

 在现实世界中，GNU 因为'EMACS 社区'以及由詹姆斯·高斯林编写 UNIX 版 Emacs 所引发的争论而发展迅速。在'针对 ITS 用户的 Emacs 手册'里，标示着 1981 年 10 月 22 日起，斯托曼就表明了授权 GPL 的想法。

 “Emacs 并未抄袭任何软件，”他写道。“与之相反，你正在加入 Emacs 软件分享社区。加入社区的条件是你必须提交对 Emacs 作出的改进，包括任何你所写的插件。”

-最初，高斯林基于其他人已经做出贡献的原因，允许自由分发高斯林版本 Emacs 的源代码。但是，1983 年 4 月，斯托曼就此谈道（bit.ly/d58ndg）：“他通过申请版权的方式伤害了每一个人，他不允许任何人进行二次发布，接着把软件贩卖给软件公司。”
+最初，高斯林基于其他人已经做出贡献的原因，允许自由分发高斯林版本 Emacs 的源代码。但是，1983 年 4 月，斯托曼就此[谈道][2]：“他通过申请版权的方式伤害了每一个人，他不允许任何人进行二次发布，接着把软件贩卖给软件公司。”

 斯托曼被此种背叛的行为所伤害，但是高斯林，不久后作为 Java 之父而闻名于世，说道：“他对我的处理方式反映了他是一个既胆小又卑鄙的人，你可以从他做过的事看出来。”

@ -26,14 +26,17 @@ Gnu 不是第一款分布式免费软件，却是第一款宣布永久免费，

 “当其他人怀疑我是否能够胜任工作，不确定我那么做将是否足够实现目标时，我已经完成了我的大部分工作。我尝试了各种手段，因为在我的同伴和敌人之间除了我什么都没有。我自己都感到很惊讶，有时候我竟然成功了。

-“有时候我会失败; 我的一些同伴会突然离去。接着我会寻找其他受到威胁的同伴，准备好另一场战役。随着时间的流逝，我学会了寻找恐惧并将之置于我和我的同伴中，号召其他黑客来加入我。
+“有时候我会失败; 我的一些同伴会突然离去。接着我会寻找其他受到威胁的同伴，准备好另一场战役。随着时间的流逝，我学会了寻找恐惧并将之置于我和我的同伴中，号召其他黑客来加入我。”

-“如今，很多时候我不是唯一的。当我看着这么多黑客不断参与进来并坚持下去，这是一种救赎、也是一种乐趣，我知道，这片乐土将会幸存下来 – 只是现在。因为危险每年都会扩增。”
+“如今，很多时候我不是唯一的。当我看着这么多黑客不断参与进来并坚持下去，这是一种救赎、也是一种乐趣，我知道，这片乐土将会幸存下来 – 不只是现在。因为危险每年都会扩增。”

 --------------------------------------------------------------------------------

 via: http://www.linuxuser.co.uk/features/gnu-toward-the-post-scarcity-world-the-free-software-column

-译者：[SteveArcher](https://github.com/SteveArcher) 校对：[校对者ID](https://github.com/校对者ID)
+[1]:http://zh.wikipedia.org/wiki/%E5%90%8E%E7%A8%80%E7%BC%BA
+[2]:bit.ly/d58ndg
+
+译者：[SteveArcher](https://github.com/SteveArcher) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/How
+++ b/translated/How
@ -8,11 +8,11 @@

 当你通过 Software Manager 安装 Ubuntu One 客户端以后，你准备打开并配置它时，你甚至都无法在菜单搜索里面找到它。就像是完全没有安装过一样。但你查看 Software Manager，又显示它已经安装完成了。问题到底出在哪了？

-问题的关键是 **Ubuntu One installer** 已经转交 **ubuntuone-control-panel-qt** 包了。这个包没有安装，你的 Ubuntu One 就无法运行。要解决这个问题，打开终端 (Ctrl+Alt+T)并运行下面的命令：
+问题的关键是 **Ubuntu One installer** 需要 **ubuntuone-control-panel-qt** 包。这个包没有安装，你的 Ubuntu One 的安装过程就无法运行。要解决这个问题，打开终端 (Ctrl+Alt+T)并运行下面的命令：

    sudo apt-get install ubuntuone-control-panel-qt

-现在你在菜单里面搜索，你会发现 Ubuntu One 已经存在了。现在你可以配置账户，进行同步。现在你可能觉得你已经解决了所有的问题，这时你会发现 **Ubuntu One indicator 并没出现在面板上**。
+现在你在菜单里面搜索，你会发现 Ubuntu One 已经存在了。现在你可以配置账户，选择哪些同步和哪些不同步。现在你可能觉得你已经解决了所有的问题，这时你会发现 **Ubuntu One 指示器并没出现在面板上**。

 ### 在 Linux Mint 16 中安装 Ubuntu One indicator: ###

@ -22,7 +22,7 @@
    sudo apt-get update 
    sudo apt-get install indicator-ubuntuone

-注销并重新登录后，你会看到 indicator 出现在面板中。与此同时，你的 Ubuntu One 也全部安装完成了。我希望这篇 **在 Linux Mint 中安装 Ubuntu One** 会对你有所帮助。欢迎提出问题和建议。
+注销并重新登录后，你会看到这个指示器已经出现在面板中。与此同时，你的 Ubuntu One 也全部安装完成了。我希望这篇 **在 Linux Mint 中安装 Ubuntu One** 会对你有所帮助。欢迎提出问题和建议。

 --------------------------------------------------------------------------------

--- a/published/How
+++ b/published/How
@ -0,0 +1,35 @@
+如何正确双启动Ubuntu和Windows双系统
+================================================================================
+
+**尽管微软想让你信任Windows，但一个Linux操作系统和一个Windows操作系统可以在同一台PC上和平共存。这个文章会指导你如何让一个Ubuntu系统和Windows操作系统并行运行。**
+
+![](http://i1-news.softpedia-static.com/images/news2/How-to-Dual-Boot-Ubuntu-and-Windows-Properly-415377-2.jpg)
+
+你必须考虑两种场景，同时你也必须决定哪一种适合你。这里必须要考虑安装顺序。在你已经安装好Ubuntu操作系统后再安装Windows会有一点问题，因为微软似乎不太在意其他小伙伴。
+
+如果你是在已经安装好Windows后安装Ubuntu，那么事情会变得简单多了，几乎没有任何工作和准备是必需的。
+
+让我们开始处理更加困难的问题。如果你已经有一个Ubuntu系统，想安装Windows，你会丢掉GRUB，它是默认的引导程序。Windows不会在意它，并会擦除它。
+
+如果你已经犯了这个错误，但你并没有重写Linux分区，请别沮丧。数据仍然在那里，你需要的是一个含有Ubuntu（最新到13.10版本）的可启动live CD。你需要安装一个名为Boot-Repair的应用程序，使用PPA来安装它。
+
+记住，如果你使用U盘，安装应用会相当简单，因为Ubuntu安装镜像是混合镜像。用Live CD启动一个Ubuntu会话，打开终端，然后输入下列指令：
+
+    sudo add-apt-repository ppa:yannubuntu/boot-repair && sudo apt-get update
+    sudo apt-get install -y boot-repair && (boot-repair &)
+
+打开应用程序，点击推荐修复，然后等待。在这个步骤完成后，重启机器，你就会重新看到GRUB，实现双启动。
+
+在另一方面，如果你已经安装好Windows，想要安装Ubuntu，事情会更加简单。启动Ubuntu安装，选择安装到一个非Windows分区，格式化为EXT4，选择引导程序的位置，然后就搞定了。
+
+如果你选择将引导程序安装在和Windows安装的同一块硬盘上，它会擦除微软的引导程序。这样没有问题，因为GRUB会识别出WIndows操作系统，你不会丢掉它。如果你把它安装在其它地方，譬如在另一块硬盘上，当你选择从不同的硬盘启动时，你会看到它们两个。
+
+开始享受你的Ubuntu和Windows双系统启动的乐趣吧！
+
+--------------------------------------------------------------------------------
+
+via: http://news.softpedia.com/news/How-to-Dual-Boot-Ubuntu-and-Windows-Properly-415377.shtml
+
+译者：[KayGuoWhu](https://github.com/KayGuoWhu) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/How
+++ b/translated/How
@ -12,27 +12,27 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙

 > 防火墙是计算机中一款应用软件或基于硬件的网络安全系统。它根据应用配置的规则，分析数据包，然后决定是否允许此数据包通过，来控制整个系统的网络数据进出访问权限。

-**Iptables** 是一款广泛使用于服务器的防火墙。它是一款应用程序，它会根据一系列规则来管理服务器上的进出数据流。一般来说，只有可信任的连接才允许进入服务器。但 **IPTables** 是在控制台模式下运行，它非常的复杂。不熟悉 iptables 配置规则和命令的用户可以读读下面的文章，它描述了如何使用iptables防火墙。
+**iptables** 是一款广泛使用于服务器的防火墙。它是一款应用程序，它会根据一系列规则来管理服务器上的进出数据流。一般来说，只有可信任的连接才允许进入服务器。但 **iptables** 是在控制台模式下运行，它非常的复杂。不熟悉 iptables 配置规则和命令的用户可以读读下面的文章，它描述了如何使用iptables防火墙。

- [IPTables 基础 (Linux 防火墙) 指南][1]
+- [iptables 基础 (Linux 防火墙) 指南][1]

-### Debian/Ubuntu 系统中安装 UFW 防火墙 ###
+## Debian/Ubuntu 系统中安装 UFW 防火墙 ##

-为了降低 **IPTables** 设置的复杂度，有许多对应的前端应用。如果你运行的是 **Ubuntu** linux 系统的话， **UFW** 就是一款默认的防火墙工具。我们开始来探讨 **UFW** 防火墙吧。
+为了降低 **iptables** 设置的复杂度，有许多对应的前端应用。如果你运行的是 **Ubuntu** linux 系统的话， **UFW** 就是一款默认的防火墙工具。我们开始来探讨 **UFW** 防火墙吧。

 ### 什么是 UFW ###

 **UFW (简单的防火墙)** 是广泛使用的 **iptables 防火墙** 的前端应用，这是非常适合于基于主机的防火墙。UFW 即提供了一套管理**网络过滤器**的框架，又提供了控制防火墙的命令行界面接口。它给那些不熟悉防火墙概念的 Linux 新用户提供了友好、易使用的用户界面。

-同时，另一方面，它也提供了命令行界面，为系统管理员准备了一套复杂的命令，用来设置复杂的防火墙规则。**UFW** 对像 **Debian、Ubuntu** 和 **Linux Mint** 这些发布版本来说也是上上选。 
+同时，另一方面，它也提供了命令行界面，为系统管理员准备了一套复杂的命令，用来设置复杂的防火墙规则。**UFW** 对像 **Debian、Ubuntu** 和 **Linux Mint** 这些发布版本来说也是上上之选。 

-#### UFW 基本用法 ####
+## UFW 基本用法 ##

 首先，用如下命令来检查下系统上是否已经安装了 **UFW** 。 

    $ sudo dpkg --get-selections | grep ufw

-如查还没有安装，可以使用 **apt** 命令来安装，如下所示：
+如还没有安装，可以使用 **apt** 命令来安装，如下所示：

    $ sudo apt-get install ufw

@ -40,27 +40,27 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙

    $ sudo ufw status

-如果你发现状态是： **不活跃** , 意思是没有被激活或不起作用。
+如果你发现状态是： **inactive** , 意思是没有被激活或不起作用。

-#### 启用/禁用 UFW ####
+### 启用/禁用 UFW ###

 要启用它，你只需在终端下键入如下命令：

    $ sudo ufw enable

-    在系统启动时启用和激活防火墙
+在系统启动时启用和激活防火墙

 要禁用，只需输入：

    $ sudo ufw disable

-#### 列出当前UFW规则 ####
+### 列出当前UFW规则 ###

 在防火墙被激活后，你可以向里面添加你自己的规则。如果你想看看默认的规则，可以输入。

    $ sudo ufw status verbose

-##### 输出样例 #####
+输出样例：

    Status: active
    Logging: on (low)
@ -68,11 +68,11 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙
    New profiles: skip
    $

-#### 添加UFW规则 ####
+### 添加UFW规则 ###

 如你所见，默认是不允许所有外部访问连接的。如果你想远程连接你的机器，就得开放相应的端口。例如，你想用 ssh 来连接，下面是添加的命令。

-#### 允许访问 ####
+### 允许访问 ###

    $ sudo ufw allow ssh
    
@ -99,7 +99,7 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙
    [1] 22 		ALLOW 			Anywhere
    [2] 22 		ALLOW 			Anywhere (v6)

-第一条规则的意思是**所有**通过**22端口**访问机器的 **tcp** 或 **udp** 数据包都是允许的。如果你希望仅允许 **tcp** 数据包访问应该怎么办？可以在**端口**数字后加个 **tcp** 参数。下面的示例及相应的输出。
+第一条规则的意思是**所有**通过**22端口**访问机器的 **tcp** 或 **udp** 数据包都是允许的。如果你希望仅允许 **tcp** 数据包访问应该怎么办？可以在**服务端口**后加个 **tcp** 参数。下面的示例及相应的输出。

    $ sudo ufw allow ssh/tcp
    
@ -108,7 +108,7 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙
    22/tcp 		ALLOW 			Anywhere
    22/tcp 		ALLOW 			Anywhere (v6)

-#### 拒绝访问 ####
+### 拒绝访问 ###

 添加拒绝规则也是同样的招数。我们假设你想拒绝 ftp 访问, 你只需输入

@ -167,7 +167,7 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙
    Anywhere	ALLOW 			192.168.0.104
    Anywhere	ALLOW 			192.168.0.0/24

-如你所见， from 参数仅仅限制连接的来源，而目的 －用 **To** 列表示－是**所有地方**。让我们看看允许访问 **22端口(ssh)**的例子。
+如你所见， from 参数仅仅限制连接的来源，而目的（用 **To** 列表示）是**所有地方**。让我们看看允许访问 **22端口(ssh)**的例子。

    $ sudo ufw allow to any port 22

@ -254,7 +254,7 @@ Debian/Ubuntu系统中安装和配置UFW－简单的防火墙
 - /etc/ufw/sysctl.conf: 内核网络可调参数。
 - /etc/ufw/ufw.conf: 设置系统启动时 UFW 是否可用，和设置日志级别。

-### 结论 ###
+## 结论 ##

 **UFW** 作为 iptables 的前端应用，给用户提供了简单的接口界面。使用着不需要去记非常复杂的 iptables 语法。**UFW** 也使用了‘ **简单英语** ’作为它的参数。

--- a/translated/How
+++ b/translated/How
@ -2,11 +2,11 @@
 ================================================================================
 用户帐号管理是系统管理员最重要的工作之一。而密码安全是系统安全中最受关注的一块。在本教程中，我将为大家介绍**如何在 Linux 上设置密码策略**。

-假设你已经在你的 Linux 系统上使用了 [PAM (Pluggable Authentication Modules，插入式验证模块)][1]，因为近些年所有的 Linux 发行版都在使用它。
+假设你已经在你的 Linux 系统上使用了 [PAM (Pluggable Authentication Modules，插入式验证模块)][1]，因为这些年所有的 Linux 发行版都在使用它。

 ### 准备工作 ###

-安装 PAM 模块，获得 cracklib 的支持。cracklib 能提供额外的密码检查能力。
+安装 PAM 的 cracklib 模块，cracklib 能提供额外的密码检查能力。

 Debian、Ubuntu 或 Linux Mint 系统上：

@ -20,7 +20,7 @@ CentOS、Fedora、RHEL 系统已经默认安装了 cracklib PAM 模块，所以

 ### 禁止使用旧密码 ###

-看下同时有 “password” 和 “pam_unix.so” 字段并且附加有 “remember=5” 的那行，它表示禁止使用最近用过的5个密码（己使用过的密码会被保存在 /etc/security/opasswd 下面）。
+找到同时有 “password” 和 “pam_unix.so” 字段并且附加有 “remember=5” 的那行，它表示禁止使用最近用过的5个密码（己使用过的密码会被保存在 /etc/security/opasswd 下面）。

 Debian、Ubuntu 或 Linux Mint 系统上：

@ -36,7 +36,7 @@ CentOS、Fedora、RHEL 系统上：

 ### 设置最短密码长度 ###

-找到同时有 “password” 和 “pam_cracklib.so” 字段并且附加有 “minlen=10” 的那行，它表示最小密码长度为（10 - <# of types>）。这里的 <# of types> 表示类型数量。PAM 提供4种类型符号作为密码（大写字母、小写字母、数字和标点符号）。如果你的密码同时用上了这4种类型的符号，并且你的 minlen 设为10，那么最短的密码长度允许是6个字符。
+找到同时有 “password” 和 “pam_cracklib.so” 字段并且附加有 “minlen=10” 的那行，它表示最小密码长度为（10 - 类型数量）。这里的 “类型数量” 表示不同的字符类型数量。PAM 提供4种类型符号作为密码（大写字母、小写字母、数字和标点符号）。如果你的密码同时用上了这4种类型的符号，并且你的 minlen 设为10，那么最短的密码长度允许是6个字符。

 Debian、Ubuntu 或 Linux Mint 系统上：

--- a/translated/Juju
+++ b/translated/Juju
@ -65,6 +65,6 @@ Inkscape 中的克隆工具得到了用武之地：在不同分布层上重复

 via: http://design.canonical.com/2013/11/juju-ice-cream-icon-design/

-译者：[SteveArcher](https://github.com/SteveArcher) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[SteveArcher](https://github.com/SteveArcher) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Linus
+++ b/translated/Linus
@ -1,8 +1,8 @@
-Linus Torvalds发布了2013年的最后一个Linux内核3.13RC版本
+2013年的最后一个Linux内核3.13RC版本
 ================================================================================
-**Linux Torvalds宣布Linux内核3.13分支中的第六个候选版本已发布，即时可用。** 
+**在2013年结束前，Linux Torvalds宣布Linux内核3.13分支中的第六个候选版本已发布，即时可用。** 

-Linux内核3.13 RC6按时发布了，但是仅包含了很小数量的一些提交，使得此次候选版本成为了迄今体积最小的一个，至少在这一个开发周期中如此。
+Linux内核3.13 RC6仅包含了很小数量的一些提交，使得此次候选版本成为了迄今体积最小的一个，至少在这一个开发周期中如此。

 Linus Torvalds在官方发布中说道：“正如我们之前期望的那样，整个一周假期都没有什么大的bug出现。因此，我们这次只有一些小的随机更新：驱动方面（例如无限宽带、GPU、CPUfreg、libata、块设备等），一些小的文件系统修复（ext4/jdb2)，以及一些ARM SoC方面的更新。x86、perCPU 和 cgroup 方面的更新很少。甚至没什么值得注意的，只有81个很平常的小提交。”

--- a/published/Linus
+++ b/published/Linus
@ -0,0 +1,27 @@
+Linus Torvalds坦言所有CLA都不够完美，Canonical有话说
+================================================================================
+**一场关于 Canonical 公司的贡献者许可协议的争论已经持续了好几天，现在连 Linus Torvalds 也加入这场论战了，呃，这次他比较心平气和了一点。**
+
+![](http://i1-news.softpedia-static.com/images/news2/Linus-Torvalds-Says-All-Contributor-License-Agreements-Are-Broken-418978-2.jpg)
+
+贡献者许可协议（CLA）允许你的软件贡献者（比如 Canonical，Apache 以及其他贡献者）在这个应用需要保护的方面提供法律保护，比如版权。
+
+到了 Canonical 宣布使用 CLA，事情就变得有点耐人寻味了。Canonical 是一家商业公司，为了生存下去，它得赚钱，并且它的目标绝不仅仅是发行 Ubuntu 操作系统，它需要盈利。于是乎，Canonical 公司利用 CLA 将一些软件通过私有许可发行出来。（2011年7月份，Canonical 开始让贡献者签署一份 CLA 文件，文件表示贡献者可以保留自己的版权，同时要授权 Canonical 公司可以改变贡献者的许可协议 —— 译者注。）
+
+> “公平地说，人们只是讨厌 Canonical。那些 FSF 和 Apache 基金会的 CLA 也是这副德行。他们只是没有因为修改许可协议而受到非议，但是这些版权转换工作最终将会消灭整个社区。”
+
+> “基本上，在 CLA 下你不可能获得像 Linux 内核一样那么多的随机驱动补丁。因此不管多少人想试水 CLA，不管改不改这个协议，都一样，所有 CLA 都有本质上的缺陷，”Linus Torvals 在 Google+ 上面发帖说道。
+
+Ubuntu 社区经理 Jono Bacon 解释为什么 Canonical 的 CLA 会走这条道，以及它不能给那些想为项目作贡献的人设置障碍的原因。
+
+> “这些都是社区贡献的问题。社区一直存在很多问题：开发语言的选择、VCS、管理方式、社区讨论的口音、如何决定方案、如何回顾分支、bug 管理、CI 工作流程以及其他无数问题。CLA 仅仅是其中一个。有人欢喜，有人讨厌，萝卜青菜各有所爱罢了。”
+
+> “我不认为 Canonical 在 CLA 方面表现得不够诚意，也不关心为什么它会认为它的 CLA 方案很有必要。Canonical 在人们印象中是完美无瑕的吗？不见得。那它危险吗？它虚伪吗？当然不。”Jono Bacon 说道。
+
+--------------------------------------------------------------------------------
+
+via: http://news.softpedia.com/news/Linus-Torvalds-Says-All-Contributor-License-Agreements-Are-Broken-418978.shtml
+
+译者：[bazz2](https://github.com/bazz2) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Linux
+++ b/translated/Linux
@ -1,10 +1,10 @@
-Linux id 命令 - 打印用户id和组id信息
+Linux id 命令 - 显示用户id和组id信息
 ================================================================================
 要登入一台计算机，我们需要一个用户名。用户名是一个可以被计算机识别的身份。基于此，计算机会对使用这个用户名的登陆的人应用一系列的规则。在Linux系统下，我们可以使用 **id** 命令。

 ### 什么是 id 命令 ###

-**id** 命令可以打印真实有效的用户 ID(UID) 和组 ID(GID)。UID 是对一个用户的单一身份标识。组 ID（GID）可以包含多个UID。
+**id** 命令可以显示真实有效的用户 ID(UID) 和组 ID(GID)。UID 是对一个用户的单一身份标识。组 ID（GID）则对应多个UID。

 ### 如何使用 id 命令 ###

@ -82,7 +82,7 @@ id 命令可以使用一些选项。下面有一些在日常使用中有用的

 ![-g 选项](http://linoxide.com/wp-content/uploads/2013/12/id_g1.png)

-#### 打印特定用户信息 ####
+#### 输出特定用户信息 ####

 我们可以输出特定的用户信息相关的 UID 和 GID。只需要在 id 命令后跟上用户名。

--- a/translated/Linux
+++ b/translated/Linux
@ -1,5 +1,6 @@
 Linux无处不在！让我来告诉你它到底在哪！
 ================================================================================
+
 ![](http://www.linuxfederation.com/wp-content/uploads/2013/12/open-source-world.jpg)

 “[Linux][1]无处不在。大到空间站，小到微波炉，都能看到Linux的强大威力。”可能你听过很多前面这样的描述，也许你会想“真的假的？是夸张？还是确实如此？”我可以负责任的告诉你，的确如此！那些世界上最大的公司都在使用Linux。也许听到那些公司的名字你都不会相信，那么，准备好环游世界吧！我会向你展示Linux到底在哪，人们又是如何使用Linux的~
@ -16,7 +17,7 @@ Linux无处不在！让我来告诉你它到底在哪！

 美国国家核安全管理局运行着世界上速度排名第十的超级计算机 —— IBM Roadrunner，它使用的就是红帽企业版Linux，它的操作系统为[Fedora][5]。

-美国佛罗里达Largo市市政府使用Linux，“在全市范围内广泛节省了大量开支”，从而赢得了国际赞誉。
+美国佛罗里达Largo市政府使用Linux，“在全市范围内广泛节省了大量开支”，从而赢得了国际赞誉。

 2012年6月，美国海军与雷神公司（Raytheon）签署了一项将近2800万美元的合同，后者将为其Northup-Grumman MQ8B型火力侦察无人机的垂直起降舰队安装Linux地面站控制软件。合同中包含了马里兰州克森特河海军航空站为Linux系统的准备工作已经先行支付的 $5,175,075美元。

@ -38,7 +39,7 @@ Linux无处不在！让我来告诉你它到底在哪！

 - **中国** - 国有“爱存不存”银行（ICBC，有人也叫工商银行）以它的web服务器和一个新的终端平台为基础，已经在其全部20000个营业网点安装了Linux。

-中华人民共和国为了其技术独立，仅仅使用Linux作为其龙芯处理器家族的操作系统。
+这个国家为了其技术独立，仅仅使用Linux作为其龙芯处理器家族的操作系统。

 - **古巴** - 来自古巴大学信息科学专业的学生们开发了他们自己的Linux发行版——Nova，为的就是替代政府与公民电脑上的微软Windows操作系统，该项目现在已经得到了古巴政府的支持，并成功部署了超过8000台电脑。

@ -147,24 +148,25 @@ Linux在商业领域的服务器上有非常广泛的应用，而且已经持续
 综上，这些就是我所知道的使用Linux的地方，当然，这些绝对不是真实数字的全部，甚至沧海一粟都算不上。请在评论中自由留言，如果我遗漏了哪些使用Linux的国家或公司，请在评论中提出来，我会尽快把它们添加到列表中~

 数据与资料来源: [维基百科][13]
+
 --------------------------------------------------------------------------------

 via: http://www.linuxfederation.com/linux-everywhere/

-译者：[Mr小眼儿](http://blog.csdn.net/tinyeyeser) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[Mr小眼儿](http://blog.csdn.net/tinyeyeser) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

-[1]:http://www.linuxfederation.com/linux-everywhere/www.linux.org
-[2]:http://www.linuxfederation.com/linux-everywhere/www.redhat.com
-[3]:http://www.linuxfederation.com/linux-everywhere/www.apache.org
+[1]:http://www.linux.org
+[2]:http://www.redhat.com
+[3]:http://www.apache.org
 [4]:https://drupal.org/
-[5]:http://www.linuxfederation.com/linux-everywhere/fedoraproject.org
-[6]:http://www.linuxfederation.com/linux-everywhere/www.debian.org
-[7]:http://www.linuxfederation.com/linux-everywhere/www.opensuse.org
-[8]:http://www.linuxfederation.com/linux-everywhere/www.ubuntu.com
-[9]:http://www.linuxfederation.com/linux-everywhere/www.kubuntu.org
-[10]:http://www.linuxfederation.com/linux-everywhere/www.edubuntu.org
+[5]:http://fedoraproject.org
+[6]:http://www.debian.org
+[7]:http://www.opensuse.org
+[8]:http://www.ubuntu.com
+[9]:http://www.kubuntu.org
+[10]:http://www.edubuntu.org
 [11]:https://www.suse.com/
 [12]:https://www.scientificlinux.org/
 [13]:https://en.wikipedia.org/wiki/Main_Page
--- a/translated/Setup
+++ b/translated/Setup
@ -1,4 +1,4 @@
-分分钟使用ownCloud在RHEL，CentOS，Scientific Linux 6.5上安装你自己的个人云服务
+使用ownCloud在Linux安装你的个人云服务
 ================================================================================
 [ownCloud][1]是一个免费开源的软件，用于为分享文件，日历，联系人，书签和个人音频/视频。非常容易安装和管理。

@ -45,11 +45,11 @@
    MariaDB [(none)]> exit
    Bye

-### 获取owncloud ###
+### 获取ownCloud ###

 切换到你的apache root目录并下载ownCloud最新版

-转到Apache root文件目录并下载最新版owncloud。
+转到Apache root文件目录并下载最新版ownCloud。

    # wget http://download.owncloud.org/community/owncloud-6.0.0a.tar.bz2

@ -105,7 +105,7 @@

 via: http://www.unixmen.com/setup-your-personal-cloud-server-in-minutes-using-owncloud/

-译者：[Vito](https://github.com/vito-L) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[Vito](https://github.com/vito-L) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/published/Software
+++ b/published/Software
@ -0,0 +1,78 @@
+软件在吞噬世界，但是开源软件在吞噬自己
+================================================================================
+![](http://readwrite.com/files/styles/1400_0/public/fields/shutterstock_144092914.jpg)
+
+**在开源世界，大家都不安分**
+
+
+像[Marc Andreessen posits][1]所说，软件可能在吞噬世界，但是开源软件似乎在吞噬自己。伴随着快速的步伐，软件世界逐渐习惯产业化，他们的卖主开始为更多的利益投资（比如：在操作系统方面的微软和数据库方面的甲骨文）， 开源软件的世界正迈向一个加速进化的时代，从来不满足于既得的荣誉。
+
+在快速变更的开源世界，企业如何投资？
+
+### 开源超神了 ###
+
+虽然[Dirk Riehle][2]对于开源项目增长的分析并不是特别过时，当然，一部分已经[增长的趋势][3]除外：
+
+![](http://readwrite.com/files/total-growth-figure-5.jpg)
+
+现在大部分重要领域的技术-大数据，云，移动-都是开源的。伴随着Haddop、OpenStack等工具的活跃，我们应该期待开源软件卯足了劲发展。
+
+这是好是坏？
+
+### 开源码农竞争激烈 ###
+
+举个栗子，在系统配置领域。 Redmonk 的 Stephen O'Grady 挑了些数据用来衡量受欢迎程度，Chef、 Puppet、 Ansible 和 Salt，后面两个是这个领域的新星，但是赢得了相当的社区热情和采纳度。
+
+这让O'Grady [推测][4]：“ 看起来合理地去认为系统配置领域会和开源关系型数据库一样有相同的变革趋势，伴随着两个突出的工程出现，这样的观点有点问题。”
+
+O’Grady觉得：
+
+> 从这些观察中得出的最有趣的结论或许是 Ansible 和 Salt 的关联。这些工程会有不错的前景，比如在这个领域对解决方案的需求，和非常强的个人偏好的影响，例如，Salt 在 Python 开发者当中的亲和力。
+
+实际上，我必须承认最有趣的的结论是，没有开源项目能保证长久。Puppet 在2005年退出，并且一直在和有固定期权的在职者竞争，现在和Chef竞争（4年后退出），Ansible（最新两年）和 Salt（最新两年）。
+
+任何重要领域的在职者，总是会穷追不舍地吹毛求疵。但是在开源世界，比赛不会等待十亿美元的市场在它产生影响的时候形成。由Chef 和 Puppet 铺垫了的 Salt 和 Ansible 在市场的上升就是一个证明。
+
+### 社区付出了，社区也拿走了 ###
+
+你会发现同样的动态在CMS中(Drupal 、Joomla 、 Alfresco 、 Wordpress 以及无数的其它 CMS)，在云中(Eucalyptus 、 OpenStack 、 CloudStack 、 CloudFoundry 、 OpenShift 及其它)，在[web 服务器中][5]，在关系和非关系的数据库中。
+
+开源数据库数量的膨胀伴随着几乎每天都产生的新对手，正如[DB-Engines database tracking service][6]中可以看到的一样。或许最好玩的是开源关系数据库领域，直到最近MySQL支配这个领域。Postgers 也是和 MySQL 赛跑，虽然是老二，但是排得非常后。
+
+
+现在事情都在变化，或者骚动。很大程度因为 Oracle 的所谓的对 MySQL 社区的践踏，Postggres 在最前沿的 MySQLer中炙手可热。MariaDB 也是这样。虽然还是一个小家伙，比如[RedHat Fedora和Ubuntu等Linux发行版内置数据库更换成MariaDB了][7]，Google换掉了MySQL等。
+
+或许就像O'Grady说的，这归结为开发者的偏好。如果开发者占据主要地位，小小的可以阻碍他们向更合适自己的新项目转换的障碍，会导致秩序混乱。如果这有道理，将会很好解释开源为什么拒绝长期垄断。
+
+很难让开发者保持乐观。
+
+### 做一笔社区友好的生意 ###
+
+对于想要对已有的开源项目投资的企业，这意味着什么呢？一个简单的、也许没有不令人满意的答案是企业应该投入到项目中，确定他们的可持续性，并且给予企业能力去支持他们自己。
+
+但是大部分企业不想自己码出最好的代码。
+
+相反，他们会去寻找受欢迎程度高的项目，非常适合企业的需求的，而且还有很强的社区的。如果项目在社区变得没什么意思的时候，欢迎程度可能会飞跃。最基础的原因，Linux已经在操作系统之巅呆了很久了，已经适应社区影响和需求。
+
+不幸的是，没有什么方法去真正衡量一个开源社区的活力。一些成功的项目，比如OpenStack，取决于强大的基础。其他的，像Linux，取决于强大的个人和他的帮手。
+
+但是所有成功的开源项目维持了他们强劲的热度，每几个月就会有一个发行版。快速发展的项目会非常难以供企业支持。
+
+企业应该怎样避免开源项目荒废的风险呢?
+
+
+--------------------------------------------------------------------------------
+
+via: http://readwrite.com/2013/12/12/open-source-innovation
+
+译者：[ggaaooppeenngg](https://github.com/ggaaooppeenngg) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://online.wsj.com/news/articles/SB10001424053111903480904576512250915629460
+[2]:http://dirkriehle.com/publications/2008-2/the-total-growth-of-open-source/
+[3]:http://www.techrepublic.com/blog/linux-and-open-source/driving-forces-behind-linux-and-open-source-growth/
+[4]:http://redmonk.com/sogrady/2013/12/06/configuration-management-2013/
+[5]:http://www.theregister.co.uk/2013/02/06/open_and_shut/
+[6]:http://db-engines.com/en/ranking
+[7]:http://www.zdnet.com/oracle-who-fedora-and-opensuse-will-replace-mysql-with-mariadb-7000010640/
--- a/published/The
+++ b/published/The
@ -0,0 +1,33 @@
+厚达500页的《The Debian Administrator's Handbook》书更新至Debian 7 
+================================================================================
+
+几个月以前，Debian开发者[发布][1]了《The Debian Administrator's Handbook》，这本便于阅读、组织良好的书深入展现了Debian的内部。
+
+本书最初发布的版本现在已经[更新][2]至Debian 7 Wheezy，改名为《**The Debian Administrator's Handbook, Debian Wheezy from Discovery to Mastery**》，新书根据目前现状重新整理了Debian的知识点，并明显增加了手册知识点数量。
+
+《The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery》是该手册的第一次重大更新，这次更新距第一次发布已经超过了一年时间，因此，推荐给已经熟悉Debian，并希望提升Debian知识的用户们。
+
+> “我们高兴的宣布《The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery》发布了。这是自第一版书（2012年5月）发布后的第一次重大更新。我们更新了所有的章节来介绍Debian 7的改变。我们还删除了一些已经不再适用的过时内容。当然我们也增加了新的东西（如关于 multi-arch的部分），并修正了读者反馈的16个错误。”
+
+什么是Debian？安装方法、二进制包的结构、软件包的结构、稳定软件库、性能和apt-get命令、配置和编程、通过ADSL连接、数据库、编译内核、RAID和LVM、图形化桌面、创建Debian包等，全部涵盖在了《The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery》的498页内容中。
+
+![](http://iloveubuntu.net/pictures_me/The%20Debian%20Administrator%E2%80%99s%20Handbook,%20Debian%20Wheezy%20from%20Discovery%20to%20Mastery.png)
+
+《The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery》可以免费下载（498页，[PDF][3]，[EPUB][4]，[MOBI][5]）。
+
+对于喜欢印刷版书籍的朋友，《The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery》可以通过以下方式购买[http://debian-handbook.info/get/][6]
+
+--------------------------------------------------------------------------------
+
+via: http://iloveubuntu.net/debian-administrator%E2%80%99s-handbook-updated-debian-7-wheezy-published-and-freely-available-download
+
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://iloveubuntu.net/debian-administrator%E2%80%99s-handbook-available-both-payed-and-free-ebook-epub-mobi-pdf
+[2]:http://debian-handbook.info/2013/major-update-of-the-debian-administrators-handbook-for-debian-7-wheezy/
+[3]:http://debian-handbook.info/download/stable/debian-handbook.pdf
+[4]:http://debian-handbook.info/download/stable/debian-handbook.epub
+[5]:http://debian-handbook.info/download/stable/debian-handbook.mobi
+[6]:http://debian-handbook.info/get/
--- a/Distributions.md
+++ b/Distributions.md
@ -0,0 +1,21 @@
+Fedora 项目将不再为它的 Linux 发行版取名
+================================================================================
+**Fedora 项目曾有一个丰富多彩的发行版命名历史，但是，这段历史将会在 Fedora 21 这里结束。**
+
+![](http://i1-news.softpedia-static.com/images/news2/The-Fedora-Project-Will-No-Longer-Name-Their-Linux-Distributions-416156-2.jpg)
+
+Fedora 开发者已经决定现在是时候结束 Fedora 操作系统的命名规则和命名流程。我们不清楚命名的这一过程是否会由社区来代替实现，但是有一件事是非常确定的：Fedora 有关人员将不会继续为其取名。
+
+“Fedora 21 的代号会是什么呢？然而再一次回答：空。不是‘空’字符串而是没有”。Fedora 委员会决定终止发行名称这一过程。但这并不意味“不再有发行名称”，发行名可以取决于社区或是工作组。又或者以任何方式来进行改革，Red Hat 的 Jaroslav Reznik 在[博客][1]中说到。
+
+这些出现在一个无名的邮件列表的信息已经流传了相当一段时间了，但是可能到目前为止，Fedora 项目还没有一个很明确的说法。
+
+--------------------------------------------------------------------------------
+
+via: http://news.softpedia.com/news/The-Fedora-Project-Will-No-Longer-Name-Their-Linux-Distributions-416156.shtml
+
+译者：[hyaocuk](https://github.com/hyaocuk) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://borntobeopen.blogspot.ru/2014/01/wheres-fedora-21-schedule.html
--- a/translated/The
+++ b/translated/The
@ -1,4 +1,4 @@
-00 关于作者
+戴文的Linux内核专题：关于作者
 ================================================================================
 [![](http://www.linux.org/data/avatars/l/4/4843.jpg)][1]

--- a/translated/The
+++ b/translated/The
@ -67,7 +67,7 @@ NFC要处理HCI帧需要启用下面一个特性(NFC HCI implementation)。

 使用固态硬盘的系统需要MTD的支持(Memory Technology Device (MTD) support)。MTD设备是固态存储设备。典型的存储设备与固态硬盘(SSD)不同。用于磁盘单元的标准常规不适用于SSD(读、写、擦除)。

-大多数会桌面电脑否有并口(一个有25个洞的连接器)，所以他们需要这个特性(Parallel port support)。并口在其他许多鲜为人知的应用中通常用于打印机和ZIP驱动器。并口有25针。
+大多数会桌面电脑带有并口(一个有25个洞的连接器)，所以他们需要这个特性(Parallel port support)。并口在其他许多鲜为人知的应用中通常用于打印机和ZIP驱动器。并口有25针。

 对IBM兼容计算机启用这个特性(PC-style hardware)。它们是不同类型的计算机。除了IBM计算机(通常运行Windows),还有苹果计算机。Linxu可以运行在几乎所有类型的计算机上。

@ -116,13 +116,14 @@ PCMCIA的并口支持可以启用(Support for PCMCIA management for PC-style por
 Imation SuperDisks需要Shuttle EP1284芯片的支持(Support c7/c8 chips)。

 一些其他的并行IDE协议可以启用，包括：
-Shuttle EPIA protocol
-Freecom IQ ASIC-2 protocol - (用于Maxell Superdisks)
-FreeCom power protocol
-KingByte KBIC-951A/971A protocols
-KT PHd protocol - (用于2.5英寸外置并口硬盘)
-OnSpec 90c20 protocol
-OnSpec 90c26 protocol
+
+- Shuttle EPIA protocol
+- Freecom IQ ASIC-2 protocol - (用于Maxell Superdisks)
+- FreeCom power protocol
+- KingByte KBIC-951A/971A protocols
+- KT PHd protocol - (用于2.5英寸外置并口硬盘)
+- OnSpec 90c20 protocol
+- OnSpec 90c26 protocol

 注意：这些协议以及支持的插入并口的设备意味着这些都类似于热插拔设备,就像USB设备插入USB端口一样。USB和火线人仍旧是使用最流行的端口,因为它们的大小和速度。一个并口设备单元大于USB闪存因为并口大于USB端口。

@ -134,6 +135,6 @@ OnSpec 90c26 protocol

 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-10.4613/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/The
+++ b/translated/The
@ -6,7 +6,7 @@

 Linux支持两种不同的康柏智能阵列控制器：(Compaq SMART2 support)和(Compaq Smart Array 5xxx support)。阵列控制器是将物理存储单元表现为逻辑单元的设备。这些控制可能同样实现了基于硬件的RAID。硬件和软件RIAD的不同是简单的。Linux管理并见到软件RIAD。Linux将硬件RAID视为另外的存储单元。这意味着Linux没有意识到设备就是RAID驱动器。硬件(阵列控制器)独立于内核管理着RAID系统。这对于系统的性能更好因为内核不必配置或者管理RAID。注意，不同的阵列控制器有不同的RAID能力。

-上面提到的阵列控制器可以通过这个驱动反问SCSI磁带(SCSI tape drive support for Smart Array 5xxx)。SCSI磁带是使用SCSI协议的磁带。
+上面提到的阵列控制器可以通过这个驱动访问SCSI磁带(SCSI tape drive support for Smart Array 5xxx)。SCSI磁带是使用SCSI协议的磁带机。

 PCI RAID控制器Mylex DAC960、AcceleRAID和eXtremeRAID在这个驱动中支持(Mylex DAC960/DAC1100 PCI RAID Controller support)。PCI RAID控制器是一个连接到PCI卡的阵列控制器。RAID控制器是拥有RAID功能的阵列控制器。

@ -49,7 +49,7 @@ Linux内核可以使用可擦写光盘作为缓存空间(Enable write caching)

 下面的驱动允许虚拟块设备创建为virtio(Virtio block driver)。virtio是IO虚拟化平台。

-一些旧的硬盘还要一个特殊的驱动(Very old hard disk (MFM/RLL/IDE) driver)。
+一些非常老的硬盘还要一个特殊的驱动(Very old hard disk (MFM/RLL/IDE) driver)。

 这里有一个驱动用于先前提到的Rados设备(Rados block device (RBD))。

@ -62,17 +62,18 @@ Linux内核可以使用可擦写光盘作为缓存空间(Enable write caching)
 如果电位器是连接到SPI总线，那么需要这个驱动(support SPI bus connection)。

 注意:Linux内核支持很多传感器因为Linux内核经常用于天气设备和机器人。
+
 这个驱动用于IBM RSA(Condor)服务处理器(Device driver for IBM RSA service processor)。

 内核同样支持PCI Sensable PHANToM设备驱动(Sensable PHANToM (PCI))。

 这个驱动指引不同来自并行追踪接口(Parallel Trace Interface (PTI))的追踪数据发往Intel Penwell PTI口 (Parallel Trace Interface for MIPI P1149.7 cJTAG standard)。这个被指领的数据用于调试目的。

-一些带有IOC4芯片的SGI IO控制器需要这个驱动(SGI IOC4 Base IO support)。SGI IO是由SCI管理的输入/输出舍必。IOC4芯片控制着许多由这些设备执行的任务。这是一个基础驱动。其他对这些设备的驱动依赖于这个驱动。
+一些带有IOC4芯片的SGI IO控制器需要这个驱动(SGI IOC4 Base IO support)。SGI IO是由SCI管理的输入/输出设备。IOC4芯片控制着许多由这些设备执行的任务。这是一个基础驱动。其他对这些设备的驱动依赖于这个驱动。

 这里有很少的TI闪存媒体适配器驱动在Linux内核中，(TI Flash Media interface support) 和(TI Flash Media PCI74xx/PCI76xx host adapter support)。

-这个	驱动("Integrated Circuits ICS932S401")用于ICS932S401时钟控制芯片。
+这个驱动("Integrated Circuits ICS932S401")用于ICS932S401时钟控制芯片。

 Atmel同步串行通信外设(Synchronized Serial Communication peripheral (SSC))有一个驱动在内核中(Device driver for Atmel SSC peripheral)。这个设备提供点对点的设备间的串行连接。

@ -83,12 +84,13 @@ Atmel同步串行通信外设(Synchronized Serial Communication peripheral (SSC)
 这个驱动让应用可以与HP工业标准服务器中的iLO管理处理器通信(Channel interface driver for the HP iLO processor)。"iLO"代表的是"Integrity Integrated Lights-Out".iLO允许远程服务器管理。

 Linux内核支持ALS APDS9802光敏传感器(Medfield Avago APDS9802 ALS Sensor module)。一些其他支持的传感器包括：
-Intersil ISL29003 ambient light sensor
-Intersil ISL29020 ambient light sensor
-Taos TSL2550 ambient light sensor
-ROHM BH1780GLI ambient light sensor
-BH1770GLC / SFH7770 combined ALS - Proximity sensor
-APDS990X combined als and proximity sensors
+
+- Intersil ISL29003 ambient light sensor
+- Intersil ISL29020 ambient light sensor
+- Taos TSL2550 ambient light sensor
+- ROHM BH1780GLI ambient light sensor
+- BH1770GLC / SFH7770 combined ALS - Proximity sensor
+- APDS990X combined als and proximity sensors

 注意：如果内核是为广泛的计算机编译的话，大多数驱动应该以模块形式加入。

@ -116,6 +118,6 @@ Silicon微控制器使用Silicon实验室C2端口，这需要一个特殊的驱

 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-11.4640/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/The
+++ b/translated/The
@ -6,49 +6,49 @@

 下一组我们要讨论的特性是"EEPROM support"。电可擦除可编程只读存储器(Electrically Erasable Programmable Read-Only Memory)是一种掉电或者意外关闭后不会擦除内容的存储器。

-内核支持在I2C卡上的EEPROM芯片包括FRAMs、ROMs和SRAMs (I2C EEPROMs / RAMs / ROMs 来自多数供货商)。FRAM(同样也称作FeRAM是一种使用铁电原理而不是电介质存储数据的随机访问存储芯片)。ROM芯片是只读(Read Only Memory)芯片。SRAM是静态而不是动态存储器就像DRAM。DRAN必须被刷新以保留数据而SRAM不需要刷新。然而,两者都会在电源关闭或者丢失时失去数据。
+内核支持在I2C卡上的EEPROM芯片包括FRAMs、ROMs和SRAMs (I2C EEPROMs / RAMs / ROMs 来自多数供货商)。FRAM(同样也称作FeRAM是一种使用铁电原理而不是电介质存储数据的随机访问存储芯片)。ROM芯片是只读(Read Only Memory)芯片。SRAM是静态而不是动态存储器就像DRAM。DRAN必须被刷新以保留数据而SRAM不需要刷新。然而，两者都会在电源关闭或者丢失时失去数据。

 内核支持SPI总线的EEPROM(SPI EEPROMs from most vendors)。串行外设接口总线(Serial Peripheral Interface Bus (SPI))是一个缺乏错误检测的全双工总线系统。

-老式的I2C EEPROM芯片需要一个除了上面I2C驱动的驱动(Old I2C EEPROM reader)。I2C总线用于嵌入式系统和电话,由于它用的是低速总线协议。
+老式的I2C EEPROM芯片需要一个除了上面I2C驱动之外的驱动(Old I2C EEPROM reader)。I2C总线用于嵌入式系统和电话，由于它用的是低速总线协议。

-这个特性用来防止Maxim的可编程EEPROM变成只读模式(Maxim MAX6874/5 power supply supervisor)。特别地,这驱动提供对这个芯片的更好的电源管理。
+这个特性用来防止Maxim的可编程EEPROM变成只读模式(Maxim MAX6874/5 power supply supervisor)。特别地，这驱动提供对这个芯片的更好的电源管理。

-这里还有一个驱动"EEPROM 93CX6 support","Microwire EEPROM 93XX46 support"和"ENE CB710/720 Flash memory card reader support"。
+这里还有一个驱动"EEPROM 93CX6 support"，"Microwire EEPROM 93XX46 support"和"ENE CB710/720 Flash memory card reader support"。

-和其他内核特性一样,这里有一个对于EEPROM的调试特性(Enable driver debugging)。再说一次,为了更好的性能,禁用调试特性。
+和其他内核特性一样，这里有一个对于EEPROM的调试特性(Enable driver debugging)。再说一次，为了更好的性能，禁用调试特性。

-下面,我们有一个TI特性(Shared transport core driver)。这个驱动提供对于BT/FM和GPS芯片的传输协议。
+下面，我们有一个TI特性(Shared transport core driver)。这个驱动提供对于BT/FM和GPS芯片的传输协议。

 下面的驱动支持I2C LIS3LV02Dx加速度计(STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C))。设备提供的数据存储在/sys/devices/platform/lis3lv02d。

-下一步, Linux提供了下载固件到Altera的FPGA的模块(Altera FPGA firmware download module)。FPGA就是现在可编程门阵列(field-programmable gate array)。它们是可编程集成电路。
+下一步， Linux提供了下载固件到Altera的FPGA的模块(Altera FPGA firmware download module)。FPGA就是现场可编辑逻辑门阵列(field-programmable gate array)。它们是可编程集成电路。

-Intel Management Engine Interface"提供Intel芯片的安全和其他服务。
+Intel Management Engine Interface提供Intel芯片的安全和其他服务。

 "ME Enabled Intel Chipsets"可以支持MEI。MEI是"Management Engine Interface"(管理引擎接口)。这个驱动支持有MEI服务的芯片组。

 "VMware VMCI Driver"是一种用于客户机和宿主机中继通信的高速虚拟设备。VMCI代表的是"Virtual Machine Communication Interface"(虚拟机通信接口)。

-下面, "ATA/ATAPI/MFM/RLL support"可以启用/禁用。MFM (Modified Frequency Modulation)是一种特殊的编码软驱位的方法。然而,这并不工作在所有的软驱上。MFM使用RLL(Run-Length Limited)编码制式。RLL通过有带宽限制的系统通信转换数据。ATAPI是先前提过的"ATA Packet Interface",同时ATA也在讨论接口标准的时候讨论过。
+下面， "ATA/ATAPI/MFM/RLL support"可以启用/禁用。MFM (Modified Frequency Modulation)是一种特殊的编码软驱位的方法。然而，这并不工作在所有的软驱上。MFM使用RLL(Run-Length Limited)编码制式。RLL通过有带宽限制的系统通信转换数据。ATAPI是先前提过的"ATA Packet Interface"，同时ATA也在讨论接口标准的时候讨论过。

 现在我们将讨论SCSI支持。小型计算机接口(Small Computer System Interface (SCSI))是另外一种SATA的接口标准。USB和火线设备使用SCSI协议。

 第一个SCSI设定关于"RAID Transport Class"。这允许RAID使用SCSI标准。

-为了使用SCSI目标,启用这个特性(SCSI target support)。
+为了使用SCSI目标，启用这个特性(SCSI target support)。

-如果系统会运行旧的Linux应用,系统可能需要"legacy /proc/scsi/ support"。这会在/proc/scsi创建SCSI文件。
+如果系统会运行旧的Linux应用，系统可能需要"legacy /proc/scsi/ support"。这会在/proc/scsi创建SCSI文件。

-为了支持SCSI磁盘,启用下一个特性(SCSI disk support)。这是一个通用驱动。
+为了支持SCSI磁盘，启用下一个特性(SCSI disk support)。这是一个通用驱动。

-为了支持SCSI磁带,启用这个特性(SCSI tape support)。这是一个通用驱动。SCSI磁带驱动器在像磁带的磁性条上记录数据。
+为了支持SCSI磁带，启用这个特性(SCSI tape support)。这是一个通用驱动。SCSI磁带驱动器在像磁带的磁性条上记录数据。

 OnStream SCSI磁带需要这个驱动而不是前面提到SCSI通用驱动SCSI OnStream SC-x0 tape support)。

-"对于SCSI CDROM support",一些CD-ROM使用SCSI协议。
+"对于SCSI CDROM support"，一些CD-ROM使用SCSI协议。

-下面, 用户可以启用"Enable vendor-specific extensions (for SCSI CDROM)"。
+下面， 用户可以启用"Enable vendor-specific extensions (for SCSI CDROM)"。

 这是一个对于大量不同SCSI设备的通用驱动(SCSI generic support)。这主要用于SCSI扫描仪和其他不被上面提到的SCSI驱动支持的设备或者那些之后会讨论的设备。

@ -62,17 +62,17 @@ Linux内核应该设置为每个SCSI设备搜索全部的逻辑单元号(Logical

 这里还有一个SCSI日志系统(SCSI logging facility)。

-为了增强你的系统,启用这个特性会允许SCSI在系统启动时就被探测到而不是先启用再探测(Asynchronous SCSI scanning)。大多数系统可以一次执行这两个任务,因此为什么允许这项? 对于那些连接了很多SCSI设备的硬件,这个会明显加快启动速度。
+为了增强你的系统，启用这个特性会允许SCSI在系统启动时就被探测到而不是先启用再探测(Asynchronous SCSI scanning)。大多数系统可以一次执行这两个任务，因此为什么允许这项? 对于那些连接了很多SCSI设备的硬件，这个会明显加快启动速度。

-下面,"Parallel SCSI (SPI) Transport Attributes"(传统的并行SCSI)允许每个SCSI设备发送传输信息给sysfs。一些系统需要这个特性。
+下面，"Parallel SCSI (SPI) Transport Attributes"(传统的并行SCSI)允许每个SCSI设备发送传输信息给sysfs。一些系统需要这个特性。

-下面的特性和上面提到的一样,但是发送光纤通道设备的传输信息(FiberChannel Transport Attributes)(光纤通道接口)。光线通道设备使用SCSI。
+下面的特性和上面提到的一样，但是发送光纤通道设备的传输信息(FiberChannel Transport Attributes)(光纤通道接口)。光线通道设备使用SCSI。

 下面用户可以启用/禁用"SCSI target support for FiberChannel Transport Attributes"(为光纤通道添加"target"模式驱动)。

 iSCSI设备和SAS设备的传输数据可以导出到sysfs(iSCSI Transport Attributes)和SAS Transport Attributes)。SAS代表的的是"Serial Attached SCSI"(串行链接SCSI)。

-下面,ATA支持被加入libsas(ATA support for libsas (requires libata))。注意配置工具提示需要libata。为了满足这个需求,启用ATA支持。更多情况下,配置工具已经或者将会会你这么做,但是请无论再检查一下。libsas和libata是相应的支持SAS和ATA的库。
+下面，ATA支持被加入libsas(ATA support for libsas (requires libata))。注意配置工具提示需要libata。为了满足这个需求，启用ATA支持。更多情况下，配置工具已经或者将会会你这么做，但是请无论再检查一下。libsas和libata是相应的支持SAS和ATA的库。

 下面的特性允许SAS接口接收SMP帧(Support for SMP interpretation for SAS hosts)。这加入了一个SMP解释器到libsas中。然而，这不会增加内核的尺寸。SMP帧允许所有在多CPU系统上的处理器访问SAS设备。

@ -100,7 +100,7 @@ SRP可以发送传输的数据给sysfs(SRP Transport Attributes)。SRP代表SCSI

 内核包含了对于"SATA Zero Power Optical Disc Drive (ZPODD) support"的驱动。这会在不使用时关闭SATA光盘驱动器(SATA optical disc drives (ODD))。这节约了能源以及减少损耗。

-贴士：即使你在编译一个高性能的内核，尝试启用所有的电源管理特性。则减少了电源消耗、操作开销、热量产生(热量会降低性能)，以及磨损。
+贴士：即使你在编译一个高性能的内核，尝试启用所有的电源管理特性。则减少了电源消耗、操作开销、热量产生(热量会降低性能)，以及老化。

 SATA端口复用器需要这个驱动(SATA Port Multiplier support)。端口复用器是一个拥有许多端口但是自己仅需插入一个端口的设备。举例来说，如果一个硬件有一个SATA口，但是还需要更多的口，在这个口上插入端口复用器。现在设备可以有许多SATA口了。

@ -109,16 +109,16 @@ SATA端口复用器需要这个驱动(SATA Port Multiplier support)。端口复
 对于要在Soc硬件上支持AHCI SATA设备，必须启用这个驱动(Platform AHCI SATA support)。Soc代表片上系统(System-on-a-Chip)。

 下面是一些特殊设备的驱动
-Initio 162x SATA support
-ACard AHCI variant (ATP 8620)
-Silicon Image 3124/3132 SATA support
+- Initio 162x SATA support
+- ACard AHCI variant (ATP 8620)
+- Silicon Image 3124/3132 SATA support

-再说一次,等着下一篇精彩的文章。
+再说一次，等着下一篇精彩的文章。

 --------------------------------------------------------------------------------

 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-12.4681/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/The
+++ b/translated/The
@ -72,7 +72,7 @@ MD框架需要多路径支持(Multipath I/O support)。MD框架就是多设备(M

 这个驱动会发现最有效的到存储设备的路径来读取和写入(I/O Path Selector based on the number of in-flight I/Os)。

-=下面的一个驱动和以上相同，但是会寻找最快路径(I/O Path Selector based on the service time)。
+下面的一个驱动和以上相同，但是会寻找最快路径(I/O Path Selector based on the service time)。

 如果一个逻辑卷上的物理存储单元正忙，如果可能的话，这个特性会允许读取/写入到另一个物理卷上。

@ -124,6 +124,6 @@ SCSI同样也可以支持光纤通道主机适配器(Fusion MPT ScsiHost drivers

 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-13.4714/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/The
+++ b/translated/The
@ -4,7 +4,7 @@

 你好！ 准备好读另一篇很酷的Linux内核文章了么?

-接下来，在我们的长期追求中，我们可以启用/禁用"Fusion MPT logging facility"。MPT代表"Message Passing Technology"(消息传递技术)。Fusion驱动是由LSI Logic公司开发。MPT一种进程间使用的特定消息策略。这个技术是同步的意味着进程将会等待所需的消息。
+接下来，在这个任务中，我们可以启用/禁用"Fusion MPT logging facility"。MPT代表"Message Passing Technology"(消息传递技术)。Fusion驱动是由LSI Logic公司开发。MPT一种进程间使用的特定消息策略。这个技术是同步的意味着进程将会等待所需的消息。

 在这之后，如果计算机处理拥有火线端口就应该启用"FireWire driver stack"。如果没有，那么就没有必要去启动一个不会使用到的火线驱动。火线很像USB。不过在协议、速度、物理形状和端口布局上不同。通常上，苹果设备使用火线和USB。一些PC有火线端口，但是不像USB口那样普及。

@ -113,6 +113,6 @@ Pegasus USB是USB转以太网的适配器/转换器(USB Pegasus/Pegasus-II based

 via: http://www.linux.org/threads/the-linux-kernel-configuring-the-kernel-part-14.4765/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/published/Top
+++ b/published/Top
@ -0,0 +1,44 @@
+十大顶级的黑客级Linux发行版！
+================================================================================
+黑客和安全研究员需要在他们手边随时都有那些黑客工具。它们很多都是基于流行的Ubuntu和Debain操作系统，并且其中已经安装了许多黑客工具。
+
+![](http://www.efytimes.com/admin/useradmin/photo/ef0R121832PM132014.jpg)
+
+1. [BackTrack 5r3][1]:这是一个最受欢迎和广为人知的基于Linux的黑客发行版。它是基于Canonical的Ubuntu操作系统的，它的logo的意思是，"如果你更安静，你将听到的更多。"在版本5中，除了以前的KDE桌面外，还增加了GNOME桌面环境。
+
+2. [Nodezero][2]:这是另外一个基于Ubuntu的黑客版，它用于渗透测试。它会跟着Ubuntu同步更新的。
+
+3. [BackBox Linux][3]: 这也是一个基于Ubuntu的黑客工具。根据开发者称，它被设计来创建一个渗透测试发行版，并且快速而易用。它还可以通过软件仓库来更新那些白帽渗透测试工具。
+
+4. [Blackbuntu][4]:Ubuntu自己虽然不是一个黑客工具，但是有许多基于它的黑客版本。这个发行版带来了诸如网络扫描、信息获取、渗透、漏洞识别，权限提升，无线网络分析、VoIP分析等各类工具。
+
+5. [Samurai Web Testing Framework][5]:这个发行版主要关注在对网站的攻击方面，它使用最好的免费开源的工具攻击和入侵网站。开发者已经把包括侦查、映射、探索和利用的攻击的四个步骤都集成到了发行版中。
+
+6. [Knoppix STD][6]:从Ubuntu迁移到了Debian，Knoppix STD现在是一个基于Debian的黑客发行版，可以运行GNOME、KDE、LXDE和Openbox等桌面环境。它已经出现了很长一段时间，并且是它们之中最早的live发行版。
+
+7. [Pentoo][7]:这是一个基于Gentoo的针对安全测试的live CD。它带来了大量的自定义工具和内核。包括Backported WiFi stack, XFCE4等等。
+
+8. [Weakerthan][8]:这个发行版使用Flufbox桌面环境，它包含了很多无线工具，最适合用于WiFi攻击。它基于Debian Squeeze发行版，具有WiFi攻击、Cisco漏洞利用、SQL入侵、Web入侵、蓝牙及其他功能。
+
+9. [Matriux Krypton][9]:这也许是第一个直接基于Debian OS的发行版。它是一个有300个安全工具的兵工厂，是白帽测试、渗透测试、安全测试、系统和网络管理、网络取证的一个好选择。
+
+10. [DEFT][10]:一款带有DART（Digital Advanced Response Toolkit，高级数字响应工具）的基于Linux Kernel 3 的操作系统。它使用WINE来在Linux上运行Windows工具，并主要运行LXDE桌面环境。
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=125775
+
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.backtrack-linux.org/downloads/
+[2]:http://www.nodezero-linux.org/downloads
+[3]:http://www.backbox.org/downloads
+[4]:http://sourceforge.net/projects/blackbuntu/
+[5]:http://sourceforge.net/projects/samurai/files/
+[6]:http://s-t-d.org/download.html
+[7]:http://www.pentoo.ch/download/
+[8]:http://weaknetlabs.com/main/?page_id=479
+[9]:http://sourceforge.net/projects/matriux/
+[10]:http://iso.linuxquestions.org/deft-linux/deft-linux-7/
--- a/translated/Tunnel
+++ b/translated/Tunnel
@ -1,8 +1,9 @@
-在Debian 7/Ubuntu 13.10 使用SSH隧道链接
+在Debian 7/Ubuntu 13.10 上使用隧道封装SSH连接
 ================================================================================
-**隧道** 被设计用于远端和本地(inetd-startable)或远端服务器间的SSL加密封装。它被用于加入SSL功能作为超级守护进程，像POP2，POP3和IMAP服务而不必改变程序代码。隧道使用OpenSSL库用于加密，因此它支持任何被编译进库的加密算法。简而言之，隧道可以使任何一个不安全的端口变得安全加密。

-在本篇中，我会描述如何通过SSL使用SSH隧道。这个步骤非常简单。你需要在你的客户端PC和远程PC都已经安装运行了sshd。
+**隧道** 被设计用于远端客户端和本地(可通过inetd启动)或远端服务器间的SSL加密封装。它可以用于为inetd进程增加SSL功能，像POP2（译注：厄，POP2这个服务还有人用么？），POP3和IMAP服务而不必改变程序代码。隧道使用OpenSSL库用于加密，因此它支持任何被编译进库的加密算法。简而言之，隧道可以使任何一个不安全的端口变得安全加密。
+
+在本篇中，我会描述如何通过SSL水稻封装SSH。这个步骤非常简单。你需要在你的客户端PC和远程PC都已经安装运行了sshd。

 我正在使用下面提到的两个系统。

@ -75,7 +76,7 @@

    # vi /etc/default/stunnel4

-改变行从 **Enabled = 0** 到 **1**。
+改变行从 **ENABLED = 0** 到 **1**。

    # /etc/default/stunnel
    # Julien LEMOINE <speedblue@debian.org>
@ -120,7 +121,7 @@

    $ sudo vi /etc/default/stunnel4

-改变行从 **Enabled = 0** 到 **1**.
+改变行从 **ENABLED = 0** 到 **1**.

    # /etc/default/stunnel
    # Julien LEMOINE <speedblue@debian.org>
@ -233,8 +234,7 @@

 现在你可以用ssh连接到你的远程机器上了，但是所有的流量通过SSL隧道。

-You’re done now! You can SSH to your remote system even when the ssh default 22 is blocked by any firewall.
-你已经完成了！你可以使用SSH到你的远程系统即使ssh的默认端口被防火墙阻止了。
+你已经完成了！即使ssh的默认端口被防火墙阻止了，你仍然可以使用SSH到你的远程系统。

 参考链接:

@ -244,7 +244,7 @@ You’re done now! You can SSH to your remote system even when the ssh default 2

 via: http://www.unixmen.com/tunnel-ssh-connections-ssl-using-stunnel-debian-7-ubuntu-13-10/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/published/Ubuntu
+++ b/published/Ubuntu
@ -0,0 +1,18 @@
+Ubuntu默认在主目录外面明文存储你的Wi-Fi密码!
+================================================================================
+
+Ubuntu可能不像你想象的那么安全．据报道，Linux驱动的发行版在主目录外存储Wi-Fi配置文件，这使得它们更易于被访问。这包括Wi-Fi配置文件的密码。报道说，一个用户指出，Wi-Fi密码在Ubuntu上是不加密的，因为它们都存储在主目录之外。此文件夹虽然可以在操作系统的安装过程中进行加密。
+
+"最近，我偶然发现了一个事实，NetworkManager默认存储WiFi配置文件*包括明文密码*到/etc/NetworkManager/system-connections/。我认为当他/她开启了主目录加密时，肯定不希望存储密码到主目录之外，应该以某种方式纠正。" - Softpedia引用邮件列表中Per Guth的话。
+
+这个问题显然是为了让“所有用户都可以连接到这个网络”，即默认情况下启用该选项的结果。为了关掉此功能，用户必须打开Network Indicator，然后去Edit Connection。然后选择在Edit上的Select Network and clock。在General选项卡，取消勾选，以将其关闭。
+
+取消选中该选项据说会移动这个密码进入到所需的文件夹（主目录），但Softpedia报告推测，大多数用户不会注意到这个问题。Canonical是否会进行任何更改，还有待观察。
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=125483
+
+译者：[Akagi201](https://github.com/Akagi201) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/published/Ubuntu
+++ b/published/Ubuntu
@ -0,0 +1,42 @@
+Shuttleworth表示Ubuntu将在微软之前达到真正的全平台融合
+================================================================================
+**Ubuntu的创始人表示，六个月一次的Ubuntu发布传统可能会成为过去。**
+
+> ‘也许我们会减轻这6个月的事而把它们分布到各个时间段里’
+
+与[PCPro][1]说到Canonical的融合计划 —— 我们将会看到一个供手机、平板和台式机等全平台使用的Ubuntu 15.04 —— Mark Shuttleworth解释说移动终端用户已经习惯于在任何时候接受升级，这部分原因可能会带来 *“也许我们会减轻这6个月的事而把它们分布到各个时间段里”*
+
+这已经不是第一次提出关于更改Ubuntu更新周期的问题了。今年早些时候的讨论都涉及到[移动发行版的滚动发布][2]，Ubuntu 13.04的发布带给用户[更新方式的改变][3]。
+
+### 手机平台覆盖的优势 ###
+
+![](http://www.omgubuntu.co.uk/wp-content/uploads/2013/12/mark-tile-300x171.jpg)
+
+这并不是这次简单采访中提到的唯一的点，Shuttleworth还表示，他相信**Ubuntu将领先于微软实现真正的移动/桌面融合。**那个总部在雷蒙德的公司曾说过[在Windows Phone和Windows8平台上的统一][4]和[因Windows RT的不良反馈而解散][5]。
+
+Shuttleworth指出当涉及到招揽应用开发商时，Ubuntu的Linux基础，可以给Ubuntu带来巨大优势。
+
+*“Android的原生应用及web应用相比Windows平台而言更接近于在Ubuntu上的程序。许多Android开发人员使用Ubuntu，并在ubuntu上开发他们的软件，所以Ubuntu更容易成为开发人员的目标平台。”*
+
+> ‘没有公布硬件合作伙伴’
+
+当被问及是否有**硬件合作伙伴愿意生产的Ubuntu手机和平板电脑**，Mark有几分躲闪，他说，虽然目前“没有宣布合作伙伴”，但目前已经有几个“家用品牌”的“前沿设备”将Ubuntu作为内部测试操作系统。
+
+他表示，这个独立的测试是一种“强烈利益信号”，带给产品更“舒适”的体验。
+
+此前，在十二月份的巴黎Le Web会议上Mark告诉记者，与硬件合作伙伴达成协议[2014年将发布一款高端手机][6]。该公司生产的手机的名称尚未透露（译注：现在我们已经知道了~）。
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2013/12/ubuntu-touch-plans-2014
+
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[wxy](https://github.com/wxy)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.pcpro.co.uk/news/interviews/386080/mark-shuttleworth-interview-taking-ubuntu-beyond-desktops
+[2]:http://www.omgubuntu.co.uk/2013/02/ubuntu-to-discuss-rolling-release-move-at-next-weeks-uds
+[3]:http://www.omgubuntu.co.uk/2013/08/phased-updates-to-start-rolling-out-for-ubuntu-13-04
+[4]:http://blogs.wsj.com/cio/2013/10/24/microsoft-moves-closer-to-mobile-desktop-convergence/
+[5]:http://www.theguardian.com/technology/2013/nov/26/microsoft-kill-windows-rt-larson-green
+[6]:http://www.omgubuntu.co.uk/2013/12/ubuntu-touch-signs-first-hardware-partner-will-debut-high-end-phone-2014
--- a/translated/Understanding
+++ b/translated/Understanding
@ -1,90 +1,107 @@
-通过例子来理解 Linux 的 cd 命令
+实例学习 Linux 的 cd 命令，及对内部命令的解释
 ================================================================================
+
 在 *nix 的世界里，cd 命令是最为基础的命令，它所做的是改变当前的工作目录。 本文将深入讲解关于 cd 的技术细节。
-### cd 命令：一个内在的命令
-绝大多数的 Linux 发行版都将 Bash Shell 用作默认的 Shell。Bash 有一些自己内部的命令，cd 就是其中一个。我将会解释究竟什么是内部命令，以及为什么 cd 会是一个内部命令。那么首先，请检查确认你的当前 shell 以及环境变量：
+
+### cd 命令：一个内部命令
+
+绝大多数的 Linux 发行版都将 Bash Shell 用作默认的 Shell。Bash 有一些自己内部的命令，cd 就是其中一个。我将会解释究竟什么是内部命令，以及为什么 cd 会是一个内部命令。
+
+那么首先，请检查确认你的当前 shell 以及环境变量：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/01.cd_shell.png)

 现在继续使用 which 命令来检查 cd 所在的路径：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/02.cd_which.png)

 我们发现没有输出。因为在我们的系统中 cd 命令其实并没有对应某个 binary，但是我们却又仍然可以执行这个命令，这就是因为 cd 其实是 BASH 的一个内部命令。内部命令都是被整合进入 shell 里面的。接下来我们可以继续使用 type 命令来查看 cd 这个内部命令的更多信息。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/03.cd_type.png)

 如果你尝试去查看内部命令的手册，会发现并没有为它们单独设置手册。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/04.cd_man.png)

 对于这些内部命令来说，并没有创建单独的进程，因此它们执行起来非常快。
+
 我们可以使用 help 命令来查看所有的内部命令（help 命令本身也是一个内部命令）：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/05.cd_help_1.png)

 ![](http://linoxide.com/wp-content/uploads/2013/12/06.cd_help_2.png)

-### 为什么 cd 会是一个内部命令：
+### 为什么 cd 会是一个内部命令
+
 让我们从简单的开始聊起吧。我不会说太多繁琐细节，但是想要弄明白这个问题，还是需要对 Unix 进程有一点了解。
-不管 BASH 什么时候创建了一个进程，这个进程事实上都是在 BASH 的一个子 shell 中运行（也就是当前 BASH 进程的子进程）。这些新的进程会做一些改变，或是打印一些东西（如果需要的话），以及当这个进程死亡的时候，子 shell 并不会向当前 BASH 返回信息。请注意，cd 所做的是改变 shell 的 PWD。 因此倘若 cd 是一个外部命令，那么它改变的将会是子 shell 的 PWD，也不会向父 shell 返回任何东西。所以，当前 shell 的 PWD 就不会做任何改变。所有能对当前 shell
-的环境作出改变的命令都必须是内部命令。 因此如果我们将 cd 做成外部命令，就无法像原来一样改变当前目录了。
+
+不管 BASH 什么时候创建了一个进程，这个进程事实上都是在 BASH 的一个子 shell 中运行（也就是当前 BASH 进程的子进程）。这些新的进程会做一些改变，或是显示一些东西（如果需要的话），以及当这个进程死亡的时候，子 shell 并不会向当前 BASH 返回信息。请注意，cd 所做的是改变 shell 的 PWD。 因此倘若 cd 是一个外部命令，那么它改变的将会是子 shell 的 PWD，也不会向父 shell 返回任何东西。所以，当前 shell 的 PWD 就不会做任何改变。**所有能对当前 shell的环境作出改变的命令都必须是内部命令。** 因此如果我们将 cd 做成外部命令，就无法像原来一样改变当前目录了。
+
 好了，现在让我们再来聊聊 cd 命令的用法。
+
 ### cd 命令的用法：
-如果你不加任何参数地来使用 cd 命令，不管你现在在哪，都会把你带到你的 home 目录下。
+
+如果你不加任何参数地来使用 cd 命令，不管你现在在哪，都会把你带到**你的** home 目录下。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/07.cd_home.png)

-其实波浪线符号（~）代表的也是 home 目录，我们同样可以用它回到 home。
+其实波浪线符号（~）代表的也是 home 目录，我们同样可以用它回到 home（译注：通常用~配合其下的子目录名，来切换到自己home下的子目录，如：cd ~/Desktop）。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/08.cd_home_tilde.png)

 如果你是 root 用户，你可以通过使用波浪号加任何一个用户名来切换到该用户的 home 目录下。在一些 Linux 发行版中，没有特权的用户默认是没有权限访问其他用户的 home 目录的。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/09.cd_home_user.png)

 再来看，. 目录代表的是当前目录，而 .. 代表的是上级目录。所以我们可以使用 .. 来回到上级目录。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/10.cd_parent.png)

-大部分情况下，. 是不会改变你的 PWD。举例来看：
+大部分情况下，cd . 是不会改变你的 PWD。举例来看：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/11.cd_dot.png)

 但是如果你的当前目录已经被重命名了，那么你的 PWD 就会发生改变：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/12.cd_dot_renamed.png)

 在 BASH 和大部分其他的 shell 中，你可以提供两种不同的路径：绝对路径和相对路径。绝对路径以 / 开始，并且和你的 PWD 无关。而相对路径不会以 / 开始，并且和你的 PWD 相关。
-Changing PWD with absolute path:
+
 使用绝对路径来改变 PWD：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/13.cd_abs_path.png)

 使用相对路径来改变 PWD：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/14cd_rel_path.png)

 我们可以在两个目录切换：
+
 cd - 命令可以返回上一次的工作目录，我们可以使用它在两个不同的目录中快速切换。
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/15.cd_toggle.png)

 我们上一次的工作目录会被储存在 OLDPWD 这个变量中。但是如果你在一个新开启的终端中来使用的话，会报出下面的错误：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/16.cd_OLDPWD_not_set.png)

 ![](http://linoxide.com/wp-content/uploads/2013/12/16.cd_OLDPWD_not_set.png)

 你可以配合 cd 命令来使用一些 bash 小技巧。
+
 比如，不妨使用 *?* 这个万能药：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/17.cd_question_mark_wild_card.png)

 使用 *：
+
 ![](http://linoxide.com/wp-content/uploads/2013/12/18.cd_star_wild_card.png)

 --------------------------------------------------------------------------------

 via: http://linoxide.com/linux-command/linux-cd-command-examples/

-译者：[译者ID](https://github.com/ailurus1991) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[ailurus1991](https://github.com/ailurus1991) 校对：[wxy](https://github.com/wxy)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

-[1]:
-[2]:
-[3]:
-[4]:
-[5]:
-[6]:
-[7]:
-[8]:
-[9]:
-[10]:
-[11]:
-[12]:
--- a/Features.md
+++ b/Features.md
@ -0,0 +1,35 @@
+10 Lesser Known Ubuntu One Features
+================================================================================
+Even though Ubuntu One may appear to be just an Ubuntu-only file synchronization service, it’s much more as it can be used on Windows, Android, iOS, and from the web. Ubuntu One has 5GB of free storage space for all.
+
+![](http://www.efytimes.com/admin/useradmin/photo/Kj3S10756PM1212014.jpg)
+
+As cited on howtogeek.com, Ubuntu One comes with features for sharing files or folders online, streaming music to your smartphone, synchronizing installed applications to all your devices, and much more. Let’s take a look at ten such unknown features below -
+
+1.**Sync Any Folder** – On a default basis, Ubuntu merely synchronizes files within the Ubuntu One folder in your home directory. But you can right-click any folder, point to the Ubuntu One menu and choose Synchronize This Folder to begin synchronizing it, too. You can manage your synchronized folders from the Ubuntu One application.
+
+2.**Limit Bandwidth** - Ubuntu One utilises every available bandwidth for file uploads and downloads as a default. It allows you to restrict its upload and download speeds in case you have a slow connection. The bandwidth settings can be seen on the Settings pane in the Ubuntu One window.
+
+3.**Using Ubuntu One on Windows** - Ubuntu One doesn’t only run on Linux but provides a Windows client with complete file synchronisation support. Ubuntu One is a cross-platform file synchronization service and you can use it if you’re a Windows user who has never used Ubuntu.
+
+4.**Sharing Files** – By making use of the right-click menu in your file manager or the Ubuntu One website, you can share files and folders publically on the Internet or privately with other Ubuntu One users.
+
+5.**Synchronisation of Installed Software** - Ubuntu One can synchronize the software installed by you from Ubuntu’s Software Center between your computers making it easy to keep track of which software that has been installed.
+
+6. **Using Mobile Apps** - Ubuntu One provides apps for Android, iPhone, iPad and iPod Touch. Using the app, you can access your Ubuntu One files on the go using your mobile device.
+
+7.**Automatically Uploading Photos Via Your Smartphone** - The mobile app can automatically upload photos using your smartphone to your personal Ubuntu One cloud. It permits easy access to your photos on all your devices.
+
+8.**Mobile Music Streaming** - Ubuntu One provides a Ubuntu One Music app for Android and iOS. This app permits you to stream your music to your mobile device from anywhere. You can also cache files on your device for offline listening.
+
+9.**Sync Contacts** - Ubuntu One is able to synchronise your contacts and store them online. At the moment, you can import contacts from Facebook on the Ubuntu One website or add them manually. Earlier versions of Ubuntu could support contacts sync with the Evolution email client, but contact sync with Thunderbird is now absent in Ubuntu 12.04.
+
+10.**Managing Files in Your Browser** - With Ubuntu One installed on your computer, you can access and take care of your files from the Ubuntu One website. You can download files, upload files, or manage your existing files using your browser. 
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=127466
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/Managers.md
+++ b/Managers.md
@ -1,33 +0,0 @@
-10 Useful Open Source Web Based File Managers
-================================================================================
-File managers have recently been more useful than ever before. Increase in the usage of the internet is a big reason for this. Having an application that can effectively manage your files over the internet is an imperative for many. So, here is a list of 10 of the best open source file managers that you can use!
-
-![](http://www.efytimes.com/admin/useradmin/photo/xBds51300PM1102014.jpg)
-
-1. **eXtplorer**: This application provides you with move, copy, edit, search, delete, download and upload capabilities. In addition, you can also create and extract archives, directories and new files using eXtplorer. It’s key feature is that it lets you access files through FTP. You can either opt to use it under the Mozilla Public License or the GNU Public License. A minimum of PHP 4.3 is required on the server and JavaScript on the browser must be updated in order to use this file manager.
-
-2. **AjaXplorer**: This explorer is supported by all major browsers and can adapt to smaller screens likes those in mobile phones very easily. While the iOS application for this file manager is already live, the Android application is supposedly coming soon. All you need is a web-server with PHP 5.1 or above to run the AjaXplorer. It allows you to directly stream video content from the server.
-
-3. **KFM**: This free and open source file manager can be used as a plugin for rich text editors like FCKedition, CKeditor and Tiny MCE. If you’re using a Linux-based operating system, then you need PHP 5.2 or above, while Mac OS X and Windows need MySQL 4.1 or above and MySQL 5.0 or above respectively. It has a search engine of its own and comes with a text editor that can highlight syntax. It also brings mp3 playback and video playback options.
-
-4. **PAFM**: This file manager gives the user complete control over the files and also allows source code editing using CodePress. The key feature of the file manager comes through Code Press, which provides as-you-type syntax highlighting.
-
-5. **QuiXplorer**: This file manager can be used for management and sharing over the internet and intranets. It also provides a multi-user mode, where each individual user can have their own settings.
-
-6. **BytesFall** Explorer: This explorer was released under the GNU GLU license and has been written using PHP and JavaScript. It’s UI is very similar to the Windows Explorer but it has used projects like GeSHi, LiveTree, Shell Commander, FCKeditor etc. because of which it has a varied set of functions.
-
-7. **NavPHP**: This file manager was written using PHP and AJAX and offers Windows XP style navigation. Like the QuiXplorer, this one also has a multi-user mode and comes with a code editor of its own. In addition, it can also Deflate and Gzip a webpage. You can also download a file or folder as a zip file using this.
-
-8. **iDC File Manager**: This is a multi-user system that can be installed on Linux or Windows-based web servers. It provides the Hotlink function with social network support and can also monitor user activity on it. It is driven by the MySQL database.
-
-9. **FileMan**: This file manager comes with a what-you-see-is-what-you-get editor, which allows editing and creation of HTML files. Apart from the HTML editor, it has various other options that can be very useful.
-
-10. **Relay**: This file manager is used under the GNU Public License and is AJAX enabled. If you use large sets of directories and files, then this manager is ideal for you. 
-
--------------------------------------------------------------------------------
-
-via: http://www.efytimes.com/e1/fullnews.asp?edid=126569
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/Directories.md
+++ b/Directories.md
@ -0,0 +1,190 @@
+翻译ing by Luox 
+
+15 Linux cp Command Examples - Create a Copy of Files and Directories
+================================================================================
+Copying files or directories is one of basic activity in every operating system. Backup activity is basically is creating a copy of files and directories. On Linux system, we can use **cp** command to do it.
+
+### What is copy command ###
+
+As we mentioned above, **cp** command is a command to create copy of files and directories. Here’s some samples of cp command that might useful in day-to-day operation
+
+#### 1. Run cp without any options ####
+
+This is a very basic cp usage. To copy a file name myfile.txt from one location to another location, we can type like this :
+
+    $ cp myfile.txt /home/pungki/office
+
+![Copy without options](http://linoxide.com/wp-content/uploads/2014/01/cp_default.png)
+
+If we don’t type absolute path, it mean that we are copying a file on current directory. From example above, **myfile.txt** is located in **/home/pungki/Documents**. We don’t have to type **/home/pungki/Documents/myfile.txt** to copy **myfile.txt** if we are in that **/home/pungki/Documents** directory. While **/home/pungki/office** is a folder where the file will be copied.
+
+#### 2. Copy multiple files at the same time ####
+
+To copy multiple file at the same time, we can just put the files behind the copy command which separated by space. Here’s an example :
+
+    $ cp file_1.txt file_2.txt file_3.txt /home/pungki/office
+
+![Copying multiple files](http://linoxide.com/wp-content/uploads/2014/01/cp_multiple_file.png)
+
+#### 3. Copy a directory ####
+
+Copying a directory is a little bit tricky. You need to add **-r** or **-R** option to do it. -r or -R option means recursive. **This option is a must** whether the directory is empty or not. Here’s an example :
+
+    $ cp -r directory_1 /home/pungki/office
+
+![Copy directory](http://linoxide.com/wp-content/uploads/2014/01/cp_directory.png)
+
+One more thing to note is that you need to **remove the trailing slash** behind the directory name. Otherwise you will have an error message like **cp : omitting directory ‘directory_1/**’
+
+![Copy directory error](http://linoxide.com/wp-content/uploads/2014/01/cp_directory_error.png)
+
+If you got that error, the directory will not copied to the destination folder.
+
+#### 4. Create hard links to files instead of copying them ####
+
+Copying file means you must have some space on the storage to store the copied files. Sometimes for any reasons, you may want to create “shortcut” or links to the files instead of copying them. To do this, we can use **-l** option.
+
+    $ cp -l file_4.txt /home/pungki/office
+
+![Copy hardlinks](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks.png)
+
+From screenshot above, we see that a hardlink of **file_4.txt** was copied into **/home/pungki/office/file_4.txt**. It marked by the same inode, **835386**. But please note, hardlinks cannot be created into directories. Let’s take a look an example below.
+
+*The original directory_1 has inode number 278230*
+![Inode number of original directory](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks_dir_1_ori.png)
+
+*The original file_5.txt has inode number 279231*
+![Original inode number of file](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks_file_5_ori.png)
+
+*Do cp command on directory_1*
+![Copy using -rl options](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks_rl_dir.png)
+
+*The copied directory_1 has inode number 274800*
+![Inode number of copied directory](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks_dir_1_result.png)
+
+*The copied file_5.txt had inode number 279231. Same with its original file*
+![Inode number of copied file](http://linoxide.com/wp-content/uploads/2014/01/cp_hardlinks_file_5_result.png)
+
+#### 5. Create symbolic links to files ####
+
+There is another type of links called **softlinks** or **symbolic links**. We use **-s** option to do this. Here’s a sample command.
+
+    $ cp -s /home/pungki/Documents/file_6.txt file_6.txt
+
+Creating symlinks only can be done in current directory. On screenshot above, we want to create symbolic links from source directory - **/home/pungki/Documents/file_6.txt to /home/pungki/office**. But to create symbolic links, **I must inside** /home/pungki/office as a destination folder. Once I manage to be there, I can run cp **-s** command above.
+
+Then when you list the file with detail, you will see that **/home/pungki/office/file_6.txt** is pointing to the original file. Its marked with arrow sign after the file name.
+
+![Symbolic links](http://linoxide.com/wp-content/uploads/2014/01/cp_symlinks.png)
+
+#### 6. Copy without following symbolic links in Source ####
+
+To do this, we can use **-P** option. When cp command found a file with symbolic links, it will copy the as is. Take a look at the sample below.
+
+    $ cp -P file_6.txt ./movie
+
+![Copy using -P option](http://linoxide.com/wp-content/uploads/2014/01/cp_P.png)
+
+As you can see, the cp command will copy **file_6.txt** as is. The file type still a symbolic link.
+
+#### 7. Copy with following symbolic links in Source ####
+
+Now we can do this with **-L** option. Basically, **this is an opposite** of -P option above. Here’s the sample.
+
+    $ cp -L file_6.txt ./movie
+
+![Copy using -L option](http://linoxide.com/wp-content/uploads/2014/01/cp_L.png)
+
+With this option, the copied file is the same file with the source file of **file_6.txt**. This is known from the file size. The copied file has **50 bytes** file size while the **file_6.txt** as symbolic link has **33 bytes** file size.
+
+#### 8. Archive the files ####
+
+When we are going to copy a directory, we will use **-r** or **-R** option. But we can also use **-a** option to archive file. This will create an **exact copy** of files and directories including symbolic links if any. Here’s a sample :
+
+    $ cp -a directory_1/ /home/pungki/office
+
+![Copy using -a option](http://linoxide.com/wp-content/uploads/2014/01/cp_a.png)
+
+The above command will copy a directory named directory_1 into folder **/home/pungki/office**. As you can see, the **file_6.txt** still copied as symbolic links.
+
+#### 9. Explain what is being done ####
+
+By default, when copying activity is success, we will see a command prompt again. If you want to know what happen during the copying file, we can use **-v** option.
+
+    $ cp -v *.txt /home/pungki/office
+
+![Verbose option](http://linoxide.com/wp-content/uploads/2014/01/cp_v.png)
+
+When we copying all txt files in current directory to **/home/pungki/office/** directory, **-v** option will show what is being done. This additional information will make us more sure about the copying activity.
+
+#### 10. Copy only when the source file is newer ####
+
+To do this, we can use **-u** option. Take a look this example below.
+
+    $ cp -vu *.txt /home/pungki/office
+
+![Copy only if newer](http://linoxide.com/wp-content/uploads/2014/01/cp_u.png)
+
+In the beginning, we see **file_1.txt has 0 bytes** file size. Then we edit it using vi, add some content and save it. Next, we see the file size has changed into 36 bytes.
+Meanwhile in **/home/pungki/office** directory, we **already have all** *.txt files. When we use -u option, combine with -v option to see what is being done, cp command will only copy a file(s) which is newer from destination directory. As the result, we see that **only file_1.txt is copied into /home/pungki/office directory**.
+
+#### 11. Use interactive mode ####
+
+Interactive mode will ask if the destination folder have already the file. To activate interactive mode, use **-i** option.
+
+    $ cp -ir directory_1/ /home/pungki/office/
+
+![Interactive mode](http://linoxide.com/wp-content/uploads/2014/01/cp_i.png)
+
+#### 12. Create backup date of each copied file ####
+
+When the destination folder already have the file, by default cp command will overwrite the same file in the destination directory. Using **--backup** option, cp command will make a backup of each existing destination file. ../office will refer to /home/pungki/office. Here’s a sample :
+
+    $ cp --backup=simple -v *.txt ../office
+
+![Backup option](http://linoxide.com/wp-content/uploads/2014/01/cp_backup.png)
+
+As we can see, **--backup=simple** option will create a backup file which **marked by a tilde sign (~)** at the end of the file. **--backup** option has some Control, which are :
+
+- **none, off** : never backups (even if --backup is given)
+- **numbered, t** : make numbered backups
+- **existing, nil** : numbered if numbered backup exist, simple otherwise
+- **simple, never** : always make simple backups
+
+#### 13. Copy only file attributes ####
+
+Cp command also provide us with **--attributes-only** option. As we can guess from its name, this option will only copy a file name and its attributes without copying any data. Here’s a sample.
+
+    $ cp --attributes-only file_6.txt -v ../office
+
+![Copy attributes only](http://linoxide.com/wp-content/uploads/2014/01/cp_attributes_only.png)
+
+From screenshot above, **the original file_6.txt file has 50 bytes** file size. Using **--attributes-only** option, **the copied file will have 0 bytes** file size. This is because the content of file is not being copied.
+
+#### 14. Force copying ####
+
+Using **-f** option will force the copying activity. If the destination files cannot be opened, then **-f** will try again.
+
+    $ cp -f *.txt -v ../office
+
+![Copy with force](http://linoxide.com/wp-content/uploads/2014/01/cp_f.png)
+
+#### 15. Remove destination before copy ####
+
+To do this, we can use **--remove-destination option**. This option is **contrast with -f option** above. If the cp command find the same file name on the destination folder, cp command will remove destination file first, the copy the new one. Here’s an example.
+
+    $ cp --remove-destination *.txt -v ../office
+
+![Remove destination option](http://linoxide.com/wp-content/uploads/2014/01/cp_remove_destination.png)
+
+### Conclusion ###
+
+Cp command is one of basic Linux commands. For those who want to learn Linux, must know this command. Of course you can type **man cp** or cp **--help** from your console to display its manual page to explore more detail.
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/linux-command/linux-cp-command/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/2014--The
+++ b/sources/2014--The
@ -1,38 +0,0 @@
-2014: The year of the Linux car?
-> ================================================================================
-> You read that right: Not the year of the Linux desktop, the year of the Linux car. Major automotive companies are investing in making Linux their cars' operating system of choice.
-
-When you think about Linux, you probably think about servers, desktops, and Android smartphones and tablets. What you almost certainly don't think about is cars, but Linux is already running under the hood of many cars, and it may play a much larger role soon, too.
-
-![Say hello to Linux running under the hood of your car. (Image: Linux)](http://cdn-static.zdnet.com/i/r/story/70/00/014091/auto-linux-455x269.png)
-
-That was the message Matt Jones brought to the [Linux Foundation][1]'s [Linux Collaboration Summit][2] in San Francisco, California. Jones is a senior technical specialist for [Jaguar Land Rover][3] infotainment systems and VP of a non-profit automotive industry group driving adoption of an In-Vehicle Infotainment (IVI) open-source development platform, [GenIVI Alliance][4].
-
-Jones said that Jaguar Land Rover had asked their customers what they wanted, and they didn't want much — just a full-featured home entertainment network in their cars. Of course, while you can put a HDTV-quality display on the front-dashboard, providing the high-speed networking in city traffic is a problem well outside the automobile industry's purview.
-
-What the automotive businesses can do, and are working toward in the [Automotive Grade Linux (AGL)][5], a Linux Foundation sub group, is providing a common operating system and application programming interfaces (APIs). With this, car manufacturers can focus on delivering applications and not worry about operating system infrastructure. After all, as Jones said, "When was the last time you bought a car based on its operating system?"
-
-During his keynote, Jones announced that AGL had released a prototype [IVI & remote vehicle interaction operating system and application development package][6]. This is a Linux-based open-source image for creating an IVI system along with a controller area network (CAN), a vehicle bus standard, API; a HTML5 application framework; and sample user interface.
-
-Jones said, "We [Jaguar Land Rover] are involved with AGL to enable open source and Linux within automotive as a whole, and focus on making it easier for developers with reference hardware and software platforms. Such technology has long been available in lots of vehicles, but nobody has given it away before". So if you're ready to "hack" a car, the AGL has the tools you'll need.
-
-AGL and Jaguar Land Rover are also giving developers reason to start car hacking. The pair have announced a developer contest: [2013 AGL User Experience Contest][7]. The winner will get the chance to work with the AGL and Jaguar Land Rover.
-
-There are three categories: Best user experience, best visual appearance, and best new concept or additional feature. The contest runs April 15 — May 17, and winners will be announced at the [Automotive Linux Summit][8] in Tokyo at the end of May. If you want to work with Linux and cars, this seems like an ideal chance to get in on the ground floor.
-
--------------------------------------------------------------------------------
-
-via: http://www.zdnet.com/2014-the-year-of-the-linux-car-7000014091/
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://events.linuxfoundation.org/
-[2]:http://events.linuxfoundation.org/events/collaboration-summit
-[3]:http://www.jaguarlandrover.com/index.html
-[4]:http://www.genivi.org/
-[5]:http://automotive.linuxfoundation.org/
-[6]:http://automotive.linuxfoundation.org/agl-demonstrator
-[7]:http://automotive.linuxfoundation.org/2013-agl-user-experience-contest
-[8]:http://events.linuxfoundation.org/events/automotive-linux-summit-spring
--- a/sources/5
+++ b/sources/5
@ -0,0 +1,60 @@
+5 Linux Distributions that Deserve more Love
+================================================================================
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/linux.jpg)
+
+As I wrote in my previous post, [Linux is Everywhere][1] and there are hundreds if not thousands of different distributions. Some are very famous, some boasts of their 10 million user base and then there are others who live in the shadow of famous distributions. Some distributions struggle to even gain a fraction of what big distributions enjoy and a few handful of distributions die every year. But today we are here to discuss about few distributions that being awesome still don’t get the love they deserve. It doesn’t matter if the distribution is original or forked or based on some other distribution, if it does the job, is stable enough for daily use and is not getting the love it deserves, it will be on the list.
+
+### 5. Rosa ###
+
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/o_bootscreen-von-rosa-desktop-2012.jpg)
+
+[ROSA Desktop][2], is a Linux distribution featuring a highly customized KDE desktop with a number of modifications designed to enhance the user-friendliness of the working environment developed by ROSA, a Russian company who also develops an “Enterprise Server” edition of ROSA which is based on Red Hat Enterprise Linux. This is one of the most customized distributions you can find on web with many in-house features like a completely redesigned login Screen, a tool named “TimeFrame” which allows you to easily monitor your activity at specified dates, heavily modified “Dolhpin” file manager, Rocket Bar, Simple Welcome, Rosa Media Player and many others.
+
+### 4. Korora ###
+
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/korora_3d_text_by_topazharley-d71surb.png)
+
+[Korora][3] was born out of a desire to make Linux easier for new users, while still being useful for experts. Originally based on Gentoo Linux in 2005, Korora was re-born in 2010 as a Fedora Remix with tweaks and extras to make the system “just work” out of the box. Korora is a mix of Fedora + RPM Fusion + Korora packages, where Korora provides the bleeding edge and stability of a Red Hat distribution, it effortlessly works out of the box. Many people complain about Fedora of being too vanilla but Fedora is designed that way, people who love Fedora but still want something that works out of box, Korora is for you.
+
+### 3. Chakra Linux ###
+
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/schermata2.png)
+
+If you are a KDE fan and you cannot wait for months to use the latest software then there’s a match for you made in heaven, they call it Chakra Linux which started as a Arch Linux fork but has turned into an independent distribution with its own repositories, packages, Kernel and half/rolling release cycle.
+
+[Chakra Linux][4] works mostly out of the box and has all the goodness of Arch Linux. Some may argue that why not use Arch Linux and then install KDE instead of using Chakra Linux. First the install process, no matter how hard everyone try to convince you how easy it is, it is not. An OS should be easy to use and even easier to install, not the other way around.
+
+Chakra Linux is one of the very few true KDE distributions available, so you can be assured that you will get the very best KDE experience while using Chakra Linux.
+
+### 2. Ubuntu Gnome ###
+
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/gnomeubuntu-vert-wh.png)
+
+Ubuntu might have been the centre of controversy for past few years, especially the decision to switch to Unity but I personally kind of like Unity. On other side it has always been so buggy on my Nvidia setup and I have seen people constantly complaining about weird Unity behaviour. There were other Semi-official flavours available but none of them really felt like a true Ubuntu experience until [Ubuntu Gnome][5] arrived.
+
+There is nothing much to write about this, Ubuntu Gnome is just Ubuntu with a Gnome Shell, I felt like it should make the list. Ubuntu has been the favourite distribution for a long time and because of few bad decisions Canonical made, the distribution should not suffer. I am happy to say that Ubuntu Gnome feels every bit of original Ubuntu while lacking the Canonical’s rude and forceful behaviour.
+
+### 1. Sabayon Linux ###
+
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/sabayon_5.3.jpg)
+
+[Sabayon][6] Linux is a Gentoo-based distribution which follows the works-out-of-the-box philosophy and it does that without skipping a beat. It may sound a bit biased but Sabayon is one of the very few distributions that ‘actually’ works out of the box across a wide range of systems.
+
+Sabayon follows a no nonsense philosophy and everything works as it is supposed to, you don’t have to mess with the terminal to get things done, you don’t have to add ‘extra’ repositories to add the most obvious functionality, everything is there in one place, by the way you can do all those things if you want to but the point is you cannot force the user, if I want to use Arch Linux without banging my head with the terminal, I should be able to do that.
+
+Sabayon is a bleeding edge, fast and surprisingly stable distribution for which the credit goes to rock solid Gentoo core. It is very easy to use with your choice of DE, even easier to install, works out of the box, features a very simple and capable package manager, comes with most of the required applications and it can still be customized deep down like any other distribution.
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxfederation.com/linux-distributions-love/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.linuxfederation.com/linux-everywhere/
+[2]:http://www.rosalab.com/products/desktop_fresh
+[3]:https://kororaproject.org/
+[4]:http://www.chakra-project.org/
+[5]:http://ubuntugnome.org/
+[6]:http://www.sabayon.org/
--- a/sources/5
+++ b/sources/5
@ -1,37 +0,0 @@
-5 Things To Love And Hate About Ubuntu 13.10
-================================================================================
-Ubuntu 13.10 made a lot of noise before and after its arrival. The OS takes Canonical to a whole new level, especially with the big year that Linux has had in 2013. But now that the dust has settled and there's less talk, let us take a look at five things that you might like and five things that you may hate in the OS.
-
-![](http://1-ps.googleusercontent.com/h/www.efytimes.com/admin/useradmin/photo/150x150xpLjk60315PM1132014.jpg.pagespeed.ic.7YFoOIdGP_.jpg)
-
-### LOVE ###
-
-**OpenStack APIs**: Ubuntu 13.10 is compatible with them. In fact, both internal and external Ubuntu-hoster clouds are compatible with OpenStack APIs now.
-
-**Graphical User Interface**: The Unity GUI is now going from PCs to smartphones and tablets as well.
-
-**Upgraded Dashboard**: Ubuntu Dash has been upgraded, which offers users the option to search even the Ubuntu One cloud.
-
-**Good Juju**: In Saucy Salamander, you can use Juju in order to create app instances within Linux containers or LXC.
-
-**GUI is smoother**: Perhaps because of its versatility, the GUI for Saucy Salamander is much smoother than older GUIs.
-
-### HATE ###
-
-**No Mir**: The Unity interface hasn’t moved from X.org to the Mir translator. This was a major let down for many.
-
-**No MariaDB**: The forked MySQL database, MariaDB, has not been introduced by Canonical. This is more surprising than disappointing as most other vendors have already made the move. Canonical’s Ubuntu 13.10 still has MySQL as the default LAMP database.
-
-**Old landscape management tool**: Canonical’s landscape service is not advanced enough. In fact, it is old compared to even the Microsoft System Center that comes with Windows.
-
-**Only two supported phones**: Only the Nexus 4 and the Galaxy Nexus smartphones support Ubuntu 13.10 right now. In addition, only core and shell apps are available for the devices.
-
-**LXC is still beta**: We talked about Juju being used alongside LXC, but LXC itself is still in beta mode. It is supposedly going to get a stable build in February this year.
-
--------------------------------------------------------------------------------
-
-via: http://www.networkworld.com/slideshow/134353/ubuntu-1310-5-things-we-love-5-things-we-hate.html
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/Netbook!.md
+++ b/Netbook!.md
@ -1,31 +0,0 @@
-6 Unusual Yet Great Linux Operating Systems For Your Netbook!
-================================================================================
-> The beauty of Linux-based operating systems is that they can be customised as per the requirements. So, here we present top 6 unusual yet interesting distros for netbooks! 
-
-A good netbook operating system is one that can fully utilise its resources. The memory usage should be minimal when it is on the idle mode and as the screen is smaller, you need to have a very good navigation system to avoid cluttering the screen.
-
-And what better for a Linux enthusiast than having a netbook optimised operating system, based on open source technology.
-
-![](http://1-ps.googleusercontent.com/h/www.efytimes.com/admin/useradmin/photo/150x150xlU3z33744PM1132014.jpg.pagespeed.ic.3AoI0od5vQ.jpg)
-
-1.**AntiX** – This utilises the iceWM window manager that assists in keeping the initial memory footprint low. Although it’s not as stylish as Ubuntu, Mint or Elementary, it is fully functional. There is a taskbar for navigation at the bottom and icons on the desktop that has been standard across operating systems over a number of years. AntiX is accompanied with an array of applications with a few that won’t necessarily fit well with a netbook.
-
-2. **SparkyLinux** - The appearance and feel of Razor-Qt is extremely traditional and comes with a panel at the bottom and a menu in the bottom left corner. SparkyLinux is accompanied with an array of applications. The developers once again have plumped for the LibreOffice suite over the lighter Abiword and Gnumeric tools.
-
-3. **Lubuntu** - The LXDE desktop is extremely light and nearly as easy to customise as Xubuntu. The desktop is quite familiar having a panel at the bottom with a menu and system tray icons. However, you can customise Lubuntu to appear the way you want it to with multiple panels if you so wish. The applications are quite well adapted to a netbook with the Sylpheed email client, the Firefox web browser as well as Abiword and Gnumeric.
-
-4. **OS4** – This is based on Xubuntu. It makes use of the XFCE desktop that is wonderful for customizing and can work any way you want it to. XFCE being a lightweight desktop environment performs grealty on a netbook. However, you will need to install the restricted extras package to get Flash videos and MP3s to play but with OS4 these things work straight away. It comes with a Commodore Amiga Emulator installed so if you like to retro game on your netbook this is definitely an option.
-
-5. **Point Linux** – This is unique as it uses the MATE desktop. The MATE desktop was initially taken from Gnome 2 but it has evolved to be a really good desktop environment in its own right. Point Linux appears quite stylish. The menus appear great and the performance on the netbook is really good. Similar to LXDE and XFCE desktops, it is highly customizable. Point Linux comes with four virtual workspaces by default allowing you to use these again to maximize the usage of your netbook so that it is limited by memory and processor power over display issues.
-
-6. **Elementary OS** – This is great if you are looking for something very stylish. It doesn’t have an office suite on installation but you have the option to pick and select tools you want to use. For web browsing you have Midori and the email client is Geary. It comes installed with Totem for viewing movies and the audio application is a compact tool called Noise.
-
-Source: everydaylinuxuser.com
-
--------------------------------------------------------------------------------
-
-via: http://www.efytimes.com/e1/fullnews.asp?edid=126643
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/9
+++ b/sources/9
@ -0,0 +1,135 @@
+9 Killer Tips To Speed Up Ubuntu 13.10
+================================================================================
+![](http://itsfoss.com/wp-content/uploads/2014/01/Speed_Up_Ubuntu_1310.jpg)
+
+Whether you have a fresh install of Ubuntu 13.10 or upgraded to it, you might have experienced that after using Ubuntu for some times, the system starts running slow. In this article we shall see several tweaks and **tips to make Ubuntu run faster**.
+
+Before we see how to improve overall system performance in Ubuntu 13.10, first lets ponder on why the system gets slower overtime. There could be several reasons for it. You may have a humble computer with basic configuration. You might have installed several applications which are eating up resources at boot time. Endless reasons in fact.
+
+Here I have listed several small tweaks that will help you speed up Ubuntu a little. There are some best practices as well which you can employ to get a smoother and improved system performance. You can choose to follow all or some of it. All of them adds up a little to give you a smoother, quicker and faster Ubuntu.
+
+### Tips to make Ubuntu 13.10 run faster: ###
+
+I have used these tweaks with Ubuntu 13.10 but I believe that the same can be used in older Ubuntu versions as well as other Linux distributions which are based on Ubuntu such as Linux Mint, Elementary OS Luna etc.
+
+Reduce the default grub load time:
+
+The grub gives you 10 seconds to change between dual boot OS or to go in recovery etc. To me, its too much. It also means you will have to sit beside your computer and press the enter key to boot in to Ubuntu as soon as possible. A little time taking, ain’t it? First trick would be to change this boot time. If you are more comfortable with a GUI tool, read this article to [change grub time and boot order with Grub Customizer][1].
+
+For the rest of us, you can simply use the following command to open grub configuration:
+
+    sudo gedit /etc/default/grub &
+
+And change **GRUB_TIMEOUT=10** to **GRUB_TIMEOUT=2**. This will change the boot time to 2 seconds. Prefer not to put 0 here as you will lost the privilege to change between OS and recovery options. Once you have changed the grub configuration, use the following command to make the change count:
+
+    sudo update-grub
+
+### Manage the start up applications: ###
+
+Overtime you tend to start installing applications. If you are a regular It’s FOSS reader, you might have installed many apps from [App of the week][2] series. Some of these apps are started at each start up and of course resources will be busy in running these applications. Result: a slow computer for a significant time duration at each boot. Go in Unity Dash and look for **Startup Applications**:
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/Startup_Applications_Ubuntu.jpeg)
+
+In here, look at what applications are loaded at start up. Now think if you there are any applications which you don’t require to be started up every time you boot in to Ubuntu. Feel free to remove them:
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/Startup_applications_ubuntu_1310.jpeg)
+
+But what if you don’t want to remove the applications from start up? For example if you installed one of the [best indicator applets for Ubuntu 13.10][3], you will want them to be started automatically at each boot. What you can do here is to delay some the start of some of the programs. This way you will free up the resource at boot time and your applications will be started automatically, after sometime. In the previous picture click on Edit and change the run command with a sleep option. For example if you want to delay the running of Dropbox indicator for lets say 20 seconds, you just need to **add a command** like this in the existing command:
+
+    sleep 10;
+
+So, the command ‘**dropbox start -i**‘ changes to ‘**sleep 20; drobox start -i**‘. Which means that now Drobox will start with a 20 seconds delay. You can change the start time of other start up applications in similar fashion.
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/Edit_startup_applications_Ubuntu.jpeg)
+
+### Install preload to speed up application load time: ###
+
+Preload is a daemon that runs in background and analyzes user behavior and frequently run applications. Open a terminal and use the following command to install preload:
+
+    sudo apt-get install preload
+
+After installing it, restart your computer and forget about it. It will be working in background. [[Read more about preload][4]]
+
+### Choose the best mirror for software updates: ###
+
+It’s good to verify that you are using the best mirror to update the software. Ubuntu software repository are mirrored across the globe and it is quite advisable to use the one which is nearest to you. This will result in a quicker system update as it reduces the time to get the packages from the server.
+
+In **Software & Updates->Ubuntu Software tab->Download From** choose **Other** and there after click on **Select Best Server**:
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/Ubuntu_software_Center_Mirror.jpeg)
+
+It will run a test and tell you which is the best mirror for you. Normally, the best mirror is already set but as I said, no harm in verifying it. Also, this may result in some delay in getting the updates if the nearest mirror where the repository is cached is not updated frequently. This is useful for people with relatively slower internet connection. You can also these tips to [speed up wifi speed in Ubuntu][5].
+
+### Use apt-fast instead of apt-get for a speedy update: ###
+
+apt-fast is a shellscript wrapper for “apt-get” that improves updated and package download speed by downloading packages from multiple connection simultaneously. If you frequently use terminal and apt-get to install and update the packages, you may want to give apt-fast a try. Install apt-fast via official PPA using the following commands:
+
+    sudo add-apt-repository ppa:apt-fast/stable
+    sudo apt-get update
+    sudo apt-get install apt-fast
+
+### Remove language related ign from apt-get update: ###
+
+Have you ever noticed the output of sudo apt-get update? There are three kind of lines in it, **hit**, **ign** and **get**. You can read their meaning [here][6]. If you look at IGN lines, you will find that most of them are related to language translation. If you use all the applications, packages in English, there is absolutely no need of a translation of package database from English to English.
+
+If you suppress this language related updates from apt-get, it will slightly increase the apt-get update speed. To do that, open the following file:
+
+    sudo gedit /etc/apt/apt.conf.d/00aptitude
+
+And add the following line at the end of this file:
+
+    Acquire::Languages "none";
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/ign_language-apt_get_update.jpeg)
+
+### Reduce overheating: ###
+
+Overheating is a common problem in computers these days. An overheated computer runs quite slow. It takes ages to open a program when your CPU fan is running like Usain Bolt. There are two tools which you can use to reduce overheating and thus get a better system performance in Ubuntu 13.10, TLP and CPUFREQ.
+
+To install and use TLP, use the following commands in a terminal:
+
+    sudo add-apt-repository ppa:linrunner/tlp
+    sudo apt-get update
+    sudo apt-get install tlp tlp-rdw
+    sudo tlp start
+
+You don’t need to do anything after installing TLP. It works in background. To install CPUFREQ indicator use the following command:
+
+    sudo apt-get install indicator-cpufreq
+
+Restart your computer and use the **Powersave** mode in it:
+
+![](http://itsfoss.com/wp-content/uploads/2013/11/CPUFREQ-indicator.jpeg)
+
+### Tweak LibreOffice to make it faster: ###
+
+If you are a frequent user of office product, then you may want to tweak the default LibreOffice a bit to make it faster. You will be tweaking memory option here. Open LibreOffice and go to **Tools->Options**. In there, choose **Memory** from left side bar and enable **Systray Quickstarter** along with increasing memory allocation.
+
+![](http://itsfoss.com/wp-content/uploads/2013/08/LibreOffice_Memory_option_1.jpeg)
+
+You can read more about [how to speed up LibreOffice][7] in detail.
+
+### Use lighter alternatives of different applications: ###
+
+ This is more of a suggestion and liking. Some of the default or popular applications are resource heavy and may not be suitable for a low end computer. What you can do is to use some alternates to these applications. For example, use [AppGrid][8] instead of Ubuntu Software Center. Use [Gdebi][9] to install packages. Use AbiWord instead of LibreOffice Writer etc.
+
+That’s conclude the collection of tips to **make Ubuntu 13.10 faster**. I am sure these tips would provide overall a better system performance. Do you have some tricks up your sleeves as well to **speed up Ubuntu 13.10**? Did these tips helped you as well? Do share your views. Questions, suggestions are always welcomed. Feel free to drop to the comment section.
+
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/speed-up-ubuntu-1310/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://itsfoss.com/windows-default-os-dual-boot-ubuntu-1304-easy/
+[2]:http://itsfoss.com/tag/app-of-the-week/
+[3]:http://itsfoss.com/7-best-indicator-applets-for-ubuntu-13-10/
+[4]:http://itsfoss.com/improve-application-startup-speed-with-preload-in-ubuntu/
+[5]:http://itsfoss.com/speed-up-slow-wifi-connection-ubuntu/
+[6]:http://ubuntuforums.org/showthread.php?t=231300
+[7]:http://itsfoss.com/speed-libre-office-simple-trick/
+[8]:http://itsfoss.com/app-grid-lighter-alternative-ubuntu-software-center/
+[9]:http://itsfoss.com/install-deb-files-easily-and-quickly-in-ubuntu-12-10-quick-tip/
--- a/Demanding.md
+++ b/Demanding.md
@ -1,3 +1,4 @@
+[Translating by SteveArcher]
 Are Open Source Developers Too Demanding?
 ================================================================================
 **Open source invites participation, including criticism. But do developers sometimes take it too far?**
@ -67,4 +68,4 @@ via: http://readwrite.com/2013/11/26/are-open-source-developers-too-demanding#aw
 [5]:http://gigaom.com/2013/11/25/how-the-use-of-a-nosql-database-played-a-role-in-the-healthcare-gov-snafu/
 [6]:http://developers.slashdot.org/story/13/11/24/1437203/nyt-healthcaregov-project-chaos-due-partly-to-unorthodox-database-choice
 [7]:http://readwrite.com/2013/11/04/sorry-open-source-isnt-the-panacea-for-healthcaregov#awesm=~oojDQ8fiVXrjGP
-[8]:http://digital.cabinetoffice.gov.uk/colophon-beta/
+[8]:http://digital.cabinetoffice.gov.uk/colophon-beta/
--- a/sources/Built
+++ b/sources/Built
@ -1,180 +0,0 @@
-Built in Audit Trail Tool – Last Command in Linux
-================================================================================
-![](http://linoxide.com/wp-content/uploads/2013/12/linux-last-command.jpg)
-
-If you are working as a server administrator, you may understand that you have to protect your server. Not only from the outside, but you have to protect it from the inside. Linux has one built-in command to see who is the last logged in user into your server.
-
-The command is **last**. This command is **very useful for audit trail**. Let’s start to see what can last to do for you.
-
-### What is the function of Last command ###
-
-**Last** display a list of all user logged in (and out) from **/var/log/wtmp** since the file was created. This file is binary file which cannot view by text editor such as Vi, Joe or another else. This trick is pretty smart because user (or root) can not modify the file as they want.
-
-Last gives you information the name of all users logged in, its tty, IP Address (if the user doing a remote connection) date – time, and how long the user logged in.
-
-### How to run Last ###
-
-You just need to type **last** on your console. Here’s the sample :
-
-    $ last
-
-    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
-    pungki tty1 Mon Dec 2 09:31 still logged in
-    reboot system boot 2.6.32-358.23.2 Mon Dec 2 09:20 - 13:25 (04:05) 
-
-Here’s how to read last information :
-
- The first column tell who are the user
- The second column give us information about how the user is connected
-
->     pts/0 (pseudo terminal) means that the user connect via remote connections such as SSH or telnet
-> 
->     tty (teletypewriter) means that the user connect via direct connection to the computer or local terminal
-> 
->     Exception for reboot activity the status will be shown is system boot
-
- The third column **show where the user come from**. If the user connect from remote computer, you will see a hostname or an IP Address. If you see :0.0 or nothing it means that the user is connect via local terminal. Exception for reboot activity, the kernel version will be shown as the status
- The remaining columns display **when the log activity has happened**. Numbers in the bracket tell us how many hours and minutes the connection was happened
-
-### Some examples of Last command on day-to-day operation ###
-
-#### Limit the number of line shown ####
-
-When you have a lot of lines to show, you can limit how many lines do you want to see. Use **-n parameter** to do it.
-
-    $ last -n 3
-
-    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
-    pungki tty1 Mon Dec 2 09:31 still logged in
-    reboot system boot 2.6.32-358.23.2 Mon Dec 2 09:20 - 13:25 (04:05)
-
-**-n parameter** will make last command to display 3 lines starting from the current time and backwards
-
-#### Don’t display the hostname ####
-
-Use **-R parameter** to do is. Here’s the sample :
-
-    $ last -R
-
-    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53)
-    pungki tty1 Mon Dec 2 09:31 still logged in
-    reboot system boot Mon Dec 2 09:20 - 13:25 (04:05)
-
-As you see, now there is no information about hostname or IP Address
-
-#### Display the hostname in the last column ####
-
-To do this, we can use **-a parameter**
-
-    $ last -a
-
-    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53) 10.0.76.162
-    pungki tty1 Mon Dec 2 09:31 still logged in :0.0
-    reboot system boot Mon Dec 2 09:20 - 13:25 (04:05) 2.6.32-358.23.2.el6.i686
-
-Now the hostname information such as 10.0.76.162 will be placed in the last column.
-
-#### Print full login and logout time and dates ####
-
-You can use **-F parameter** for this. Here’s a sample.
-
-    $ last -F
-
-    leni pts/0 10.0.76.162 Mon Dec 2 12:32:24 2013 – Mon Dec 2013 13:25:24 2013 (00:53)
-
-#### Print specific user name ####
-
-If you want to trace specific user, you can print it specifically. Put the name of user behind last command.
-
-    $ last leni
-
-    leni tty1 Mon Dec 2 18-42 still logged in
-    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53) 10.0.76.162
-
-Or if you want to know when **reboot** is done, you can also display it
-
-    $ last reboot
-
-    reboot system boot Mon Dec 2 09:20 - 16:55 (07:34)
-    reboot system boot Sun Dec 1 04:26 - 04:27 (00:01)
-    reboot system boot Wed Nov 27 20:27 - 01:24 (04:57)
-    reboot system boot Tue Nov 26 21:06 - 06:13 (09:06)
-
-#### Print spesific tty / pts ####
-
-Last can also print information about specific tty / pts. Just put the tty name or pty name behind the last command. Here are some sample outputs :
-
-    $ last tty1
-
-    pungki tty1 Mon Dec 2 09:31 still logged in
-    pungki tty1 Mon Dec 2 04:26 – down (00:00)
-    pungki tty1 Mon Dec 2 04:07 – down (00:00)
-    pungki tty1 Sun Dec 1 18:55 – 04:07 (09:12)
-
-    $ last pts/0
-
-    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
-    pungki pts/0 :0.0 Wed Nov 27 20:28 – down (04:56)
-
-When you see **down value** – such as the second line above – , it means that the user was logged in from specific time until the system is reboot or shutdown.
-
-#### Use another file than /var/log/wtmp ####
-
-By default, last command will parse information from **/var/log/wtmp**. If you want t**he last command** parse from another file, you can use **-f parameter**. For example, you may rotate the log after a certain condition. Let’s say the previous file is named **/var/log/wtmp.1** . Then the last command will be like this.
-
-    $ last -f /var/log/wtmp.1
-
-#### Display the run level changes ####
-
-There is **-x parameter** if you want to display run level changes. Here’s a sample output :
-
-    pungki tty1 Mon Dec 2 19:21 still logged in
-    runlevel (to lvl 3) 2.6.32-358.23.2 Mon Dec 2 19:20 – 19:29 (00:08)
-    reboot system boot 2.6.32-358.23.2 Mon Dec 2 19:20 – 19:29 (00:08)
-    shutdown system down 2.6.32-358.23.2 Mon Dec 2 18:56 – 19:20 (00:23)
-    runlevel (to lvl 0) 2.6.32-358.23.2 Mon Dec 2 18:56 – 18:56 (00:00)
-    leni tty1 Mon Dec 2 18:42 – down (00:00) 
-
-You can see that there are two entries of run level. Runlevel which has **to lvl 3** entry means the system is running on full console mode. No active X Window or GUI. Meanwhile, when the system is **shutdown**, Linux us **run level 0**. That’s why last show you **to lvl 0** entry
-
-#### View bad logins ####
-
-While **last** command logs successful logins, then **lastb** command **record failed login attempts**. You **must have root** access to run lastb command. Here’s a sample output from lastb command. Lastb will parse information from /var/log/btmp.
-
-    # lastb
-
-    leni tty1 Mon Dec 2 22:12 – 22:12 (00:00)
-    rahma tty1 Mon Dec 2 22:11 – 22:11 (00:00) 
-
-#### Rotate the logs ####
-
-Since **/var/log/wtmp** record every single log in activities, the size of the file may grow quickly. By default, Linux will **rotate /var/log/wtmp** every month. The detail of rotation activity is put in /etc/logrotate.conf file. Here’s the content of my **/etc/logrotate.conf** file.
-
-    /var/log/wtmp {
-    　　monthly
-    　　create 0664 root umtp
-    　　minsize 1M
-    　　rotate 1
-    }
-
-And for **/var/log/btmp**, here’s default configuration of rotate activity
-
-    /var/log/btmp {
-    　　missingok
-    　　monthly
-    　　create 0600 root umtp
-    　　minsize 1M
-    　　rotate 1
-    }
-
-### Conclusion ###
-
-You can combine those parameters to custom the output of last and lastb. All parameter **which run on last** command, **also run on** lastb command. For more detail, please visit last manual page by typing **man last** on your console.
-
--------------------------------------------------------------------------------
-
-via: http://linoxide.com/linux-command/linux-last-command/
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Collectl
+++ b/sources/Collectl
@ -1,3 +1,4 @@
+translating by icybreaker
 Collectl is a powerful tool to monitor system resources on Linux
 ================================================================================
 ### Monitoring system resources ###
@ -372,4 +373,4 @@ via: http://www.binarytides.com/collectl-monitor-system-resources-linux/
 [2]:http://collectl-utils.sourceforge.net/
 [3]:http://collectl.sourceforge.net/FAQ-collectl.html
 [4]:http://collectl.sourceforge.net/Documentation.html
-[5]:http://collectl.sourceforge.net/Matrix.html
+[5]:http://collectl.sourceforge.net/Matrix.html
--- a/sources/Conky
+++ b/sources/Conky
@ -0,0 +1,52 @@
+乌龙茶 翻译中
+Conky Harmattan Is A Stylish Desktop Companion For Linux
+================================================================================
+![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/01/conky-harmatten.jpg)
+
+**To butcher a well-worn phrase, ‘With great power comes great frustration’ – at least that’s the case when wrestling with Conky, the versatile system monitoring tool for Linux.**
+
+On the one hand it’s super featured and highly versatile, on the other it’s a pain in the rump to configure.
+
+![Several themes and modes are included](http://www.omgubuntu.co.uk/wp-content/uploads/2014/01/Screen-Shot-2014-01-21-at-20.42.42.png)
+
+**Conky Harmattan**, a new collection of themes from deviantArt user Zagortenay333, is no exception to this rule. Whilst the screenshots show off a stylish desktop widget that’s sure to impress most who see it, the effort needed to get it running will scare many of those people away.
+
+To help, its creator has included a **thorough step-by-step guide to installing** it and, for when things don’t quite appear as planned, a **helpful “troubleshooting” file** lists fixes for some of the most commonly encountered issues.
+
+Harmatten includes:
+
+- **12 themes**, including Ubuntu Touch, Numix and Elementary designs
+- **4 display modes**, including ‘mini’ and ‘compact’
+- **2 weather modes**
+- **Metric and Imperial weather unit options**
+
+By default Harmattan is “fixed”; this means that you can’t move it around using your mouse. Instead you’ll need to adjust the ‘x’ and ‘y’ gap values in the conky-config file during setup – another tick in the “faff” column!
+
+Unlike most Conky Themes Harmattan doesn’t require you to jump through lua rings hoops to replicate on your screen what you see on others’.
+
+### Getting Harmattan Conky ###
+
+To use this theme you’ll first need to install conky-all and curl from the Ubuntu Software Centre. Without these some features may not work.
+
+- [Install conky-all in Ubuntu][1]
+- [Install curl in Ubuntu][2]
+
+Next, to download the theme head on over to the author’s deviantArt page.
+
+- [Download Conky Harmattan][3]
+
+After extracting the Harmattan package archive, press Ctrl+H in the Nautilus file browser to view ‘hidden’ files.
+
+Lastly, fire up the ‘Installation’ read me and follow the advice.
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/01/conky-harmattan-for-linux
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:apt:conky-all
+[2]:apt:curl
+[3]:http://www.deviantart.com/art/Conky-Harmattan-426662366
--- a/sources/Create
+++ b/sources/Create
@ -0,0 +1,75 @@
+翻译 ing Luoxcat
+
+Create Directory - subdirectory, other than that What mkdir command do in Linux
+================================================================================
+After knowing about ls command for listing entries inside directory, we are now moving to creating directory in Linux system. On Linux, we can use **mkdir** command. Mkdir is short for “make directory”.
+
+### What is mkdir ###
+
+Mkdir is a command for creating directories in Linux system. This command is a built-in command.
+
+### Run mkdir command ###
+
+You can type **mkdir** directly from your console to use it.
+
+    $ mkdir
+
+By default, running mkdir without any parameter will create directory under the current directory. Here’s a sample of it :
+
+![mkdir command](http://linoxide.com/wp-content/uploads/2014/01/mkdir.png)
+
+From screenshot above, we created directory called **office**. When we run mkdir command, we are in **/home/pungki** directory. So then the new directory, which is office, is **created under /home/pungki** directory. **If we put an exact location** - for example : **/usr/local** - , then Linux will create a directory under **/usr/local** directory.
+
+When Linux found that the directory which suppose to be created is already exist, then Linux will telling us that Linux can’t cretate it.
+
+![mkdir directory exist](http://linoxide.com/wp-content/uploads/2014/01/mkdir_error.png)
+
+Another pre-requisite of creating directory that **you must have access to** the location where the directory want to be created. When you don’t have it then mkdir will report an error.
+
+![mkdir permission denied](http://linoxide.com/wp-content/uploads/2014/01/mkdir_permission_denied.png)
+
+### Create multiple directories ###
+
+We can also create multiple directories at the same time. Let say we want to create directories named **ubuntu, redhat and slackware**. Then the syntax will be like this :
+
+    $ mkdir ubuntu redhat slackware
+
+![create multiple directories](http://linoxide.com/wp-content/uploads/2014/01/mkdir_multiple.png)
+
+### Add directory include its sub-directory ###
+
+When you want to created a include its sub-directory, you will need to use -p parameter. This parameter will create parent directory first, if mkdir cannot find it. Let say we want to create directory named **letter** and directory named **important** under directory letter. Then the syntax will be like this :
+
+    $ mkdir -p letter/important
+
+![mkdir sub-directory](http://linoxide.com/wp-content/uploads/2014/01/mkdir_p.png)
+
+### Set access privilege ###
+
+Using **-m** parameter, we can also set the access privilege for the new directory on-the-fly. Here’s an example.
+
+    $ mkdir -m=r-- letter
+
+The above command will create a directory named letter and give access privilege **read-only** for the **directory owner, directory group owner** and **anybody**.
+
+![mkdir set privilege](http://linoxide.com/wp-content/uploads/2014/01/mkdir_m.png)
+
+### Print message a message for each created directory ###
+
+If we want, we can use **-v** parameter to do this. Here’s an example.
+
+    $ mkdir -v ubuntu redhat slackware
+
+![mkdir verbose](http://linoxide.com/wp-content/uploads/2014/01/mkdir_v.png)
+
+### Conclusion ###
+
+Mkdir command is also one of the basic command that must known for everyone who want to learn Linux. As usual, you can always type **man mkdir** or **mkdir --help** to display mkdir manual page and explore it more detail.
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/linux-command/linux-mkdir-command/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Daily
+++ b/sources/Daily
@ -0,0 +1,51 @@
+Daily Ubuntu Tips – Intel Graphics Installer 1.0.3 Released – Supports Ubuntu 13.10
+================================================================================
+For those using desktops or laptops with Intel graphic cards running Ubuntu Linux 13.10, here’s something they might want to do – Install Intel Graphic Installer for Linux.
+
+Intel Graphic Installer for Linux allows users to easily install the latest graphic and video drivers for Intel graphic hardware. Until just recently, there were no support Ubuntu Linux 13.10.
+
+If you want to stay current with the latest drivers for Intel cards in your machine, you might need this installer. It enhances, optimizes and provides the best user experience with your Intel graphic hardware.
+
+[https://01.org/linuxgraphics/downloads/2013/intelr-graphics-installer-1.0.3-linux][1]
+
+### Installing Intel Graphic Installer in Ubuntu ###
+
+If you surely know that your computer has an Intel graphic card and you’re running Ubuntu 13.10, continue below to learn how to install this package,
+
+Some users have had issues with their systems after installing and configuring the driver package, so you should be cautious and backup your system before installing. When you’re done and ready, run the commands below to download the 32-bit version of the package.
+
+### 32-bit Ubuntu Linux ###
+
+    cd /tmp && wget https://download.01.org/gfx/ubuntu/13.10/main/pool/main/i/intel-linux-graphics-installer/intel-linux-graphics-installer_1.0.3_i386.deb
+
+For those running 64-bit Ubuntu, run the commands below to download the 64-bit version.
+
+### 64-bit Ubuntu Linux ###
+
+    cd /tmp && wget https://download.01.org/gfx/ubuntu/13.10/main/pool/main/i/intel-linux-graphics-installer/intel-linux-graphics-installer_1.0.3_amd64.deb
+
+After downloading the package, run the commands below to install.
+
+    sudo dpkg -i intel-linux-graphics-installer*.deb; sudo apt-get -f install
+
+After installing the installer, go to Unity Dash and search for the installer. When it opens, continue. It will search and identify the correct driver for your device.
+
+![](http://www.liberiangeek.net/wp-content/uploads/2014/01/intelgraphicsinstaller.png)
+
+In order for your system to trust Intel Graphic Installer, you must add the following key to Ubuntu’s software repository. Run the commands below to add it.
+
+    wget --no-check-certificate https://download.01.org/gfx/RPM-GPG-KEY-ilg -O - | sudo apt-key add -
+
+That’s it. If you did everything as described above, your machine should be running the correct Intel driver. If not, it maybe that your graphic card isn’t compatible or it’s not supported.
+
+Enjoy!
+
+--------------------------------------------------------------------------------
+
+via: http://www.liberiangeek.net/2014/01/daily-ubuntu-tips-intel-graphics-installer-1-0-3-released-supports-ubuntu-13-10/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://01.org/linuxgraphics/downloads/2013/intelr-graphics-installer-1.0.3-linux
--- a/sources/Daily
+++ b/sources/Daily
@ -1,41 +0,0 @@
-Daily Ubuntu Tips – Take Screenshots Of your Desktop
-================================================================================
-Ubuntu, a powerful and modern operating system allows you to perform many tasks. From creating and editing documents using LibreOffice Productivity Suite to enhancing an image with GIMP, Ubuntu is super!
-
-If you need a super operating system to carry out your tasks, you may want to choose Ubuntu.
-
-Another thing you can do when using Ubuntu is to take screenshots of your desktop and/or active application windows. There are many third-party tools you can install to perform such tasks, but you don’t have to, because Ubuntu comes with one already installed.
-
-This program is useful if you want to show someone how do something in Ubuntu. Screenshots are just normal image files that can stored and send via email programs to others.
-
-To use the screenshots program, go to Dash or press the Windows key on your keyboard to bring up Dash. The Windows key is the key left of the spacebar with Windows logo.
-
-When Dash opens, search for Screenshot, select Screenshot to open it.
-
-Here are some of the screen you can capture:
-
- You can grab the whole screen
- You can grab the current program windows
- You can select a particular area and grab it
-
-If you wan to include the mouse pointer, check the box next to it and enable it.
-
-![](http://www.liberiangeek.net/wp-content/uploads/2013/12/screenshot.png)
-
-When you want to capture a screen, click ‘**Take Screenshot**’.  The program will disappear and automatically take a screenshot.
-
-If you want to capture a particular area, choose that option and when you click ‘**Take Screenshot**’, the mouse pointer will change into a crosshair. You can then be drag the curser to desired size. When you stop, the image is captured automatically.
-
-This is how you do it when you’re using Ubuntu
-
-Hope this helps and please come back again.
-
-Enjoy!
-
--------------------------------------------------------------------------------
-
-via: http://www.liberiangeek.net/2013/12/daily-ubuntu-tips-take-screenshots-of-your-desktop/
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Daily
+++ b/sources/Daily
@ -0,0 +1,41 @@
+Daily Ubuntu Tips – Upgrade To Ubuntu 14.04 (Trusty Tahr) From 13.10
+================================================================================
+Although Ubuntu 14.04 isn’t scheduled to be released anytime soon, those that like to try bleeding edge software and OS can now do an in-place upgrade to Ubuntu 14.04 from 13.10.
+
+Ubuntu 14.04 is scheduled to be released tentatively on April 17th 2014 but you don’t have to wait that long to upgrade and try it. This brief tutorial is going to show you how to do an in-place upgrade to Ubuntu 14.04 from 13.10.
+
+In place upgrade is when you run the update-manager command from an existing Ubuntu installation to upgrade to the next. It allows you to retain most of your documents, settings and some applications.
+
+Most in-place upgrades rely on a reliable Internet connection. Without a good and stable internet connections, it might be impossible to upgrade Ubuntu using this method.
+
+If you can’t upgrade using the internet, you can also perform an in-place upgrade from a CD/DVD disc. This method allows you to upgrade Ubuntu offline without internet connection.
+
+### Upgrading to Ubuntu 14.04 ###
+
+To upgrade to Ubuntu 14.04, you must first prepare your existing computer. To do that, run the commands below to update all existing packages and kernels.
+
+    sudo apt-get update && sudo apt-get dist-upgrade && sudo apt-get autoremove
+
+After updating your machine, you may want to restart so new packages and kernel can apply before upgrading.
+
+Next, press the **Alt + F2** keys on your keyboard to open Ubuntu run command box.  When the box opens, type the commands below and press **Enter**.
+
+    update-manager –d
+
+Ubuntu should then open update-manager with an upgrade option. Press **Upgrade** to begin upgrading your machine.
+
+![](http://www.liberiangeek.net/wp-content/uploads/2014/01/ubuntu1404upgrade.png)
+
+That’s it!
+
+Wait for Ubuntu to finish downloading and installing all the upgraded packages. When that’s done, you’ll be prompted to restart your computer.
+
+Enjoy!
+
+--------------------------------------------------------------------------------
+
+via: http://www.liberiangeek.net/2014/01/daily-ubuntu-tips-upgrade-to-ubuntu-14-04-trusty-tahr-from-13-10/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Here
+++ b/sources/Here
@ -1,3 +1,5 @@
+翻译中 by tomatoKiller
+
 Here are Facebook’s 9 top open-source projects from 2013
 ================================================================================
 Facebook and open-source software go together like Jay-Z and Beyoncé — you just can’t have one without the other.
--- a/sources/How
+++ b/sources/How
@ -0,0 +1,77 @@
+How To Install Gnome 3.10 In Ubuntu 13.10
+================================================================================
+![](http://itsfoss.com/wp-content/uploads/2014/01/Install_Gnome_310_Ubuntu_1310.jpeg)
+
+Bored of Unity or simply dislike it? Why not **install Gnome 3.10 in Ubuntu 13.10**? Installing a new desktop environment is one of the first few [things to do after installing Ubuntu 13.10][1], if you like experimenting a bit. In this quick tutorial we shall see **how to install Gnome 3.10 in Ubuntu 13.10**.
+
+### Install Gnome 3.10 in Ubuntu 13.10: ###
+
+We shall be using several PPAs to install Gnome 3.10 and distribution upgrade will take some time to finish. I presume you have good internet speed, if not, you can use some of the [tips to improve system performance in Ubuntu 13.10][2].
+
+#### Step 1: Install GDM [Optional] ####
+
+First step is to install [GDM][3] along with the default [LightDM][4]. This is optional but recommended as some people mentioned issues with LightDM. Open a terminal (Ctrl+Alt+T) and use the following command:
+
+    sudo apt-get install gdm
+
+#### Step 2: Add PPAs and upgrade the system ####
+
+Now is the time to add some Gnome 3.10 PPAs. Addition of PPAs will be followed by a distribution upgrade which takes time and downloads over 200 MB of data.
+
+    sudo add-apt-repository ppa:gnome3-team/gnome3-next
+    sudo add-apt-repository ppa:gnome3-team/gnome3-staging
+    sudo apt-get update
+    sudo apt-get dist-upgrade
+
+#### Step 3: Install Gnome shell ####
+
+Once the upgrade has been done, use the following command to install Gnome 3.10 in Ubuntu.
+
+    sudo apt-get install gnome-shell
+
+#### Step 4: Install Gnome specific apps [Optional] ####
+
+This step too is optional. You may want to install some Gnome specific applications to get the full feel of Gnome 3.10 in Ubuntu. You may face issues with some of these apps.
+
+    sudo apt-get install gnome-weather gnome-music gnome-maps gnome-documents gnome-boxes gnome-shell-extensions gnome-tweak-tool gnome-clocks
+
+That would be all you need to do. Restart your computer, at login, choose Gnome by clicking on the gear symbol. Here is what my Gnome 3.10 looks like on my laptop:
+
+![](http://itsfoss.com/wp-content/uploads/2014/01/Gnome_310_Ubuntu_1310.jpeg)
+
+### Uninstall Gnome 3.10: ###
+
+Did not like Gnome 3.10? No worries. Uninstall them by [deleting PPA][5]. To do that, you need to install PPA Purge (if not installed already). Use the following command:
+
+    sudo apt-get install ppa-purge
+
+And afterwards, install the PPAs you installed:
+
+    sudo ppa-purge ppa:gnome3-team/gnome3-staging
+    sudo ppa-purge ppa:gnome3-team/gnome3-next
+
+This will revert Gnome 3.10 to Gnome 3.8 which is available in Ubuntu 13.10 repository. To completely remove Gnome 3, use the following command:
+
+    sudo apt-get remove gnome-shell ubuntu-gnome-desktop
+
+This will revert Gnome 3.10 to Gnome 3.8 which is available in Ubuntu 13.10 repository. To completely remove Gnome 3, use the following command:
+
+    sudo apt-get remove gnome-shell ubuntu-gnome-desktop
+
+And of course you should remove any application that you installed specifically for Gnome 3.10
+
+I hope this tutorial helped you to install Gnome 3.10 in Ubuntu 13.10. Did you try Gnome 3.10 already? Which you like more, Gnome or Unity?
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/install-gnome-3-ubuntu-1310/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://itsfoss.com/things-to-do-after-installing-ubuntu-13-10/
+[2]:http://itsfoss.com/speed-up-ubuntu-1310/
+[3]:https://wiki.gnome.org/Projects/GDM
+[4]:http://en.wikipedia.org/wiki/LightDM
+[5]:http://itsfoss.com/how-to-remove-or-delete-ppas-quick-tip/
--- a/Properly.md
+++ b/Properly.md
@ -1,34 +0,0 @@
-How to Dual Boot Ubuntu and Windows Properly
-================================================================================
-**Despite what Microsoft would have you believe, a Linux and a Windows operating system can coexist peacefully on the same PC. This is a tutorial that will teach you how to get an Ubuntu system to run in parallel with a Windows OS.**
-
-![](http://i1-news.softpedia-static.com/images/news2/How-to-Dual-Boot-Ubuntu-and-Windows-Properly-415377-2.jpg)
-
-There are two situations that you must consider, and you have to decide which one applies to you. This has to do with the order of the installation. Installing Windows after you already have an Ubuntu system is a little bit problematic, because Microsoft doesn't really care about other users.
-
-If you install Ubuntu after you already have Windows installed, things are a lot simpler and virtually no work or preparation is required.
-
-Let’s get on with the more difficult problem. If you have an Ubuntu system and you want to install Windows, you will lose GRUB, which is the default bootloader. Windows doesn’t really care and will erase it.
-
-If you made this mistake and you didn't overwrite the Linux partition, don't despair. The data is still there and all you need is a bootable live CD with Ubuntu (up until 13.10). You will need to install an application called Boot-Repair. This is done with a PPA.
-
-Remember, if you use a USB stick, it's quite easy to install applications because Ubuntu is a hybrid image. Boot the live Ubuntu session, open a terminal, and enter the following commands:
-
-    sudo add-apt-repository ppa:yannubuntu/boot-repair && sudo apt-get update
-    sudo apt-get install -y boot-repair && (boot-repair &)
-
-Open the application, click recommended repair, and wait. When it's finished, reboot, and you will get GRUB back and dual boot.
-
-On the other hand, if you already have Windows and you want to install Ubuntu, things are a lot easier. Start the Ubuntu installation, choose to install on a partition that's not Windows, format to EXT4, choose the location of the bootloader, and it's done.
-
-If you choose to place the bootloader on the same hard drive as the Windows installation, it will erase the Microsoft's bootloader. This is ok because GRUB recognizes the Windows OS and you won't miss it. If you place it somewhere else, on another hard-drive for example, you will get both of them when you choose to boot from different hard drives.
-
-Enjoy your Ubuntu and Windows dual boot system.
-
--------------------------------------------------------------------------------
-
-via: http://news.softpedia.com/news/How-to-Dual-Boot-Ubuntu-and-Windows-Properly-415377.shtml
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/How
+++ b/sources/How
@ -1,72 +0,0 @@
-How to convert video to animated gif image on Linux
-================================================================================
-Once thought of as outdated art forms, animated GIF images have now come back. If you haven't noticed, quite a few online sharing and social networking sites are now supporting animated GIF images, for example, on [Tumblr][1], [Flickr][2], [Google+][3], and [partly on Facebook][4]. Due to their ease of consumption and sharing, GIF-ed animations are now part of mainstream Internet culture.
-
-So some of you may wonder how you can create such animated GIF images. There are various online or offline tools dedicated to create animated GIF images. Another option is to create an animated GIF image off of an existing video clip. In this tutorial, I will describe **how to convert a video file to an animated GIF image on Linux**.
-
-As a more useful example, let me demonstrate how to **convert a YouTube video to an animated GIF image**.
-
-### Step 1: Download a YouTube Video ###
-
-First, download a YouTube video that you would like to convert. You can use [youtube-dl][5] tool to save a YouTube video as an MP3 file. Suppose you saved your favorite YouTube video as "funny.mp3".
-
-### Step 2: Extract Video Frames from a Video ###
-
-Next, [install FFmpeg][5] on your Linux system, which I will use to extract video frames from the video.
-
-The following command will extract individual video frames, and save them as GIF images. Make sure to use the output file format ("out%04d.gif") as is. That way, individual frames will be named and saved properly.
-
-    ffmpeg -t <duration> -ss <starting position in hh:mm:ss format> -i <input_video> out%04d.gif
-
-For example, if you want to extract the video frames of input video, for 5 seconds, starting at 10 seconds from the beginning, run the following command. 
-
-    $ ffmpeg -t 5 -ss 00:00:10 -i funny.mp4 out%04d.gif 
-
-After FFmpeg is completed, you will see a list of GIF files created, which are named as "out[\d+].gif".
-
-### Step 3: Merge Video Frames into an Animated GIF ###
-
-The next step is to merge individual GIF files into one animated GIF image. For that, you can use ImageMagick.
-
-First, [install ImageMagick][7] on your Linux system if you haven't done so.
-
-Then, run the following command to merge created GIF images into a single animated GIF file.
-
-    convert -delay <ticks>x<ticks-per-second> -loop 0 out*gif <output-gif-file>
-
-In the command, "-delay" is an option that controls the animation speed. This option indicates that [ticks/ticks-per-second] seconds must elapse before the display of the next frame. The "-loop 0" option indicates infinite loops of animation. If you want, you can specify "-loop N", in which case the animation will repeat itself N times.
-
-For example, to create an animated GIF image with 20 frames-per-second and infinite loop, use the following command.
-
-    $ convert -delay 1x20 -loop 0 out*.gif animation.gif 
-
-### Step 4 (Optional): Reduce the Size of an Animated GIF ###
-
-The last (optional) step is to reduce the size of the created GIF file, by using ImageMagick's GIF optimizer.
-
-Use the following command to reduce the GIF size.
-
-    convert -layers Optimize animation.gif animation_small.gif 
-
-Now you are ready to share the GIF image on your social networks. The following shows a sample GIF image that I created from a cute YouTube video.
-
-Enjoy. :-)
-
-[![](http://farm8.staticflickr.com/7372/10988763123_4e89a18085_o.gif)][8]
-
--------------------------------------------------------------------------------
-
-via: http://xmodulo.com/2013/11/convert-video-animated-gif-image-linux.html
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://staff.tumblr.com/post/15623140287/1mb-gifs
-[2]:http://www.flickr.com/photos/markus-weldon-imagebank/4439159924/sizes/o/in/photostream/
-[3]:https://plus.google.com/communities/110524851358723545415
-[4]:http://mashable.com/2013/08/29/gifs-return-to-facebook/
-[5]:http://xmodulo.com/2013/03/how-to-save-youtube-videos-on-linux.html
-[6]:http://xmodulo.com/2013/06/how-to-install-ffmpeg-on-linux.html
-[7]:http://ask.xmodulo.com/install-imagemagick-linux.html
-[8]:http://www.flickr.com/photos/xmodulo/10988763123/
--- a/sources/How
+++ b/sources/How
@ -1,206 +0,0 @@
-**【chenguang翻译中】**
-
-How to integrate Google Calendar in Linux desktop
-================================================================================
-Google Calendar is one of the most popular web applications. One can access or sync Google Calendar across multiple devices either via web interface or with native apps. In Linux, there are several ways to access Google Calendar natively, such as by using email client plugins (e.g., Evolution or Thunderbird) or calendar apps (e.g., Sunbird or Rainlendar). These solutions, however, typically involve installing unnecessarily bulky software which you will probably not need.
-
-If all you want is to access and get reminded by Google Calendar natively on Linux, then you can consider [Google Calendar command line interface (or gcalcli)][1], which is much more light-weight. Even better for Linux desktop, you can use gcalcli together with [Conky][2], to integrate Google Calendar into your desktop theme transparently.
-
-In this tutorial, I will demonstrate **how to integrate Google Calendar into Linux desktop, by using gcalcli and Conky**.
-
-### Install gcalcli on Linux ###
-
-Before installing gcalcli, verify that you are using Python 2, as gcalcli is not compatible with Python 3.
-
-To install gcalcli on Debian, Ubuntu or Linux Mint, use the following commands.
-
-    $ sudo apt-get install git python-pip python-gdata python-dateutil python-gflags python-vobject python-parsedatetime
-    $ sudo pip install google-api-python-client
-    $ sudo pip install apiclient urllib3
-    $ git clone https://github.com/insanum/gcalcli.git
-    $ cd gcalcli
-    $ sudo python setup.py install 
-
-**Note**: gcalcli is included in the standard repository of Ubuntu or Linux mint. However, that version is not updated with the latest features and bug fixes. So I recommend building gcalcli from the source, as documented above.
-
-To install gcalcli on Fedora, CentOS or RHEL, run the following.
-
-    $ sudo yum install git python-pip python-gdata python-dateutil python-gflags python-vobject
-    $ sudo pip install google-api-python-client
-    $ sudo pip install apiclient urllib3
-    $ git clone https://github.com/insanum/gcalcli.git
-    $ cd gcalcli
-    $ sudo python setup.py install 
-
-### Google Authentication for gcalcli ###
-
-To be able to access Google Calendar with gcalcli, you need to go through OAuth2 authention with your Google account, in order to grant gcalcli permission to access your Google Calendar.
-
-The first time you run gcalcl, OAuth2 authentication will automatically be initiated. Thus run the following command to start.
-
-    $ gcalcli agenda 
-
-The command will print out a URL as shown below.
-
-[![](http://farm4.staticflickr.com/3791/11216331146_d2c5f95963_z.jpg)][3]
-
-At the same time, it will pop up a web browser window, and direct you to the URL. If a web browser window fails to open for any reason, you can copy and paste the URL into a web browser window manually.
-
-If you are not logged in to your Google account, you will be asked to log in. After logging in, you will see the following message, asking you to allow gcalcl to manage your Google Calendar. Click on "Accept" button.
-
-[![](http://farm4.staticflickr.com/3810/11216308465_1008fc1bb3_z.jpg)][4]
-
-Enable Google Calendar API
-
-After authentication, the next step is to enable API access for Google Calendar. gcalcli accesses your Google Calendar via Google Calendar API. In order to use Google Calendar API, however, you need to explicitly enable the API under your Google account.
-
-First go to: [https://cloud.google.com/console][5]. Click on "API Project" under project list.
-
-Go to "APIs & auth" --> "APIs" to see a list of Google APIs. Click on toggle button for "Calendar API" to enable the API.
-
-Now go to "APIs & auth" --> "Registered apps" to register gcalcli app. Click on "Register app" button on the top.
-
-[![](http://farm8.staticflickr.com/7293/11216363656_c203b6dfa2_z.jpg)][6]
-
-Fill in the app name (e.g., "My Gcalcli"), and choose "Native" as a platform. Click on "Register" button to finalize.
-
-This will create and show OAuth client ID and secret as follows. Make a note of this information. You can ignore the warning saying that "You have not set up your product name".
-
-[![](http://farm3.staticflickr.com/2890/11216593546_312a564f1f_z.jpg)][7]
-
-The result of OAuth authentication will be saved in ~/.gcalcli_oauth text file.
-
-### Access Google Calendar from the Command Line with gcalcli ###
-
-You are almost ready to access Google Calendar with gcalcli.
-
-Create a gcalcli configuration file in your home directory as follows. Put OAuth client ID and secret that you obtained before, in the following format.
-
-    $ vi ~/.gcalclirc 
-
-> --client_id='XXXXXXXXXX.apps.googleusercontent.com'
-> --client_secret='YYYYYYYYYYYYYYYY'
-
-At this point, you should be able to run gcalcli from the command line.
-
-Try the following two commands, which will print a list of your Google Calendars, and an agenda for the next 5 days, respectively.
-
-    $ gcalcli list
-    $ gcalcli agenda 
-
-[![](http://farm4.staticflickr.com/3780/11216465043_c8f6d8967d_z.jpg)][8]
-
-### Integrate gcalcli with Conky ###
-
-The final step is to integrate the output of gcalcli into your desktop theme. For that, you need Conky, which is a very powerful tool that can display a wide range of information directly on desktop theme.
-
-First [install Conky][9] on your Linux system.
-
-Then, create a following script somewhere in your home directory (e.g., ~/bin).
-
-    $ vi ~/bin/gcal.sh 
-
-> #!/bin/sh
-> 
-> gcalcli --conky calw 2 |
->     sed -e 's/^[(0\x71^[(B/?/g' \
->         -e 's/^[(0\x78^[(B/?/g' \
->         -e 's/^[(0\x6A^[(B/?/g' \
->         -e 's/^[(0\x6B^[(B/?/g' \
->         -e 's/^[(0\x6C^[(B/?/g' \
->         -e 's/^[(0\x6D^[(B/?/g' \
->         -e 's/^[(0\x6E^[(B/?/g' \
->         -e 's/^[(0\x74^[(B/?/g' \
->         -e 's/^[(0\x75^[(B/?/g' \
->         -e 's/^[(0\x76^[(B/?/g' \
->         -e 's/^[(0\x77^[(B/?/g'
-
-    $ chmod +x ~/bin/gcal.sh 
-
-**Important Note**: '^[' in the above script must be the **actual ESCAPE key** (i.e. press Ctrl-V ESC in vi editor).
-
-This script translates VT100 escape sequences to Unicode box drawing characters. This is a [needed workaround][10] because Conky does not support ASCII line art used by gcalcli.
-
-Finally, create a Conky configuration file in your home directory as follows.
-
-    $ vi ~/.conkyrc 
-
-> alignment top_right
-> maximum_width 630
-> minimum_size 330 10
-> gap_x 25
-> gap_y 50
-> 
-> own_window yes
-> own_window_type conky
-> own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
-> own_window_transparent yes
-> own_window_argb_visual yes
-> own_window_argb_value 0
-> 
-> update_interval 300
-> background no
-> 
-> border_width 1
-> default_color cornflowerblue
-> default_outline_color white
-> default_shade_color white
-> double_buffer no
-> draw_borders no
-> draw_graph_borders no
-> draw_outline no
-> draw_shades no
-> max_port_monitor_connections 64
-> max_specials 512
-> max_user_text 16384
-> text_buffer_size 8096
-> no_buffers yes
-> out_to_console no
-> uppercase no
-> use_xft yes
-> xftfont Bitstream Vera Sans Mono:size=10
-> 
-> TEXT
-> *** Google Calendar Agenda ***
-> ${execpi 300 gcalcli --conky agenda}
-> ${execpi 300 ~/bin/gcal.sh}
-
-This Conky configuration will display an agenda and two weeks' worth of schedules of your Google Calendar, directly in your desktop theme. The displayed info is updated every 5 minutes.
-
-Now you can activate Conky by running the following.
-
-    $ conky 
-
-You should see Google Calendar in the right side of your Linux desktop as follows.
-
-[![](http://farm8.staticflickr.com/7390/11216377436_72d00cec49_z.jpg)][11]
-
-Once you verify that Google Calendar shows up correctly, you can set Conky to auto-start every time you log in to your desktop.
-
-### Set up Google Calendar Reminder ###
-
-gcalcli can also send a reminder for any upcoming schedule in your Google Calendar. It uses notify-send command to send desktop notifications. For Google Calendar reminder, you can set up a cron job like the following.
-
-    $ crontab -l 
-
-> */10 * * * * /usr/local/bin/gcalcli remind
-
--------------------------------------------------------------------------------
-
-via: http://xmodulo.com/2013/12/integrate-google-calendar-linux-desktop.html
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:https://github.com/insanum/gcalcli
-[2]:http://conky.sourceforge.net/
-[3]:http://www.flickr.com/photos/xmodulo/11216331146/
-[4]:http://www.flickr.com/photos/xmodulo/11216308465/
-[5]:https://cloud.google.com/console
-[6]:http://www.flickr.com/photos/xmodulo/11216363656/
-[7]:http://www.flickr.com/photos/xmodulo/11216593546/
-[8]:http://www.flickr.com/photos/xmodulo/11216465043/
-[9]:http://xmodulo.com/2013/12/install-configure-conky-linux.html
-[10]:https://github.com/insanum/gcalcli/issues/97
-[11]:http://www.flickr.com/photos/xmodulo/11216377436/
--- a/Analyzer.md
+++ b/Analyzer.md
@ -0,0 +1,21 @@
+How to visually observe the partitions' usage with Ubuntu 13.10's Disk Usage Analyzer
+================================================================================
+Movies, books, audio tracks are among the content types often populating the user's harddisk, aspect that usually generates various issues, such as lack of space and not clearly understanding its main cause.
+
+Ubuntu 13.10 ships by default Disk Usage Analyzer, handy utility permitting to the user to have a rapid-yet-effective look at the files and folders occupying the harddisk via graphical easily-graspable visuals.
+
+Launching Disk Usage Analyzer, faces the user with all harddisk partitions labeled with name, size and available space, clicking on an entry, opens the entry into a dedicated interface where the partition is scanned and exposed with its items.
+
+As a consequence, the user is to observe the items and their sizes via both sidebar (text based) and right-side, latter featuring a clear representation of the opened partitions; hovering the mouse pointer over the visual, reveals its size and contained items.
+
+![](http://iloveubuntu.net/pictures_me/Disk%20Usage%20Analyzer%20ubuntu%2013.10.png)
+
+Disk Usage Analyzer allows, therefore, to the user to spot potentially-faulty folders unnoticed until now, for example, the user can immediately discover a big-sized element (the bigger the element, the bigger the size) occupying a significant portion of the partition, yet, due to its name, has remain unnoticed.
+
+--------------------------------------------------------------------------------
+
+via: http://iloveubuntu.net/how-visually-observe-partitions-usage-ubuntu-1310s-disk-usage-analyzer
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Linus
+++ b/sources/Linus
@ -0,0 +1,67 @@
+Linus Torvalds Announces Kernel 3.13, opens Linux 3.14 Merge Window
+================================================================================
+Linux Kernel 3.13 has been released. However, it must be noted that the final release doesn’t bring in anything new except for a few fixes and the patch from rc8 is fairly small in size as it has a small number of architecture updates including those for ARM, PowerPC, x86, SPARC and driver updates including GPU and networking.
+
+![](http://www.efytimes.com/admin/useradmin/photo/Z82K112446AM1212014.jpeg)
+
+The prominent changes include: nftables, the successor of iptables, a revamp of the block layer designed for high-performance SSDs, a power capping framework to cap power consumption in Intel RAPL devices, improved squashfs performance, AMD Radeon power management enabled by default and automatic AMD Radeon GPU switching, improved NUMA and hugepage performance , TCP Fast Open enabled by default, support for NFC payments, support for the high-availability Seamless Redundancy protocol, new drivers and many other small improvements.
+
+### A scalable block layer for high performance SSD storage ###
+
+This release includes a new design for the Linux block layer, based on two levels of queues: one level of per-CPU queues for submitting IO, which then funnel down into a second level of hardware submission queues. Experiments shown that this design can achieve many millions of IOs per second, leveraging the new capabilities of NVM-Express or high-end PCI-E devices and multicore CPUs, while still providing the common interface and convenience features of the block layer.
+
+### nftables, the successor of iptables ###
+
+There are new iptables/iptables utilities that translate iptables rules to nftables bytecode, and it is also possible to use and add new xtable modules. As a bonus, these new utilities provide features that weren't possible with the old iptables design: notification for changes in tables/chains, better incremental rule update support, and the ability to enable/disable the chains per table. The new nft utility has a improved syntax. 
+
+### Radeon: power management enabled by default, automatic GPU switching, R9 290X Hawaii support ###
+
+The power management support provides improved power consumption, which is critical for battery powered devices, but it is also a requirement to provide good high-end performance, as it provides the ability to reclock to GPU to higher power states in GPUs and APUs that default to slower clock speeds.
+
+### Power capping framework ###
+
+This release includes a framework designed around the Intel RAPL (Running Average Power Limit) that allow to set power consumption limits to devices that support it.
+
+### Support for the Intel Many Integrated Core Architecture ###
+
+This release adds support for the Intel Many Integrated Core Architecture or MIC, a multiprocessor computer architecture incorporating earlier work on the Larrabee many core architecture, the Teraflops Research Chip multicore chip research project, and the Intel Single-chip Cloud Computer multicore microprocessor.
+
+### Improved performance in NUMA systems ###
+
+This release includes many of such policies that attempt to put a process near its memory, and can handle cases such as shared pages between processes or transparent huge pages. New sysctls have been added to enable/disable and tune the NUMA scheduling.
+
+### Improved page table access scalability in hugepage workloads ###
+
+This release uses finer grained locking improving the page table access scalability in threaded hugepage workloads. For more details, see the recommended LWN article.
+
+### Squashfs performance improved ###
+
+Squashfs, the read-only filesystem used by most live distributions, installers, and some embedded Linux distributions, has got important improvements that dramatically increase performance in workloads with multiple parallel reads.
+
+### Applications can cap the rate computed by network transport layer ###
+
+This release adds a new socket option, SO_MAX_PACING_RATE, which offers applications the ability to cap the rate computed by transport layer. It has been designed as a bufferbloat mechanism to avoid buffers getting filled up with packets, but it can also be used to limit the transmission rate in applications.
+
+### TCP Fast Open enabled by default ###
+
+Optimisation to the process of stablishing a TCP connection that allows the elimination of one round time trip from certain kinds of TCP conversation, which can improve the load speed of web pages
+
+### NFC payments support ###
+
+This release implements support for the Secure Element. A netlink API is available to enable, disable and discover NFC attached (embedded or UICC ones) secure elements. With some userspace help, this allows to support NFC payments, used to implement financial transactions.
+
+Support for the High-availability Seamless Redundancy protocol
+
+It is suited for applications that demand high availability and very short reaction time.
+
+Features Courtesy [http://kernelnewbies.org/Linux_3.13][1]
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=127445
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://kernelnewbies.org/Linux_3.13
--- a/sources/Linux
+++ b/sources/Linux
@ -0,0 +1,73 @@
+[翻译中]zsJacky
+
+Linux pwd command - Know Your Current Working Directory
+================================================================================
+Where you are inside a deep directory, sometimes you may want to know where exactly you are. With this pwd command, you can do it.
+
+### What is pwd ###
+
+Pwd is a command to print name of current / working directory. When we are “lost” into a deep directory, we can always reveal where we are.
+
+### How to use it ###
+
+Since pwd command is intended to only print name of current / working directory, pwd does not have a lot of parameter to add. To use it, you just can type :
+
+    $ pwd
+
+And it will print where you are. For a shell like bash, sometimes this information already print after host-name. Take a look at below picture.
+
+![Pwd in bash](http://linoxide.com/wp-content/uploads/2014/01/pwd_bash.png)
+
+As you can see above, the **/lib/udev/rules.d** is printed a hostname. When we type pwd, it will print **/lib/udev/rules.d** again. But when you are using another shell such as **csh**, pwd may help you to tell where are you. Here’s a sample of it.
+
+    % pwd
+
+![Pwd in csh shell](http://linoxide.com/wp-content/uploads/2014/01/pwd_csh.png)
+
+### Print physical directory avoid all symlinks ###
+
+When you are in directory which is a symbolic links to another directory, you will find that pwd will print the alias / symbolic links to it. To print the real directory name, we can use **-P** parameter.
+
+    $ pwd -P
+
+![Physical pwd](http://linoxide.com/wp-content/uploads/2014/01/pwd_P1.png)
+
+![Physicall pwd](http://linoxide.com/wp-content/uploads/2014/01/pwd_P2.png)
+
+![Physical pwd](http://linoxide.com/wp-content/uploads/2014/01/pwd_P3.png)
+
+At the screenshot above, we are change the directory to **PlayOnLinux’s virtual drives**. This directory is located in **/home/pungki** and its a symbolic link to wineprefix directory. When we do pwd command, the shell return **/home/pungki/PlayOnLinux’s virtual drives**. But if we add **-P** parameter, the we will know that the real directory is **/home/pungki/.PlayOnLinux’s/wineprefix**
+
+### Reveal which pwd ###
+
+On bash shell, pwd may already built-in inside it. To know it, we can use this command :
+
+    $ type -a pwd
+
+![pwd type](http://linoxide.com/wp-content/uploads/2014/01/pwd_type.png)
+
+You see that there are **two** pwd’s. When you use pwd, you may use the built-in pwd command on your shell. This pwd will override the original pwd. Here’s a sample.
+
+![Symlink pwd](http://linoxide.com/wp-content/uploads/2014/01/pwd_L.png)
+
+On the screenshot above, we are now inside **/home/pungki./PlayOnLinux/wineprefix**. When we use **/bin/pwd**, it will return the real name of current directory. But when we add **-L** parameter, it will return a symbolic link name of current directory.
+
+This **-L** parameter output the same result if we just type pwd, which use built-in shell pwd.
+
+### Print pwd version ###
+
+To print pwd version, we can use **--version** parameter. But for bash shell, we need to use **/bin/pwd** instead of pwd. Otherwise, it will return an error message.
+
+![pwd version](http://linoxide.com/wp-content/uploads/2014/01/pwd_version.png)
+
+### Conclusion ###
+
+pwd may help you to know where your current directory when your bash don’t print it directly on command prompt. As usual, you can always type **man pwd** to explore pwd usage more detail.
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/linux-command/linux-pwd-command/
+
+译者：[zsJacky](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Mark
+++ b/sources/Mark
@ -0,0 +1,57 @@
+Mark Shuttleworth interview: Taking Ubuntu beyond desktops
+================================================================================
+He may have stepped back from the CEO role at Canonical, but Mark Shuttleworth is still very much the public face of Ubuntu.
+
+He suffered a setback earlier this year when the crowdfunded Ubuntu Edge project – in which he invested a lot of personal capital, if not actual money – failed to get anywhere near its ambitious investment target. However, he tells us the project wasn’t a total failure, and may even be aped by the best-known smartphone maker of them all.
+
+#### Q. How long will Ubuntu remain primarily focused on the desktop? ####
+
+**A.** If you look at the design work we’ve done across desktops, phones and tablets, we’ve done it specifically so we can converge them into one codebase. The mobile code we’re working on now is also the future desktop codebase: your phone can give you a desktop, since it has all the desktop code sitting on it.
+
+> The mobile code we’re working on now is also the future desktop codebase
+
+The actual convergence will happen some time during the next major cycle – it won’t be in 14.04, but it could be in 14.10 or 15.04. We believe we’ll be able to deliver that before Microsoft manages to converge Windows on mobile and PC, which the company has said is its goal from a design and development perspective.
+
+Once we’ve converged those, there’s a question about whether the six-month release cycles make as much sense. Phone and tablet users are used to the idea that the phone just updates itself whenever, so maybe we’ll soften up on the six-month thing and release updates all the time.
+
+#### Q. With Android and iOS so well established, how will you encourage developers to produce apps for Ubuntu? ####
+
+**A.** That’s the key question. Ubuntu is the number-one platform for all kinds of [cloud computing][1] – Instagram is all Ubuntu, for example, and the back-end of many of the games and services that people run on their mobile devices runs on Ubuntu in the cloud. So, on that side we feel very much the strong incumbent.
+
+I think the key difference between us and Windows 8 is that we’re based on Linux, just like Android. That means web apps and native apps designed for Android are much closer to being on Ubuntu than they are to being on Windows. Many Android developers use Ubuntu, and develop their apps on Ubuntu, so it’s much easier for them to target that simultaneously.
+
+#### Q. Do you have any hardware partners lined up to make Ubuntu phones and tablets? ####
+
+**A.** We’ve seen test devices by a series of household brands. All those companies have internal teams looking at their future options. It’s very difficult to influence them; they decide what they think is interesting for themselves.
+
+But we’ve seen a number of them take cutting-edge devices and put on Ubuntu. Since we’re also Linux, it’s relatively easy for them to do that if they have Android devices in the pipeline. It’s a very strong signal of interest that they’re independently putting Ubuntu on devices and showing it to carriers.
+
+The core story is that we don’t have any announced partners, but we’re comfortable that the industry is taking a good, hard look at Ubuntu, and investing the time and money needed to do that properly.
+
+#### Q. Were you disappointed that the Ubuntu Edge didn’t get funding? ####
+
+**A.** I was very, very disappointed that we weren’t able to turn it into reality. I continue to get mail from people who say “I supported the Edge and I’m disappointed it didn’t happen”. But I was blown away by the level of support that we did achieve. For us to get a device out would be a huge undertaking, but if you consider an existing phone manufacturer, they could do something like the Edge with a lower [funding] threshold.
+
+Also, we’ve seen an uptick in interest in convergence. People are saying, “yes, mobile processors are catching up with the desktop”. When Apple announced the next-generation iPhone [5s], it called the processor “desktop-class”, and I don’t think that was an accident.
+
+It was a rare occasion where perhaps the company gloated prematurely, and sent what we think is a very clear signal that it will converge the iPhone and the MacBook Air. There’s no point talking about the desktop performance of your CPU unless you plan to make a desktop device with that CPU.
+
+So, while I was disappointed that we didn’t make the Edge, I’m convinced the idea is going to get made. Our focus will be on having the best software stack for a converged world.
+
+#### Q. What smartphone do you use on a personal basis? ####
+
+**A.** I have Ubuntu running on my own smartphone – it’s a Nexus, and I’ve replaced Android. I also have a collection of devices running everything: Windows Phone, iOS and Android. It helps me stay in touch with what users expect.
+
+#### Q. What’s the state of play with Ubuntu TV? It was announced in 2012 but things have gone quiet since then. ####
+
+**A.** Ubuntu TV has been folded into the mobile codebase. We’re now working on production. It might be phone in this release, tablet in the next release and, ultimately, everything converged. We’ll have one codebase that will be the Ubuntu experience across all those different form factors.
+
+--------------------------------------------------------------------------------
+
+via: http://www.pcpro.co.uk/news/interviews/386080/mark-shuttleworth-interview-taking-ubuntu-beyond-desktops
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.cloudpro.co.uk/
--- a/sources/Markdown
+++ b/sources/Markdown
@ -0,0 +1,34 @@
+Markdown Text Editor CuteMarkEd 0.9.0 Gets New Options
+================================================================================
+![](http://i1-news.softpedia-static.com/images/news2/Markdown-Text-Editor-CuteMarkEd-0-9-0-Gets-News-Options-421082-2.png)
+
+**CuteMarkEd 0.9.0, a Qt-based, free, and open source markdown editor with live HTML preview, has been released and is available for download.**
+
+CuteMarkEd is a very useful Qt Text Editor that can provide support for math expressions, code syntax highlighting, and syntax highlighting for a markdown document.
+
+### Highlights of CuteMarkEd 0.9.0: ###
+
+- A snippets system has been added;
+- A "Go to Line" menu item has been added;
+- The new options "case sensitive," "whole words only," and "use regular expressions" have been added to find/replace functionality;
+- Support has been implemented for adding the selected word to a user dictionary;
+- An option to change width of tab characters has been added.
+
+Check the complete list of changes and improvements in the official [announcement][1].
+
+Download CuteMarkEd 0.9.0 right now:
+
+- [CuteMarkEd 0.9.0 tar.gz][2] [sources] [372 KB]
+
+Remember that this is a development version and it should NOT be installed on production machines. It is intended for testing purposes only.
+
+--------------------------------------------------------------------------------
+
+via: http://news.softpedia.com/news/Markdown-Text-Editor-CuteMarkEd-0-9-0-Gets-News-Options-421082.shtml
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://qt-apps.org/content/show.php/CuteMarkEd?content=158801
+[2]:https://github.com/cloose/CuteMarkEd/archive/v0.9.0.tar.gz
--- a/sources/Moving
+++ b/sources/Moving
@ -0,0 +1,65 @@
+Moving a city to Linux requires political backing, says Munich project leader
+================================================================================
+> Munich city authority has migrated almost 15,000 PCs from Windows NT to its own Linux distribution
+
+IDG News Service - This year saw the completion of the city of Munich's switch to Linux, a move that began about ten years ago. "One of the biggest lessons learned was that you can't do such a project without continued political backing," said Peter Hofmann, the leader of the LiMux project, summing up the experience.
+
+The Munich city authority migrated around 14,800 of the 15,000 or so PCs on its network to LiMux, its own Linux distribution based on Ubuntu, exceeding its initial goal of migrating 12,000 desktops.
+
+Munich decided to migrate its IT systems when Microsoft said it planned to discontinue support for the operating system the city then relied on, Windows NT 4.0. The city was forced to choose between moving to a newer version of Windows, or finding an alternative platform, as new software and new versions of existing software would not be available on Windows NT. The city council decided to go with Linux to become more independent from software vendors.
+
+Continued political backing was key to the success of the migration, said Hofmann.
+
+"We had it from the start and it never failed. We had to treat our politicians as stakeholders and keep them informed," he said.
+
+By doing this, the politicians never lost interest and always knew what the people involved in the project were doing, he said. "I saw a lot of other open source projects going down the sink," because they didn't have that backing, or lost it, he said.
+
+It took the city about 10 years from the first decision to switch through to completion of the LiMux project, which was originally scheduled for completion in 2009. However, there were several delays along the way.
+
+First, the migration started a year later than originally planned, said Hofmann. The second delay was caused in 2007 when the city council decided that Munich's IT department should also be responsible for the standardization of the infrastructure that is necessary for Linux clients, he said. Munich however didn't have the right processes nor the right organization for that kind of standardization, he said.
+
+The project was delayed for a third time in 2010, when the city council decided to enlarge the project, said Hofmann. Goals were added to develop three additional processes within the project: risk management, test management and requirement engineering.
+
+Despite the difficulties, Hofmann said he would do it again tomorrow.
+
+The heterogenous infrastructure of Munich's IT organization was one of the projects biggest problems, Hofmann said. When the project started there were 22 organizations that each had their own individual configuration, software, hardware, processes and knowledge for their Windows clients and the accompanying infrastructure they were using, he said. "We wanted to have a standardized, centrally delivered and developed Linux client," he said.
+
+While Hofmann expected the splintered infrastructure to cause problems, standardizing the clients proved harder than he expected, for both technical and organizational reasons.
+
+Luckily, he had the freedom to rebuild the whole of the city's IT infrastructure.
+
+"Anyone planning to switch needs to be prepared to rethink their entire IT organization. Switching to Linux is more than saving costs and using free software," he added.
+
+Munich's switch did save money though. In November 2012, responding to a question from a council member, the city calculated that migrating to LiMux instead of modernizing its existing Microsoft software [would save it over a!11 million][1].
+
+That calculation compared the LiMux option with a switch to either Windows 7 and Microsoft Office or Windows 7 and OpenOffice, the productivity suite Munich chose for LiMux. It included necessary hardware upgrades, training, external migration support and optimization processes, among other things. Both Windows options were significantly more expensive than LiMux, mainly due to Microsoft's software licensing fees.
+
+One expense Hofmann said he doesn't have with LiMux is support contracts. "What do you need a support contract for? You really get no support, you get new versions. The only reason you need it is because your lawyers tell you so they can have someone to blame if it is failing. We no longer blame anyone, we try to fix it," he said.
+
+If Munich's IT staff can't fix a bug themselves, they will find a specialist to solve the specific bug, Hofmann said. "You no longer rely on some vendor or some service that you buy. You rely on yourself and what you know," he said.
+
+There are still complaints though. Word and Excel documents received from external organizations sometimes have to be modified and sent back, which can lead to difficulties with interoperability, he said. The city is trying to convince its correspondents to use ODF, the file format of OpenOffice, or PDF for documents that don't need to be changed, Hofmann said, adding that the city has helped finance development of interoperability tools.
+
+As part of its switch to OpenOffice, however, the city implemented WollMux, an office extension for templates and forms, that was published as free software 2008 and is now used by a handful of other organizations, he said.
+
+There were other obstacles to the elimination of Microsoft Office -- including the city's reliance on over a thousand Microsoft Office and Visual Basic macros in its in-house applications, Hofmann said.
+
+Now there are around 100 such macros still in use on the few remaining Windows PCs.
+
+"It never was our goal to eliminate Windows as a whole," he said, although the city has gone well beyond its initial target of migrating 80 percent of its PCs.
+
+The financial department, for instance, still has three Windows PCs running special banking software. To switch that department to LiMux the city would have had to pay the software vendor to develop a Linux version of its application for the three PCs, Hofmann said.
+
+The city faced a similar problem in its dealings with the Bundesdruckerei, the German authority that prints passports. It mandates the use of a Windows application to transmit the data required to personalize the passports, he said.
+
+While Hofmann can look confidently to the city's future, he recognizes that switching to Linux is not for everyone. Yet even those who don't want to switch can still profit from the city's experience: "Some guy once told me, 'Since you started your project I can negotiate with Microsoft.'"
+
+--------------------------------------------------------------------------------
+
+via: http://www.computerworld.com/s/article/9245353/Moving_a_city_to_Linux_requires_political_backing_says_Munich_project_leader?taxonomyId=122
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.itworld.com/operating-systems/321474/switching-linux-saves-munich-over-11-million
--- a/sources/Pear
+++ b/sources/Pear
@ -0,0 +1,33 @@
+Pear OS Is History!
+================================================================================
+![](http://itsfoss.com/wp-content/uploads/2014/01/RIP_PearOS.jpeg)
+
+Start of 2014 sees the demise of another Linux distribution. This time its Mac lookalike [Pear OS][1] that bids good bye. Starting from today, Pear OS is no longer available for download. Pear Cloud server will also go offline from 31 January.
+
+Unlike [Linux distributions that were discontinued in 2013][2], Pear OS is not discontinued for the lack of fund or man power, rather it has been bought by some unknown big enterprise (I hope its not Apple :P) that will use Pear OS for its own product. That means Pear OS cannot be forked or continued by community.
+
+Owner of Pear OS, David Tavares announced the news on [Facebook][3] on 20 January 2014.
+
+> Its future is now in hands of a company who wants to remain anonymous for the moment. The concept has pleased them it and now wants to continue and improve the system for their own products. I can not give a name but it is a very large company well known …
+
+The same message is displayed on the Pear OS website as well. David thanked the user and developers for their support in the farewell message.
+
+Probably this explains why Pear OS 8 was excessively buggy. David was less focused on developing Pear OS as he was busy in finalizing the deal.  {Read: [Pear OS 8 review][4]}
+
+I saw couple of angry messages on social networking sites that it goes against the ‘norms’ of Open Source. While the outburst is justified to an extent, it is David’s right to choose what he thinks is better for his future. As he indicated that he is going in other direction, may be to start a  new venture. I wish him good luck for his future.
+
+With Pear OS gone, its users may [install Elementary OS Luna][5], another Ubuntu based distribution with OS X-inspired looks.
+
+--------------------------------------------------------------------------------
+
+via: http://itsfoss.com/pear-os-history/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://pearlinux.fr/
+[2]:http://itsfoss.com/year-2013-linux-2-linux-distributions-discontinued/
+[3]:https://www.facebook.com/permalink.php?story_fbid=453625568072975&id=340980619337471&stream_ref=10
+[4]:http://itsfoss.com/pear-os-8-review/
+[5]:http://itsfoss.com/guide-install-elementary-os-luna/
--- a/sources/Should
+++ b/sources/Should
@ -0,0 +1,19 @@
+Should Canonical Drop the Current Background Theme for Ubuntu 14.04 LTS?
+================================================================================
+![](http://i1-news.softpedia-static.com/images/news2/Should-Canonical-Drop-the-Curent-Background-Theme-for-Ubuntu-14-04-LTS-420737-2.jpg)
+
+Ubuntu has been sporting the same kind of background for years, but the upcoming Ubuntu 14.04 LTS (Trusty Tahr) could be the perfect time for a change of scenery.
+
+The Ubuntu design team always aimed as keeping the background simple and familiar. As a rule of thumb, you need to make sure that people recognize the operating system at a glance, just by looking at the colors of the desktop.
+
+The last major change in this direction was at the launch of Ubuntu 10.04 LTS (Lucid Lynx). After Lucid Lynx, the backgrounds have been evolving, from one version to another, in small increments.
+
+Ubuntu 14.04 LTS (Trusty Tahr) might be the time to shake things up a bit. Canonical is also preparing a face lift for the icons and Unity7. What better moment to make Ubuntu 14.04 LTS stand apart from all the ones that came before it?
+
+--------------------------------------------------------------------------------
+
+via: http://news.softpedia.com/news/Should-Canonical-Drop-the-Curent-Background-Theme-for-Ubuntu-14-04-LTS-420737.shtml
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Software
+++ b/sources/Software
@ -1,76 +0,0 @@
-Software May Be Eating The World, But Open Source Software Is Eating Itself
-================================================================================
-**Nothing sits still for long in the world of open source.**
-
-Software may be eating the world, as [Marc Andreessen posits][1], but open-source software seems to be eating itself. And at a far faster clip. While the software world has grown used to products and their vendors dominating for long stretches (think: Microsoft in operating systems and Oracle in databases), the new world of open source is moving at an accelerated, Darwinian pace, leaving no project to rest on its laurels.
-
-In this fast-changing open source world, how should enterprises decide where to invest?
-
-### Open Source Picks Up The Pace ###
-
-Though [Dirk Riehle's analysis][2] of the total growth in open source projects is a few years old, if anything the trend he plots has [accelerated][3]:
-
-![](http://readwrite.com/files/total-growth-figure-5.jpg)
-
-Today much of the interesting code in technology’s most important markets—Big Data, cloud, mobile—is open source. With more activity focused on areas like Hadoop or OpenStack, we should expect the pace and volume of open code creation to increase.
-
-Which may be good or bad.
-
-### No Rest For The Open Source Developer ###
-
-Take, for example, the configuration management market. Redmonk’s Stephen O’Grady sifts a number of data sources that measure the popularity of Chef, Puppet, Ansible and Salt, the latter two being very new to the market, yet demonstrating considerable community enthusiasm and adoption.
-
-This prompts O’Grady to [speculate][4] that “Where it once was reasonable to conclude that the configuration management space would evolve in similar fashion to the open source relational database market—i.e. with two dominant projects—that future is now in question.”
-
-O’Grady goes on to suggest:
-
-> The most interesting conclusion to be taken from this brief look at a variety of community data sources, however, may well be the relevance of both Ansible and Salt. That these projects appear to have viable prospects in front of them speaks to the demand for solutions in the area, as well as the strong influence of personal preferences—e.g. the affinity for Salt amongst Python developers.
-
-Actually, I’d argue that the most interesting conclusion is that no open-source project has guaranteed longevity. Puppet came out in 2005 and is still making headway against entrenched proprietary incumbents, yet now it has to fight off Chef (which came out four years later), Ansible (last two years) and Salt (last two years).
-
-Yes, incumbents in any important market, proprietary or otherwise, will always have new market entrants nibbling at their heels. But in open source, the competition doesn’t wait for billion-dollar markets to form before it launches attacks. The rise of Salt and Ansible in a market already well-served by Chef and Puppet is a testament to this.
-
-### The Community Giveth, And The Community Taketh Away ###
-
-You will find this same dynamic in content management (Drupal vs. Joomla vs. Alfresco vs. Wordpress vs. countless other CMSes), cloud (Eucalyptus vs. OpenStack vs. CloudStack vs. CloudFoundry vs. OpenShift vs. many others), [web servers][5] and databases, both relational and NoSQL.
-
-The ranks of open-source databases swell with new entrants almost daily, as can be seen on the [DB-Engines database tracking service][6]. Perhaps most interesting is the open-source relational database market. Up until recently, MySQL dominated that market. Postgres was a viable runner up to MySQL, but it was a very distant second.
-
-Today things are in motion. Or commotion. Largely due to Oracle’s alleged fumbling of the MySQL community, Postgres is on a tear, booming even with the hipster crowd that welcomed MySQL. But so is MariaDB. Though still a comparative gnat, leading [Linux distributions like Red Hat’s Fedora and Ubuntu have embraced MariaDB][7], as has Google, replacing MySQL.
-
-Perhaps, as O’Grady implies, this comes down to developer preferences. If developers rule, then little impedes them from switching to new projects that may fit their needs better, throwing a given market into disarray. If this is correct, it would explain why open source resists long term monopolies:
-
-It’s hard to keep developers happy.
-
-### Building A Community-Friendly Business ###
-
-What does this mean for enterprises that are looking to make long-term investments on a given open-source project? An easy, if unsatisfying, answer is that enterprises should contribute to the projects they care about, ensuring their sustainability as well as giving the enterprise the ability to support themselves should the project dwindle.
-
-But most enterprises don’t want to have to code the winner themselves.
-
-Instead they should look for popular projects that are good technical fits for their enterprise requirements and that have strong communities. Popularity can be fleeting if a project grows callous to its community. One of the primary reasons Linux has endured so long at the top of the operating system heap is that it has been so accommodating to community influence and requirements.
-
-Unfortunately, there’s no One True Way to measure vitality in an open source community. Some successful projects, like OpenStack, lean on a strong foundation. Others, like Linux, depend upon a strong individual and her lieutenants.
-
-But all successful open-source projects that maintain their lead innovate quickly, with regular releases every few months. While a fast-moving project may be more difficult for enterprises to support, it may also be a key indication that the project will remain relevant.
-
-How else should enterprises hedge against the risk of obsolescence of an open-source project?
-
-Lede image courtesy of [Shutterstock][8].
-
--------------------------------------------------------------------------------
-
-via: http://readwrite.com/2013/12/12/open-source-innovation
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://online.wsj.com/news/articles/SB10001424053111903480904576512250915629460
-[2]:http://dirkriehle.com/publications/2008-2/the-total-growth-of-open-source/
-[3]:http://www.techrepublic.com/blog/linux-and-open-source/driving-forces-behind-linux-and-open-source-growth/
-[4]:http://redmonk.com/sogrady/2013/12/06/configuration-management-2013/
-[5]:http://www.theregister.co.uk/2013/02/06/open_and_shut/
-[6]:http://db-engines.com/en/ranking
-[7]:http://www.zdnet.com/oracle-who-fedora-and-opensuse-will-replace-mysql-with-mariadb-7000010640/
-[8]:http://www.shutterstock.com/
--- a/Distributions.md
+++ b/Distributions.md
@ -1,21 +0,0 @@
-The Fedora Project Will No Longer Name Its Linux Distributions
-================================================================================
-**The Fedora Project has a very colorful history of naming its distributions, but that will come to an end with Fedora 21.**
-
-![](http://i1-news.softpedia-static.com/images/news2/The-Fedora-Project-Will-No-Longer-Name-Their-Linux-Distributions-416156-2.jpg)
-
-The Fedora developers have decided that it was time to end the naming policy and process of their Fedora operating system. It's unclear whether the process will be carried out by the community instead, but one thing is certain: the Fedora people will no longer choose the names.
-
-“What will be the code name for Fedora 21. And again short answer: null. Not null as null string but null. Fedora Board decided to end release names process. It does not mean ‘no more release names’ but it's up to community or working groups, if anyone wants to step into the role of Name Wrangler and helps running this process. Or reform it in any way,” said Red Hat's Jaroslav Reznik in a blog [post][1].
-
-This information was made available quite a while ago on an obscure mailing list, but the Fedora Project hasn't been the best communicator possible so far.
-
--------------------------------------------------------------------------------
-
-via: http://news.softpedia.com/news/The-Fedora-Project-Will-No-Longer-Name-Their-Linux-Distributions-416156.shtml
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://borntobeopen.blogspot.ru/2014/01/wheres-fedora-21-schedule.html
--- a/Schedule.md
+++ b/Schedule.md
@ -0,0 +1,107 @@
+The Linux Foundation Delivers Complete 2014 Event Schedule
+================================================================================
+he Linux Foundation has changed up its mode of planning events, and has released its schedule of events for the entire year.  A new video is also being launched with the announcement, which is live here: [The Linux Foundation Event Experience][1]. Here are more details on what this year's foundation events will focus on.
+
+The 2014 events schedule, which includes LinuxCon and CloudOpen in North America and Europe, as well as the Linux Foundation Collaboration Summit, Embedded Linux Conference, Android Builders Summit and ApacheCon, among others.  LinuxCon and CloudOpen North America will take place this year in Chicago and will be co-located with the Linux Kernel Summit. LinuxCon and CloudOpen Europe will be in Duesseldorf, Germany, along with Embedded Linux Conference, KVM Forum and Linux Plumbers Conference.
+
+“Nearly every technology sector and community is eager to benefit from open, collaborative development process in some way,” said Jim Zemlin, executive director at The Linux Foundation, in a statement. “Today, industries as varied as automotive, life sciences and gaming are interested in tapping into the collective knowledge base and success of Linux and open development."
+
+Here are highlights from the 2014 event schedule, including some interesting cloud computing events:
+
+#### [OpenDaylight Summit][2] ####
+
+February 4-5, 2014, Hyatt Santa Clara, Santa Clara, Calif.
+
+A technical summit for developers and users involved in the community, projects, products, and companies in the Software-Defined Networking (SDN) and Network Functions Virtualization (NFV) space.
+
+#### [Linux Storage, Filesystem and MM Summit][3] ####
+
+March 24-25, 2014, The Meritage Resort, Napa Valley, Calif.
+
+Invitation-only event that brings together developers and researchers who work with the Linux storage, memory management and file system stack.
+
+#### [Linux Foundation Collaboration Summit][4] ####
+
+March 26-28, 2014, The Meritage Resort, Napa Valley, Calif.
+
+An exclusive, invitation-only summit that brings together core kernel developers, distribution maintainers, ISVs, end users, system vendors and other community organizations for sessions and workgroup meetings that help solve the most pressing issues facing Linux today.
+
+#### [ApacheCon][5] ####
+
+April 7-9, 2014, The Westin, Denver, Co.
+
+ApacheCon is the only event dedicated to bringing together the 100+ Apache Software Foundation project communities as well as other open source projects across multiple sectors in one venue to advance the work that is defining the future of technology and that represents a new generation of software development. It hosts collaboration on some of the today’s hottest open source projects, including Apache projects like Cassandra, Cordova, CloudStack, CouchDB, Geronimo, Hadoop, Hive, HTTP Server, Lucene, OpenOffice, Struts, Subversion and Tomcat, among many others.
+
+#### [CloudStack Collaboration Conference North America][6] ####
+
+April 9-11, 2014, The Westin, Denver, Co.
+
+The CloudStack Collaboration Conference North America brings together developers, systems administrators and DevOps professionals who are building and managing large networks of virtual machines and advancing the state-of-the-art for cloud computing technologies. The event offers a neutral environment where attendees can advance their work with Apache CloudStack.
+
+#### [Embedded Linux Conference][7] ####
+
+April 29-May 1, 2014, San Jose Marriott, San Jose, Calif.
+
+Now in its 10th year, this is the premier vendor-neutral technical conference for companies and developers using Linux in embedded products.
+
+#### [Android Builders Summit][8] ####
+
+April 29-May 1, 2014, San Jose Marriott, San Jose, Calif. 
+
+A technical summit for OEMs, their device manufacturers, integrators, custom builders, and the growing Android and Linux Kernel developer communities.
+
+#### [LinuxCon North America][9] ####
+
+August 20-22, 2014, Sheraton Chicago, Chicago
+
+LinuxCon is the leading annual technical conference in North America, bringing together developers, system administrators, DevOps professionals, business executives and more in a collaboration and education space for the Linux community.
+
+#### [CloudOpen North America][10] ####
+
+August 20-22, 2014, Sheraton Chicago, Chicago
+
+CloudOpen brings together the open source projects, products and companies that are driving the cloud and big data ecosystems today to share best practices from the world of traditional open source.
+
+#### [LinuxCon Europe][11] ####
+
+October 13-15, 2014, Duesseldorf Congress Centre, Duesseldorf, Germany
+
+LinuxCon Europe brings together the European Linux community, from developers, system administrators and DevOps professionals to business executives and more in a collaboration and education space for the Linux community. Previous locations have included Prague and Barcelona.
+
+#### [CloudOpen Europe][12] ####
+
+October 13-15, 2014, Duesseldorf Congress Centre, Duesseldorf, Germany
+
+CloudOpen Europe brings together the open source projects, products and companies that are driving the cloud and big data ecosystems today to share best practices from the world of traditional open source.
+
+#### [Embedded Linux Conference Europe][13] ####
+
+October 13-15, 2014, Duesseldorf Congress Centre, Duesseldorf, Germany
+
+Now in its 10th year, this is the premier vendor-neutral technical conference for companies and developers using Linux in embedded products.
+
+For more information about Linux Foundation events, you can visit: [http://events.linuxfoundation.org][14]. 
+
+
+--------------------------------------------------------------------------------
+
+via: http://ostatic.com/blog/the-linux-foundation-delivers-complete-2014-event-schedule
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://youtu.be/-WUeelICQ2U
+[2]:http://events.linuxfoundation.org/events/opendaylight-summit
+[3]:https://events.linuxfoundation.org/events/lsfmm-summit
+[4]:https://events.linuxfoundation.org/events/collaboration-summit
+[5]:http://events.linuxfoundation.org/events/apachecon-north-america
+[6]:http://events.linuxfoundation.org/events/apachecon-north-america
+[7]:https://events.linuxfoundation.org/events/embedded-linux-conference
+[8]:https://events.linuxfoundation.org/events/android-builders-summit
+[9]:http://events.linuxfoundation.org/events/linuxcon
+[10]:http://events.linuxfoundation.org/events/cloudopen-north-america
+[11]:https://events.linuxfoundation.org/events/linuxcon-europe
+[12]:http://events.linuxfoundation.org/events/cloudopen-europe
+[13]:http://events.linuxfoundation.org/events/embedded-linux-conference-europe
+[14]:http://events.linuxfoundation.org/
--- a/sources/Top
+++ b/sources/Top
@ -1,3 +1,5 @@
+Translating by OnlySang
+
 Top 10 Linux Games of 2013
 ================================================================================
 **With 2013 wrapping up, we’ve brought together 10 of our favourite Linux games of the past year.**
--- a/sources/Two
+++ b/sources/Two
@ -0,0 +1,87 @@
+Two Pi R 2: Web Servers
+================================================================================
+In my last [article][1][注：此文章在另一篇原文“Two Pi R”中], I talked about how even though an individual Raspberry Pi is not that redundant, two Pis are. I described how to set up two Raspberry Pis as a fault-tolerant file server using the GlusterFS clustered filesystem. Well, now that we have redundant, fault-tolerant storage shared across two Raspberry Pis, we can use that as a foundation to build other fault-tolerant services. In this article, I describe how to set up a simple Web server cluster on top of the Raspberry Pi foundation we already have. 
+
+ Just in case you didn't catch the first column, I'll go over the setup from last month. I have two Raspberry Pis: Pi1 and Pi2. Pi1 has an IP address of 192.168.0.121, and Pi2 has 192.168.0.122. I've set them up as a GlusterFS cluster, and they are sharing a volume named gv0 between them. I also mounted this shared volume on both machines at /mnt/gluster1, so they each could access the shared storage at the same time. Finally, I performed some failure testing. I mounted this shared storage on a third machine and launched a simple script that wrote the date to a file on the shared storage. Then, I experimented with taking down each Raspberry Pi individually to confirm the storage stayed up.
+
+Now that I have the storage up and tested, I'd like to set up these Raspberry Pis as a fault-tolerant Web cluster. Granted, Raspberry Pis don't have speedy processors or a lot of RAM, but they still have more than enough resources to act as a Web server for static files. Although the example I'm going to give is very simplistic, that's intentional—the idea is that once you have validated that a simple static site can be hosted on redundant Raspberry Pis, you can expand that with some more sophisticated content yourself.
+
+### Install Nginx ###
+
+Although I like Apache just fine, for a limited-resource Web server serving static files, something like nginx has the right blend of features, speed and low resource consumption that make it ideal for this site. Nginx is available in the default Raspbian package repository, so I log in to the first Raspberry Pi in the cluster and run: 
+
+    $ sudo apt-get update
+    $ sudo apt-get install nginx
+
+Once nginx installed, I created a new basic nginx configuration at /mnt/gluster1/cluster that contains the following config: 
+
+    server {
+      root /mnt/gluster1/www;
+      index index.html index.htm;
+      server_name twopir twopir.example.com;
+    
+      location / {
+            try_files $uri $uri/ /index.html;
+      }
+    }
+
+Note: I decided to name the service twopir, but you would change this to whatever hostname you want to use for the site. Also notice that I set the document root to /mnt/gluster1/www. This way, I can put all of my static files onto shared storage so they are available from either host.
+
+Now that I have an nginx config, I need to move the default nginx config out of the way and set up this config to be the default. Under Debian, nginx organizes its files a lot like Apache with sites-available and sites-enabled directories. Virtual host configs are stored in sites-available, and sites-enabled contains symlinks to those configs that you want to enable. Here are the steps I performed on the first Raspberry Pi: 
+
+    $ cd /etc/nginx/sites-available
+    $ sudo ln -s /mnt/gluster1/cluster .
+    $ cd /etc/nginx/sites-enabled
+    $ sudo rm default
+    $ sudo ln -s /etc/nginx/sites-available/cluster .
+
+Now I have a configuration in place but no document root to serve. The next step is to create a /mnt/gluster1/www directory and copy over the default nginx index.html file to it. Of course, you probably would want to create your own custom index.html file here instead, but copying a file is a good start: 
+
+    $ sudo mkdir /mnt/gluster1/www
+    $ cp /usr/share/nginx/www/index.html /mnt/gluster1/www
+
+With the document root in place, I can restart the nginx service: 
+
+    $ sudo /etc/init.d/nginx restart
+
+Now I can go to my DNS server and make sure I have an A record for twopir that points to my first Raspberry Pi at 192.168.0.121. In your case, of course, you would update your DNS server with your hostname and IP. Now I would open up http://twopir/ in a browser and confirm that I see the default nginx page. If I look at the /var/log/nginx/access.log file, I should see evidence that I hit the page.
+
+Once I've validated that the Web server works on the first Raspberry Pi, it's time to duplicate some of the work on the second Raspberry Pi. Because I'm storing configurations on the shared GlusterFS storage, really all I need to do is install nginx, create the proper symlinks to enable my custom nginx config and restart nginx: 
+
+    $ sudo apt-get update
+    $ sudo apt-get install nginx
+    $ cd /etc/nginx/sites-available
+    $ sudo ln -s /mnt/gluster1/cluster .
+    $ cd /etc/nginx/sites-enabled
+    $ sudo rm default
+    $ sudo ln -s /etc/nginx/sites-available/cluster .
+    $ sudo /etc/init.d/nginx restart
+
+### Two DNS A Records ###
+
+So, now I have two Web hosts that can host the same content, but the next step in this process is an important part of what makes this setup redundant. Although you definitely could set up a service like heartbeat with some sort of floating IP address that changed from one Raspberry Pi to the next depending on what was up, an even better approach is to use two DNS A records for the same hostname that point to each of the Raspberry Pi IPs. Some people refer to this as DNS load balancing, because by default, DNS lookups for a hostname that has multiple A records will return the results in random order each time you make the request: 
+
+    $ dig twopir.example.com A +short
+    192.168.0.121
+    192.168.0.122
+    $ dig twopir.example.com A +short
+    192.168.0.122
+    192.168.0.121
+
+Because the results are returned in random order, clients should get sent evenly between the different hosts, and in effect, multiple A records do result in a form of load balancing. What interests me about a host having multiple A records though isn't as much the load balancing as how a Web browser handles failure. When a browser gets two A records for a Web host, and the first host is unavailable, the browser almost immediately will fail over to the next A record in the list. This failover is fast enough that in many cases it's imperceptible to the user and definitely is much faster than the kind of failover you might see in a traditional heartbeat cluster.
+
+So, go to the same DNS server you used to add the first A record and add a second record that references the same hostname but a different IP address—the IP address of the second host in the cluster. Once you save your changes, perform a dig query like I performed above and you should get two IP addresses back. 
+
+Once you have two A records set up, the cluster is basically ready for use and is fault-tolerant. Open two terminals and log in to each Raspberry Pi, and run `tail -f /var/log/nginx/access.log` so you can watch the Web server access then load your page in a Web browser. You should see activity on the access logs on one of the servers but not the other. Now refresh a few times, and you'll notice that your browser should be sticking to a single Web server. After you feel satisfied that your requests are going to that server successfully, reboot it while refreshing the Web page multiple times. If you see a blip at all, it should be a short one, because the moment the Web server drops, you should be redirected to the second Raspberry Pi and be able to see the same index page. You also should see activity in the access logs. Once the first Raspberry Pi comes back from the reboot, you probably will not even be able to notice from the perspective of the Web browser. 
+
+Experiment with rebooting one Raspberry Pi at a time, and you should see that as long as you have one server available, the site stays up. Although this is a simplistic example, all you have to do now is copy over any other static Web content you want to serve into /mnt/gluster1/www, and enjoy your new low-cost fault-tolerant Web cluster. 
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxjournal.com/content/two-pi-r-2-web-servers
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.linuxjournal.com/content/two-pi-r
--- a/sources/Two
+++ b/sources/Two
@ -0,0 +1,149 @@
+Two Pi R
+================================================================================
+Although many people are excited about the hardware-hacking possibilities with the Raspberry Pi, one of the things that interests me most is the fact that it is essentially a small low-power Linux server I can use to replace other Linux servers I already have around the house. In previous columns, I've talked about using the Raspberry Pi to replace the server that controls my beer fridge and colocating a Raspberry Pi in Austria. After I colocated a Raspberry Pi in Austria, I started thinking about the advantages and disadvantages of using something with so many single points of failure as a server I relied on, so I started thinking about ways to handle that single point of failure. When you see "Two Pi R", you probably think the R stands for the radius for a circle. To me, it stands for redundancy. I came to the conclusion that although one Pi isn't redundant, two Pi are.
+
+So, in this article, I'm building the foundation for setting up redundant services with a pair of Raspberry Pis. I start with setting up a basic clustered network filesystem using GlusterFS. In later articles, I'll follow up with how to take advantage of this shared storage to set up other redundant services. Of course, although I'm using a Raspberry Pi for this article, these same steps should work with other hardware as well.
+
+### Configure the Raspberry Pis ###
+
+To begin, I got two SD cards and loaded them with the latest version of the default Raspberry Pi distribution from the official Raspberry Pi downloads page, the Debian-based Raspbian. I followed the documentation to set up the image and then booted in to both Raspberry Pis while they were connected to a TV to make sure that the OS booted and that SSH was set to start by default (it should be). You probably also will want to use the raspi-config tool to expand the root partition to fill the SD card, since you will want all that extra space for your redundant storage. After I confirmed I could access the Raspberry Pis remotely, I moved them away from the TV and over to a switch and rebooted them without a display connected.
+
+By default, Raspbian will get its network information via DHCP; however, if you want to set up redundant services, you will want your Raspberry Pis to keep the same IP every time they boot. In my case, I updated my DHCP server so that it handed out the same IP to my Raspberry Pis every time they booted, but you also could edit the /etc/network/interfaces file on your Raspberry Pi and change: 
+
+    iface eth0 inet dhcp
+
+to: 
+
+    auto eth0
+    iface eth0 inet static
+      address 192.168.0.121
+      netmask 255.255.255.0
+      gateway 192.168.0.1
+
+Of course, modify the networking information to match your personal network, and make sure that each Raspberry Pi uses a different IP. I also changed the hostnames of each Raspberry Pi, so I could tell them apart when I logged in. To do this, just edit /etc/hostname as root and change the hostname to what you want. Then, reboot to make sure that each Raspberry Pi comes up with the proper network settings and hostname.
+
+### Configure the GlusterFS Server ###
+
+GlusterFS is a userspace clustered filesystem that I chose for this project because of how simple it makes configuring shared network filesystems. To start, choose a Raspberry Pi that will act as your master. What little initial setup you need to do will be done from the master node, even though once things are set up, nodes should fail over automatically. Here is the information about my environment: 
+
+    Master hostname: pi1
+    Master IP: 192.168.0.121
+    Master brick path: /srv/gv0
+    Secondary hostname: pi2
+    Secondary IP: 192.168.0.122
+    Secondary brick path: /srv/gv0
+
+Before you do anything else, log in to each Raspberry Pi, and install the glusterfs-server package: 
+
+    $ sudo apt-get install glusterfs-server
+
+GlusterFS stores its files in what it calls bricks. A brick is a directory path on the server that you set aside for gluster to use. GlusterFS then combines bricks to create volumes that are accessible to clients. GlusterFS potentially can stripe data for a volume across bricks, so although a brick may look like a standard directory full of files, once you start using it with GlusterFS, you will want to modify it only via clients, not directly on the filesystem itself. In the case of the Raspberry Pi, I decided just to create a new directory called /srv/gv0 for my first brick on both Raspberry Pis: 
+
+    $ sudo mkdir /srv/gv0
+
+In this case, I will be sharing my standard SD card root filesystem, but in your case, you may want more storage. In that situation, connect a USB hard drive to each Raspberry Pi, make sure the disks are formatted, and then mount them under /srv/gv0. Just make sure that you update /etc/fstab so that it mounts your external drive at boot time. It's not required that the bricks are on the same directory path or have the same name, but the consistency doesn't hurt. 
+
+After the brick directory is available on each Raspberry Pi and the glusterfs-server package has been installed, make sure both Raspberry Pis are powered on. Then, log in to whatever node you consider the master, and use the `gluster peer probe` command to tell the master to trust the IP or hostname that you pass it as a member of the cluster. In this case, I will use the IP of my secondary node, but if you are fancy and have DNS set up you also could use its hostname instead: 
+
+    pi@pi1 ~ $ sudo gluster peer probe 192.168.0.122
+    Probe successful
+
+Now that my pi1 server (192.168.0.121) trusts pi2 (192.168.0.122), I can create my first volume, which I will call gv0. To do this, I run the `gluster volume create` command from the master node: 
+
+    pi@pi1 ~ $ sudo gluster volume create gv0 replica 2 
+     ↪192.168.0.121:/srv/gv0 192.168.0.122:/srv/gv0
+    Creation of volume gv0 has been successful. Please start 
+    the volume to access data.
+
+Let's break this command down a bit. The first part, `gluster volume create`, tells the gluster command I'm going to create a new volume. The next argument, `gv0` is the name I want to assign the volume. That name is what clients will use to refer to the volume later on. After that, the `replica 2` argument configures this volume to use replication instead of striping data between bricks. In this case, it will make sure any data is replicated across two bricks. Finally, I define the two individual bricks I want to use for this volume: the /srv/gv0 directory on 192.168.0.121 and the /srv/gv0 directory on 192.168.0.122. 
+
+Now that the volume has been created, I just need to start it:
+
+    pi@pi1 ~ $ sudo gluster volume start gv0
+    Starting volume gv0 has been successful
+
+Once the volume has been started, I can use the `volume info` command on either node to see its status: 
+
+    $ sudo gluster volume info
+
+    Volume Name: gv0
+    Type: Replicate
+    Status: Started
+    Number of Bricks: 2
+    Transport-type: tcp
+    Bricks:
+    Brick1: 192.168.0.121:/srv/gv0
+    Brick2: 192.168.0.122:/srv/gv0
+
+### onfigure the GlusterFS Client ###
+
+Now that the volume is started, I can mount it as a GlusterFS type filesystem from any client that has GlusterFS support. First though, I will want to mount it from my two Raspberry Pis as I want them to be able to write to the volume themselves. To do this, I will create a new mountpoint on my filesystem on each Raspberry Pi and use the mount command to mount the volume on it: 
+
+    $ sudo mkdir -p /mnt/gluster1
+    $ sudo mount -t glusterfs 192.168.0.121:/gv0 /mnt/gluster1
+    $ df
+    Filesystem         1K-blocks    Used Available Use% Mounted on
+    rootfs               1804128 1496464    216016  88% /
+    /dev/root            1804128 1496464    216016  88% /
+    devtmpfs               86184       0     86184   0% /dev
+    tmpfs                  18888     216     18672   2% /run
+    tmpfs                   5120       0      5120   0% /run/lock
+    tmpfs                  37760       0     37760   0% /run/shm
+    /dev/mmcblk0p1         57288   18960     38328  34% /boot
+    192.168.0.121:/gv0   1804032 1496448    215936  88% /mnt/gluster1
+
+The more pedantic readers among you may be saying to yourselves, "Wait a minute, if I am specifying a specific IP address here, what happens when 192.168.0.121 goes down?" It turns out that this IP address is used only to pull down the complete list of bricks used in the volume, and from that point on, the redundant list of bricks is what will be used when accessing the volume.
+
+Once you mount the filesystem, play around with creating files and then looking into /srv/gv0. You should be able to see (but again, don't touch) files that you've created from /mnt/gluster1 on the /srv/gv0 bricks on both nodes in your cluster: 
+
+    pi@pi1 ~ $ sudo touch /mnt/gluster1/test1
+    pi@pi1 ~ $ ls /mnt/gluster1/test1
+    /mnt/gluster1/test1
+    pi@pi1 ~ $ ls /srv/gv0
+    test1
+    pi@pi2 ~ $ ls /srv/gv0
+    test1
+
+After you are satisfied that you can mount the volume, make it permanent by adding an entry like the following to the /etc/fstab file on your Raspberry Pis: 
+
+    192.168.0.121:/gv0  /mnt/gluster1  glusterfs  defaults,_netdev  0  0
+
+Note that if you also want to access this GlusterFS volume from other clients on your network, just install the GlusterFS client package for your distribution (for Debian-based distributions, it's called glusterfs-client), and then create a mountpoint and perform the same mount command as I listed above.
+
+### Test Redundancy ###
+
+Now that I have a redundant filesystem in place, let's test it. Since I want to make sure that I could take down either of the two nodes and still have access to the files, I configured a separate client to mount this GlusterFS volume. Then I created a simple script called glustertest inside the volume: 
+
+    #!/bin/bash
+
+    while [ 1 ]
+    do
+      date > /mnt/gluster1/test1
+      cat /mnt/gluster1/test1
+      sleep 1
+    done
+
+This script runs in an infinite loop and just copies the current date into a file inside the GlusterFS volume and then cats it back to the screen. Once I make the file executable and run it, I should see a new date pop up about every second:
+
+    # chmod a+x /mnt/gluster1/glustertest
+    root@moses:~# /mnt/gluster1/glustertest
+    Sat Mar  9 13:19:02 PST 2013
+    Sat Mar  9 13:19:04 PST 2013
+    Sat Mar  9 13:19:05 PST 2013
+    Sat Mar  9 13:19:06 PST 2013
+    Sat Mar  9 13:19:07 PST 2013
+    Sat Mar  9 13:19:08 PST 2013
+
+I noticed every now and then that the output would skip a second, but in this case, I think it was just a function of the date command not being executed exactly one second apart every time, so every now and then that extra sub-second it would take to run a loop would add up.
+
+After I started the script, I then logged in to the first Raspberry Pi and typed `sudo reboot` to reboot it. The script kept on running just fine, and if there were any hiccups along the way, I couldn't tell it apart from the occasional skipping of a second that I saw beforehand. Once the first Raspberry Pi came back up, I repeated the reboot on the second one, just to confirm that I could lose either node and still be fine. This kind of redundancy is not bad considering this took only a couple commands.
+
+There you have it. Now you have the foundation set with a redundant file store across two Raspberry Pis. In my next column, I will build on top of the foundation by adding a new redundant service that takes advantage of the shared storage. 
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxjournal.com/content/two-pi-r
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/sources/Ubuntu
+++ b/sources/Ubuntu
@ -0,0 +1,42 @@
+Ubuntu GNOME 14.04 Wallpaper Contest Kicks Off
+================================================================================
+![](http://www.omgubuntu.co.uk/wp-content/uploads/2014/01/gnome_example.jpg)
+
+**Macro lenses at the ready: Ubuntu GNOME is on the hunt for a new set of community-contributed wallpapers to feature in its forthcoming release.**
+
+Ubuntu GNOME 14.04, due in mid-April, wants to look as good as it possibly can. And to do that it needs your help to ensure it ships with a swish selection of wallpapers and backgrounds.
+
+Interested? Here’s what you need to g-know.
+
+### Wallpaper Contest Rules ###
+
+Entry is open to everyone, but you’ll need to be a keen photographer or eager illustrator to take part as the Ubuntu GNOME design team are only looking to include original work.
+
+The full [submission guidelines][1] are straightforward. In summary they seek to ensure that entries:
+
+- Don’t include brand names, logos or trademarks
+- Don’t use violent, religious or explicit imagery
+- Are simple in composition with a single point of focus
+- Are designed with the GNOME Shell UI in mind
+
+It should go without saying: only submit work to which you own the full copyright, and try to aim for a minimum size of **2560 x 1600** (pixels).
+
+Deadline for all entries is February 27. After this date the Ubuntu GNOME design team will pick their favourites. The precise number of winning wallpapers will be based on the amount and overall quality of entries.
+
+Like the regular Ubuntu wallpaper competition, Ubuntu GNOME are accepting submissions on Flickr.
+
+- [Ubuntu GNOME Wallpaper Contest on Flickr][2]
+
+For those without (or unwilling to sign up for) a Yahoo! account entries can also be made via the [Ubuntu GNOME Wiki][3] (which requires an Ubuntu One account).
+
+--------------------------------------------------------------------------------
+
+via: http://www.omgubuntu.co.uk/2014/01/ubuntu-gnome-14-04-wallpaper-contest
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://wiki.ubuntu.com/UbuntuGNOME/Artwork/Trusty/CommunityWallpapers
+[2]:http://www.flickr.com/groups/2484760@N20/
+[3]:https://wiki.ubuntu.com/UbuntuGNOME/Artwork/Trusty/CommunityWallpapers/Submissions
--- a/Shuttleworth.md
+++ b/Shuttleworth.md
@ -1,44 +0,0 @@
-乌龙茶 翻译中
-Ubuntu Will Reach True Convergence Before Microsoft, Says Shuttleworth
-================================================================================
-**The traditional six-monthly Ubuntu release cycle could become a thing of the past, Ubuntu’s founder has suggested.**
-
-> ‘Maybe we’ll soften up on the six-month thing and release updates all the time’
-
-Speaking to [PCPro][1] about Canonical’s convergence plans – which will see the same codebase powering mobiles, tablets and desktops by Ubuntu 15.04 at the latest – Mark Shuttleworth reasons that mobile users are accustomed to updates being released ‘whenever’ they’re ready, something that may lead Ubuntu to *“soften up on the six-month thing and release updates all the time.”*
-
-This wouldn’t be the first time that changes to the Ubuntu release cycle have been proposed. Earlier this year discussions on [moving the distro to a pseudo-”rolling release][2]” were broached, while the release of Ubuntu 13.04 brought [a change to the way updates are pushed][3] out to users.
-
-### Convergence, Phones & Advantages ###
-
-![](http://www.omgubuntu.co.uk/wp-content/uploads/2013/12/mark-tile-300x171.jpg)
-
-Those weren’t the only release-related points to be touched upon in the brief natter,
-
-Shuttleworth also expressed his belief that **Ubuntu will deliver true mobile/desktop convergence ahead of Microsoft.** The Redmond-based company is said to be working on [unification of the Windows Phone and Windows 8 platforms][4] and [disbanding with the ill-received Windows RT][5] altogether.
-
-Ubuntu stealing a head start, coupled with its basis on Linux, could give Ubuntu an advantage when it comes to courting app developers, argues Shuttleworth.
-
-*“Web apps and native apps designed for Android are much closer to being on Ubuntu than they are to being on Windows. Many Android developers use Ubuntu, and develop their apps on Ubuntu, so it’s much easier for them to target that simultaneously.”*
-
-> ‘No Announced Hardware Partners’ 
-
-Asked whether Canonical has **hardware partners willing to produce Ubuntu phones and tablets** Mark was a little more coy, saying that while there are currently ”no announced partners” they are aware of several “household brands” testing the OS internally on “cutting-edge devices”.
-
-This independent testing is, he says, a “strong signal of interest” and something that Canonical are “comfortable” with.
-
-At December’s Le Web conference in Paris Mark told journalists that a [high-end phone is due for release in 2014][6] following ‘successful’ talks with hardware partners. The name of the company producing the phone has yet to be revealed.
--------------------------------------------------------------------------------
-
-via: http://www.omgubuntu.co.uk/2013/12/ubuntu-touch-plans-2014
-
-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.pcpro.co.uk/news/interviews/386080/mark-shuttleworth-interview-taking-ubuntu-beyond-desktops
-[2]:http://www.omgubuntu.co.uk/2013/02/ubuntu-to-discuss-rolling-release-move-at-next-weeks-uds
-[3]:http://www.omgubuntu.co.uk/2013/08/phased-updates-to-start-rolling-out-for-ubuntu-13-04
-[4]:http://blogs.wsj.com/cio/2013/10/24/microsoft-moves-closer-to-mobile-desktop-convergence/
-[5]:http://www.theguardian.com/technology/2013/nov/26/microsoft-kill-windows-rt-larson-green
-[6]:http://www.omgubuntu.co.uk/2013/12/ubuntu-touch-signs-first-hardware-partner-will-debut-high-end-phone-2014
--- a/sources/Ubuntu
+++ b/sources/Ubuntu
@ -0,0 +1,44 @@
+Ubuntu will beat Microsoft in the race to Unified OS
+================================================================================
+![](http://www.linuxfederation.com/wp-content/uploads/2014/01/ubuntu-tv-pc-smartphone-tablet.jpg)
+
+Canonical has been developing an unified OS in form of Ubuntu that can run across different devices without the need of different versions for different platforms i.e a single Ubuntu iso downloaded from [Ubuntu.com][1] can be used on the desktops, mobiles, tablets and TV’s.
+
+Some time back there were rumors of Microsoft doing the same thing, they are going to eliminate the ill-received Windows RT and unify Windows to run across different platforms.
+
+They already have a unified UI running across different platforms called Metro which resulted in a lot of heat but for the Operating systems there are two different versions as in two different Operating Systems. It creates a lot of confusion and compatibility issues as Windows RT is developed specifically for 32-bit ARM processors.
+
+In an interview Shuttleworth told [PcPro][2] that Canonical may be able to deliver a true Mobile/Desktop OS ahead of Microsoft.
+
+> The actual convergence will happen some time during the next major cycle – it won’t be in 14.04, but it could be in 14.10 or 15.04. We believe we’ll be able to deliver that before Microsoft manages to converge Windows on mobile and PC, which the company has said is its goal from a design and development perspective.
+
+When asked if well established players like Android or slowly but steadily increasing Windows can be a threat to Canonical’s future ambitions, Shuttleworth said
+
+> I think the key difference between us and Windows 8 is that we’re based on Linux, just like Android. That means web apps and native apps designed for Android are much closer to being on Ubuntu than they are to being on Windows. Many Android developers use Ubuntu, and develop their apps on Ubuntu, so it’s much easier for them to target that simultaneously.
+
+Shuttleworth didn’t confirm any official hardware partners but he did confirmed that they are aware of several “household brands” testing the OS internally on “cutting-edge devices”.
+
+Shuttleworth has also strongly hinted that Canonical can end the six month release cycle in favour of Realtime Updates.
+
+> Once we’ve converged those, there’s a question about whether the six-month release cycles make as much sense. Phone and tablet users are used to the idea that the phone just updates itself whenever, so maybe we’ll soften up on the six-month thing and release updates all the time.
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxfederation.com/ubuntu-will-beat-microsoft/
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.ubuntu.com/
+[2]:http://www.pcpro.co.uk/news/interviews/386080/mark-shuttleworth-interview-taking-ubuntu-beyond-desktops
+[3]:
+[4]:
+[5]:
+[6]:
+[7]:
+[8]:
+[9]:
+[10]:
+[11]:
+[12]:
--- a/sources/Why
+++ b/sources/Why
@ -0,0 +1,60 @@
+Why The Linux Desktop Doesn't Matter Anymore
+================================================================================
+![](http://readwrite.com/files/styles/630_0su/public/fields/shutterstock_134327498.jpg)
+
+The Linux desktop crew is a hardy bunch. Despite it being abundantly evident that the Linux desktop has lost whatever slim chance it once had to be relevant, Linux advocates continue to wring their hands and [say][1], "We kinda already won!... Sort of."
+
+While it's true to say—and [I've been saying it for years][2]—that Linux [qua][3] Android now reigns as the "desktop" champion, it's equally true that Linux has completely failed as a desktop operating system.
+
+The reason is pretty simple: Linux has never been easy or useful enough for Valerie.
+
+### The Best OS For Valerie ###
+
+Valerie is the lady who cuts my hair, and has done so every six weeks or so for the past 25 years. She's not an early adopter. She's very much part of the mainstream, and [if Valerie is using a technology][4], it's pretty clear that everyone else is, too. 
+
+Valerie recently tried to switch from a Windows machine to a MacBook. Given her interests (photography, primarily), I would have thought a Mac would be a great choice. But she was struggling to figure out how to transfer photos from her Seagate external hard drive to her Mac for editing purposes, and the Mac wasn't recognizing her external drive ([apparently a common issue][5]). The Best Buy employee told her she just needed to format the Seagate drive to make it Mac OS X compatible, and if she did that, everything would go swimmingly.
+
+Valerie panicked. She didn't like the idea of 32,000 photos being inaccessible, or worse—gone. 
+
+After my hair cut, I tried to help her get set up on her new MacBook. I noticed she had a Netflix app on her Windows laptop, but not on the Mac. On her Mac laptop, she just couldn't figure out how to transfer files, delete applications or do other things that had become natural to her on her Windows machine.
+
+Now, I'm a hardcore Mac fan with a house full of MacBook Airs and Pros, yet watching her struggle, I ultimately told her to just buy an Asus laptop with a one terabyte hard drive that could allow her to forego using the external hard drive. 
+
+It wasn't a question of which OS was better. It was a question of which OS was better for Valerie.
+
+### But My Grandmother Can Use Linux! ###
+
+For most people, most of the time, the answer is Windows or, given the prevalence of iPhones and iPads that seamlessly sync with the Mac OS X experience, the answer is increasingly Mac OS X. The answer is rarely, if ever, Linux.
+
+Dan Kusnetzky offers a [variety of reasons that Linux never took off in the enterprise][6], but for me, the real audience to analyze is the Valeries of the world.
+
+Had Valerie been using an iPad or iPhone, she would've had a compelling reason to use a Mac. But she doesn't own any of those things; for cost reasons, Valerie owns an Android smartphone and an Android tablet, which, for her, is mostly used as a glorified movie player. Linux doesn't help Valerie with any of this. It's irrelevant for her needs.
+
+This is why I find it so baffling when [people argue that Linux is good enough][7]:
+
+> It was never necessary for Linux to "beat Windows" on the desktop to be successful. What Linux needed to do was provide a viable alternative to Windows and other operating systems on the desktop. And it has done that over and over again for years. Any Windows user who wants to dump Microsoft can do so today, and can move to Linux for his or her computing needs.
+
+This is so patently untrue that it's breathtaking. Yes, people can get basic computer functions from Linux, and even advanced functionality. What they can't get is an experience that easily blends with other devices or computing experiences they already own. 
+
+### The Web Is The New Linux ###
+
+Rather than Linux, I suspect the new "desktop" winner will be Google. Not Android, per se, but Google. As [Steven J. Vaughan-Nichols notes][8], Google's Chromebooks have been flying off the shelves as they offer a great, low-cost complement to Google services. I can see Valerie using a Chromebook, because it extends the the Google experience that she already loves into a new (but actually old) form factor. Thanks to Picasa, where she already keeps copies of her photos, she should be all set.
+
+Linux is irrelevant to Valerie's needs. Not because it can't fill them, but because it forces her to conform to Linux, rather than having it conform to her needs. And guess what? There are billions of Valeries on this earth, people for whom the choice of desktop OS is not a matter of politics but rather of convenience. The Linux desktop is long on the former, and falls short of the latter.
+
+--------------------------------------------------------------------------------
+
+via: http://readwrite.com/2014/01/23/why-the-linux-desktop-never-mattered#feed=/hack&awesm=~ou6OVYfWhEnIe6
+
+译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://www.itworld.com/open-source/398428/has-linux-lost-desktop-forever-windows
+[2]:http://readwrite.com/2013/02/04/the-year-of-the-linux-desktop-2012#awesm=~otMxvaN3z0hqn1
+[3]:https://www.google.com/search?q=qua&oq=qua&aqs=chrome..69i57j69i61l2j0l2j69i61.6997j0j7&sourceid=chrome&espv=210&es_sm=91&ie=UTF-8
+[4]:http://news.cnet.com/8301-13505_3-10113244-16.html
+[5]:https://discussions.apple.com/message/12225326#12225326
+[6]:http://www.zdnet.com/why-didnt-linux-win-on-the-desktop-7000024760/
+[7]:http://www.itworld.com/open-source/398428/has-linux-lost-desktop-forever-windows
+[8]:http://www.computerworld.com/s/article/9245119/Steven_J._Vaughan_Nichols_The_Windows_killer_Chromebook
--- a/translated/10
+++ b/translated/10
@ -0,0 +1,34 @@
+
+10个有用的开源网络文件管理器
+================================================================================
+目前，随着因特网的使用率增加，文件管理变得比以前更加有用。对很多人来说，有一个应用程序来有效管理你在网络上的文件是必不可少的。因此，这里列出了10个你可能使用到的最好的开源文件管理器！
+
+![](http://www.efytimes.com/admin/useradmin/photo/xBds51300PM1102014.jpg)
+
+1. **eXtplorer**: 这个程序为你提供了移动、复制、编辑、搜索、删除、下载和上传功能。此外，你也能用eXtplorer创建和提取档案，文件夹和新文件。它的关键功能是让你通过FTP访问文件，你能选择在Mozilla 公共许可或者GNU公共许可下去使用这个功能。为了正常使用这个文件管理器，服务器的PHP最低版本要求为PHP4.3 并且浏览器的支持JavaScript。
+
+2. **AjaXplorer**:绝大多数浏览器都支持这个文件管理器并且它能很轻易地自动适应类似于手机一样的小屏幕浏览。目前iOS版的程序已经被开发出来了，安卓版的也很快就能出来。要运行AjaXplorer:，你所需要的是一个支持PHP5.1或者更高版本的网络服务器来。它允许你直接从服务器流视频内容。
+
+3. **KFM**: 这个免费和开源文件管理器可以作为像FCKedition、CKeditor、Tiny MCE 等富文本编辑器一样的插件。如果您正在使用一个基于Linux的操作系统,那么你需要PHP 5.2或更高版本,而Mac OS X和Windows分别需要MySQL4.1或更高版本和MySQL5.0或更高版本。它有一个自己的搜索引擎,附带了一个文本编辑器,可以突出显示语法。它还带有mp3播放和视频播放选项。
+
+4. **PAFM**:这个文件管理器让用户完全控制文件,还允许使用CodePress编辑源代码。文件管理器的主要特点来自CodePress,它提供了语法高亮显示。
+
+5. **QuiXplorer**: 这个文件管理器可用于在互联网和局域网管理和共享文件。它还提供了一种多用户模式,每个用户可以有自己的设置。
+
+6. **BytesFall** Explorer:这个使用PHP和JavaScript编写的管理器在GNU GLU 许可下发布。它的UI非常类似于Windows资源管理器但是它使用了类似于GeSHi、LiveTree、Shell命令、FCKeditor等的项目，因此有一组不同的功能。
+
+7. **NavPHP**: 这个文件管理器是使用PHP和AJAX编写的，并且提供了WindowsXP风格的导航。和 QuiXplorer一样,这个管理器也有一个多用户模式,并有自己的代码编辑器。此外,它还可以压缩和Gzip打包一个网页。你也可以使用这个管理器下载一个压缩成zip格式的文件或文件夹。
+
+8. **iDC File Manager**:这是一个可以安装在基于Linux或windows的网络服务器的多用户系统。它提供了热键功能并支持社交网络,还可以监视用户活动。它的数据库是MySQL。
+
+9. **FileMan**:这个文件管理器带有一个所见即所得编辑器,可以编辑和创建HTML文件。除了HTML编辑器,它还具有其他很多有用的选项。
+
+10. **Relay**: 这个文件管理器使用GNU公共许可并支持AJAX。如果你使用大量的目录和文件,那么这个管理器对你来说非常理想。
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=126569
+
+译者：[kingname](https://github.com/kingname) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/12
+++ b/translated/12
@ -1,37 +0,0 @@
-Linux 服务器管理员的12个高级命令！
-================================================================================
-我们已经读了很多教程和看了很多视频了，你现在是一名Linux高级用户了。好的，恭喜你。但是还有一些需要学习！下面一些命令在你成为全能的管理员时会派上用场！
-
-![](http://www.efytimes.com/admin/useradmin/photo/fQjv122633PM162014.png)
-
-1. **ifconfig**:你会在提升内核驻留的网络接口时会用到ifconfig命令。这个命令通常用于系统调校和调试，但是用于在启动中设置接口。
-
-2. **netstat**:是一个对于Linux用户用于显示网络相关信息的高级命令。它包含了如:路由表、网络连接、伪装连接、接口统计还有其他。
-
-3. **nslookup**:这个命令在你需要找出关于网络服务的信息时使用到。它找到你所查询的DNS域的名称服务器的信息。
-
-4. **dig**:dig工具用于请求DNS域名服务器。如果你要找出主机地址、邮件交换、名称服务器和其他相关信息，那么这是个给你的工具。你可以在Linux和Mac OS X操作系统上使用这个命令。
-
-5. **uptime**: uptime命令用于验证服务器在无人照看下发生了什么。它特别在你坐在服务器前面并看见了一些错误。
-
-6. **wall**:这个命令用于发送信息给所有已登录的用户。你只可以发消息给那些信息权限设置成了'是'的用户。消息被作为wall命令的参数给出。
-
-7. **mesg**: 用户可以使用'write'命令给你发送消息。但是作为服务器管理员，你可以使用mesg命令来决定他们是否可以接收消息。你可以选择'n'和'y'，这会相应地在屏幕上不弹出或者弹出消息。
-
-8. **write**: 如果对于一个用户的'mesg'命令的状态设置为'y'，那么write命令就允许你发送消息给那个用户。
-
-9. **talk**: 当简单的消息不够时，使用talk命令给登陆的用户。
-
-10. **w**: 这个命令是uptime和who命令的结合，如果他们一个接一个给出了特定的顺序。
-
-11. **rename**:当你需要重命名特定的文件时，rename命令会派上用场。这个命令会重命名文件通过替换文件的首次出现。
-
-12. **top**:这个命令显示运行在CPU上的进程。命令会自动刷新并保持显示进程直到你使用中断命令停止它。
-
--------------------------------------------------------------------------------
-
-via: http://www.efytimes.com/e1/fullnews.asp?edid=125990
-
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/2013：The
+++ b/translated/2013：The
@ -1,58 +0,0 @@
-2013：Linux的黄金年-十大杰出成就
-================================================================================
-
-**2013年**快结束了。这一年发生很多里程碑事件使得今年可以称得上**Linux的黄金年**。一些成果从**FOSS**和**Linux**的角度来看可以说是举世瞩目的成就。
-
-![2013 Year of Linux](http://www.tecmint.com/wp-content/uploads/2013/12/Year-2013-Linux.jpg)
-
-### 1.Android的上升趋势 ###
-
-2013年标志着Android手机的日活跃数量为**150万**。不用说，Android使用**Linux内核**是Android著名的标志，并受到大家的热情推崇，这将在未来的日子里继续。
-
-### 2. Raspberry pi ###
-
-一个曾经在低成本史上最伟大的开发，单板计算机**Raspberry pi**。Raspberry Pi的目的就是为了通过FOSS社区在学校和其他地方推广Linux，并仍在继续。
-
-### 3. Debian的空间应用 ###
-
-Debian，最新Linux发行版被用于在2013年的三月下旬的**航天飞机**实验中的控制使命。这个实验的主要内容是通过Debian控制系统来尝试通过无土栽培来为宇航员提供空气和实物的方式。
-
-### 4. SteamOS的崛起 ###
-
-SteamOS，一个基于Debian发行版被设计用于**Stream Machine Game Console**并将在**2013年12月**中旬发布。GNU/Linux的潮流应用于游戏环境无疑是一个非常受欢迎的行为。
-
-### 5. Linux的平板应用 ###
-
-查看**亚马逊**的平板销量，前十的平板都是Android操作系统。苹果和微软的平板则排在第11和12位，对于FOSS社区来说确实是个好消息。
-
-### 6. Chromebooks ###
-
-Chromebooks通过很多高端制造商赢得了笔记本电脑市场，三星，华硕推出GNU/Linux操作系统的电脑比例超过专有操作系统。
-
-### 7. The Firefox OS ###
-
-Firefox OS，用于智能手机和平板的基于Linux的开源操作系统，在**2013年4月**下旬发布了。智能手机基于**ARM**构架的Linux发行版，显示出广阔的前景。
-
-### 8. Kali发布 ###
-
-来自开发者的BackTrack Linux成为**Kali Linux**。Kali是是基于Debian的Linux发行版，母系统主要开发用于渗透测试，并分享了大量的Debian版本库，一个最丰富的发行版。Kail保持着在很短时间内超高下载记录。
-
-### 9. Android Kitkat ###
-
-最新发布的最受期待的android版本被命名为**Kitkat**，Google宣布**Android 4.4**又名**KitKat 4于2013年9月发布**.虽然之前预测的发布版本是**5.0 Key Lime Pie**。Kitkat进行了优化，能在具有最小的**512 MB内存**的设备上运行。
-
-### 10. Linux 在汽车上的应用 ###
-
-截至目前，Linux被应用于各种可穿戴设备，从手腕的手表，遥控器到飞船，所以**Linux在汽车上的应用**不是很意外但当Linux的作用表现在**汽车趋势杂志**的年度车上仍然是令人惊讶。2013年被选为优胜候选的两个型号，都运行Linux系统。
-
-这个故事会在未来继续下去。我们可能错过了一些重要的里程碑，你可以在评论部分告诉我们。以上是我们（**Tecmint**）给读者在这黄金一年的最后一篇文章。
-
-希望您能在新的一年里一如既往的支持我们。我们会在以后的日子里继续为您提供科技文章。继续关注**Tecmint**。
-
--------------------------------------------------------------------------------
-
-via: http://www.tecmint.com/2013-the-golden-year-for-linux-and-foss/
-
-译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/Administrators.md
+++ b/Administrators.md
@ -1,33 +1,34 @@
-29 Practical Examples of Nmap Commands for Linux System/Network Administrators
+对于Linux系统/网络管理员的nmap的29个实例
 ================================================================================
-The **Nmap** aka **Network Mapper** is an open source and a very versatile tool for Linux system/network administrators. **Nmap** is used for **exploring networks, perform security scans, network audit** and **finding open ports** on remote machine. It scans for Live hosts, Operating systems, packet filters and open ports running on remote hosts.
+**Nmap**亦称为**Network Mapper**(网络映射)是一个开源并且通用的用于Linux系统/网络管理员的工具。**nmap**用于**探索网络、执行安全扫描、网络核查**并且**找出开放端口**在远程机器上。它扫描在线主机、操作系统、包过滤和运行在远程主机的开放端口。

-![Nmap Commands](http://www.tecmint.com/wp-content/uploads/2013/12/Nmap-Commands.png)
-*Nmap Commands and Examples*
+![Nmap 命令](http://www.tecmint.com/wp-content/uploads/2013/12/Nmap-Commands.png)
+*Nmap 命令和示例*

-I’ll be covering most of **NMAP** usage in two different parts and this is the first part of nmap serious. Here in this setup, I have used two servers without firewall to test the working of the Nmap command.
+我会在两个不同部分覆盖大部分**NMAP**的使用，这篇是nmap系列的第一部分(译注:原文为I’ll be covering most of NMAP usage in two different parts and this is the first part of nmap serious,这里serious可能为笔误，应该为series)。在这个步骤来，我有两个没有防火墙的服务器来测试nmap命令的工作。

 - 192.168.0.100 – server1.tecmint.com
 - 192.168.0.101 – server2.tecmint.com

-### Nmap command usage ###
+### Nmap 命令使用 ###

    # nmap [Scan Type(s)] [Options] {target specification}

-### How to Install NMAP in Linux ###
+### 如何在Linux上安装nmap ###

-Most of the today’s Linux distributions like **Red Hat, CentOS, Fedoro, Debian** and **Ubuntu** have included **Nmap** in their default package management repositories called [Yum][1] and [APT][2]. The both tools are used to install and manage software packages and updates. To install **Nmap** on distribution specific use the following command.
+**Nmap** on distribution specific use the following command.
+如今大部分Linux发行版像**Red Hat, CentOS, Fedoro, Debian** 和 **Ubuntu**已经包含了**nmap**在它们默认的包管理仓库中，名为[Yum][1] 和 [APT][2]。这两者用于安装和管理软件包和更新。为了在特定发行版上安装**nmap**，使用下面的命令。

    # yum install nmap		[on Red Hat based systems]
    $ sudo apt-get install nmap	[on Debian based systems]

-Once you’ve install latest nmap application, you can follow the example instructions provided in this article.
+一旦你已经安装了最新的nmap程序，你可以跟着这篇文章中的示例指令来。

-### 1. Scan a System with Hostname and IP Address ###
+### 1. 带主机名和IP地址扫描系统 ###

-The **Nmap** tool offers various methods to scan a system. In this example, I am performing a scan using hostname as **server2.tecmint.com** to find out all open ports, services and MAC address on the system.
+**nmap**工具提供了不同的方法来扫描一个系统。在这个例子中，我使用主机名为**server2.tecmint.com**的机器执行扫描来找出所有开放端口，服务和系统上的MAC地址。

-#### Scan using Hostname ####
+#### 使用主机名扫描 ####

    [root@server1 ~]# nmap server2.tecmint.com
    
@ -46,7 +47,7 @@ The **Nmap** tool offers various methods to scan a system. In this example, I am
    Nmap finished: 1 IP address (1 host up) scanned in 0.415 seconds
    You have new mail in /var/spool/mail/root

-#### Scan using IP Address ####
+#### 使用IP地址扫描 ####

    [root@server1 ~]# nmap 192.168.0.101

@ -65,9 +66,9 @@ The **Nmap** tool offers various methods to scan a system. In this example, I am
    Nmap finished: 1 IP address (1 host up) scanned in 0.465 seconds
    You have new mail in /var/spool/mail/root

-### 2. Scan using “-v” option ###
+### 2. 使用"-v"选项扫描 ###

-You can see that the below command with “**-v**” option is giving more detailed information about the remote machine.
+你可以看到带"-v"选项的命令给出了关于远程机器的更多信息。

    [root@server1 ~]# nmap -v server2.tecmint.com

@ -97,9 +98,9 @@ You can see that the below command with “**-v**” option is giving more detai
    Nmap finished: 1 IP address (1 host up) scanned in 0.485 seconds
                   Raw packets sent: 1681 (73.962KB) | Rcvd: 1681 (77.322KB)

-#### Scan Multiple Hosts ####
+#### 扫描多台主机 ####

-You can scan multiple hosts by simply writing their IP addresses or hostnames with Nmap.
+你可以简单地通过在namap后写上它们的IP地址或者主机名来扫描多台主机。

    [root@server1 ~]# nmap 192.168.0.101 192.168.0.102 192.168.0.103

@ -116,9 +117,9 @@ You can scan multiple hosts by simply writing their IP addresses or hostnames wi
    MAC Address: 08:00:27:D9:8E:D7 (Cadmus Computer Systems)
    Nmap finished: 3 IP addresses (1 host up) scanned in 0.580 seconds

-### 4. Scan a whole Subnet ###
+### 4. 扫描整个子网 ###

-You can scan a whole subnet or IP range with Nmap by providing *** wildcard** with it.
+你可以通过**通配符**来使nmap扫描整个子网或者IP段。

    [root@server1 ~]# nmap 192.168.0.*

@ -144,11 +145,11 @@ You can scan a whole subnet or IP range with Nmap by providing *** wildcard** wi
    Nmap finished: 256 IP addresses (2 hosts up) scanned in 5.550 seconds
    You have new mail in /var/spool/mail/root

-On above output you can see that nmap scanned a whole subnet and gave the information about those hosts which are **Up** in the **Network**.
+从上面的输出你可以看到nmap扫描了整个子网，并给出了**网络**中**在线**主机的信息。

-### 5. Scan Multiple Servers using last octet of IP address ###
+### 5. 使用IP地址的最后八位扫描多台主机 ###

-You can perform scans on multiple IP address by simple specifying last octet of IP address. For example, here I performing a scan on IP addresses 192.168.0.101, 192.168.0.102 and 192.168.0.103.
+你可以简单地通过指定IP地址的最后8位执行扫描多台主机。比如说，这里我在IP地址为192.168.0.101, 192.168.0.102 and 192.168.0.103的机器上执行了扫描。

    [root@server1 ~]# nmap 192.168.0.101,102,103

@ -167,11 +168,11 @@ You can perform scans on multiple IP address by simple specifying last octet of
    Nmap finished: 3 IP addresses (1 host up) scanned in 0.552 seconds
    You have new mail in /var/spool/mail/root

-### 6. Scan list of Hosts from a File ###
+### 6. 从文件中扫描主机列表 ###

-If you have more hosts to scan and all host details are written in a file , you can directly ask nmap to read that file and perform scans. Let’s see how to do that.
+如果你有更多的自己要扫描，并且所有的主机细节写在一个文件中，你可以直接让namp读取它并执行扫描。让我们看看要怎么做。

-Create a text file called “**nmaptest.txt**” and define all the IP addresses or hostname of the server that you want to do a scan.
+创建一个名为“**nmaptest.txt**”的文本文件，并定义所有你想要扫描的IP地址或者服务器的主机名。

    [root@server1 ~]# cat > nmaptest.txt

@ -179,7 +180,7 @@ Create a text file called “**nmaptest.txt**” and define all the IP addresses
    server2.tecmint.com
    192.168.0.101

-Next, run the following command with “**iL**” option with nmap command to scan all listed IP address in the file.
+接着，带“**iL**”运行nmap命令来扫描文件中所有列出的IP地址。

    [root@server1 ~]# nmap -iL nmaptest.txt

@ -217,9 +218,9 @@ Next, run the following command with “**iL**” option with nmap command to sc

    Nmap finished: 3 IP addresses (3 hosts up) scanned in 2.047 seconds

-### 7. Scan an IP Address Range ###
+### 7. 扫描一个IP段 ###

-You can specify an IP range while performing scan with Nmap.
+在使用nmap扫描时，你可以指定一个IP段。

    [root@server1 ~]# nmap 192.168.0.101-110

@ -237,9 +238,9 @@ You can specify an IP range while performing scan with Nmap.

    Nmap finished: 10 IP addresses (1 host up) scanned in 0.542 seconds

-### 8. Scan Network Excluding Remote Hosts ###
+### 8. 排除远程主机扫描网络 ###

-You can exclude some hosts while performing a full network scan or when you are scanning with wildcards with “**–exclude**” option.
+你可以在执行全网扫描的时候排除一些主机，或者在使用通配符扫描时使用“**–exclude**”选项。

    [root@server1 ~]# nmap 192.168.0.* --exclude 192.168.0.100

@ -258,9 +259,9 @@ You can exclude some hosts while performing a full network scan or when you are
    Nmap finished: 255 IP addresses (1 host up) scanned in 5.313 seconds
    You have new mail in /var/spool/mail/root

-### 9. Scan OS information and Traceroute ###
+### 9. 扫描系统信息及路由跟踪 ###

-With Nmap, you can detect which OS and version is running on the remote host. To enable OS & version detection, script scanning and traceroute, we can use “**-A**” option with NMAP.
+使用nmap，你可以检测到运行在远程主机上的操作系统和版本。为了启用OS和版本检测，脚本扫描和跟踪路由，我们可以使用带 “**-A**” 选项使用nmap。

    [root@server1 ~]# nmap -A 192.168.0.101

@ -293,11 +294,11 @@ With Nmap, you can detect which OS and version is running on the remote host. To
    Nmap finished: 1 IP address (1 host up) scanned in 22.271 seconds
    You have new mail in /var/spool/mail/root

-In above Output, you can see that nmap is came up with TCP/IP fingerprint of the OS running on remote hosts and being more specific about the port and services running on the remote hosts.
+在上面的输出中，你可以看到运行在远程主机上操作系统的TCP/IP指纹和更详细的运行在远程主机上的特定端口和服务。

-### 10. Enable OS Detection with Nmap ###
+### 10. 使用nmap启用系统检测 ###

-Use the option “-O” and “-osscan-guess” also helps to discover OS information.
+使用选项“-O”和“-osscan-guess”同样帮助发现OS信息。

    [root@server1 ~]# nmap -O server2.tecmint.com

@ -330,9 +331,9 @@ Use the option “-O” and “-osscan-guess” also helps to discover OS inform
    Nmap finished: 1 IP address (1 host up) scanned in 11.064 seconds
    You have new mail in /var/spool/mail/root

-### 11. Scan a Host to Detect Firewall ###
+### 11. 扫描主机来检测防火墙 ###

-The below command will perform a scan on a remote host to detect if any packet filters or Firewall is used by host.
+下面的命令会在远程主机上执行扫描来检测主机上是否使用了任何包过滤器或者防火墙。

    [root@server1 ~]# nmap -sA 192.168.0.101

@ -343,9 +344,9 @@ The below command will perform a scan on a remote host to detect if any packet f
    Nmap finished: 1 IP address (1 host up) scanned in 0.382 seconds
    You have new mail in /var/spool/mail/root

-### 12. Scan a Host to check its protected by Firewall ###
+### 12. 扫描主机以检查其受到防火墙保护 ###

-To scan a host if it is protected by any packet filtering software or Firewalls.
+为了扫描一个主机是否受到任何包过滤器软件或者防火墙保护。

    [root@server1 ~]# nmap -PN 192.168.0.101

@ -363,9 +364,9 @@ To scan a host if it is protected by any packet filtering software or Firewalls.

    Nmap finished: 1 IP address (1 host up) scanned in 0.399 seconds

-### 13. Find out Live hosts in a Network ###
+### 13. 找出网络中在线主机 ###

-With the help of “**-sP**” option we can simply check which hosts are live and up in Network, with this option nmap skips port detection and other things.
+在“**-sP**”选项的bang帮助下，我们可以简单地检测网络中的主机是否在线,带这个选项后nmap会跳过端口检测和其他事情。

    [root@server1 ~]# nmap -sP 192.168.0.*

@ -375,9 +376,9 @@ With the help of “**-sP**” option we can simply check which hosts are live a
    MAC Address: 08:00:27:D9:8E:D7 (Cadmus Computer Systems)
    Nmap finished: 256 IP addresses (2 hosts up) scanned in 5.109 seconds

-### 14. Perform a Fast Scan ###
+### 14. 执行快速扫描 ###

-You can perform a fast scan with “**-F**” option to scans for the ports listed in the nmap-services files and leaves all other ports.
+你可以带“**-F**”选项扫描所有列在nmap服务文件中的端口而留下其他端口。

    [root@server1 ~]# nmap -F 192.168.0.101

@ -394,18 +395,18 @@ You can perform a fast scan with “**-F**” option to scans for the ports list

    Nmap finished: 1 IP address (1 host up) scanned in 0.322 seconds

-### 15. Find Nmap version ###
+### 15. 找出nmap版本 ###

-You can find out Nmap version you are running on your machine with “**-V**” option.
+你可以使用“**-V**”选项找出运行在你机器上的nmap版本。

    [root@server1 ~]# nmap -V

    Nmap version 4.11 ( http://www.insecure.org/nmap/ )
    You have new mail in /var/spool/mail/root

-### 16. Scan Ports Consecutively ###
+### 16. 连续扫描端口 ###

-Use the “**-r**” flag to don’t randomize.
+使用“**-r**”选项而不随机化。

    [root@server1 ~]# nmap -r 192.168.0.101

@ -423,9 +424,9 @@ Use the “**-r**” flag to don’t randomize.

    Nmap finished: 1 IP address (1 host up) scanned in 0.363 seconds

-17. Print Host interfaces and Routes
+### 17. 打印主机接口及路由 ###

-You can find out host interface and route information with nmap by using “**–iflist**” option.
+你可以使用nmap的“**–iflist**”选项来找出主机接口和路由信息。

    [root@server1 ~]# nmap --iflist

@ -440,11 +441,11 @@ You can find out host interface and route information with nmap by using “**
    192.168.0.0/0 eth0
    169.254.0.0/0 eth0

-In above output, you can see that map is listing interfaces attached to your system and their respective routes.
+在上面的输出中，你可以看到清单列出了连接到你系统中的接口和它们相应的路由。

-### 18. Scan for specific Port ###
+### 18. 扫描特定端口 ###

-There are various options to discover ports on remote machine with Nmap. You can specify the port you want nmap to scan with “**-p**” option, by default nmap scans only **TCP** ports.
+nmap使用不同的选项来发现远程机器上的端口。你可以用“**-p**”选项指定你想扫描的端口，默认上，nmap只会扫描**TCP**端口。

    [root@server1 ~]# nmap -p 80 server2.tecmint.com

@ -456,9 +457,9 @@ There are various options to discover ports on remote machine with Nmap. You can

    Nmap finished: 1 IP address (1 host up) sca

-### 19. Scan a TCP Port ###
+### 19. 扫描TCP端口 ###

-You can also specify specific port types and numbers with nmap to scan.
+你同样可以指定nmap扫描的端口类型和号码。

    [root@server1 ~]# nmap -p T:8888,80 server2.tecmint.com

@ -471,7 +472,7 @@ You can also specify specific port types and numbers with nmap to scan.

    Nmap finished: 1 IP address (1 host up) scanned in 0.157 seconds

-### 20. Scan a UDP Port ###
+### 20. 扫描UDP端口 ###

    [root@server1 ~]# nmap -sU 53 server2.tecmint.com

@ -484,7 +485,7 @@ You can also specify specific port types and numbers with nmap to scan.

    Nmap finished: 1 IP address (1 host up) scanned in 0.157 seconds

-### 21. Scan Multiple Ports ###
+### 21. 扫描多个端口 ###

 You can also scan multiple ports using option “**-p**“.

@ -499,15 +500,16 @@ You can also scan multiple ports using option “**-p**“.

    Nmap finished: 1 IP address (1 host up) scanned in 0.190 seconds

-### 22. Scan Ports by Network Range ###
+### 22. 扫描网络的端口范围 ###

 You can scan ports with ranges using expressions.
+你可以使用表达式扫描端口范围

    [root@server1 ~]#  nmap -p 80-160 192.168.0.101

-### 23. Find Host Services version Numbers ###
+### 23. 找出主机服务版本号 ###

-We can find out service’s versions which are running on remote hosts with “**-sV**” option.
+我们可以使用“**-sV**”选项找出运行在远程主机的服务版本号。

    [root@server1 ~]# nmap -sV 192.168.0.101

@ -525,9 +527,9 @@ We can find out service’s versions which are running on remote hosts with “*

    Nmap finished: 1 IP address (1 host up) scanned in 12.624 seconds

-#### 24. Scan remote hosts using TCP ACK (PA) and TCP Syn (PS) ####
+#### 24. 使用 TCP ACK (PA) 和 TCP Syn (PS) 扫描远程主机 ####

-Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in that case, we can use **TCP ACK** and **TCP Syn** methods to scan remote hosts.
+有时包过滤防火墙阻止了标准**ICMP**ping请求，在这个情况下，我们可以使用**TCP ACK**和**TCP Syn**方法来扫描远程主机。

    [root@server1 ~]# nmap -PS 192.168.0.101

@ -546,7 +548,7 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 0.360 seconds
    You have new mail in /var/spool/mail/root

-### 25. Scan Remote host for specific ports with TCP ACK ###
+### 25. 用TCP ACK扫描远程主机的特定端口###

    [root@server1 ~]# nmap -PA -p 22,80 192.168.0.101

@ -560,7 +562,7 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 0.166 seconds
    You have new mail in /var/spool/mail/root

-### 26. Scan Remote host for specific ports with TCP Syn ###
+### 26. 用TCP SYN扫描远程主机的特定端口 ###

    [root@server1 ~]# nmap -PS -p 22,80 192.168.0.101

@ -574,7 +576,7 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 0.165 seconds
    You have new mail in /var/spool/mail/root

-### 27. Perform a stealthy Scan ###
+### 27. 执行隐秘扫描 ###

    [root@server1 ~]# nmap -sS 192.168.0.101

@ -593,7 +595,7 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 0.383 seconds
    You have new mail in /var/spool/mail/root

-### 28. Check most commonly used Ports with TCP Syn ###
+### 28. 用TCP SYN扫描最常用的端口 ###

    [root@server1 ~]# nmap -sT 192.168.0.101

@ -612,7 +614,7 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 0.406 seconds
    You have new mail in /var/spool/mail/root

-### 29. Perform a tcp null scan to fool a firewall ###
+### 29. 执行tcp空扫描来愚弄防火墙 ###

    [root@server1 ~]# nmap -sN 192.168.0.101

@ -631,13 +633,13 @@ Sometimes packet filtering firewalls blocks standard **ICMP** ping requests, in
    Nmap finished: 1 IP address (1 host up) scanned in 1.584 seconds
    You have new mail in /var/spool/mail/root

-That’s it with **NMAP** for now, I’ll be coming up more creative options of **NMAP** in our second part of this serious. Till then, stay tuned with us and don’t forget to share your valuable comments.
+这些就是目前**NMAP** 的用法，我会写出更有创造性的**NMAP**的第二部分(译注:原文为 I’ll be coming up more creative options of **NMAP** in our second part of this serious,这里serious可能为笔误，应该为series)。接着，不要走开也别忘了分享你们有价值的评论。

 --------------------------------------------------------------------------------

 via: http://www.tecmint.com/nmap-command-examples/

-译者：[译者ID](https://github.com/译者ID) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/translated/6
+++ b/translated/6
@ -0,0 +1,36 @@
+为你的上网本添活力 - 6款强大而又不平凡的 Linux 操作系统
+
+================================================================================
+
+
+> 基于Linux的操作系统的优点是它们可以根据不同的需求定制。所以，在这里我们将呈现顶尖的6款专为笔记本设定不寻常而又有趣的发行版。
+
+
+评定一款上网本OS是否良好，主要取决于它是否能“物尽其用”。当在闲置模式下,内存使用应该降到最小限度，你需要一个很好的导航系统来避免屏幕的错乱。
+
+
+对于一位 Linux 爱好者来说，拥有一款对本本优化过的操作系统，同时还是基于开源技术，这是该有多好啊。
+
+![](http://1-ps.googleusercontent.com/h/www.efytimes.com/admin/useradmin/photo/150x150xlU3z33744PM1132014.jpg.pagespeed.ic.3AoI0od5vQ.jpg)
+
+1.**AntiX** - 利用了 iceWM 窗口管理器，能帮助维持初始内存的低占用。虽然它并不像 Ubuntu,Mint和Elementary 那样风靡，但是它具备全功能。在底部有一个导航任务栏，在桌面上有标准的跨操作系统的图标已经存在数年之久。AntiX 携带有一系列的应用程序，其中只有少部分不太适合用于上网本。
+
+2. **SparkyLinux** - Razor-Qt 的外观和感受是非常传统的，底部有一个面板，菜单位于底部的左下角。SparkyLinux 携带有一些应用程序。开发者再次选择了 LibreOffice 套件，而不是更加轻量的 Abiword 和 Gnumeric 工具包。
+
+3. **Lubuntu** - LXDE 桌面非常的轻量，也近乎 Xubuntu 那么容易定制。这桌面在熟悉不过了，在底部有一个面板带有菜单和系统托盘图标。然而，你可以定制你自己想要的 Lubuntu，如果你喜欢完全可以定制个多面板的。Sylpheed 邮件客户端，火狐浏览器，以及 Abiword 和 Gnumeric ，这些应用程序对于上网本来说在合适不过了。
+
+4. **OS4** - 基于 Xubuntu。使用了 XFCE 桌面在自制方面很强大，你可以尝试任何的方式来工作。XFCE 是一款轻量级的桌面环境，在上网本上运行极佳。然而，你需要安装额外的限制包来播放 Flash 视频和 MP3 , 但是OS4会让这些立马工作。同时安装有 Commodore Amiga 模拟器，你如果喜欢在你的上网本上玩复古游戏，那么这是个再好不过的选项。
+
+5. **Point Linux** - 它使用了MATE桌面，使它变得更加独特。MATE 桌面最初源于 GNOME2 ,但是现在他已经凭借自身发展成一个真正优秀的的桌面环境。Point Linux 显得非常的时尚。菜单看起来非常好，在上网本上的执行效率也很好。类似于 LXDE 和 XFCE 桌面，他也有很高的定制性。Point Linux 默认带有 4 个虚拟工作区，允许你最大限度的使用你的上网本，因此它受到内存和处理器处理显示问题的限制。
+
+6. **Elementary OS** - 如果你在寻找一些非常时尚的东西，那么这款绝对适合你。它没有安装 Office 套件，但是你有选项可以挑选你想要的工具。对于网页浏览器你可以用 Midori ，邮件客户端可以用 Geary。安装有 Totem 可以观看视频，和一款紧凑型的音频应用程序名为 Noise。
+
+来源： eyerydaylinuxuser.com
+
+--------------------------------------------------------------------------------
+
+via: http://www.efytimes.com/e1/fullnews.asp?edid=126643
+
+译者：[Luoxcat](https://github.com/Luoxcat) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Built
+++ b/translated/Built
@ -0,0 +1,181 @@
+内置审计跟踪工具- Linux last命令
+================================================================================
+![](http://linoxide.com/wp-content/uploads/2013/12/linux-last-command.jpg)
+
+如果你是一个服务器管理员，你或许理解你要保护你的服务器。不仅是从外部，还要从内部保护。linux有一个内置工具来看到最后登陆服务器的用户
+
+这个命令是**last**。命令**对于追踪非常有用**。让我们来看一下last可以为你做些什么。
+
+### last命令的功能是什么 ###
+
+**last**显示**/var/log/wtmp**文件创建起所有登录(和登出)的用户。这个文件是二进制文件,它不能被文本编辑器浏览比如vi,Joe或者其他软件。这个技巧非常聪明因为用户(或者root)不能向他们希望的那样修改文件文件。
+
+last会给出所有已登录用户的用户名,tty,IP地址(如果用户是远程连接的话),日期-时间,用户已经登录的时间。
+
+### 如何运行last ###
+
+你只要在控制台中输入**last**.这是个例子:
+
+    $ last
+
+    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
+    pungki tty1 Mon Dec 2 09:31 still logged in
+    reboot system boot 2.6.32-358.23.2 Mon Dec 2 09:20 - 13:25 (04:05) 
+
+这里是如何阅读last信息:
+
+- 第一列告诉谁是用户
+- 第二列给出了用户如何连接的信息
+
+>     pts/0 (伪终端) 意味着从诸如SSH或telnet的远程连接的用户
+> 
+>     tty (teletypewriter) 意味着直接连接到计算机或者本地连接的用户
+> 
+>     除了重启活动,所有状态会在启动时显示
+
+- 第三列**显示用户来自哪里**。如果用户来自于远程计算机,你会看到一个主机名或者IP地址。如果你看见:0.0 或者什么都没有,这意味着用户通过本地终端连接.除了重启活动,内核版本会显示在状态中。
+- 剩下的列显示**日志活动发生在何时**。括号中的数字告诉我们连接持续了多少小时和分钟。
+
+### 日常操作中last的一些示例 ###
+
+#### 限制显示行的数目 ####
+
+当你有很多行要显示时,你可以限制你想看到的行的数目.使用 **-n 参数**来这么做。
+
+    $ last -n 3
+
+    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
+    pungki tty1 Mon Dec 2 09:31 still logged in
+    reboot system boot 2.6.32-358.23.2 Mon Dec 2 09:20 - 13:25 (04:05)
+
+**-n parameter** 会使last显示从当前时间到以后的3条记录。
+
+#### 不显示主机名 ####
+
+使用 **-R parameter** 来这么做。这里是例子 :
+
+    $ last -R
+
+    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53)
+    pungki tty1 Mon Dec 2 09:31 still logged in
+    reboot system boot Mon Dec 2 09:20 - 13:25 (04:05)
+
+如你所见,现在在也没有关于主机或者IP地址的信息了。
+
+#### 最后一列显示主机名 ####
+
+要这么做,我们使用 **-a parameter**
+
+    $ last -a
+
+    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53) 10.0.76.162
+    pungki tty1 Mon Dec 2 09:31 still logged in :0.0
+    reboot system boot Mon Dec 2 09:20 - 13:25 (04:05) 2.6.32-358.23.2.el6.i686
+
+现在主机信息诸如10.0.76.162 会放在最后一列。
+
+#### 显示完整登入登出时间日期 ####
+
+对于此,你可以使用 **-F parameter**。这个是个示例:
+
+    $ last -F
+
+    leni pts/0 10.0.76.162 Mon Dec 2 12:32:24 2013 – Mon Dec 2013 13:25:24 2013 (00:53)
+
+#### 打印特定的用户名 ####
+
+如果你想要追踪特定的用户,你可以特别打印它。在last命令后面输入用户名。
+
+    $ last leni
+
+    leni tty1 Mon Dec 2 18-42 still logged in
+    leni pts/0 Mon Dec 2 12:32 - 13:25 (00:53) 10.0.76.162
+
+或者你想要知道**reboot**何时完成,你也可以这样显示它
+
+    $ last reboot
+
+    reboot system boot Mon Dec 2 09:20 - 16:55 (07:34)
+    reboot system boot Sun Dec 1 04:26 - 04:27 (00:01)
+    reboot system boot Wed Nov 27 20:27 - 01:24 (04:57)
+    reboot system boot Tue Nov 26 21:06 - 06:13 (09:06)
+
+#### 打印特定 / pts ####
+
+last同样可以打印特定tty/pts的信息. 只要在last命令后面输入tty名字或者pty名字。
+这里有一些例子:
+
+    $ last tty1
+
+    pungki tty1 Mon Dec 2 09:31 still logged in
+    pungki tty1 Mon Dec 2 04:26 – down (00:00)
+    pungki tty1 Mon Dec 2 04:07 – down (00:00)
+    pungki tty1 Sun Dec 1 18:55 – 04:07 (09:12)
+
+    $ last pts/0
+
+    leni pts/0 10.0.76.162 Mon Dec 2 12:32 - 13:25 (00:53)
+    pungki pts/0 :0.0 Wed Nov 27 20:28 – down (04:56)
+
+当你看到 **down 的值** - 比如上面的第二行,它意味着用户从某个时间登录直到系统重启或关机。
+
+#### 使用另一个文件而不是 /var/log/wtmp ####
+
+默认上,last命令会从**/var/log/wtmp**中解析信息。如果你想要**last命令**从另外一个文件解析,你可以使用**-f参数**。比如,你可以在某些条件后倒换日志。让我们假设前面的文件名为**/var/log/wtmp.1**。那么last命令会像这样。
+
+    $ last -f /var/log/wtmp.1
+
+#### 显示运行级别改变 ####
+
+这里有个**-x 参数**如果你想要改变运行级别。这里示例输出:
+
+    pungki tty1 Mon Dec 2 19:21 still logged in
+    runlevel (to lvl 3) 2.6.32-358.23.2 Mon Dec 2 19:20 – 19:29 (00:08)
+    reboot system boot 2.6.32-358.23.2 Mon Dec 2 19:20 – 19:29 (00:08)
+    shutdown system down 2.6.32-358.23.2 Mon Dec 2 18:56 – 19:20 (00:23)
+    runlevel (to lvl 0) 2.6.32-358.23.2 Mon Dec 2 18:56 – 18:56 (00:00)
+    leni tty1 Mon Dec 2 18:42 – down (00:00) 
+
+你可以看到这里有两个运行级别。运行级别**to lvl 3**的条目意味着系统运行在完整的控制台模式.没有活跃的X window或者GUI.同时,当系统**关机**时,Linux在**运行级别0**。这就是为什么last会显示**to lvl 0**。
+
+#### 查看失败登录 ####
+
+当**last**命令记录成功登录,那么 **lastb** 命令**记录失败的登录尝试**。你**必须拥有root**权限来运行lastb命令。这里有一个lastb命令的示例输出。lastb会解析/var/log/btmp的信息。
+
+    # lastb
+
+    leni tty1 Mon Dec 2 22:12 – 22:12 (00:00)
+    rahma tty1 Mon Dec 2 22:11 – 22:11 (00:00) 
+
+#### 倒换日志 ####
+
+既然*/var/log/wtmp**记录每次的登录活动,文件的大小可能会快速地增长。默认上,Linux会每月**倒换 /var/log/wtmp/**。倒换活动的细节放在/etc/logrotate.conf 文件中。这里是我**/etc/logrotate.conf**文件的内容。
+
+    /var/log/wtmp {
+    　　monthly
+    　　create 0664 root umtp
+    　　minsize 1M
+    　　rotate 1
+    }
+
+对于 **/var/log/btmp**, 这里是默认的倒换活动配置
+
+    /var/log/btmp {
+    　　missingok
+    　　monthly
+    　　create 0600 root umtp
+    　　minsize 1M
+    　　rotate 1
+    }
+
+### 总结 ###
+
+你可以结合这些参数来自定义last和lastb的输出。所有可以**运行于last命令**的参数都**可运行在**lastb命令上。更多细节,请通过在控制台输入**man last**来访问。
+
+--------------------------------------------------------------------------------
+
+via: http://linoxide.com/linux-command/linux-last-command/
+
+译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Daily
+++ b/translated/Daily
@ -0,0 +1,44 @@
+Ubuntu日常操作小技巧-截屏
+===========================================================================
+=====
+
+================================================================================
+Ubuntu，是一个能让你进行多种任务流行、实用的操作系统。从使用Libreoffice创建和编辑文档，到使用GIMP处理图片，Ubuntu最佳选择。
+
+如果你需要一个方便的操作系统来完成自己的工作，那么最后你会选择Ubuntu。
+
+你可以用Ubuntu做的另外一件事是对你的桌面截屏或者激活应用程序的窗口。有很多第三方工具可以供你选择来做这些事情，但是实际你没有必要这么做，因为Ubuntu安装时就已经自带了这些功能。
+
+如果你想向别人展示如何在Ubuntu上面做一些事情，那么这个应用程序就非常有用。截屏得到的图片文件可以保存，也可以通过email发送给其他人。
+
+为了使用截屏程序，需要进入到面板界面或者直接按下键盘上面的Windows键已进入面板，其中Windows键指的是键盘空格键的左边，有Windows图标的键。
+
+当面板打开后，找到“截屏”，然后打开这样程序(译者注：需要在已安装程序中查找或者直接在搜索框中输入“截图”)。
+
+下面是你能够通过这个截屏程序做的操作：
+
+- 截取整个屏幕
+- 截取当前程序的窗口
+- 截取特定区域
+
+如果你想在截图时将鼠标的箭头也一起截取，可以将在下方图片中的Effects选项中的"Include pointer"选项选中就可以了。
+
+![](http://www.liberiangeek.net/wp-content/uploads/2013/12/screenshot.png)
+
+当你选择好你的截屏方式后，点击图片中的‘**截图**’按钮，然后程序就会退出并且自动保存图片。
+
+如果你想截取特定区域，需要选择该方式，当你点击‘**截图**’按钮时，鼠标会变成十字形状。此刻，你可以拖拽这个十字形状的鼠标，来得到你任意你想截取的区域。在你停止拖拽鼠标后，图片会被启动截取。
+
+上面提到的就是你在使用Ubuntu时，能够使用它做的一个截图操作。
+
+希望这些能够帮助你，也欢迎你下次再到我们网站。
+
+祝您生活、工作愉快！
+
+--------------------------------------------------------------------------------
+
+via: http://www.liberiangeek.net/2013/12/daily-ubuntu-tips-take-screenshots-of-your-desktop/
+
+译者：[liuaiping](https://github.com/liuaiping) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Daily
+++ b/translated/Daily
@ -0,0 +1,44 @@
+每日Ubuntu小技巧 - 在Ubuntu中使用Spotify(声破天，音乐软件)
+================================================================================
+
+Spotify（译者注：下面用"声破天"代替）云音乐服务刚为所有用户及平台（web端/桌面端/手机端）解除时间限制，现在用户可以在任何平台、任何时间无限制的听免费音乐。
+
+起初，声破天有个第一次注册的帐号只能免费听音乐6个月的限制，但是这个限制取决于你所在的国家，不过现在任何免费的帐号都可以无限制的听音乐。
+
+任何使用Ubuntu桌面客户端听音乐的用户也是没有之前对免费账户听音乐的限制，Ubuntu用户可以使用他们最喜欢的桌面操作系统来享受免费音乐。
+
+如果你现在已经有点激动了，但还没有安装声破天，那么这里有一个快捷方法来告诉你如何在Ubuntu上面安装最新版本的声破天。
+
+对于一些处于声破天不支持注册的国家地区的用户来说，他们必须得想点别的办法了（译者注：需要使用代理），这是因为声破天并不是支持所有国家。下面图片显示的是目前声破天支持的国家列表：
+
+![](http://www.liberiangeek.net/wp-content/uploads/2014/01/spotifycountrylist.jpg)
+
+### 在Ubuntu安装上声破天 ###
+
+为了能在Ubuntu上面安装声破天，需要打开终端然后输入下面的命令，将声破天的软件仓库添加到Ubuntu
+
+    sudo apt-add-repository -y "deb http://repository.spotify.com stable non-free"
+
+下一步，将声破天的仓库密钥添加到Ubuntu，运行下面命令：
+
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 94558F59
+
+最后，更新系统的软件包仓库并且安装声破天，运行下面命令：
+
+    sudo apt-get update && sudo apt-get install spotify-client
+
+就是这样简单，我们完成了声破天的安装！
+
+在安装完声破天后，你需要打开Ubuntu的面板，在里面找到这个软件。打开后，你就可以尽情享受你的免费音乐吧！
+
+![](http://www.liberiangeek.net/wp-content/uploads/2014/01/spotifyclientubuntu.png)
+
+尽情享受吧!
+
+--------------------------------------------------------------------------------
+
+via: http://www.liberiangeek.net/2014/01/daily-ubuntu-tips-use-spotify-in-ubuntu-linux/
+
+译者：[liuaiping](https://github.com/liuaiping) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/Find
+++ b/translated/Find
@ -1,32 +1,33 @@
-在Linux Mint 16中找到保存的WiFi密码[新手教程]
+新手教程——在Linux Mint 16中找到保存的WiFi密码
 ================================================================================

-当你使用WEP，WPA或WPA2-PSK连接到无线网络时，选择“自动连接”后密码将保存在Linux Mint（或任何其他的操作系统）中。试想一个情况，你需要知道WiFi密码，例如你需要提供密码给访问者，你有没有注意到它保存在哪。您可以轻松地找到之前连接的WiFi密码。
+当你使用 WEP，WPA 或 WPA2-PSK 连接到无线网络时，选择“自动连接”后密码将保存在Linux Mint（或任何其他的操作系统）中。试想一个情况，例如你需要提供密码给来访者，这时你需要知道WiFi密码，然而你有没有把它记下来。你可以轻松地找到之前连接的WiFi密码。

-在这篇**新手教程**中，我们将会告诉你**如何在Linux Mint 16中找到保存的WiFi密码**。
+在这篇**新手教程**中，我们将会指导你**如何在 Linux Mint 16 中找到保存的 WiFi 密码**。

-### 在Linux Mint中找到保存的WiFi密码: ###
+### 在 Linux Mint 中找到保存的 WiFi 密码: ###

-找到保存的WiFi密码的过程其实非常简单。点击Menu输入network。在其中选择**Network Connections**。
+找到保存的 WiFi 密码，其实过程非常简单。点击 Menu 输入network。在其中选择**Network Connections**。

 ![](http://itsfoss.com/wp-content/uploads/2014/01/Saved-Wifi-Password-1.jpeg)

-在Network Connections中，你可以看到所有你曾经链接过的WiFi网络。选择你希望知道密码的一个，点击**Edit**。
+在 Network Connections 中，你可以看到所有你最近链接过的 WiFi 网络。选择你想要知道密码的一个，点击**Edit**。

 ![](http://itsfoss.com/wp-content/uploads/2014/01/Saved-Wifi-Password-2.png)

-到了这一步，在 **Wi-Fi Security**选项卡下，选中**Show password**来显示密码。
+在 **Wi-Fi Security** 选项卡下，选中 **Show password** 来显示密码。

 ![](http://itsfoss.com/wp-content/uploads/2014/01/Saved-Wifi-Password-3.png)

-通过以上的步骤，你就可以得到保存的WiFi密码。你也可以通过相同的步骤来[在Ubuntu中获取保存的WiFi密码][1]。希望这篇文章能够帮到你。
+通过以上步骤，你就可以得到保存的 WiFi 密码。你也可以通过类似的步骤[在 Ubuntu 中获取保存的 WiFi 密码][1]。希望这篇文章能够帮到你。

 --------------------------------------------------------------------------------

 via: http://itsfoss.com/find-wifi-password-linux-mint-16/

-译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[Caroline](https://github.com/carolinewuyan)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

 [1]:http://itsfoss.com/how-to-find-saved-wireless-wifi-passwords-ubuntu/
+ 
--- a/translated/How
+++ b/translated/How
@ -1,47 +1,47 @@
-如何在Linux Mint 16中安装图标主题[新手教程]
+新手教程——如何在 Linux Mint 16 中安装图标主题
 ================================================================================

-你是否想过默认的Mint主题和图标并不足以满足你，为何不来点改变那？在这篇初学者快速教程中，我们会告诉你如何**在Linux Mint 16中安装图标主题**以及**如何改变图标**。通过这篇快速教程你将安装上Moka图标主题。
+如果你觉得默认的 Mint 主题和图标并不足以满足你，为何不来点改变呢？在这篇初学者快速教程中，我们会指导你如何**在Linux Mint 16中安装图标主题**以及**如何改变图标**。我们将通过安装绚丽的 Moka 图标主题来学习本教程。

-小小提一下，可能你以前不知道，主题和图标主题之间是有区别的。图标主题只是改变图标的外观，而主题则是改变了包括图标在内其余很多东西的外观。
+小小提一下，可能你以前不知道，主题和图标主题之间是有区别的。图标主题只是改变图标的外观，而主题则改变了包括图标在内其余很多东西的外观。

-### 在Linux Mint 16中安装图标主题: ###
+### 在 Linux Mint 16 中安装图标主题: ###

 在Linux Mint（以及其他大部分的Linux发行版）中有个两种方法来安装图标主题。如果你下载了图标主题的压缩包，你可以在~/.icons目录下解压它。通常这个目录并不存在。你可以随意创建它。

-安装图标主题的第二种方法是使用[PPA][1]。大多数流行的图标主题都有自己的PPA。让我们来看看如何使用PPA在Mint中安装Moka图标。
+安装图标主题的第二种方法是使用 [PPA][1]。大多数流行的图标主题都有自己的 PPA。让我们来看看如何使用 PPA 在 Mint 中安装 Moka 图标。

-### 在Linux Mint 16中安装Moka图标主题: ###
+### 在 Linux Mint 16 中安装 Moka 图标主题: ###

-打开terminal（Ctrl+Alt+T）并输入下面的命令：
+打开 terminal（Ctrl+Alt+T）并输入下面的命令：

    sudo add-apt-repository ppa:moka/moka-icon-theme
    sudo apt-get update
    sudo apt-get install moka-icon-theme

-### 在Linux Mint 16中改变图标: ###
+### 在 Linux Mint 16 中改变图标: ###

-改变一个[在Ubuntu的图标主题][2]是非常直接简单地。不过在Linux Mint中稍微隐藏了一下。你安装了图标主题后，在菜单中选择**Setting**，然后选择**Themes**。
+[在 Ubuntu 中改变图标主题][2]是非常简单直接的。不过在 Linux Mint 中稍微隐藏了一下。你安装了图标主题后，在菜单中选择 **Setting**，然后选择 **Themes**。

 ![](http://itsfoss.com/wp-content/uploads/2014/01/Chnage_Icon_themes_1.jpeg)

-现在你可能已经意识到为什么我说在Linux Mint的图标更改稍微隐藏了。至少第一眼，你不会找到一个选项来改变图标。只改变图标，选择**Other settings**并点击**Icons**。你会在这找到所有的图标设置。选择你喜欢的一个。
+现在你可能已经明白为什么我说在 Linux Mint 中的图标更改稍微隐藏了。至少第一眼，你不会找到一个选项来改变图标。只改变图标，选择 **Other settings** 并点击 **Icons**。你会在这里找到所有的图标设置。选择你喜欢的一个。

-![](http://itsfoss.com/wp-content/uploads/2014/01/Change_Icon_Linux_Mint.jpeg)
+![](http://itsfoss.com/wp-content/uploads/2014/01/Change_Icon_Linux_Mint.jpeg) 

-改变会立即生效，并不需要重启。下面是我的Linux Mint使用Moka图标主题后的桌面：
+改变会立即生效，并不需要重启。下面是我的 Linux Mint 使用 Moka 图标主题后的桌面：

 ![](http://itsfoss.com/wp-content/uploads/2014/01/Moka_Linux_Mint_16.jpeg)

-我希望这篇教程能帮助你实现图标主题的修改。不要忘记Ubuntu 13.10的5个最好图标主题，你可以使用任何你喜欢的图标主题来使你的桌面变得更漂亮。有任何问题，建议，想法？随时联系。
+我希望这篇教程能帮助你实现图标主题的修改。不要忘记 Ubuntu 13.10 的5个最好图标主题，你可以使用任何你喜欢的图标主题来使你的桌面变得更漂亮。如有任何问题、建议以及想法，请在下面评论栏留下您的评论。

 --------------------------------------------------------------------------------

 via: http://itsfoss.com/install-icon-linux-mint/

-译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[Caroline](https://github.com/carolinewuyan)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

 [1]:http://en.wikipedia.org/wiki/Personal_Package_Archive
-[2]:http://itsfoss.com/how-to-install-themes-in-ubuntu-13-10/
+[2]:http://itsfoss.com/how-to-install-themes-in-ubuntu-13-10/
--- a/translated/How
+++ b/translated/How
@ -1,23 +1,22 @@
-
 在Arch上使用Syslinux替代GRUB
 ================================================================================

-这个教程用于告诉Arch Linux的使用者在Arch下安装Syslinux——一个轻量级、快速并且现代感十足的系统引导程序，并替换掉系统自带的GRUB引导程序。
+这个教程用于教授Arch Linux用户如何在Arch下安装Syslinux——一个轻量级、快速并且现代感十足的系统引导程序，用来替换掉系统自带的GRUB引导程序。

 ![](http://i1-news.softpedia-static.com/images/news2/How-to-Replace-GRUB-with-Syslinux-on-Arch-Linux-415394-2.jpg)

-实际上，Syslinux不是一个简单的开机启动装载程序，它有几种开机载入的功能，能够在本地载入，通过PXE网络载入，以及通过可移动媒体。并且，它还同时支持MBR和GPT磁盘，以及RAID设置。
+实际上，Syslinux不是一个简单的开机启动装载程序，它支持多种启动引导方式，本地载入，通过PXE网络载入，以及通过可移动媒体载入。并且，它还同时支持MBR和GPT磁盘，以及RAID设置。

-在开始你实际操作之前，你需要了解Syslinux支持如下文件系统：FAT，EXT2，EXT3，EXT4和Btrfs。而且Syslinux能够运行在支持UEFI或BIOS的机器上，到目前为止，Syslinux还只能访问自己所在的分区。
+在开始你实际操作之前，你需要了解下Syslinux支持如下文件系统：FAT，EXT2，EXT3，EXT4和Btrfs。而且Syslinux能够运行在支持UEFI或BIOS的机器上，到目前为止，Syslinux还只能访问自己所在的分区。

-在你替换GRUB启动之前，请认真考虑这只是一个可选的操作，这个操作有可能会给你带来一些麻烦。如果说你只是想尝试一下新鲜的事物，或是已经厌倦了GRUB的界面，没问题来尝试尝试Syslinux吧。
+在你替换GRUB启动之前，请认真考虑这只是一个可选的尝试，这个尝试有可能会给你带来一些麻烦。如果说你只是想感受一下新鲜的事物，或是已经厌倦了GRUB的界面，没问题来尝试尝试Syslinux吧。

 ###在Arch box 中安装Syslinux ###
-通过上面的了解，我们来开始安装Syslinux，并替换掉已有的GRUB或者GRUB2启动程序。打开一个终端，输入如下命令来安装Syslinux
+该说的都说完了，下面我们来开始安装Syslinux，准备替换掉已有的GRUB或者GRUB2启动程序。打开一个终端，输入如下命令来安装Syslinux

 sudo pacman -S syslinux

-安装完成后，你应该注意到一条消息，将指导您如何部署SYSLINUX引导装载程序，分别在BIOS或UEFI机器上。BIOS用户比较幸运，因为他们只需要运行syslinux-install_update 脚本就行了，这个脚本是Matthew Gyurgyik编写的，用来在BIOS机器上成功的部署Syslinux。
+安装完成后，你应该注意到一条消息，将指导您如何分别在BIOS或UEFI机器上部署Syslinux引导装载程序。BIOS用户比较幸运，因为他们只需要运行syslinux-install_update 脚本就行了，这个脚本是Matthew Gyurgyik编写的，用来在BIOS机器上成功的部署Syslinux。

 ###在Arch box上部署Syslinux###

@ -39,7 +38,7 @@ sudo syslinux-install_update -i -a -m

 via: http://news.softpedia.com/news/How-to-Replace-GRUB-with-Syslinux-on-Arch-Linux-415394.shtml

-译者：[dy2009](https://github.com/dy2009) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[dy2009](https://github.com/dy2009) 校对：[Mr小眼儿](http://blog.csdn.net/tinyeyeser)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/translated/How
+++ b/translated/How
@ -0,0 +1,70 @@
+在Linux上将视频转换成动态gif图片
+================================================================================
+虽然曾经被认为是过时的艺术形式，但动态GIF图片现在复苏了。如果你还没有留意到，不少在线分享和社交网络网站都开始支持动态GIF图片，例如，[Tumblr][1]，[Flickr][2]，[Google+][3]和[Facebook的部分地方][4]。由于在消费和共享上的容易，GIF的动画已经成为主流互联网文化的一部分了。
+
+所以，你们中的一些人会好奇怎样才能生成这样的动态GIF图片。已经有各种各样专门用来生成动态GIF图片的在线或离线工具。另一种选择是创建一副动态GIF图片时关闭现有的视频剪辑。在这个教程中，我会描述**在Linux上如何将一段视频文件转换成一副动态GIF图片**。
+
+作用一个更有用的例子，让我展示如何**将一个YouTube视频转换成一副动态GIF图片**。
+
+### 第一步：下载YouTube视频 ###
+
+首先，下载一个你想要转换的YouTube视频。你可以使用[youtube-dl][5]这个工具将YouTube视频保存为MP3文件。假设你把你最爱的YouTube视频保存为"funny.mp3"。
+
+### 第二步：从视频中解压视频帧 ###
+
+接下来，在Linux系统上[安装FFmpeg][5]，我会用这个工具去解压从视频中解压出视频帧。
+
+下面的指令会解压出独立的视频帧，将它们保存为GIF图片。确保使用注入("out%04d.gif")的输出文件格式。这样，独立的帧就被合适地命名并保存。
+
+    ffmpeg -t <duration> -ss <starting position in hh:mm:ss format> -i <input_video> out%04d.gif
+
+例如，如果你想解压输入视频的视频帧，从第10秒开始，每5秒一帧，请运行下列命令。
+
+    $ ffmpeg -t 5 -ss 00:00:10 -i funny.mp4 out%04d.gif 
+
+在完成FFmpeg之后，你会看到一组创建出来的GIF文件，它们被命名为"out[\d+].gif"。
+
+### 第三步：合并视频帧进一副动态GIF ###
+
+下面这一步要合并单个的GIF文件成一副动态GIF图片。为此，你可以使用ImageMagick。
+
+首先，如果你还没有的话，在Linux系统上[安装ImageMagick][7]。
+
+
+    convert -delay <ticks>x<ticks-per-second> -loop 0 out*gif <output-gif-file>
+
+在这个命令中，"-delay"是控制动态速度的选项。这个选项表示在显示下一帧画面前需要等待的［秒数］（不好翻译？）。"-loop 0"选项表示动画的无限次循环。如果你愿意，你可以指定"-loop N"让动画只重复N次。
+
+例如，为了生成一副每秒20帧和循环无数次的动态GIF图片，使用如下命令。
+
+    $ convert -delay 1x20 -loop 0 out*.gif animation.gif 
+
+### 第四步（可选）：减少动态GIF的大小 ###
+
+最后这一步（可选）是通过使用ImageMagick的GIF优化功能来减少生成的GIF文件的大小。
+
+使用下列命令去减少GIF大小。
+
+    convert -layers Optimize animation.gif animation_small.gif 
+
+现在你已经准备好在你的社交网络上分享制作完成的GIF图片。下面是一副我从一个可爱的YouTube视频中生成的GIF样例图片。
+
+享受吧！:-)
+[![](http://farm8.staticflickr.com/7372/10988763123_4e89a18085_o.gif)][8]
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2013/11/convert-video-animated-gif-image-linux.html
+
+译者：[KayGuoWhu](https://github.com/KayGuoWhu) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://staff.tumblr.com/post/15623140287/1mb-gifs
+[2]:http://www.flickr.com/photos/markus-weldon-imagebank/4439159924/sizes/o/in/photostream/
+[3]:https://plus.google.com/communities/110524851358723545415
+[4]:http://mashable.com/2013/08/29/gifs-return-to-facebook/
+[5]:http://xmodulo.com/2013/03/how-to-save-youtube-videos-on-linux.html
+[6]:http://xmodulo.com/2013/06/how-to-install-ffmpeg-on-linux.html
+[7]:http://ask.xmodulo.com/install-imagemagick-linux.html
+[8]:http://www.flickr.com/photos/xmodulo/10988763123/
--- a/translated/How
+++ b/translated/How
@ -0,0 +1,207 @@
+如何将Google Calendar 集成到Linux桌面
+================================================================================
+Google Calendar 是时下最流行的网页应用程序之一。用户可以通过网络接口或者本地的应用程序跨设备访问或同步 Google Calendar。在 Linux 上，有很多方法可以本地访问 Google Calendar，比如用电子邮件客户端插件（如 Evolution 或 Thunderbird ）或者用日历应用程序（如 Sunbird 或 Rainklendar）。这些方法通常都需要安装不必要的大型软件，这些软件你很可能根本不需要。
+
+如果你只是想在本地的 Linux 上翻翻 Google Calendar 或者用它设置提醒，那么你可以考虑使用[Google Calendar 命令行接口（或者 gcalcli）][1]，这是一种更轻型化的方法。对于 Linux 桌面操作系统用户来说，好处不止这些，如果将 gcalcli 与[Conky][2]搭配使用你就可以把 Google Calendar 透明地融入桌面主题。
+
+在这个教程中，我会展示**如何利用 gcalcli 和 Conky 将 Google Calendar 融入 Linux 桌面**
+
+### 在 Linux 安装 gcalcli ###
+
+在安装 gcalcli 之前，要确保你正在用的是 Phython 2 而不是 Phython 3 ，因为 Phython 3 与 gcalcli 不兼容。
+
+如果是在 Debian、Ubuntu 或 Linux Mint 上可以用下面的命令安装 gcalcli 
+
+    $ sudo apt-get install git python-pip python-gdata python-dateutil python-gflags python-vobject python-parsedatetime
+    $ sudo pip install google-api-python-client
+    $ sudo pip install apiclient urllib3
+    $ git clone https://github.com/insanum/gcalcli.git
+    $ cd gcalcli
+    $ sudo python setup.py install 
+
+**温馨提醒**：Ubuntu 或 Linux Mint 标准容器中虽然有 gcalcli，但是这些版本并不包含其最新的特性和针对 bug 的修复。所以这里推荐按以上所述的方法由源文件构建 gcalcli。
+
+
+对于Fedora 、CentOS 或 RHEL，可按如下方法安装。
+
+    $ sudo yum install git python-pip python-gdata python-dateutil python-gflags python-vobject
+    $ sudo pip install google-api-python-client
+    $ sudo pip install apiclient urllib3
+    $ git clone https://github.com/insanum/gcalcli.git
+    $ cd gcalcli
+    $ sudo python setup.py install 
+
+### gcalcli 的 Google 认证 ####
+
+为了能让 gcalcli 访问 Google Calendar ，你需要用你的 Google 帐号通过 OAuth2 认证，以使 gcalcli 获得许可来访问你的 Google Calendar。
+
+第一次运行 gcalcli 的时候，OAuth2 认证会自动进行初始化。因此运行下面的命令开始
+
+    $ gcalcli agenda 
+
+该命令会输出如下的一个 URL 。 
+
+[![](http://farm4.staticflickr.com/3791/11216331146_d2c5f95963_z.jpg)][3]
+
+同时这个命令也会弹出一个指向该 URL 的浏览器窗口。如果因为一些原因，你的浏览器没有反应，你可以手动复制粘贴这个 URL 到你的浏览器中。 
+
+如果你还没有登录你的 Google 帐号，你得先登录。然后你会看到下面要求你许可 gcalcli 管理 Google Calendar 的信息。点击“Accept”即可。
+
+[![](http://farm4.staticflickr.com/3810/11216308465_1008fc1bb3_z.jpg)][4]
+
+### 支持 Google Calendar API ###
+
+认证后，下一步就是支持 Google Calendar 的 API 访问。gcalcli 通过 Google Calendar API 访问Google Calendar 。但是，如果要使用 Google API 就必须明确你的 Google 帐号支持 Google API。
+
+首先到：[https://cloud.google.com/console][5]。点击项目列表下的“API Project ”
+
+转到“Apiary & auth ”下面的“APIs”你会看见一个 Google APIs 列表。点击“Calendar API”的开关按钮使其能支持 API。
+
+现在转到“Apiary & auth”下的“Registered apps”那里，去注册 gcalcli app。点击最顶端的“Registered app”按钮。
+
+[![](http://farm8.staticflickr.com/7293/11216363656_c203b6dfa2_z.jpg)][6]
+
+填写 app 的名字（如，“My Gcalcli”），然后选择“ Native ”作为平台。点击“Registered”按钮。
+
+这一步会生成并显示 OAuth 用户的 ID 和密码。另外关于上面提示的“You have not set up your product name（您没有设置您的产品名称）”，你可以忽略掉。
+
+[![](http://farm3.staticflickr.com/2890/11216593546_312a564f1f_z.jpg)][7]
+
+OAuth的认证结果将会保存在 ～/.gcalcli_oauth 文本文件中。
+
+### 用 gcalcli 在命令行中访问 Google Calendar ###
+
+你现在马上就可以用 gcalcli 访问Google Calendar 了。 
+
+在你的家目录创建一个如下的 gcalcli 配置文件。将你先前获得的 OAuth 用户 ID 和 密码按下面格式输入进去。
+
+    $ vi ~/.gcalclirc 
+
+> --client_id='XXXXXXXXXX.apps.googleusercontent.com'
+> --client_secret='YYYYYYYYYYYYYYYY'
+
+到了这一步，你应该可以在命令行运行 gcalcli 了。
+
+试试下面的命令，这两个命令会分别打印出一个你的 Google Calendar 的列表和今后 5 天的日程安排。
+
+    $ gcalcli list
+    $ gcalcli agenda 
+
+[![](http://farm4.staticflickr.com/3780/11216465043_c8f6d8967d_z.jpg)][8]
+
+### 将 gcalcli 与 Conky 结合 ###
+
+最后一步就是将 gcalcli 的输出导入你的桌面主题中。为了做到这一点，你需要 Conky 这个非常强大的工具，它可以把许多信息直接显示在你的桌面主题中。
+
+首先在你的 Linux 系统上 [安装 Conky][9]。 
+
+然后，在你的家目录下的某个地方( 例如 ～/bin )创建如下的脚本程序。
+
+    $ vi ~/bin/gcal.sh 
+
+> #!/bin/sh
+> 
+> gcalcli --conky calw 2 |
+>     sed -e 's/^[(0\x71^[(B/?/g' \
+>         -e 's/^[(0\x78^[(B/?/g' \
+>         -e 's/^[(0\x6A^[(B/?/g' \
+>         -e 's/^[(0\x6B^[(B/?/g' \
+>         -e 's/^[(0\x6C^[(B/?/g' \
+>         -e 's/^[(0\x6D^[(B/?/g' \
+>         -e 's/^[(0\x6E^[(B/?/g' \
+>         -e 's/^[(0\x74^[(B/?/g' \
+>         -e 's/^[(0\x75^[(B/?/g' \
+>         -e 's/^[(0\x76^[(B/?/g' \
+>         -e 's/^[(0\x77^[(B/?/g'
+
+    $ chmod +x ~/bin/gcal.sh 
+
+
+**重要提醒**：上面脚本中的 ‘^[’ 必须是**真正的 ESCAPE 键**( 也就是说在 vi 中按 Ctrl-V 然后按 Esc )。
+
+
+这个脚本程序将 VT100 转义序列转成Unicode组件图字符。这是[必须的一步][10]，因为 Conky 不支持 gcalcli 使用的 ASNII 字符画。
+
+最后，在你的家目录中创建下面的 Conky 配置文件。
+
+    $ vi ~/.conkyrc 
+
+> alignment top_right
+> maximum_width 630
+> minimum_size 330 10
+> gap_x 25
+> gap_y 50
+> 
+> own_window yes
+> own_window_type conky
+> own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+> own_window_transparent yes
+> own_window_argb_visual yes
+> own_window_argb_value 0
+> 
+> update_interval 300
+> background no
+> 
+> border_width 1
+> default_color cornflowerblue
+> default_outline_color white
+> default_shade_color white
+> double_buffer no
+> draw_borders no
+> draw_graph_borders no
+> draw_outline no
+> draw_shades no
+> max_port_monitor_connections 64
+> max_specials 512
+> max_user_text 16384
+> text_buffer_size 8096
+> no_buffers yes
+> out_to_console no
+> uppercase no
+> use_xft yes
+> xftfont Bitstream Vera Sans Mono:size=10
+> 
+> TEXT
+> *** Google Calendar Agenda ***
+> ${execpi 300 gcalcli --conky agenda}
+> ${execpi 300 ~/bin/gcal.sh}
+
+这个 Conky 配置文件会直接在你的桌面主题上显示你的 Google Calendar 的一个日程表和一个两个星期的时间表。
+
+现在，你可以运行下面的命令激活 Conky。
+
+    $ conky 
+
+你应该可以在 Linux 桌面的右边看到 Google Calendar。 
+
+[![](http://farm8.staticflickr.com/7390/11216377436_72d00cec49_z.jpg)][11]
+
+确认 Google Calendar 可以正常运行后，你可以将 Conky 设为在每次登录时自动启动。
+
+### 设置 Google Calendar 提醒 ###
+
+gcalcli 也可以为 Google Calendar 中即将到来的事件发送一个提醒。它使用 notify-send 命令。对于 Google Calendar 提醒，你可以像下面一样设置一个工作进程。
+
+    $ crontab -l 
+
+> */10 * * * * /usr/local/bin/gcalcli remind
+
+--------------------------------------------------------------------------------
+
+via: http://xmodulo.com/2013/12/integrate-google-calendar-linux-desktop.html
+
+译者：[Linchenguang](https://github.com/Linchenguang) 校对：[Caroline](https://github.com/carolinewuyan)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://github.com/insanum/gcalcli
+[2]:http://conky.sourceforge.net/
+[3]:http://www.flickr.com/photos/xmodulo/11216331146/
+[4]:http://www.flickr.com/photos/xmodulo/11216308465/
+[5]:https://cloud.google.com/console
+[6]:http://www.flickr.com/photos/xmodulo/11216363656/
+[7]:http://www.flickr.com/photos/xmodulo/11216593546/
+[8]:http://www.flickr.com/photos/xmodulo/11216465043/
+[9]:http://xmodulo.com/2013/12/install-configure-conky-linux.html
+[10]:https://github.com/insanum/gcalcli/issues/97
+[11]:http://www.flickr.com/photos/xmodulo/11216377436/
--- a/translated/How
+++ b/translated/How
@ -1,12 +1,12 @@
 Linux 中如何打开一个大文本文件
 ================================================================================
-在“大数据”时候，我们会经常遇到有大文件文件（上 GB 或更大）的情况。假设有某种方式需要我们手工的搜索和编辑这些大文件，或者为了解决一些特定的问题而需要手工分析多个上 GB 的日志文件。传统的文本编辑软件对处理这样的大文件不太有效，当我们试图打开一个大文件时会经常由于内存不足而郁闷的不行。
+在“大数据”时代，我们会经常遇到有大文本文件（上 GB 或更大）的情况。假设需要我们手工的搜索和编辑这些大文件，或者为了解决一些特定的问题而需要手工分析多个上 GB 的日志文件。传统的文本编辑软件对处理这样的大文件不太有效，当我们试图打开一个大文件时会经常由于内存不足而郁闷的不行。

-如果你是一个精明的系统管理员，你也许会用 cat、tail、grep、sed、awk 等这些命令的组合来打开和编辑一个任意的文本文件。在这篇教程里，我将会谈论关于如何**在 Linux 中打开（和有可能编辑）一个大文本文件**的更友好的方式方法。
+如果你是一个精明的系统管理员，你也许会用 cat、tail、grep、sed、awk 等这些命令的组合来打开和编辑一个文本文件。在这篇教程里，我将会谈论关于如何**在 Linux 中打开（并编辑）一个大文本文件**的更友好的方式方法。

 ### Vim 的 LargeFile 插件 ###

-文本编辑器拥有大量的插件（或脚本），它们能扩展 VIM 的功能。其中的一个是 [LargeFile plugin][1].Vim。
+Vim文本编辑器拥有大量的插件（或脚本），它们能扩展 VIM 的功能。其中的一个Vim插件是 [LargeFile 插件][1]。

 LargeFile 插件可以使大文件更迅速的被加载和编辑，它是通过关闭 VIM 的一些像事件、回退、语法高亮等功能来实现的。

@ -22,7 +22,7 @@ LargeFile 插件可以使大文件更迅速的被加载和编辑，它是通过

 可以从 [Vim website][2] 上下载 LargFile 插件，最新版本号是5，下载的文件将会保存为 Vimball 格式（以 .vba 结尾）。

-要在你的 home 目录下安装插件，如下所示用 VIM 打开 .vba 文件。
+要在你的 home 目录下安装插件，用 VIM 打开 .vba 文件，如下所示。

    $ gunzip LargeFile.vba.gz
    $ vim LargeFile.vba 
@ -42,12 +42,13 @@ LargeFile 插件可以使大文件更迅速的被加载和编辑，它是通过
 > let g:LargeFile=10

 虽然 LargeFile 可以加速文件装载的速度，但 VIM 自身对编辑相当大的文件支持不太好，因为它会一下子把整个文件都加载进内存。例如，用 VIM 装载 1G　大小的文件，它就会占很多内存和交换空间，如下图所示的顶部输出。
+[![](http://farm6.staticflickr.com/5519/11313640366_0064c698ac_z.jpg)][4]

 所以如果你的文件明显大于你 Linux 系统的物理内存的话，就要考虑其它的选择，如下所述。

 ### glogg 日志资源管理器 ###

-如果你只需要查看一个文本文件，并不会对它做编辑，可以考虑下　[glogg][4]。它是一款基于图形用户界面的独立日志分析器。该　glogg　分析器支持通过正则表达式和通配符来对要打开的文本文件进行过滤和筛选，使用户只看到其真正关注的内容。
+如果你只需要查看一个文本文件，并不对它做编辑，可以考虑下　[glogg][5]。它是一款基于图形用户界面的独立日志分析器。该　glogg　分析器支持通过正则表达式和通配符来对要打开的文本文件进行过滤和筛选，使用户只看到其真正关注的内容。

 在 Debian (Wheezy 版本或更高版本)、Ubuntu 或 Linux Mint 系统中安装 glogg :　

@ -63,17 +64,17 @@ LargeFile 插件可以使大文件更迅速的被加载和编辑，它是通过

 glogg 能很快的打开一个大文本文件。我花了大约 12 秒就打开了一个 1G 的日志文件。

-[![](http://farm8.staticflickr.com/7354/11313640286_4ebee2b959_z.jpg)][5]
+[![](http://farm8.staticflickr.com/7354/11313640286_4ebee2b959_z.jpg)][6]

 在 "Text" 区域，你可以输入正则表达式，然后点击 "Search" 按纽，它支持表达式大小写敏感搜索以及自动刷新功能。搜索后，在窗体底部会显示出筛选的结果内容。

-从装载文件来跟 VIM 对比， glogg　显得更轻量级，在加载完一个 1G 的日志文件后，它仅仅只使用了 83M 的物理内存。
+[![](http://farm3.staticflickr.com/2851/11313594455_d57c700c4b_z.jpg)][7]

-[![](http://farm3.staticflickr.com/2851/11313594455_d57c700c4b_z.jpg)][6]
+从装载文件来跟 VIM 对比， glogg　显得更轻量级，在加载完一个 1G 的日志文件后，它仅仅只使用了 83M 的物理内存。

 ### JOE 文体编辑器 ###

-[JOE][7] 是GPL下发布一个轻量级的基于终端的文本编辑器。JOE 是一款支持大文件，可以打开和编辑比物理内存大的文件的文本编辑器。
+[JOE][8] 是GPL下发布的一个轻量级的基于终端的文本编辑器。JOE 是一款少有的支持大文件的文本编辑器，可以打开和编辑比物理内存大的文件。

 此外，JOE支持各种功能强大的文本编辑功能，如非破坏性编辑，用正则表达式搜索和替换，无限次的撤销/重做，语法高亮等。

@ -89,13 +90,13 @@ glogg 能很快的打开一个大文本文件。我花了大约 12 秒就打开

    $ joe test.log 

-[![](http://farm4.staticflickr.com/3684/11317402126_406058bf78_z.jpg)][8]
+[![](http://farm4.staticflickr.com/3684/11317402126_406058bf78_z.jpg)][9]

 相比上面提到的 glogg 来说，用 JOE 加载一个大文本文件会有点卡，加载一个 1G 的文件要用将近 30 秒的时间，不过考虑到要对文件进行全文编辑，这还能忍受。一旦文件加载完成，就可以在相当快捷的终端模式中编辑此文件。

-The memory consumption of JOE is impressive. To load and edit a 1GB text file, it only takes 47MB of physical memory.
+JOE的内存消耗令人印象深刻。加载并编辑一个1GB的文本文件，只花费47MB的物理内存。

-[![](http://farm4.staticflickr.com/3728/11317483233_2017b5878b_z.jpg)][9]
+[![](http://farm4.staticflickr.com/3728/11317483233_2017b5878b_z.jpg)][10]

 如果你还知道在 Linux 中打开/编辑大文本文件的其它方法的话，请跟我们分享！

--- a/translated/Linux
+++ b/translated/Linux
@ -0,0 +1,44 @@
+Linux 安全方面的3条新闻: Linux 3.13 内核、SystemRescueCD 4 和 BackBox 3.13 发行版
+================================================================================
+### 1) Linux 3.13 ###
+
+Linus Torvalds 本周释出了 Linux Kernel 3.13 作为2014年的开门红。按照惯例，此版本更新了大量驱动。
+
+并且，Linuxt Kernel 3.13 包含了 nftable，这个软件是大名鼎鼎的 iptables 的继任者。从提交的代码来看，nftables 继续使用现存的网络过滤钩子(netfilter hooks)、连接追踪系统、NAT 子系统、透明代理引擎、日志基础架构和用户空间包排列设施。
+
+> “简而言之，nftables 提供4个128位的普通寄存器和1个特殊寄存器用于保存结论”，代码提交的注释上说道，“并且 nftables 继承了 iptables 的“table/chain/rule 对象”这些概念，但提供了更灵活的配置方式，它也包含原先映射支持的未知数据类型架构。”
+> 
+> 值得注意的是 nftables 还支持 NFC（近场通信）支付协议。
+> 
+> “使用 NFC_CMD_SE_IO 命令发送 ISO07816 应用协议数据单元到 NFC 嵌入式安全设备，”Intel 开发人员 Samuel Ortiz 在他的提交[信息][1]中写道：“反馈信息也是通过 NFC_CMD_SE_IO 返回到用户空间的。”
+
+### 2) System Rescue CD 4.0.0 ###
+
+大多数人都会使用 Linux 作为服务器或桌面系统，其实我们还可以把一个 Linux 系统拿来救援一个非 *nix 系统。
+
+用于恢复系统和数据的 Linux 发行版中，比较流行的一个是“SystemRescueCd”，它在上周更新到了4.0.0版。
+
+以下是它的[更新记录][2]：
+
+- 标准内核：长期支持（LTS）版 linux-3.10.25（内核镜像包含32位的 rescue32 和 64位的 rescue64）
+- 备用内核：最新稳定版 linux-3.12.7（内核镜像包含32位的 altker32 和 64位的 altker64）
+- XOrg 图形环境和驱动更新到 xorg-server-1.14.3
+- GParted 更新到 0.17.0（添加在线重新分区的功能）
+- btrfs 工具集更新到 sys-fs/btrfs-progs-3.12
+
+### 3) BackBox 3.13 ###
+
+Linux 也是那些安全专家们手中的强大武器，而 BackBox 就是一个专注于安全的 Linux 发行版（BackBox 主要面对安全评估和渗透测试 —— 译者注）。最新版的 BackBox 更新了大量组件，有一点很奇怪，它没有使用最新的 Linux 3.13 内核，而用了 Linux 3.11 内核。
+
+现在的 BackBox 发行版可以在匿名模式下更新安全工具。
+
+--------------------------------------------------------------------------------
+
+via: http://www.linuxplanet.com/news/linux-top-3-linux-3.13-system-rescue-4-and-backbox-3.13.html
+
+译者：[bazz2](https://github.com/bazz2) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5ce3f32b5264b337bfd13a780452a17705307725
+[2]:http://www.sysresccd.org/Changes-x86
--- a/translated/Linux
+++ b/translated/Linux
@ -1,92 +0,0 @@
-Linux free 命令 - 显示系统中空闲和已使用的内存
-================================================================================
-系统管理员必须管理他们服务器的健康。其中重要的一部分是内存。当服务器内存用满时，它会减小服务器的性能。为了监视内存利用率，Linux有一个工具称为free。
-
-### free是什么 ###
-
-**free** 命令是一个显示系统中空闲和已用内存大小的工具。free命令的输出和top命令相似。大多数Linux发行版已经含有free命令。
-
-### How to run it ###
-
-为了运行，只要在控制台输入**free**。不带选项运行会显示一个以KB为单位的默认输出。
-
-    $ free
-
-![free默认视图](http://linoxide.com/wp-content/uploads/2013/12/free_default.png)
-
-从上面的截图我们看到：
-
-#### 内存 (以KB计) ####
-
- Total : 1026740
- Used : 843396
- Free : 183344
- Shared : 0
- Buffers : 52704
- Cached : 376384
-
-#### Swap (以KB计) ####
-
- Total : 1045500
- Used : 3376
- Free : 1042124
-
-当你看见buffer/cache的空闲空间低或者swap的空闲空间低，那么内存需要升级了。这意味这内存利用率很高。请注意 **共享内存那个应该被忽略**，因为他已经被废弃了。
-
-### 以其他单元显示内存信息 ###
-
-如我们先前提到的，默认上free会以KB为单位显示信息。free同样提供给我们 **b (B), -k (KB), -m (MB), -g (GB) and –tera (TB)**这些单位。要显示我们想要的单位，只要选择一个并在free后面跟上。下面一个是以MB为单位的输出。
-
-    $ free -m
-
-![free命令以MB为单位](http://linoxide.com/wp-content/uploads/2013/12/free_m.png)
-
-这个技巧技巧同样适用于**-b, -k, -g** and **–tera** 选项。
-
-### 以人类可读方式显示内存信息 ###
-
-free同样提供了**-h**选项，这意味着人类可读(译注:系统上可能并不存在-h选项，已被-m取代)。那么这与其他的选项有什么不同呢，如**-m**(MB)选项？ 最大的可见的不同是**-h**选项会在数字后面加上人类可读的单元。让我们看一个例子。
-
-    $ free -h
-
-![人类可读的free](http://linoxide.com/wp-content/uploads/2013/12/free_h.png)
-
-如我们一起看到的，在1,0数字后这里是**G(GB)**字母。当数字并没有达到GB时，free足够聪明来知道并在每个数字后面跟上合适的单元。后面的**M** - 数字929告诉我们它有929MB(译注: 原文为929 number tell us its 969 Megabytes，这里应该为typo)。
-
-### 延迟显示free ###
-
-作为一个显示工具，最好的捕捉内存利用率的方法是使用延迟。为了这么做，我们可以使用**-s**选项后面跟上我们想要的N秒。我们总是在后面跟上多于1个的选项来使输出满足我们的需求。假如我们想要每3s捕捉内存利用率并且是人类可读的。那么就像这样做:
-
-    $ free -hs 3
-
-![延迟3s显示free](http://linoxide.com/wp-content/uploads/2013/12/free_hs3.png)
-
-### 显示高低内存利用率 ###
-
-如果我们想要知道高低内存统计，我们可以使用-l选项。下面是一个例子。
-
-    $ free -l
-
-![Free 的 低-高 统计](http://linoxide.com/wp-content/uploads/2013/12/free_l.png)
-
-### 显示Linux全部内存 ###
-
-如果我们需要每列的总计信息，我们可以在free命令后面跟上-t选项。这会字底部额外加入一行显示。
-
-    $ free -t
-
-![free命令带总计内存](http://linoxide.com/wp-content/uploads/2013/12/free_t.png)
-
-### 总结 ###
-
-除了[vmstat][1]以外，free命令是另外一个用于捕捉内存利用率的简单统计工具。用这个你可以抓取一个快速的关于你Linux内存的信息。free命令使用/proc/meminfo作为基准来显示内存利用率信息。如往常一样，你可以在控制台下输入"man free"来发现关于free的更多细节。
-
--------------------------------------------------------------------------------
-
-via: http://linoxide.com/linux-command/linux-free-command/
-
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://linoxide.com/linux-command/linux-vmstat-command-tool-report-virtual-memory-statistics/
--- a/translated/Linux
+++ b/translated/Linux
@ -1,10 +1,10 @@
-Linux 下报告CPU和I/O报告命令iostat
+Linux 下使用iostat命令生成CPU和I/O的统计报告
 ================================================================================
-一个通用处理单元挥着CPU是一台电脑的大脑。所有的处理命令运行在上面。输入/输出或者I/O同样扮演了一个重要的角色。硬盘被用于提供数据给处理器并保存已被CPU处理的数据。一种恒来那个处理器和I/O利用率的方法是使用**iostat**命令。从它们的利用率，我们可以决定是否该增加更多资源。
+CPU（中央处理单元）是一台电脑的大脑。所有的处理命令都运行在上面。I/O（输入/输出）同样扮演了一个重要角色。硬盘用于提供数据给处理器并保存CPU处理过的数据。一种衡量处理器和I/O利用率的方法是使用**iostat**命令。通过它们的利用率，我们可以决定是否该增加更多资源。

 ### iostat 是什么 ###

-iostat是一个通过观察设备的活跃时间和他们平均传输率之间的管理来监视系统输入/输出设备负载的命令。iostat可以生成一个用于改变系统系统从而更好在输入/输出和物理硬盘间取得平衡的报告。
+iostat通过观察设备的活跃时间和他们平均传输率之间的关系来监视系统的输入/输出设备负载。iostat生成的报告可以用于修改系统配置从而更好在物理硬盘间平衡输入/输出的报告。

 ### 安装 iostat ###

@ -31,15 +31,15 @@ iostat包含在**sysstat**包内。如果你没有，你首先需要安装它。
 #### 第一部分包含了CPU报告 ####

 - **%user** : 显示了在执行用户(应用)层时的CPU利用率
- **%nice** : 显示了在执行以nice后的优先级运行用户层的CPU利用率
+- **%nice** : 显示了在以nice优先级运行用户层的CPU利用率
 - **%system** : 显示了在执行系统(内核)层时的CPU利用率
- **%iowait** : 显示了CPU在有未完成的I/O请求时空闲时间的百分比
+- **%iowait** : 显示了CPU在I/O请求挂起时空闲时间的百分比
 - **%steal** : 显示了当hypervisor正服务于另外一个虚拟处理器时无意识地等待虚拟CPU所占有的时间百分比。
- **%idle** : 请求时空闲时间的百分比
+- **%idle** : 显示了CPU在I/O没有挂起请求时空闲时间的百分比

 #### 第二部分包含了设备利用率报告 ####

- **Device** : 设备/分区名字列在 **/dev** 目录
+- **Device** : 列出的**/dev** 目录下的设备/分区名称
 - **tps** : 显示每秒传输给设备的数量。更高的tps意味着处理器更忙。
 - **Blk_read/s** : 显示了每秒从设备上读取的块的数量(KB,MB)
 - **Blk_wrtn/s** : 显示了每秒写入设备上块的数量(KB,MB)
@ -66,7 +66,7 @@ iostat包含在**sysstat**包内。如果你没有，你首先需要安装它。

 ### 带延迟使用iostat ###

-和[vmstat][1]一样,作为一个统计工具，最好带延迟参数来使用它。带了它，我们可以看到趋势。这里有一些带延时运行iostat的示例。
+和[vmstat][1]一样,作为一个统计工具，最好带延迟参数来使用它。通过延迟参数，我们可以看到趋势。这里有一些带延时运行iostat的示例。

 #### 以KB为单位，2秒间隔，运行3次的方式运行iostat ####

@ -80,7 +80,7 @@ iostat包含在**sysstat**包内。如果你没有，你首先需要安装它。

 ![以3秒为间隔，只显示iostat](http://linoxide.com/wp-content/uploads/2013/12/iostat_c_3_6.png)

-#### Show hda2 and hda6 device only report with 2 seconds interval and 4 times reports ####
+#### 显示hda2和hda6的设备报告，以2秒为间隔，报告4次 ####

    $ iostat -d hda2 hda6 2 4

@ -91,19 +91,19 @@ iostat包含在**sysstat**包内。如果你没有，你首先需要安装它。
 iostat使用这些文件来创建报告。

 **/proc/stat**  包含了系统统计
-**/proc/partitions** 包含磁盘统计 (对于2.5以前的已打过补丁的内核)
+**/proc/partitions** 包含磁盘统计 (对于已打过补丁的2.5以前的内核)
 **/proc/diskstats** 包含磁盘统计 (对于2.5以后的内核)
 **/sys** 包含块设备统计 (2.5以后内核)

 ### 总结 ###

-vmstat用于监视内存使用，iostat用于监视CPU使用率和I/O系统，这样我们就有了完整的工具来监视你机器中三个重要的组件。这些工具的一个好处是你无需使用特权运行它们。你可以浏览iostat的手册来深入了解。只需在控制台下输入**man iostat**就可进入iostat手册界面。
+vmstat用于监视内存使用，iostat用于监视CPU使用率和I/O系统，这样我们就有了完整的工具来监视你机器中三个重要的组件。这些工具的一个好处是你无需使用root权限运行它们。你可以浏览iostat的手册来深入了解。只需在控制台下输入**man iostat**就可进入iostat手册界面。

 --------------------------------------------------------------------------------

 via: http://linoxide.com/linux-command/linux-iostat-command/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[Mr小眼儿](http://blog.csdn.net/tinyeyeser)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

--- a/translated/The
+++ b/translated/The
@ -1,33 +0,0 @@
-《The Debian Administrator’s Handbook》更新至Debian 7 Wheezy，可免费下载
-================================================================================
-
-几个月以前，Debian开发者[发布][1]了《The Debian Administrator's Handbook》，实质上，是一本清晰呈现Debian的内部，方便用户以及正确结构化信息的全面手册。
-
-最初的书现在已经[更新][2]至Debian 7 Wheezy，更新为“**The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery**”，新书根据目前现状重新整理了Debian的知识点，并明显提升了手册知识点数量。
-
-"The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery"是该手册的第一次重大更新，从最初版本到现在更新超过一年时间，因此，推荐给已经熟悉Debian，并希望提升Debian知识的用户们。
-
-> “我们高兴的宣布‘The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery’发布了。这是自第一版书（2012年5月）发布后的第一次重大更新。我们通过更新所有章节来介绍Debian 7的改变。我们还删除了一些确实不再适用的过时内容。相对的，我们增加了新的东西（如关于 multi-arch的部分），并修正了读者反馈的16个错误。”
-
-什么是Debian，安装方法，二进制包的结构，软件包的结构，稳定库，性能和apt-get命令，配置和编程，通过ADSL连接，数据库，编译内核，RAID和LVM，图形化桌面，创建Debian包，全部涵盖在了“The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery”的498页内容中。
-
-![](http://iloveubuntu.net/pictures_me/The%20Debian%20Administrator%E2%80%99s%20Handbook,%20Debian%20Wheezy%20from%20Discovery%20to%20Mastery.png)
-
-“The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery”可以免费下载（498页，[PDF][3]，[EPUB][4]，[MOBI][5]）。
-
-对于喜欢印刷版书籍的朋友，“The Debian Administrator’s Handbook, Debian Wheezy from Discovery to Mastery”可以通过以下方式购买[http://debian-handbook.info/get/][6]
-
--------------------------------------------------------------------------------
-
-via: http://iloveubuntu.net/debian-administrator%E2%80%99s-handbook-updated-debian-7-wheezy-published-and-freely-available-download
-
-译者：[乌龙茶](https://github.com/yechunxiao19) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://iloveubuntu.net/debian-administrator%E2%80%99s-handbook-available-both-payed-and-free-ebook-epub-mobi-pdf
-[2]:http://debian-handbook.info/2013/major-update-of-the-debian-administrators-handbook-for-debian-7-wheezy/
-[3]:http://debian-handbook.info/download/stable/debian-handbook.pdf
-[4]:http://debian-handbook.info/download/stable/debian-handbook.epub
-[5]:http://debian-handbook.info/download/stable/debian-handbook.mobi
-[6]:http://debian-handbook.info/get/
--- a/translated/The
+++ b/translated/The
@ -0,0 +1,57 @@
+戴文的Linux内核专题：28 编译与安装
+================================================================================
+![](http://www.linux.org/attachments/slide-jpg.762/)
+
+你好！在花费了大量的时间在配置你需要的内核后，你现在可以编译它了。源代码是纯文本形式的C代码。这对人来可读但是对机器不这样。编译会将代码转换成计算机可理解的一种称之为二进制码的形式(1是 [开],0 是 [关])。编译同样会将所有内核代码文件变成一个内核的文件。
+
+为了编译内核，在内核源代码相同目录下，在终端内输入"make"。这会花费一些时间。一旦完成，模块必须通过"make modules"来编译。为了从一开始就简化编译过程，输入"make; make modules"。这会先编译接着是模块，而不用用户再回来输入"make modules"。
+
+![](http://www.linux.org/attachments/compiling_01-png.763/)
+
+警告：在你安装一个内核时，备份所有的重要数据，确保有一份/boot目录备份在FAT32的存储卡上。这可以在如果安装失败后帮助修复系统。FAT32不会存储权限，因此它更容易被用作live盘来还原数据。记住设置原始文件权限和可执行位。
+
+一旦编译已经成功完成，我们可以安装内核到本地系统中(我会马上解释如何在其他系统上安装内核[交叉编译])。在相同的终端下，在编译完成后，输入"make install"。这会在/boot目录下存放一些文件。"vmlinuz"(或者其他相似的名字)是内核自身。"initrd"是基于内存的文件系统，它被置于内存中且在启动中使用。"System-map"包含了一张内核符号列表。这些全局变量和函数用于内核代码。"config"	是内核的配置文件。grub.cfg会自动更新。然而，有些bootloder需要手动配置。内核安装器会自动配置Grub，LILO和SysLinux bootloder。像BURG这类bootloder需要手动配置。模块的安装同样需要输入"make modules install"。
+
+![](http://www.linux.org/attachments/compiling_04-png.764/)
+
+注：内核和模块的安装可以写在一行-“make install && make modules_install”。
+
+![](http://www.linux.org/attachments/compiling_05-png.765/)
+
+一旦上面的过程完成了，用户可以通过重启系统并在开机后在终端内输入"uname -r"来确保内核已经安装。如果系统无法启动或者uname报告你预期外的版本号，这个问题可能众多问题之一引起。或者是bootloader没有正确设置，特性/配置冲突，编译失败，不正确的安装，或者其他原因。找出问题源头最好的方法是查看系统日志(如果系统已经启动到足以产生日志)。"dmsg"是一个在屏幕上打印内核日志的命令。查看错误、警告或者未预料的结果。如果系统没有启动或者没有足够启动完全来生成日志，使用live linux盘来执行诊断和修复。如果所有的都失败了，再次编译内核并确保你已经用root或者"sudo"安装了内核。
+
+注：最好的修复系统的方式是使用live Linux发行版来移除新的/损坏的内核，接着手动修复Grub文件(或者复制一个备份)。
+
+一些Linux用户也喜欢安装文档，但这并不是必要。对于那些想要安装文档的用户，输入这行，这里的version是你的内核版本号 "install -d /usr/share/doc/linux-VERSION && cp -r Documentation/* /usr/share/doc/linux-VERSION"(VERSION 是内核版本号)。很明显，这需要root特权。
+
+为了编译一个如你目前内核一样特性的内核，输入这条命令"zcat /proc/config.gz > .config"。这个文件可能不存在，如果是这样，你可能需要询问你发行版/内核的开发者这个文件。"zcat"命令解压并写入数据到一个".config"文件中。记住在你希望的地方输入".config"。这个文件放置在Linux内核目录下并允许它替换当前的文件。接着，像往常一样编译安装你的内核。
+
+交叉编译稍微有点不同。为目标系统配置内核。确保内核配置完后，它在脑海中交叉配置过了。当交叉编译时，需要熟悉两条术语。"Host"是执行编译的系统，"Target"是接收新内核的系统。确保主机系统有合适的编译器。比如，对于ARM系统的交叉编译，用户需要在主机系统上有gcc-arm-linux-gnueabi。通常来说，开发这可以在他们的包管理器上搜寻或者Googledao合适/最好的适合他们需要的交叉编译器。特定的用于ARM系统交叉编译的命令是"make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-"。"ARCH=arm"指的是目标处理器的类型，"CROSS_COMPILE"指明了交叉编译器。注意交叉编译器前面缺少了"gcc-"并以破折号结束。这是用户在使用交叉编译器作为参数使用时必须使用的格式。模块可以通过输入"make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules".交叉编译。为了在目标系统上安装内核，复制内核文件夹到目标系统上。一旦文件已在目标系统上并在该目录下打开了终端，输入"make install && make modules_install"。当然你必须是root或者使用"sudo"。
+
+信息：Kernel.org放了一个支持的交叉编译器列表([https://www.kernel.org/pub/tools/crosstool/][1])。
+
+### 安装编译总结: ###
+
+#### 标准: ####
+
+    make && make modules && make install && make modules_install
+
+#### 做一个更新的版本或者重混你的内核: ####
+
+    zcat /proc/config.gz > .config &&  make && make modules && make install && make modules_install
+
+#### 交叉编译: ####
+
+    make ARCH={TARGET-ARCHITERCTURE} CROSS_COMPILE={COMPILER}; make ARCH={TARGET-ARCHITERCTURE} CROSS_COMPILE={COMPILER} modules && make install && make modules_install
+
+下篇文章中，我们会讨论加入和激活模块。谢谢！
+
+--------------------------------------------------------------------------------
+
+via: http://www.linux.org/threads/the-linux-kernel-compiling-and-installing.5208/
+
+译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+
+本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
+
+[1]:https://www.kernel.org/pub/tools/crosstool/
--- a/translated/Top
+++ b/translated/Top
@ -1,44 +0,0 @@
-10个对于黑客顶级的Linux发行版！
-================================================================================
-黑客和安全研究员在手上总是需要工具。它们很多都基于流行的Ubuntu和Debain操作系统，其中已经安装了许多的黑客工具。
-
-![](http://www.efytimes.com/admin/useradmin/photo/ef0R121832PM132014.jpg)
-
-1. [BackTrack 5r3][1]:这是一个最受欢迎和指明的基于Linux的黑客发行版。基于Canonical的Ubuntu操作系统，Backtrack的logo说，"你变得更安静，你听到的更多。"在版本5中，GNOME桌面环境已经随着普遍的KDE桌面环境一起加入了。
-
-2. [Nodezero][2]:这是另外一个基于Ubuntu的黑客版，它用于渗透测试。每当Ubuntu收到bug补丁时，Nodezero也会得到。
-
-3. [BackBox Linux][3]: 这也是一个基于Ubuntu的用于黑客的工具。根据开发者，该系统被设计来创建一个渗透测试发行版，并且快速又易用。它还会使用仓库获取新的道德黑客工具的更新。
-
-4. [Blackbuntu][4]:Ubuntu自己可能不是一个黑客工具，但是有许多基于它的版本。这个发行版带来了诸如网络映射、信息手机、渗透、漏洞识别，特权提升，无线网络分析、VoIP分析等等。
-
-5. [Samurai Web Testing Framework][5]:这个发行版注重使用最好的用于黑客和攻击的免费和开源的工具攻击网站。开发者已经把4步合并到发行版中，包括侦查、映射、探索和利用。
-
-6. [Knoppix STD][6]:从Ubuntu到Debian，Knoppix STD是一个基于Debian的黑客发行版，运行GNOME、KDE、LXDE和Openbox桌面环境。它已经存在了很长一段时间并且是它们之中最早的live发行版。
-
-7. [Pentoo][7]:这是一个针对安全测试的live CD，并且基于Gentoo。它带来了大量的自定义工具和来自公司的内核。这里包含了Backported WiFi stack, XFCE4等等。
-
-8. [Weakerthan][8]:这个发行版使用Flufbox桌面环境，这最适合无线黑客因为它包含了很多无线工具。它基于Debian Squeeze发行版，带来了WiFi攻击、Cisco漏洞利用、SQL入侵、Web入侵、蓝牙和其他等。
-
-9. [Matriux Krypton][9]:在Weaker4n之后，这也许是第一个直接基于Debian OS的发行版。它是一个有300个安全工具的兵工厂，是道德入侵、渗透测试、安全测试、系统和网络管理、网络取证的一个好选择。
-
-10. [DEFT][10]:一款带有高级数字响应工具的基于Linux Kernel 3 的操作系统。它使用WINE来在Linux上运行Windows工具，并主要运行LXDE桌面环境。
-
--------------------------------------------------------------------------------
-
-via: http://www.efytimes.com/e1/fullnews.asp?edid=125775
-
-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
-
-[1]:http://www.backtrack-linux.org/downloads/
-[2]:http://www.nodezero-linux.org/downloads
-[3]:http://www.backbox.org/downloads
-[4]:http://sourceforge.net/projects/blackbuntu/
-[5]:http://sourceforge.net/projects/samurai/files/
-[6]:http://s-t-d.org/download.html
-[7]:http://www.pentoo.ch/download/
-[8]:http://weaknetlabs.com/main/?page_id=479
-[9]:http://sourceforge.net/projects/matriux/
-[10]:http://iso.linuxquestions.org/deft-linux/deft-linux-7/
--- a/translated/Ubuntu
+++ b/translated/Ubuntu
@ -1,18 +0,0 @@
-Ubuntu默认存储你的Wi-Fi密码!
-================================================================================
-
-Ubuntu可能不像你想象的那么安全．据报道，Linux驱动的发行版在home目录外存储Wi-Fi配置文件，这使得它们更易于被访问。这包括Wi-Fi配置文件的密码。报道说，一个用户指出，Wi-Fi密码在Ubuntu上是不加密的，因为它们都存储在home目录之外。此文件夹虽然可以在操作系统的安装过程中进行加密。
-
-"最近，我偶然发现了一个事实，NetworkManager默认存储WiFi配置文件*包括明文密码*到/etc/NetworkManager/system-connections/.我认为这不是用户所期望的，当他/她开启了home目录加密，正因为如此，应该以某种方式纠正." - Softpedia引用邮件列表中Per Guth的话。
-
-这个问题显然是为了让“所有用户都可以连接到这个网络”，即默认情况下启用该选项的结果。为了关掉此功能，用户必须打开Network Indicator，然后去Edit Connection。然后选择在Edit上的Select Network and clock。在General选项卡，取消勾选，以将其关闭。
-
-取消选中该选项据说会移动密码进入所需的文件夹，但Softpedia报告推测，大多数用户不会注意到这个问题。Canonical是否会进行任何更改，还有待观察。
-
--------------------------------------------------------------------------------
-
-via: http://www.efytimes.com/e1/fullnews.asp?edid=125483
-
-译者：[Akagi201](https://github.com/Akagi201) 校对：[校对者ID](https://github.com/校对者ID)
-
-本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出
--- a/translated/userdel
+++ b/translated/userdel
@ -1,16 +1,16 @@
 userdel 命令 - 从Linux系统中删除用户账户
 ================================================================================
-**userdel** command to delete a user
-在服务器上维护用户意味着加入、修改和删除他们。当用户不在需要在系统上时，我们需要删除它避免安全缺口。在Linux系统上，我们有**userdel**命令来删除一个用户。
+在服务器上维护用户意味着添加、修改以及删除用户。当一个用户出于某种原因不再需要登录系统时，我们需要删除此用户以避免安全缺口。在Linux系统上，我们用 **userdel** 命令来删除一个用户。

 ![](http://linoxide.com/wp-content/uploads/2013/12/userdel-linux-command.jpg)

 ### userdel是什么 ###

-userdel是一个底层用于删除用户的工具。在Debian上，我们应该通常使用deluser命令。userdel会查询系统账户文件，例如 **/etc/password** 和 **/etc/group**。那么他会删除所有和用户名相关的条目。在我们删除它之前，用户名必须存在。
+userdel 是一个底层用于删除用户的工具。在 Debian 上，我们通常会使用 deluser 命令。userdel 会查询系统账户文件，例如 **/etc/password** 和 **/etc/group**。那么它会删除所有和用户名相关的条目。在我们删除它之前，用户名必须存在。

 ### 如何使用userdel ###
-既然userdel会修改系统账户文件，那么我们**需要root特权**来运行它。不然我们会遇到一个错误信息“*only root can do that*”或者相似的信息。在我们得到特权后，我们可以在你的控制台下在userdel后面输入用户名。下面是一个平常默认使用userdel的例子。
+
+由于 userdel 会修改系统账户文件，那么我们**需要root特权**来运行它。不然我们会遇到一个报错信息“*只有root权限才能执行这项操作*”或者类似的信息。在我们得到特权后，我们可以通过输入 userdel 从你的控制台删除用户。下面是一个默认使用 userdel 的样例。

    $ sudo userdel pasadena

@ -20,43 +20,42 @@ userdel是一个底层用于删除用户的工具。在Debian上，我们应该

 ![](http://linoxide.com/wp-content/uploads/2013/12/userdel_default.png)

-如你所见，我们不能没有root权限而删除用户pasadena。当我们有权限时，系统不会给出错误信息，这意味着用户已经成功删除。
+正如你所见，我们不能没有root权限而删除用户 pasadena。当我们有权限时，系统不会给出错误信息，这意味着用户已经成功删除。

 ### 完全删除用户家目录 ###

-不带选项使用userdel，只会删除用户。用户的家目录将仍会在/home目录下。
+不带选项使用 userdel，只会删除用户。用户的家目录将仍会在/home目录下。

 ![](http://linoxide.com/wp-content/uploads/2013/12/userdel_home_folder.png)

-当我们进入/home目录时，我们仍旧可以看到1002拥有pasadena文件夹。已创建的用户会有一个与用户名相同的组名。1002是pasadena用户名的UID和GID，还是pasadena的组名。
+当我们进入/home目录时，我们仍旧可以看到1002拥有 pasadena 文件夹。已创建的用户会有一个与用户名相同的组名。1002是 pasadena 用户名的 UID 和 GID，也是 pasadena 的组名。

-为了在删除用户时完全删除家目录，我们可以使用-r选项。这个选项同样会删除用户的邮件池如果存在的话。
+为了在删除用户时完全删除家目录，我们可以使用 **-r** 选项。这个选项同样会删除用户的邮件池如果存在的话。

 ![](http://linoxide.com/wp-content/uploads/2013/12/userdel_r.png)

 ### 强制删除一个用户 ###

-Userdel provide **-f** option to force user deletion. This option will delete a user even the user still log in into Linux system. Please take a look a sample screenshot.
-userdel提供了**-f**选项来强制删除用户。这个选项会删除用户及时用户已经登入系统。请看一下示例截图
+userdel 提供了 **-f** 选项来强制删除用户。甚至当用户已经登入 Linux 系统时此选项仍旧生效。请看一下示例截图。

 ![](http://linoxide.com/wp-content/uploads/2013/12/userdel_f.png)

-截图的上面显示用户pasadena已经登陆了系统。它被标记的进程**6218**是SSHD进程。但是当我们用“**userdel -f pasadena**”只会显示已经登陆的用户的信息。命令本身是成功的。如果我们使用[cat 命令][1]查看**/etc/passwd**的内容，我们看不到到用户pasadena存在了。他的家目录还存在但是属主已经改变。
+截图的上面显示用户 pasadena 已经登录了系统。它被标记的进程**6218**是 SSHD 进程。但是当我们用“**userdel -f pasadena**”只会显示已经登录的用户的信息。命令本身是成功的。如果我们使用[cat 命令][1]查看**/etc/passwd**的内容，我们看不到到用户 pasadena 存在了。他的家目录还存在但是所有者已经改变。

-有一点我们必须知道的额是，带**-f**选项的userdel**不会断开**SSH链接。因此用户仍旧是已登录并是活跃的及时用户已不存在。但是当用户登出后用户不再可以登陆因为用户已经删除。
+有一件事我们必须了解，带 **-f** 选项的 userdel **不会断开** SSH 链接。因此，即使用户已经不存在，但实际上仍是登录状态，并且是活跃用户。但是当用户登出后不可再登录，因为用户已经被删除。

-因此**这个选项使用很危险**因为它会使你的系统进入不一致的状态。
+因此**所以这个选项使用起来有些危险**，因为它会使你的系统进入不一致的状态。

-总结
+### 总结 ###

-userdel是一个Linux系统内部删除用户的工具。userdel同样**deluser**命令的后端，一个perl删除用户的脚本。如往常一样，你可以输入**man userdel**来探索关于userdel命令的更多细节。
+userdel 是一个 Linux 系统内部删除用户的工具。userdel同样是**deluser**命令的后端，一个perl删除用户的脚本。如往常一样，你可以输入**man userdel**来查看关于userdel命令的更多细节。 

 --------------------------------------------------------------------------------

 via: http://linoxide.com/linux-command/linux-userdel-command/

-译者：[geekpi](https://github.com/geekpi) 校对：[校对者ID](https://github.com/校对者ID)
+译者：[geekpi](https://github.com/geekpi) 校对：[Caroline](https://github.com/carolinewuyan)

 本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创翻译，[Linux中国](http://linux.cn/) 荣誉推出

-[1]:http://linoxide.com/linux-command/13-cat-command-examples/
+[1]:http://linoxide.com/linux-command/13-cat-command-examples/